Removed email confirmation, fixed alert styling.

electionscience · Jul 25, 2024 · 88fef5e · 88fef5e
1 parent f4ef6b0
commit 88fef5e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 28 deletions.
diff --git a/approval_polls/settings.py b/approval_polls/settings.py
@@ -13,6 +13,7 @@
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 environ.Env.read_env(os.path.join(os.path.dirname(BASE_DIR), ".env"))
 DEBUG = env("DEBUG")
+print(DEBUG)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
@@ -33,9 +34,6 @@
 
 if DEBUG:
     db_path = os.path.join(BASE_DIR, "db.sqlite3")
-    CSRF_TRUSTED_ORIGINS = ["http://localhost:8000", "http://127.0.0.1:8000"]
-    CSRF_ALLOWED_ORIGINS = ["http://localhost:8000", "http://127.0.0.1:8000"]
-    CORS_ORIGINS_WHITELIST = ["http://localhost:8000", "http://127.0.0.1:8000"]
     ALLOWED_HOSTS.extend(["localhost", "0.0.0.0", "127.0.0.1"])  # trunk-ignore(bandit)
 
 if not DEBUG:
@@ -276,7 +274,7 @@
 ACCOUNT_USERNAME_REQUIRED = True
 SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT = True
 SOCIALACCOUNT_EMAIL_AUTHENTICATION = True
-ACCOUNT_EMAIL_VERIFICATION = "optional"
+ACCOUNT_EMAIL_VERIFICATION = "none"
 ACCOUNT_CONFIRM_EMAIL_ON_GET = True
 ACCOUNT_AUTHENTICATION_METHOD = "username_email"
 ACCOUNT_EMAIL_REQUIRED = True
@@ -285,6 +283,4 @@
 ACCOUNT_DEFAULT_HTTP_PROTOCOL = env(
     "ACCOUNT_DEFAULT_HTTP_PROTOCOL", str, default="https"
 )
-# ACCOUNT_LOGIN_ATTEMPTS_LIMIT = 5  # or any reasonable number
-ACCOUNT_RATE_LIMITS = False
 ACCOUNT_FORMS = {"signup": "approval_polls.forms.CustomSignupForm"}
diff --git a/approval_polls/staticfiles/scss/custom.scss b/approval_polls/staticfiles/scss/custom.scss
@@ -2,7 +2,7 @@
 $primary: #000000;
 $secondary: #ffffff;
 $success: #000000;
-$info: #ffffff;
+$info: #f8f9fa; // Light gray for info messages.
 $warning: #aa4a44;
 $danger: #aa4a44;
 $light: #ffffff;
@@ -133,7 +133,6 @@ body {
 @each $color, $value in $theme-colors {
   .alert-#{$color} {
     color: $primary;
-    background-color: $value;
     border-color: $primary;
   }
 }
diff --git a/approval_polls/staticfiles/style.css b/approval_polls/staticfiles/style.css
diff --git a/approval_polls/templates/base.html b/approval_polls/templates/base.html
@@ -37,7 +37,6 @@
                 integrity="sha512-pZ0i46J1zsMwPd2NQZ4IaL427jXE2RVHMk3uv/wPTNlBVp9AbB1L65/4YdrXRPLEmyZCkY9qYOOsQp44V4orHg=="
                 crossorigin="anonymous"
                 referrerpolicy="no-referrer"></script>
-        <link type="text/css" rel="stylesheet" href="{% static 'style.css' %}" />
         {% load compress %}
         {% compress css %}
             <link type="text/x-scss"
@@ -92,6 +91,11 @@
             </nav>
         </header>
         <main class="container my-5">
+            {% if messages %}
+                <div class="messages">
+                    {% for message in messages %}<div class="alert alert-{{ message.tags }}">{{ message }}</div>{% endfor %}
+                </div>
+            {% endif %}
             {% block content %}
             {% endblock content %}
         </main>

diff --git a/approval_polls/templates/my_info.html b/approval_polls/templates/my_info.html
@@ -11,14 +11,6 @@ <h1 class="mb-4">My User Profile</h1>
             <div class="card-body">
                 <h2 class="card-title h4">Personal Information</h2>
                 <dl class="row">
-                    <dt class="col-sm-3">First Name:</dt>
-                    <dd class="col-sm-9">
-                        {{ current_user.first_name }}
-                    </dd>
-                    <dt class="col-sm-3">Last Name:</dt>
-                    <dd class="col-sm-9">
-                        {{ current_user.last_name }}
-                    </dd>
                     <dt class="col-sm-3">Username:</dt>
                     <dd class="col-sm-9">
                         {{ current_user.username }}
@@ -50,13 +42,6 @@ <h2 class="card-title h4">Personal Information</h2>
             </div>
         </div>
         <h2 class="mb-3">My Polls</h2>
-        {% if messages %}
-            <div class="messages">
-                {% for message in messages %}
-                    <div class="alert alert-{{ message.tags }}">{{ message }}</div>
-                {% endfor %}
-            </div>
-        {% endif %}
         {% if latest_poll_list %}
             {% for poll in latest_poll_list %}
                 <div class="card mb-3" id="poll-{{ poll.id }}">
@@ -84,7 +69,7 @@ <h3 class="card-title h5">
                             <a class="page-link"
                                href="?page={{ latest_poll_list.previous_page_number }}"
                                aria-label="Previous">
-                                <span aria-hidden="true">&laquo;</span> Previous
+                                <span aria-hidden="true">«</span> Previous
                             </a>
                         </li>
                     {% endif %}
@@ -96,7 +81,7 @@ <h3 class="card-title h5">
                             <a class="page-link"
                                href="?page={{ latest_poll_list.next_page_number }}"
                                aria-label="Next">
-                                Next <span aria-hidden="true">&raquo;</span>
+                                Next <span aria-hidden="true">»</span>
                             </a>
                         </li>
                     {% endif %}

diff --git a/approval_polls/templates/my_polls.html b/approval_polls/templates/my_polls.html
@@ -33,7 +33,7 @@ <h5 class="card-title">
                             <a class="page-link"
                                href="?page={{ latest_poll_list.previous_page_number }}"
                                aria-label="Previous">
-                                <span aria-hidden="true">&laquo;</span> Previous
+                                <span aria-hidden="true">«</span> Previous
                             </a>
                         </li>
                     {% endif %}
@@ -45,7 +45,7 @@ <h5 class="card-title">
                             <a class="page-link"
                                href="?page={{ latest_poll_list.next_page_number }}"
                                aria-label="Next">
-                                Next <span aria-hidden="true">&raquo;</span>
+                                Next <span aria-hidden="true">»</span>
                             </a>
                         </li>
                     {% endif %}