From 66f15709b73ce44277595ddf2edb6ec1a4f79346 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 21:57:09 +0000
Subject: [PATCH 1/4] Bump django from 4.2.5 to 4.2.7 in /ACMAS/app

Bumps [django](https://github.com/django/django) from 4.2.5 to 4.2.7.
- [Commits](https://github.com/django/django/compare/4.2.5...4.2.7)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 ACMAS/app/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACMAS/app/requirements.txt b/ACMAS/app/requirements.txt
index 98cf453..30216ba 100644
--- a/ACMAS/app/requirements.txt
+++ b/ACMAS/app/requirements.txt
@@ -1,4 +1,4 @@
-Django==4.2.5
+Django==4.2.7
 django-dbbackup==4.0.2
 django_components
 

From 2a46ad597e00ee252e61c8d74abaffed995c631a Mon Sep 17 00:00:00 2001
From: Noah Cussatti <nolc75@gmail.com>
Date: Sun, 5 Nov 2023 15:29:35 -0500
Subject: [PATCH 2/4] Added requested changes

---
 ACMAS/app/ACMAS_Web/components/field/field.html | 9 ++++-----
 ACMAS/app/ACMAS_Web/templates/index.html        | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ACMAS/app/ACMAS_Web/components/field/field.html b/ACMAS/app/ACMAS_Web/components/field/field.html
index 373eb3b..8ca4c42 100644
--- a/ACMAS/app/ACMAS_Web/components/field/field.html
+++ b/ACMAS/app/ACMAS_Web/components/field/field.html
@@ -29,16 +29,15 @@
     {% endif %}
     {% if name == "username" and placeholder == "Create username..." %}
     <div class="-left-48 absolute invisible peer-focus:visible">
-        <div class="w-40 h-36 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
+        <div class="w-40 h-28 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
             <ul class="list-disc pl-2 gap-y-2">
                 <li>Required</li>
-                <li>150 characters or fewer</li>
-                <li>Letters, digits and @/./+/-/_ only.</li>
-                <li>entirely numeric</li>
+                <li>< 150 characters</li>
+                <li>Letters, digits and @/./+/-/_ only</li>
             </ul>
         </div>
         <div class="relative z-30">
-            <div class="flex left-full -ml-3 bottom-[4.5rem] absolute z-0">
+            <div class="flex left-full -ml-3 bottom-14 absolute z-0">
                 <div class="h-4 w-4 origin-bottom-left rotate-45 transform border border-light-gray bg-white border-b-white border-l-white"></div>
             </div>
         </div>
diff --git a/ACMAS/app/ACMAS_Web/templates/index.html b/ACMAS/app/ACMAS_Web/templates/index.html
index c29a4fb..8df3ad2 100644
--- a/ACMAS/app/ACMAS_Web/templates/index.html
+++ b/ACMAS/app/ACMAS_Web/templates/index.html
@@ -18,8 +18,8 @@
 <div class="p-0 flex items-center overflow-hidden relative" style="height: 75vh;">
     <div class="absolute w-full h-full" style="background: linear-gradient(-45deg, #f8f8f3, #f5f2d6, #dbebf3, #c6d6f7); background-size: 300% 300%; animation: gradient 65s ease infinite;"> </div>
     <div class="container mx-auto px-4 z-3 pt-6 relative lg:w-6/12">
-        <div class="justify-center flex flex-wrap flex-col -mx-4 text-center">
-            <h1 class="text-7xl font-bold text-white leading-tight mt-0" style="color: #327796">ACMAS</h1>
+        <div class="justify-center items-center flex flex-wrap flex-col -mx-4 text-center">
+            <img class="h-48 w-96" src="../static/img/ACMAS_Logo.svg" alt="ACMAS star logo">
             <h2 class="text-3xl text-white mb-24" style="color: #327796">Automated Course Material Archiving System</h2>
         </div>
     </div>

From 8330861456bfbb2b175ff454d46a548c6b6cd8d6 Mon Sep 17 00:00:00 2001
From: Noah Cussatti <nolc75@gmail.com>
Date: Sun, 5 Nov 2023 15:42:56 -0500
Subject: [PATCH 3/4] Update field.html

---
 ACMAS/app/ACMAS_Web/components/field/field.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ACMAS/app/ACMAS_Web/components/field/field.html b/ACMAS/app/ACMAS_Web/components/field/field.html
index 8ca4c42..1fe8f6f 100644
--- a/ACMAS/app/ACMAS_Web/components/field/field.html
+++ b/ACMAS/app/ACMAS_Web/components/field/field.html
@@ -12,7 +12,7 @@
     {% if name == "password1" and placeholder == "Create password..." %}
     <div class="-left-48 absolute invisible peer-focus:visible">
         <div class="w-40 h-40 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
-            <p>Password can't be:</p>
+            <p class="text-center">Password can't be:</p>
             <ul class="list-disc pl-2 gap-y-2">
                 <li>too similar to other personal information</li>
                 <li>less than 8 characters </li>
@@ -29,15 +29,16 @@
     {% endif %}
     {% if name == "username" and placeholder == "Create username..." %}
     <div class="-left-48 absolute invisible peer-focus:visible">
-        <div class="w-40 h-28 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
+        <div class="w-40 h-40 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
+            <p class="text-center">Required</p>
             <ul class="list-disc pl-2 gap-y-2">
-                <li>Required</li>
-                <li>< 150 characters</li>
+                <li>150 characters or fewer</li>
                 <li>Letters, digits and @/./+/-/_ only</li>
+                <li>Must not be fully numeric</li>
             </ul>
         </div>
         <div class="relative z-30">
-            <div class="flex left-full -ml-3 bottom-14 absolute z-0">
+            <div class="flex left-full -ml-3 bottom-20 absolute z-0">
                 <div class="h-4 w-4 origin-bottom-left rotate-45 transform border border-light-gray bg-white border-b-white border-l-white"></div>
             </div>
         </div>

From e12bae629f0876d769312328f10a771717275588 Mon Sep 17 00:00:00 2001
From: Noah Cussatti <nolc75@gmail.com>
Date: Sun, 5 Nov 2023 15:47:42 -0500
Subject: [PATCH 4/4] Update field.html

---
 ACMAS/app/ACMAS_Web/components/field/field.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ACMAS/app/ACMAS_Web/components/field/field.html b/ACMAS/app/ACMAS_Web/components/field/field.html
index 1fe8f6f..cb19a1e 100644
--- a/ACMAS/app/ACMAS_Web/components/field/field.html
+++ b/ACMAS/app/ACMAS_Web/components/field/field.html
@@ -28,18 +28,18 @@
     </div>
     {% endif %}
     {% if name == "username" and placeholder == "Create username..." %}
-    <div class="-left-48 absolute invisible peer-focus:visible">
-        <div class="w-40 h-40 flex flex-col bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
+    <div class="absolute -left-48 invisible peer-focus:visible">
+        <div class="w-40 h-40 flex-col flex bg-white text-gray-600 text-xs rounded-xl text-left p-4 border border-light-gray z-50 justify-items-center">
             <p class="text-center">Required</p>
-            <ul class="list-disc pl-2 gap-y-2">
+            <ul class="pl-2 list-disc gap-y-2">
                 <li>150 characters or fewer</li>
                 <li>Letters, digits and @/./+/-/_ only</li>
                 <li>Must not be fully numeric</li>
             </ul>
         </div>
-        <div class="relative z-30">
-            <div class="flex left-full -ml-3 bottom-20 absolute z-0">
-                <div class="h-4 w-4 origin-bottom-left rotate-45 transform border border-light-gray bg-white border-b-white border-l-white"></div>
+        <div class="z-30 relative">
+            <div class="flex -ml-3 left-full bottom-20 absolute z-0">
+                <div class="w-4 h-4 origin-bottom-left rotate-45 transform border border-light-gray bg-white border-b-white border-l-white"></div>
             </div>
         </div>
     </div>