(#141) Adding navbar and footer to login pages (#195)

* Adding navbar and footer to login pages * test fix
gcivil-nyu-org · Nov 18, 2024 · 53c1a11 · 53c1a11
1 parent bc288f2
commit 53c1a11
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 40 deletions.
diff --git a/src/accounts/templates/register.html b/src/accounts/templates/register.html
@@ -1,16 +1,8 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
+{% extends 'base.html' %} 
+{% block title %}Register{% endblock %}
     {% load static %}
 
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Register</title>
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/tailwind.min.css" rel="stylesheet">
-    <link href="{% static 'css/styles.css' %}" rel="stylesheet">
-
-</head>
-<body class="bg-gray-100 font-sans">
+{% block content %}
     <div class="container mx-auto px-4 h-screen flex items-center justify-center">
         <div class="w-full max-w-md">
             <div class="bg-white shadow-md rounded-lg overflow-hidden">
@@ -40,5 +32,4 @@ <h3 class="text-2xl font-bold">Register</h3>
             </div>
         </div>
     </div>
-</body>
-</html>
+{% endblock %}
diff --git a/src/accounts/templates/service_provider_login.html b/src/accounts/templates/service_provider_login.html
@@ -1,15 +1,7 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
+{% extends 'base.html' %} 
+{% block title %}Service Provider Login{% endblock %}
     {% load static %}
-
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Service Provider Login</title>
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/tailwind.min.css" rel="stylesheet">
-    <link href="{% static 'css/styles.css' %}" rel="stylesheet">
-</head>
-<body class="bg-gray-100 font-sans">
+{% block content %}
     <div class="container mx-auto px-4 h-screen flex items-center justify-center">
         <div class="w-full max-w-md">
             <div class="bg-white shadow-md rounded-lg overflow-hidden">
@@ -67,5 +59,4 @@ <h3 class="text-2xl font-bold">Service Provider Login</h3>
             </div>
         </div>
     </div>
-</body>
-</html>
+{% endblock %}
diff --git a/src/accounts/templates/user_login.html b/src/accounts/templates/user_login.html
@@ -1,16 +1,8 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
+{% extends 'base.html' %} 
+{% block title %}Service Provider Login{% endblock %}
     {% load static %}
     {% load socialaccount %}
-
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>User Login</title>
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/tailwind.min.css" rel="stylesheet">
-    <link href="{% static 'css/styles.css' %}" rel="stylesheet">
-</head>
-<body class="bg-gray-100 font-sans">
+    {% block content %}
     <div class="container mx-auto px-4 h-screen flex items-center justify-center">
         <div class="w-full max-w-md">
             <div class="bg-white shadow-md rounded-lg overflow-hidden">
@@ -80,5 +72,4 @@ <h1 class="text-2xl font-bold">User Login</h1>
             </div>
         </div>
     </div>
-</body>
-</html>
+{% endblock %}
diff --git a/src/services/tests.py b/src/services/tests.py
@@ -1484,7 +1484,7 @@ def test_get_pending_approval_services_client_error(self, mock_boto_resource):
         mock_table.scan.side_effect = ClientError(error_response, "Scan")
 
         services = self.service_repo.get_pending_approval_services()
-        self.assertNotEqual(services, [])
+        self.assertEqual(services, [])
         # mock_table.scan.assert_called_once_with(
         #     FilterExpression=Attr("ServiceStatus").eq("PENDING_APPROVAL")
         # )