Ver código fonte

update static urls and message tags

Mohammed Khan 1 ano atrás
pai
commit
f1ae91ea41
2 arquivos alterados com 19 adições e 16 exclusões
  1. 9 9
      backend/templates/base.html
  2. 10 7
      backend/users/templates/index.html

+ 9 - 9
backend/templates/base.html

@@ -2,7 +2,7 @@
 <!doctype html>
 <html lang="en">
     <head>
-        <link rel="icon" href="{% static 'fontawesome-free-5.15.3-web/svgs/solid/../../apps/main/static/fontawesome-free-5.15.3-web/svgs/solid/underline.svg' %}">
+        <link rel="icon" href="{% static 'fontawesome-free-5.15.3-web/svgs/solid/underline.svg' %}">
 
         <meta charset="utf-8">
         <meta name="keywords" content="youtube, playlists, videos, delete videos, delete playlists, delete multiple videos, move multiple videos, merge playlists, video manager, playlist manager, youtube playlists, untube, google">
@@ -118,13 +118,13 @@
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
  <link href="https://fonts.googleapis.com/css2?family=Comfortaa&family=Fredoka+One&display=swap" rel="stylesheet">
 
-        <link href="{% static 'fontawesome-free-5.15.3-web/css/../../apps/main/static/fontawesome-free-5.15.3-web/css/all.min.css' %}" rel="stylesheet">
-        <link href="{% static 'bootstrap5.0.1/css/../../apps/main/static/bootstrap5.0.1/css/bootstrap.min.css' %}" rel="stylesheet">
-        <link rel="stylesheet" href="{% static 'choices.js/../../apps/main/static/choices.js/choices.min.css' %}">
+        <link href="{% static 'fontawesome-free-5.15.3-web/css/all.min.css' %}" rel="stylesheet">
+        <link href="{% static 'bootstrap5.0.1/css/bootstrap.min.css' %}" rel="stylesheet">
+        <link rel="stylesheet" href="{% static 'choices.js/choices.min.css' %}">
 
-        <script src="{% static 'htmx/../../apps/main/static/htmx/htmx.min.js' %}" type="application/javascript"></script>
-        <script src="{% static 'jquery3.6.0/js/../../apps/main/static/jquery3.6.0/js/jquery-3.6.0.min.js' %}" type="application/javascript"></script>
-        <script src="{% static 'bootstrap5.0.1/js/../../apps/main/static/bootstrap5.0.1/js/bootstrap.bundle.min.js' %}" type="application/javascript"></script>
+        <script src="{% static 'htmx/htmx.min.js' %}" type="application/javascript"></script>
+        <script src="{% static 'jquery3.6.0/js/jquery-3.6.0.min.js' %}" type="application/javascript"></script>
+        <script src="{% static 'bootstrap5.0.1/js/bootstrap.bundle.min.js' %}" type="application/javascript"></script>
             </head>
     <body class="text-dark" style="font-family: 'Fredoka One', 'Comfortaa',  sans-serif; {% if not user.profile.enable_gradient_bg %}background-color: #FDF4DC;{% endif %}">
 
@@ -228,9 +228,9 @@
 
         <br>
 
-        <script src="{% static 'clipboard.js/../../apps/main/static/clipboard.js/clipboard.min.js' %}" type="application/javascript"></script>
+        <script src="{% static 'clipboard.js/clipboard.min.js' %}" type="application/javascript"></script>
         <script async src="https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js" integrity="sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D" crossorigin="anonymous"></script>
-        <script src="{% static 'choices.js/../../apps/main/static/choices.js/choices.min.js' %}"></script>
+        <script src="{% static 'choices.js/choices.min.js' %}"></script>
 
         <script type="application/javascript">
 

+ 10 - 7
backend/users/templates/index.html

@@ -52,20 +52,23 @@
 
       <div class="container py-4">
             {% if messages %}
-                    {% for message in messages %}
-                      <div class="alert alert-success alert-dismissible fade show" role="alert">
-                          {{ message }}
-                          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                      </div>
-                    {% endfor %}
-                {% endif %}
+                {% for message in messages %}
+                <div class="alert alert-dismissible bg-{% if message.tags == "error" %}danger{% else %}{{ message.tags }}{% endif %} text-white border-0 fade show" role="alert">
+                    <strong>{{message|safe}}</strong>
+                </div>
+                {% endfor %}
+            {% endif %}
 
     <div class="p-5 mb-4 bg-light rounded-3">
       <div class="container-fluid py-5">
         <h1 class="display-5 fw-bold">UnTube</h1>
         <p class="col-md-8 fs-4">A simple Youtube playlist manager to help you modify and keep track of your YouTube playlists with ease.</p>
 
+          {% if user.is_authenticated %}
+          <a class="btn btn-success btn-lg" href="{% url 'home' %}">Visit Dashboard</a>
+          {% else %}
           <a class="btn btn-danger btn-lg" href="{% provider_login_url 'google' %}">Login with Google</a>
+          {% endif %}
           <a class="btn btn-primary btn-lg" href="#more">Tell me more</a>
       </div>
     </div>