From 3922c25067f70d98ab46fc822c42f30e3252922f Mon Sep 17 00:00:00 2001
From: Amr Moustafa <amrwaele@gmail.com>
Date: Sat, 21 Oct 2023 13:20:13 -0400
Subject: [PATCH 1/5] Linked CCSS Resources page to initiatives section

---
 data/initiatives.yml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/data/initiatives.yml b/data/initiatives.yml
index 6f605bfc7..0e9bde71a 100644
--- a/data/initiatives.yml
+++ b/data/initiatives.yml
@@ -1,18 +1,24 @@
-- title: "CCSS Magazine"
-  link: "http://magazine.carletoncomputersciencesociety.ca/"
-  color: "#e62828"
-  description: "The latest Issue of the CCSS magazine."
-  active: true
-- title: "Carleton Merged"
-  link: "https://merged.carletoncomputerscience.ca/"
-  color: "black"
-  description: "An app for viewing all upcoming events in the Carleton CS community."
+- title: "CCSS Resources"
+  link: "https://resources.carletoncomputerscience.ca/"
+  color: "#08dd7a"
+  description: "A webpage with all the resources the CCSS has to offer."
   active: true
 - title: "DiscreteMath.ca"
   link: "https://discretemath.ca/"
   color: "#ffab40"
   description: "Interactive content for COMP 1805 and COMP 2804."
   active: true
+- title: "CCSS Magazine"
+  link: "http://magazine.carletoncomputersciencesociety.ca/"
+  color: "#e62828"
+  description: "The latest Issue of the CCSS magazine."
+  active: true
+
+# - title: "Carleton Merged"
+#   link: "https://merged.carletoncomputerscience.ca/"
+#   color: "black"
+#   description: "An app for viewing all upcoming events in the Carleton CS community."
+#   active: true
 # - title: "CCSS Code Challenge"
 #  link: "https://ccss.carleton.ca/"
 #  color: "#4285f4ff"

From 3ec615d542045182c148aae210e549a1090d7816 Mon Sep 17 00:00:00 2001
From: Amr Moustafa <amrwaele@gmail.com>
Date: Sat, 21 Oct 2023 13:38:51 -0400
Subject: [PATCH 2/5] update footer to use hugo year formatting

---
 layouts/partials/footer.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e809fbd7a..ec6c18769 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -17,10 +17,7 @@
   <!--Added dynamic date updating with JavaScript-->
   <div class="footer-copyright">
     ©
-    <script>
-      document.write(new Date().getFullYear());
-    </script>
-    <span> </span>
+    <span>{{ now.Year }}</span>
     Carleton Computer Science Society
   </div>
 </div>

From 39bdd349bc03c8b19da181a52851e21533383082 Mon Sep 17 00:00:00 2001
From: Amr Moustafa <amrwaele@gmail.com>
Date: Sat, 21 Oct 2023 16:30:26 -0400
Subject: [PATCH 3/5] Redesigned paginator styling on mobile and desktop

---
 assets/scss/components/_pagniator.scss | 56 +++++++++++++++++++--
 layouts/partials/paginator.html        | 68 ++++++++++++--------------
 2 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/assets/scss/components/_pagniator.scss b/assets/scss/components/_pagniator.scss
index b448c46da..76a8a0c00 100644
--- a/assets/scss/components/_pagniator.scss
+++ b/assets/scss/components/_pagniator.scss
@@ -1,15 +1,24 @@
 .pagination {
   text-align: center;
-  font-size: bold;
+  font-weight: bold;
   display: flex;
   justify-content: space-between;
-  max-width: 10rem;
+  max-width: 50rem;
   margin: auto;
-  padding: 0;
+  padding-inline-start: 20px;
+  padding-inline-end: 20px;
+  animation: all 0.4s ease-in;
 
   li {
     display: inline;
     text-align: center;
+    // background: #bf112b;
+    background: #bf112b38;
+    border-radius: 30px;
+    font-size: 20px;
+    font-family: monospace;
+    color: black;
+    padding: 1rem;
   }
 
   a {
@@ -17,6 +26,45 @@
   }
 
   .pagination__item--current {
-    color: red;
+    color: white;
+    background-color: #bf112b;
+  }
+
+  .pagination__item {
+    animation: all 0.4s ease-in;
+  }
+
+  @media only screen and (max-width: 600px) {
+    .pagination {
+      font-size: 1rem;
+      padding-inline-start: 20px;
+      padding-inline-end: 20px;
+    }
+
+    .pagination__item {
+      font-size: 1rem;
+      padding: 0.7em;
+    }
+  }
+
+  @media only screen and (max-width: 500px) {
+    .pagination__item {
+      font-size: 1rem;
+      padding: 0.5em;
+    }
+  }
+
+  @media only screen and (max-width: 400px) {
+    .pagination__item {
+      font-size: 1rem;
+      padding: 0.5em;
+    }
+
+    .pagination {
+      font-size: 1rem;
+      color: red;
+      padding-inline-start: 20px !important;
+      padding-inline-end: 20px !important;
+    }
   }
 }
diff --git a/layouts/partials/paginator.html b/layouts/partials/paginator.html
index cb8b19035..229697f32 100644
--- a/layouts/partials/paginator.html
+++ b/layouts/partials/paginator.html
@@ -18,27 +18,23 @@
     <!-- First page. -->
     <!-- If we aren't on page 1 add a button to go to the first page -->
     {{ if ne $paginator.PageNumber 1 }}
