TaliaMak · lindseyljones · Apr 15, 2023 · Apr 15, 2023
diff --git a/.DS_Store b/.DS_Store
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/myapp/.DS_Store b/myapp/.DS_Store
diff --git a/myapp/__pycache__/__init__.cpython-310.pyc b/myapp/__pycache__/__init__.cpython-310.pyc
diff --git a/myapp/__pycache__/admin.cpython-310.pyc b/myapp/__pycache__/admin.cpython-310.pyc
diff --git a/myapp/__pycache__/apps.cpython-310.pyc b/myapp/__pycache__/apps.cpython-310.pyc
diff --git a/myapp/__pycache__/models.cpython-310.pyc b/myapp/__pycache__/models.cpython-310.pyc
diff --git a/myapp/__pycache__/urls.cpython-310.pyc b/myapp/__pycache__/urls.cpython-310.pyc
diff --git a/myapp/__pycache__/views.cpython-310.pyc b/myapp/__pycache__/views.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/0001_initial.cpython-310.pyc b/myapp/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/0002_food_materialgoods_transportation.cpython-310.pyc b/myapp/migrations/__pycache__/0002_food_materialgoods_transportation.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/0002_rename_user_usern.cpython-310.pyc b/myapp/migrations/__pycache__/0002_rename_user_usern.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/0003_user.cpython-310.pyc b/myapp/migrations/__pycache__/0003_user.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/0003_user_name_alter_materialgoods_months_owned.cpython-310.pyc b/myapp/migrations/__pycache__/0003_user_name_alter_materialgoods_months_owned.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/0004_delete_usern.cpython-310.pyc b/myapp/migrations/__pycache__/0004_delete_usern.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/0004_remove_user_name.cpython-310.pyc b/myapp/migrations/__pycache__/0004_remove_user_name.cpython-310.pyc
diff --git a/...migrations/__pycache__/0005_merge_0004_delete_usern_0004_remove_user_name.cpython-310.pyc b/...migrations/__pycache__/0005_merge_0004_delete_usern_0004_remove_user_name.cpython-310.pyc
diff --git a/myapp/migrations/__pycache__/__init__.cpython-310.pyc b/myapp/migrations/__pycache__/__init__.cpython-310.pyc
diff --git a/myapp/templates/.DS_Store b/myapp/templates/.DS_Store
diff --git a/myapp/templates/myapp/CO2_img.jpg b/myapp/templates/myapp/CO2_img.jpg
diff --git a/myapp/templates/myapp/carbon_footprint.jpg b/myapp/templates/myapp/carbon_footprint.jpg
diff --git a/myapp/templates/myapp/co2_emish.jpg b/myapp/templates/myapp/co2_emish.jpg
diff --git a/myapp/templates/myapp/create_account.html b/myapp/templates/myapp/create_account.html
@@ -12,44 +12,46 @@
 </head>
 
 
-<h1 class = "text-center"> Create Account </h1>
+<h1 class = "text-center text-success"> Welcome! Create Your Account: </h1>
 
 <body>
   <form action = "{% url 'reroute_create_account' %}" method="post">
     {% csrf_token %}
 
        </div>
 
-      <div class = "text-center"> First Name:
-    <input class = " mb-4 border-primary-subtle border border-3" type = "text" name = "first_name" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
+      <div class = "text-center text-success"> First Name:
+    <input class = " mb-4 border-success-subtle border border-1" type = "text" name = "first_name" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
 
   </div>
 
        </div>
 
-      <div class = "text-center"> Last Name:
-    <input class = " mb-4 border-primary-subtle border border-3" type = "text" name = "last_name" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
+      <div class = "text-center text-success"> Last Name:
+    <input class = " mb-4 border-success-subtle border border-1" type = "text" name = "last_name" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
 
   </div>
 
        </div>
 
-      <div class = "text-center"> Email Address:
-    <input class = " mb-4 border-primary-subtle border border-3" type = "text" name = "email" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
+      <div class = "text-center text-success"> Email Address:
+    <input class = " mb-4 border-success-subtle border border-1" type = "text" name = "email" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
 
   </div>
-    <div class = "text-center"> Username:
-    <input class = " mb-4 border-primary-subtle border border-3" type = "text" name = "username" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
+    <div class = "text-center text-success"> Username:
+    <input class = " mb-4 border-success-subtle border border-1" type = "text" name = "username" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
     </div>
 
 
-     <div class = "text-center"> Password:
-    <input class =  "mb-4 border-primary-subtle border border-3"  type = "text"  name = "password" required>
+     <div class = "text-center text-success"> Password:
+    <input class =  "mb-4 border-success-subtle border border-1"  type = "text"  name = "password" required>
   </div>
 
-
+    <a class="nav-link active text-center text-success" href="{% url 'login' %}"
+      >I already have an account.</a
+    >
      <div class = "text-center">
-    <input class = "bg-primary fw-bold w-auto p-3 mb-4 border-primary-subtle border-5 rounded-pill border" type="submit" value="Submit">
+    <input class = "btn btn-success" type="submit" value="Create Account">
     </div>
 
   </form>

