Merge branch 'master' into prod

stariluz · Jul 22, 2024 · 4ec0132 · 4ec0132
2 parents 40b260c + e8825a6
commit 4ec0132
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 49 deletions.
diff --git a/static/css/auth/sesion.css b/static/css/auth/sesion.css
@@ -0,0 +1,57 @@
+html {
+    height: 100%;
+}
+
+body {
+    margin: 0;
+    height: 100%;
+    box-sizing: border-box;
+    background: rgb(24, 23, 31);
+    background: linear-gradient(45deg, rgba(24, 23, 31, 1) 0%, rgba(18, 15, 83, 1) 55%, rgba(0, 99, 255, 1) 100%);
+}
+
+.main-container {
+    height: 100%;
+    display: flex;
+    align-items: center;
+}
+
+.auth-title {
+    text-align: center;
+    font-size: 2rem;
+    font-weight: 700;
+}
+
+.auth-container {
+    max-width: 400px;
+    padding: 20px 30px;
+    box-sizing: border-box;
+    background-color: #ffffff;
+    box-shadow: 2px 2px 20px -5px #2c2d2ca6;
+    border-radius: 10px;
+}
+
+.auth-container-header {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.auth-container h1,
+.auth-container h2 {
+    margin: 10px 0px;
+    letter-spacing: 2px;
+}
+
+.auth-container p {
+    font-size: 20px;
+}
+
+.invalid-feedback {
+    text-align: start !important;
+}
+
+.btn {
+    border-radius: 50px 50px 50px 50px;
+}
diff --git a/static/css/posts/new.css b/static/css/posts/new.css
@@ -1,4 +1,4 @@
-.posts-grid {
+/* .posts-grid {
     display: flex;
     justify-content: center;
-}
+} */
diff --git a/static/css/sesion.css b/static/css/sesion.css
diff --git a/templates/posts/new.html b/templates/posts/new.html
@@ -78,4 +78,6 @@ <h2 class="post-title form-control {% if form.title.errors %} is-invalid {% endi
   {{ block.super }}
   <script src="{% static 'js/posts/new.js' %}"></script>
   <script src="{% static 'js/drag_and_drop.js' %}"></script>
+  <script src="{% static 'js/modules/minimasonry.js' %}" type="module"></script>
+  <script src="{% static 'js/posts/masonry.js' %}" type="module"></script>
 {% endblock %}
diff --git a/templates/users/base.html → templates/users/auth.html b/templates/users/base.html → templates/users/auth.html
@@ -12,11 +12,11 @@
     {% load static %}
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
     <link rel="stylesheet" href="{% static 'css/main.css' %}" />
-    <link rel="stylesheet" href="{% static 'css/sesion.css' %}" />
+    <link rel="stylesheet" href="{% static 'css/auth/sesion.css' %}" />
 </head>
 <body>
     <div class="header-padding"></div>
-    <div class="container principal-container">
+    <div class="container main-container">
         {% block content %}
         {% endblock content %}
     </div>

diff --git a/templates/users/login.html b/templates/users/login.html
@@ -1,11 +1,11 @@
-{% extends 'users/base.html' %}
+{% extends 'users/auth.html' %}
 
 {% block title %}
     Log In | myFacegram
 {% endblock title %}
 
 {% block content %}
-    <div class="container container-sesion">
+    <div class="container auth-container">
         {% for item in errors %}
             {% for error in item %}
                 <div class="alert alert-danger">
@@ -14,13 +14,15 @@
             {% endfor %}
         {% endfor %}
         {% load static %}
-        <img class="" src="{% static 'img/user_logo.png'%}" alt="" width="72" height="72">
-        <h1 class="h1 mb-4">Log in!</h1>
-        {% if error %}
-            <p style="color: red;"> {{ error }}</p>
-        {% endif %}
+        <div class="auth-container-header">
+            <img class="" src="{% static 'img/user_logo.png'%}" alt="" width="72" height="72">
+            <h1 class="auth-title">Log in!</h1>
+        </div>
         <form method="POST" action="{% url 'users:login' %}">
             {% csrf_token %}
+            {% if error %}
+                <p style="color: red;"> {{ error }}</p>
+            {% endif %}
             <div class="form-group">
                 <input class="form-control" type="text" placeholder="Username" name="username">
                 <input class="form-control" type="password" placeholder="Password" name="password">  

diff --git a/templates/users/profile.html b/templates/users/profile.html
@@ -72,5 +72,5 @@ <h6 class="d-inline">Description:</h6>
 {% block script %}
   {{ block.super }}
   <script src="{% static 'js/modules/minimasonry.js' %}" type="module"></script>
-  <script src="{% static 'js/posts/masonry.js' %}"></script>
+  <script src="{% static 'js/posts/masonry.js' %}" type="module"></script>
 {% endblock %}
diff --git a/templates/users/signup.html b/templates/users/signup.html
@@ -1,22 +1,23 @@
-{% extends 'users/base.html' %}
+{% extends 'users/auth.html' %}
 
 {% block title %}
     Sign up | myFacegram
 {% endblock title %}
 
 {% load static %}
 {% block content %}
-    <div class="container container-sesion">
+    <div class="container auth-container">
         {% for item in errors %}
             {% for error in item %}
                 <div class="alert alert-danger">
                     {{ error }}
                 </div>
             {% endfor %}
         {% endfor %}
-
-        <img class="" src="{% static 'img/user_logo.png'%}" alt="" width="72" height="72">
-        <h1 class="h1 mb-4">Sign up!</h1>
+        <div class="auth-container-header">
+            <img class="" src="{% static 'img/user_logo.png'%}" alt="" width="72" height="72">
+            <h1 class="auth-title">Sign up!</h1>
+        </div>
 
         <form method="POST" action="{% url 'users:signup' %}">
             {% csrf_token %}