-      <li class="pagination__item pagination__item--first">
-        <a
-          class="pagination__link pagination__link--first"
-          href="{{ $paginator.First.URL }}"
-        >
-          ««
-        </a>
-      </li>
+      <a
+        class="pagination__link pagination__link--first"
+        href="{{ $paginator.First.URL }}"
+      >
+        <li class="pagination__item pagination__item--first">««</li>
+      </a>
     {{ end }}
 
     <!-- Previous page. -->
     <!-- If a previous page exists, add a button to go to the previous page -->
     {{ if $paginator.HasPrev }}
-      <li class="pagination__item pagination__item--previous">
-        <a
-          href="{{ $paginator.Prev.URL }}"
-          class="pagination__link pagination__link--previous"
-        >
-          «
-        </a>
-      </li>
+      <a
+        href="{{ $paginator.Prev.URL }}"
+        class="pagination__link pagination__link--previous"
+      >
+        <li class="pagination__item pagination__item--previous">«</li>
+      </a>
     {{ end }}
 
     <!-- Page numbers. -->
@@ -80,38 +76,34 @@
 
       <!-- Output page numbers. -->
       {{ if eq ($.Scratch.Get "page_number_flag") true }}
-        <li
-          class="pagination__item{{ if eq . $paginator }} pagination__item--current{{ end }}"
-        >
-          <a href="{{ .URL }}" class="pagination__link">
+        <a href="{{ .URL }}" class="pagination__link">
+          <li
+            class="pagination__item{{ if eq . $paginator }} pagination__item--current{{ end }}"
+          >
             {{ .PageNumber }}
-          </a>
-        </li>
+          </li>
+        </a>
       {{ end }}
     {{ end }}
 
     <!-- Next page. -->
     {{ if $paginator.HasNext }}
-      <li class="pagination__item pagination__item--next">
-        <a
-          href="{{ $paginator.Next.URL }}"
-          class="pagination__link pagination__link--next"
-        >
-          »
-        </a>
-      </li>
+      <a
+        href="{{ $paginator.Next.URL }}"
+        class="pagination__link pagination__link--next"
+      >
+        <li class="pagination__item pagination__item--next">»</li>
+      </a>
     {{ end }}
 
     <!-- Last page. -->
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-      <li class="pagination__item pagination__item--last">
-        <a
-          class="pagination__link pagination__link--last"
-          href="{{ $paginator.Last.URL }}"
-        >
-          »»
-        </a>
-      </li>
+      <a
+        class="pagination__link pagination__link--last"
+        href="{{ $paginator.Last.URL }}"
+      >
+        <li class="pagination__item pagination__item--last">»»</li>
+      </a>
     {{ end }}
   </ul>
   <!-- .pagination -->

From 64122530a3c3681ec187794adf62f34561a419f2 Mon Sep 17 00:00:00 2001
From: Amr Moustafa <amrwaele@gmail.com>
Date: Sat, 21 Oct 2023 18:18:01 -0400
Subject: [PATCH 4/5] Added pagination link hover color changes

---
 assets/scss/components/_pagniator.scss | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/assets/scss/components/_pagniator.scss b/assets/scss/components/_pagniator.scss
index 76a8a0c00..184defa5c 100644
--- a/assets/scss/components/_pagniator.scss
+++ b/assets/scss/components/_pagniator.scss
@@ -19,12 +19,22 @@
     font-family: monospace;
     color: black;
     padding: 1rem;
+
+    &:hover {
+      background: #ff7777 !important;
+    }
   }
 
+
   a {
     text-decoration: auto;
   }
 
+  a:hover {
+    background: #ff7777 !important;
+  }
+
+
   .pagination__item--current {
     color: white;
     background-color: #bf112b;
@@ -34,6 +44,8 @@
     animation: all 0.4s ease-in;
   }
 
+
+
   @media only screen and (max-width: 600px) {
     .pagination {
       font-size: 1rem;
@@ -67,4 +79,4 @@
       padding-inline-end: 20px !important;
     }
   }
-}
+}
\ No newline at end of file

From b9742646e52f3e4db4b4596732943b6471b09c76 Mon Sep 17 00:00:00 2001
From: Amr Moustafa <amrwaele@gmail.com>
Date: Sat, 21 Oct 2023 18:27:07 -0400
Subject: [PATCH 5/5] ran prettier

---
 assets/scss/components/_pagniator.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/assets/scss/components/_pagniator.scss b/assets/scss/components/_pagniator.scss
index 184defa5c..c126d9baa 100644
--- a/assets/scss/components/_pagniator.scss
+++ b/assets/scss/components/_pagniator.scss
@@ -25,7 +25,6 @@
     }
   }
 
-
   a {
     text-decoration: auto;
   }
@@ -34,7 +33,6 @@
     background: #ff7777 !important;
   }
 
-
   .pagination__item--current {
     color: white;
     background-color: #bf112b;
@@ -44,8 +42,6 @@
     animation: all 0.4s ease-in;
   }
 
-
-
   @media only screen and (max-width: 600px) {
     .pagination {
       font-size: 1rem;
@@ -79,4 +75,4 @@
       padding-inline-end: 20px !important;
     }
   }
-}
\ No newline at end of file
+}