diff --git a/myapp/templates/myapp/created_account.html b/myapp/templates/myapp/created_account.html
@@ -1,7 +1,10 @@
 <!-- d-->
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous"> <!-- Code from Bootstrap: https://getbootstrap.com -->
 
-<h1 class = "text-center"> You created your account! </h1>
 
- <a class="nav-link active text-center" href="{% url 'login' %}"
+<h1 class = "text-center text-success"> You created your account! </h1>
+<h2 class = "text-center text-success"> Time to calculate your carbon emissions...</h2>
+
+ <a class="nav-link active text-center text-success" href="{% url 'login' %}"
       >Return to login page</a
     >
diff --git a/myapp/templates/myapp/login.html b/myapp/templates/myapp/login.html
@@ -11,26 +11,60 @@
 </head>
 
 
-<h1 class = "text-center"> Login Page </h1>
+<h1 class = "text-center text-success"> Login Page </h1>
 
+<!-- Carousel -->
+<div id="demo" class="carousel slide" data-bs-ride="carousel">
+
+  <!-- Indicators/dots -->
+  <div class="carousel-indicators">
+    <button type="button" data-bs-target="#demo" data-bs-slide-to="0" class="active"></button>
+    <button type="button" data-bs-target="#demo" data-bs-slide-to="1"></button>
+    <button type="button" data-bs-target="#demo" data-bs-slide-to="2"></button>
+  </div>
+
+  <!-- The slideshow/carousel -->
+  <div class="carousel-inner">
+    <div class="carousel-item active">
+      <img src="https://www.innovationnewsnetwork.com/wp-content/uploads/2022/11/©-iStockPetmal-1340519929-696x392.jpg" class="img-fluid rounded mx-auto d-block">
+    </div>
+    <div class="carousel-item">
+      <img src="https://media.istockphoto.com/id/481976157/vector/greenhouse-gases-of-earth.jpg?s=170667a&w=0&k=20&c=Plw16R0tVzsykLnGHaqlUvgEAUBP9sAgXxqicd8I8vg="  class="img-fluid rounded mx-auto d-block">
+    </div>
+    <div class="carousel-item">
+      <img src="CO2.jpg"  class="img-fluid rounded mx-auto d-block">
+    </div>
+  </div>
+
+  <!-- Left and right controls/icons -->
+  <button class="carousel-control-prev btn btn-outline-success" type="button" data-bs-target="#demo" data-bs-slide="prev">
+    <span class="carousel-control-prev-icon"></span>
+  </button>
+  <button class="carousel-control-next btn btn-outline-success" type="button" data-bs-target="#demo" data-bs-slide="next">
+    <span class="carousel-control-next-icon"></span>
+  </button>
+</div>
+
+
+
+<br>
 <body>
   <form action = "{% url 'login_reroute' %}" method="post">
     {% csrf_token %}
-    <div class = "text-center"> Username:
-    <input class = " mb-4 border-primary-subtle border border-3" type = "text" name = "username" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
+    <div class = "text-center text-success"> Username:
+    <input class = " mb-4 border-success-subtle border border-1" type = "text" name = "username" required> <!-- makes input a requirement https://www.w3schools.com/tags/att_input_required.asp -->
 
   </div>
 
-     <div class = "text-center"> Password:
-    <input class =  "mb-4 border-primary-subtle border border-3"  type = "text"  name = "password" required>
+     <div class = "text-center text-success"> Password:
+    <input class =  "mb-4 border-success-subtle border border-1"  type = "text"  name = "password" required>
   </div>
 
- <a class="nav-link active text-center" href="{% url 'create_account' %}"
-      >Create an account</a
+ <a class="nav-link active text-center text-success" href="{% url 'create_account' %}"
+      >Create an account.</a
     >
-
      <div class = "text-center">
-    <input class = "bg-primary fw-bold w-auto p-3 mb-4 border-primary-subtle border-5 rounded-pill border" type="submit" value="Submit">
+    <input class = "btn btn-success" type="submit" value="Login">
     </div>
 
   </form>

diff --git a/myapp/templates/myapp/login_reroute.html b/myapp/templates/myapp/login_reroute.html
@@ -1,6 +1,8 @@
 <!--d -->
-<h1 class = "text-center"> Your Username or Password was incorrect </h1>
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous"> <!-- Code from Bootstrap: https://getbootstrap.com -->
 
- <a class="nav-link active text-center" href="{% url 'login' %}"
-      >Return to login page</a
+<h1 class = "text-center text-success"> Your Username or Password was incorrect. </h1>
+
+ <a class="nav-link active text-center text-muted" href="{% url 'login' %}"
+      >Return to login page.</a
     >
diff --git a/mysite/__pycache__/__init__.cpython-310.pyc b/mysite/__pycache__/__init__.cpython-310.pyc
diff --git a/mysite/__pycache__/settings.cpython-310.pyc b/mysite/__pycache__/settings.cpython-310.pyc
diff --git a/mysite/__pycache__/wsgi.cpython-310.pyc b/mysite/__pycache__/wsgi.cpython-310.pyc