From 960d44eb7f2c5f6f8f61e39a9b9bb5cd736adbee Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:19:15 +0200
Subject: [PATCH 01/50] Feat: Added the app route for the new volunteer
 component.

---
 client/src/app/app.routes.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index 70235999..c2ab938a 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -10,6 +10,7 @@ import { ProvincialRankingsComponent } from './pages/provincial-rankings/provinc
 import { ProvincialRecordsComponent } from './pages/provincial-records/provincial-records.component';
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { TermsComponent } from './pages/terms/terms.component';
+import { VolunteerComponent } from './pages/volunteer/volunteer.component';
 
 export const AppRoutes: Routes = [
   { path: '', component: HomeComponent, title: 'CubingZA - Home' },
@@ -21,6 +22,7 @@ export const AppRoutes: Routes = [
   { path: 'records', component: ProvincialRecordsComponent, title: 'CubingZA - Records' },
   { path: 'notifications', canActivate: [AuthGuard], component: NotificationsComponent, title: 'CubingZA - Notifications' },
   { path: 'contact', component: ContactComponent, title: 'CubingZA - Contact Us' },
+  { path: 'volunteer', component: VolunteerComponent },
   ...AccountRoutes,
   {
     path: 'admin',

From 34d389e4ea70aba4f04efa9c2b7de8c5df2afb5b Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:20:31 +0200
Subject: [PATCH 02/50] Feat: Volunteer navbar addition.

---
 client/src/app/components/navbar/navbar.component.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index de612e76..8a7e28f0 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -57,6 +57,11 @@
         <fa-icon [icon]="faEnvelope" />
         <span class="collapsable-label">Contact</span>
       </a></li>
+      <li><a class="navbar-item" routerLink="/volunteer" [routerLinkActive]="['active']"> 
+        <fa-icon [icon]="faRightToBracket" />
+        <span class="collapsable-label">Volunteer</span> 
+      </a></li> 
+
     </ul>
 
     <ul class="navbar-right">
@@ -81,4 +86,4 @@
     </ul>
 
   </div>
-</div>
\ No newline at end of file
+</div>

From 76919fea7bdb7624ecea7816e20a524071481ecd Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:21:22 +0200
Subject: [PATCH 03/50] Feat: Html for new volunteer page: Issue #40

---
 .../pages/volunteer/volunteer.component.html   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 client/src/app/pages/volunteer/volunteer.component.html

diff --git a/client/src/app/pages/volunteer/volunteer.component.html b/client/src/app/pages/volunteer/volunteer.component.html
new file mode 100644
index 00000000..cce3ad24
--- /dev/null
+++ b/client/src/app/pages/volunteer/volunteer.component.html
@@ -0,0 +1,18 @@
+<h1>Get Involved with CubingZA!</h1>
+
+<p>
+  We're always looking for passionate individuals to help grow the cubing community in South Africa. 
+  Whether you have a few hours to spare or want to take on a more involved role, 
+  there are many ways to contribute.
+</p>
+
+<h1>Volunteer Opportunities</h1>
+
+<h3>Example</h3> <p> example description </p> 
+
+<h2>More Information</h2>
+
+<p>
+  Interested in volunteering? Contact us at <a href="mailto:example@gmail.com">example&#64;gmail.com</a> 
+  to learn more about current opportunities and how to get involved.
+</p>

From 362ed910e95b039722b8ec90a4105023d26525c4 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:22:12 +0200
Subject: [PATCH 04/50] Empty styling file for volunteering component.

---
 client/src/app/pages/volunteer/volunteer.component.less | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 client/src/app/pages/volunteer/volunteer.component.less

diff --git a/client/src/app/pages/volunteer/volunteer.component.less b/client/src/app/pages/volunteer/volunteer.component.less
new file mode 100644
index 00000000..e69de29b

From bac6e8ad324df163f523ffb0ab519d2ad6acc853 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:23:20 +0200
Subject: [PATCH 05/50] Enhancement/feat: Added ts component for volunteering
 page. Issue #40.

---
 .../volunteer/volunteer.component.spec.ts     | 19 +++++++++++++++++++
 .../pages/volunteer/volunteer.component.ts    |  8 ++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 client/src/app/pages/volunteer/volunteer.component.spec.ts
 create mode 100644 client/src/app/pages/volunteer/volunteer.component.ts

diff --git a/client/src/app/pages/volunteer/volunteer.component.spec.ts b/client/src/app/pages/volunteer/volunteer.component.spec.ts
new file mode 100644
index 00000000..c11f5599
--- /dev/null
+++ b/client/src/app/pages/volunteer/volunteer.component.spec.ts
@@ -0,0 +1,19 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { VolunteerComponent } from './volunteer.component';
+
+describe('VolunteerComponent', () => {
+  let component: VolunteerComponent;
+  let fixture: ComponentFixture<VolunteerComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ VolunteerComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(VolunteerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+});
diff --git a/client/src/app/pages/volunteer/volunteer.component.ts b/client/src/app/pages/volunteer/volunteer.component.ts
new file mode 100644
index 00000000..7172dd03
--- /dev/null
+++ b/client/src/app/pages/volunteer/volunteer.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-volunteer',
+  templateUrl: './volunteer.component.html',
+})
+export class VolunteerComponent {
+}

From 1d76c2eccb7c7bb5fd1cfcd8ac1152b551cd4a99 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:56:25 +0200
Subject: [PATCH 06/50] Faqs App route.

---
 client/src/app/app.routes.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index c2ab938a..2adb7148 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -11,6 +11,7 @@ import { ProvincialRecordsComponent } from './pages/provincial-records/provincia
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { TermsComponent } from './pages/terms/terms.component';
 import { VolunteerComponent } from './pages/volunteer/volunteer.component';
+import { faqsComponent } from './pages/faqs/faqs.component';
 
 export const AppRoutes: Routes = [
   { path: '', component: HomeComponent, title: 'CubingZA - Home' },
@@ -23,6 +24,7 @@ export const AppRoutes: Routes = [
   { path: 'notifications', canActivate: [AuthGuard], component: NotificationsComponent, title: 'CubingZA - Notifications' },
   { path: 'contact', component: ContactComponent, title: 'CubingZA - Contact Us' },
   { path: 'volunteer', component: VolunteerComponent },
+  { path: 'faqs', component: faqsComponent },
   ...AccountRoutes,
   {
     path: 'admin',

From d2f68626da63053b2b8e7dfaef3f9b04eeb544f3 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:56:49 +0200
Subject: [PATCH 07/50] Faqs example html.

---
 client/src/app/components/navbar/navbar.component.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index 8a7e28f0..2559b989 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -61,7 +61,10 @@
         <fa-icon [icon]="faRightToBracket" />
         <span class="collapsable-label">Volunteer</span> 
       </a></li> 
-
+      <li><a class="navbar-item" routerLink="/faqs" [routerLinkActive]="['active']"> 
+        <fa-icon [icon]="faInfoCircle" />
+        <span class="collapsable-label">FAQS</span> 
+      </a></li> 
     </ul>
 
     <ul class="navbar-right">

From b4d88bf8c0bb58b1a83d23aa875a97d6798ff799 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:57:15 +0200
Subject: [PATCH 08/50] Faqs compenent html

---
 client/src/app/pages/faqs/faqs.component.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 client/src/app/pages/faqs/faqs.component.html

diff --git a/client/src/app/pages/faqs/faqs.component.html b/client/src/app/pages/faqs/faqs.component.html
new file mode 100644
index 00000000..c10c1e61
--- /dev/null
+++ b/client/src/app/pages/faqs/faqs.component.html
@@ -0,0 +1,15 @@
+<h1>Frequently asked questions</h1>
+
+<p>
+  Questions we're asked consistantly and have seen asked by most.
+</p>
+
+<h1>FAQS</h1>
+
+<h3>Example</h3> <p>example answer</p> 
+
+<h2>More Information</h2>
+
+<p>
+  More questions? <a href="/contact">Click me!</a> to ask a question not listed here.
+</p>

From 90efb17629bc2fcfa446e3ac9dd6bf5fa7a6290e Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:57:31 +0200
Subject: [PATCH 09/50] Empty faqs, styling file.

---
 client/src/app/pages/faqs/faqs.component.less | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 client/src/app/pages/faqs/faqs.component.less

diff --git a/client/src/app/pages/faqs/faqs.component.less b/client/src/app/pages/faqs/faqs.component.less
new file mode 100644
index 00000000..e69de29b

From f548dcc20505119836e76adeb8edae9aa295f1d5 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:57:42 +0200
Subject: [PATCH 10/50] Faqs ts component.

---
 .../src/app/pages/faqs/faqs.component.spec.ts | 19 +++++++++++++++++++
 client/src/app/pages/faqs/faqs.component.ts   |  8 ++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 client/src/app/pages/faqs/faqs.component.spec.ts
 create mode 100644 client/src/app/pages/faqs/faqs.component.ts

diff --git a/client/src/app/pages/faqs/faqs.component.spec.ts b/client/src/app/pages/faqs/faqs.component.spec.ts
new file mode 100644
index 00000000..444aa6c2
--- /dev/null
+++ b/client/src/app/pages/faqs/faqs.component.spec.ts
@@ -0,0 +1,19 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { faqsComponent } from './faqs.component';
+
+describe('faqsComponent', () => {
+  let component: faqsComponent;
+  let fixture: ComponentFixture<faqsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ faqsComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(faqsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+});
diff --git a/client/src/app/pages/faqs/faqs.component.ts b/client/src/app/pages/faqs/faqs.component.ts
new file mode 100644
index 00000000..514c92f6
--- /dev/null
+++ b/client/src/app/pages/faqs/faqs.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-faqs',
+  templateUrl: './faqs.component.html',
+})
+export class faqsComponent {
+}

From af8394080379855b8f5c1b0e5f9fd3c2b86a93f5 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:25:16 +0200
Subject: [PATCH 11/50] Enhancement: Changed the the copy and pasted testing
 spec and gave it it's own basic example one for volunteer component, added
 the same thing for the faqs.

---
 client/src/app/pages/faqs/faqs.component.spec.ts   |  4 ++++
 .../pages/volunteer/volunteer.component.spec.ts    | 14 ++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/src/app/pages/faqs/faqs.component.spec.ts b/client/src/app/pages/faqs/faqs.component.spec.ts
index 444aa6c2..e36ce2cc 100644
--- a/client/src/app/pages/faqs/faqs.component.spec.ts
+++ b/client/src/app/pages/faqs/faqs.component.spec.ts
@@ -16,4 +16,8 @@ describe('faqsComponent', () => {
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
 });
diff --git a/client/src/app/pages/volunteer/volunteer.component.spec.ts b/client/src/app/pages/volunteer/volunteer.component.spec.ts
index c11f5599..c43b605c 100644
--- a/client/src/app/pages/volunteer/volunteer.component.spec.ts
+++ b/client/src/app/pages/volunteer/volunteer.component.spec.ts
@@ -3,17 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { VolunteerComponent } from './volunteer.component';
 
 describe('VolunteerComponent', () => {
-  let component: VolunteerComponent;
-  let fixture: ComponentFixture<VolunteerComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ VolunteerComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(VolunteerComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+  it('should create', () => {
+    expect(new VolunteerComponent()).toBeTruthy(); 
   });
 });

From 7c7dec40c1718f7ac433aeea00c6c988a6053f7f Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:03:26 +0200
Subject: [PATCH 12/50] Added the Html for the volunteering opportunities.

---
 client/src/app/pages/volunteer/volunteer.component.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/app/pages/volunteer/volunteer.component.html b/client/src/app/pages/volunteer/volunteer.component.html
index cce3ad24..87152c1b 100644
--- a/client/src/app/pages/volunteer/volunteer.component.html
+++ b/client/src/app/pages/volunteer/volunteer.component.html
@@ -10,8 +10,16 @@ <h1>Volunteer Opportunities</h1>
 
 <h3>Example</h3> <p> example description </p> 
 
+<h3>Volunteering at Events:</h3> <p> We always need help running competitions smoothly. This starts with the running, judging, and scrambling roles you're already familiar with, but where we really appreciate help is with setting up the day before, and taking down and packing up equipment after the competition. If you're interested in doing this, I suggest emailing the competition organisers in the week before the competition to find out when and how you can help. </p>
+
+<h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
+
+<h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: CubingZA Website Issues. A specific area where we could use help is improving the design of our competition announcement emails. </p>
+
 <h2>More Information</h2>
 
+
+
 <p>
   Interested in volunteering? Contact us at <a href="mailto:example@gmail.com">example&#64;gmail.com</a> 
   to learn more about current opportunities and how to get involved.

From 3a883d190f2d4b9309c8fae92e652ba5abcf7092 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:34:49 +0200
Subject: [PATCH 13/50] Enhancement: Added better navbar fontawesome icons
 relating to the next pages.

---
 client/src/app/components/navbar/navbar.component.html | 4 ++--
 client/src/app/components/navbar/navbar.component.ts   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index 2559b989..6cf622d1 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -58,11 +58,11 @@
         <span class="collapsable-label">Contact</span>
       </a></li>
       <li><a class="navbar-item" routerLink="/volunteer" [routerLinkActive]="['active']"> 
-        <fa-icon [icon]="faRightToBracket" />
+        <fa-icon [icon]="faBook" />
         <span class="collapsable-label">Volunteer</span> 
       </a></li> 
       <li><a class="navbar-item" routerLink="/faqs" [routerLinkActive]="['active']"> 
-        <fa-icon [icon]="faInfoCircle" />
+        <fa-icon [icon]="faQuestionCircle" />
         <span class="collapsable-label">FAQS</span> 
       </a></li> 
     </ul>
diff --git a/client/src/app/components/navbar/navbar.component.ts b/client/src/app/components/navbar/navbar.component.ts
index 539f179c..202bed4a 100644
--- a/client/src/app/components/navbar/navbar.component.ts
+++ b/client/src/app/components/navbar/navbar.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import {
   faInfoCircle, faRightToBracket, faRightFromBracket, faUserPlus,
   faEnvelope, faUser, faGear, faMapLocationDot, faUsers, faCalendarDays,
-  faScrewdriverWrench, faCaretDown, faRankingStar, faTrophy
+  faScrewdriverWrench, faCaretDown, faRankingStar, faTrophy, faQuestionCircle, faBook,
 } from '@fortawesome/free-solid-svg-icons';
 import { AuthService } from 'src/app/services/auth/auth.service';
 
@@ -14,6 +14,8 @@ import { AuthService } from 'src/app/services/auth/auth.service';
 })
 export class NavbarComponent {
 
+  faBook = faBook;
+  faQuestionCircle = faQuestionCircle;
   faInfoCircle = faInfoCircle;
   faRightToBracket = faRightToBracket;
   faEnvelope = faEnvelope;

From 117c12c0be7cac0b630b417640592942cd183c46 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:35:44 +0200
Subject: [PATCH 14/50] Enhancement: Adding similar formatting to other pages
 to make the website look neater. Adding almost all the finishing touchers to
 be ready for review.

---
 client/src/app/pages/faqs/faqs.component.html | 31 +++++++++++-----
 .../pages/volunteer/volunteer.component.html  | 37 ++++++++++---------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/client/src/app/pages/faqs/faqs.component.html b/client/src/app/pages/faqs/faqs.component.html
index c10c1e61..b3222ca9 100644
--- a/client/src/app/pages/faqs/faqs.component.html
+++ b/client/src/app/pages/faqs/faqs.component.html
@@ -1,15 +1,26 @@
-<h1>Frequently asked questions</h1>
+<div class="container about-page">
 
-<p>
-  Questions we're asked consistantly and have seen asked by most.
-</p>
+  <h1>Frequently asked questions</h1>
 
-<h1>FAQS</h1>
+  <div class="row">
+    <div class="col-full">
 
-<h3>Example</h3> <p>example answer</p> 
+    <p>
+      Questions that we are asked quite often, and some answers.
+    </p>
 
-<h2>More Information</h2>
+      <h1>FAQS</h1>
 
-<p>
-  More questions? <a href="/contact">Click me!</a> to ask a question not listed here.
-</p>
+        <div>
+
+          <h3><b>1.</b> What can I do to help CubingZA?</h3> <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you can help.</p> 
+
+        </div>
+
+      <h2>More Information</h2>
+
+        <p>
+          More questions? <a href="/contact">Click me!</a> Contact us for any remaining questions you may have!
+        </p>
+    </div>
+  </div>
\ No newline at end of file
diff --git a/client/src/app/pages/volunteer/volunteer.component.html b/client/src/app/pages/volunteer/volunteer.component.html
index 87152c1b..9d3dd5da 100644
--- a/client/src/app/pages/volunteer/volunteer.component.html
+++ b/client/src/app/pages/volunteer/volunteer.component.html
@@ -1,26 +1,29 @@
-<h1>Get Involved with CubingZA!</h1>
+<div class="container about-page">
 
-<p>
-  We're always looking for passionate individuals to help grow the cubing community in South Africa. 
-  Whether you have a few hours to spare or want to take on a more involved role, 
-  there are many ways to contribute.
-</p>
+  <h1>Get Involved with CubingZA!</h1>
 
-<h1>Volunteer Opportunities</h1>
+  <div class="row">
+    <div class="col-full">
 
-<h3>Example</h3> <p> example description </p> 
+    <p>
+      We're always looking for passionate individuals to help grow the cubing community in South Africa. 
+      Whether you have a few hours to spare or want to take on a more involved role, 
+      there are many ways to contribute.
+    </p>
 
-<h3>Volunteering at Events:</h3> <p> We always need help running competitions smoothly. This starts with the running, judging, and scrambling roles you're already familiar with, but where we really appreciate help is with setting up the day before, and taking down and packing up equipment after the competition. If you're interested in doing this, I suggest emailing the competition organisers in the week before the competition to find out when and how you can help. </p>
+    <h1>Volunteer Opportunities</h1>
 
-<h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
+      <h3>Volunteering at Events:</h3> <p> We always need help running competitions smoothly. This starts with the running, judging, and scrambling roles you're already familiar with, but where we really appreciate help is with setting up the day before, and taking down and packing up equipment after the competition. If you're interested in doing this, I suggest emailing the competition organisers in the week before the competition to find out when and how you can help. </p>
 
-<h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: CubingZA Website Issues. A specific area where we could use help is improving the design of our competition announcement emails. </p>
+      <h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
 
-<h2>More Information</h2>
+      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: CubingZA Website Issues. A specific area where we could use help is improving the design of our competition announcement emails. </p>
 
+    <h2>More Information</h2>
 
-
-<p>
-  Interested in volunteering? Contact us at <a href="mailto:example@gmail.com">example&#64;gmail.com</a> 
-  to learn more about current opportunities and how to get involved.
-</p>
+      <p>
+        Interested in volunteering? Contact us <a href="/contact">here!</a> 
+        to learn more about current opportunities and how to get involved.
+      </p>
+    </div>
+  </div>
\ No newline at end of file

From 02fad337c61003df657e2a18eb27d05404ea727f Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Thu, 15 Aug 2024 17:48:02 +0200
Subject: [PATCH 15/50] Enhancement: Changed Faqs to FAQ + added FAQS

---
 client/src/app/app.routes.ts                  |  4 +-
 .../components/navbar/navbar.component.html   |  4 +-
 client/src/app/pages/FAQ/FAQ.component.html   | 42 +++++++++++++++++++
 .../FAQ.component.less}                       |  0
 .../FAQ.component.spec.ts}                    | 12 +++---
 client/src/app/pages/FAQ/FAQ.component.ts     |  8 ++++
 client/src/app/pages/faqs/faqs.component.html | 26 ------------
 client/src/app/pages/faqs/faqs.component.ts   |  8 ----
 8 files changed, 60 insertions(+), 44 deletions(-)
 create mode 100644 client/src/app/pages/FAQ/FAQ.component.html
 rename client/src/app/pages/{faqs/faqs.component.less => FAQ/FAQ.component.less} (100%)
 rename client/src/app/pages/{faqs/faqs.component.spec.ts => FAQ/FAQ.component.spec.ts} (56%)
 create mode 100644 client/src/app/pages/FAQ/FAQ.component.ts
 delete mode 100644 client/src/app/pages/faqs/faqs.component.html
 delete mode 100644 client/src/app/pages/faqs/faqs.component.ts

diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index 2adb7148..df1f92d0 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -11,7 +11,7 @@ import { ProvincialRecordsComponent } from './pages/provincial-records/provincia
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { TermsComponent } from './pages/terms/terms.component';
 import { VolunteerComponent } from './pages/volunteer/volunteer.component';
-import { faqsComponent } from './pages/faqs/faqs.component';
+import { FAQComponent } from './pages/FAQ/FAQ.component';
 
 export const AppRoutes: Routes = [
   { path: '', component: HomeComponent, title: 'CubingZA - Home' },
@@ -24,7 +24,7 @@ export const AppRoutes: Routes = [
   { path: 'notifications', canActivate: [AuthGuard], component: NotificationsComponent, title: 'CubingZA - Notifications' },
   { path: 'contact', component: ContactComponent, title: 'CubingZA - Contact Us' },
   { path: 'volunteer', component: VolunteerComponent },
-  { path: 'faqs', component: faqsComponent },
+  { path: 'FAQ', component: FAQComponent },
   ...AccountRoutes,
   {
     path: 'admin',
diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index 6cf622d1..f91b5090 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -61,9 +61,9 @@
         <fa-icon [icon]="faBook" />
         <span class="collapsable-label">Volunteer</span> 
       </a></li> 
-      <li><a class="navbar-item" routerLink="/faqs" [routerLinkActive]="['active']"> 
+      <li><a class="navbar-item" routerLink="/FAQ" [routerLinkActive]="['active']"> 
         <fa-icon [icon]="faQuestionCircle" />
-        <span class="collapsable-label">FAQS</span> 
+        <span class="collapsable-label">FAQ</span> 
       </a></li> 
     </ul>
 
diff --git a/client/src/app/pages/FAQ/FAQ.component.html b/client/src/app/pages/FAQ/FAQ.component.html
new file mode 100644
index 00000000..2456fa02
--- /dev/null
+++ b/client/src/app/pages/FAQ/FAQ.component.html
@@ -0,0 +1,42 @@
+<div class="container about-page">
+
+  <h1>Frequently asked questions</h1>
+
+  <div class="row">
+    <div class="col-full">
+
+    <p>
+      Questions that we are asked quite often, and some answers.
+    </p>
+
+      <h1>FAQS</h1>
+
+        <div>
+          
+          <h2>CubingZA Questions</h2>
+
+            <h3><b>1.</b> What can I do to help CubingZA?</h3> <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you can help.</p> 
+
+          <h2>General Questions</h2>
+
+            <h3><b>2.</b>How do I stay in touch with other cubers?</h3> <p>Join the CubingZA Whatsapp community by clicking on <a href="https://chat.whatsapp.com/IIDXPTFGhJw7u3gUl4Nf4I">this link!</a></p> 
+
+          <h2>Competition Questions</h2>
+
+            <h3><b>3.</b> Do I need to be at both days if I am only competing on one day?</h3>
+            No, you only have to be there on the day that you are competing. Make sure to check out the schedule tab to see when you compete. We suggest arriving at the competition at least 30 minutes prior to your event in case we run ahead of schedule.
+
+            <h3><b>4.</b>Where can I view my results on the day of the competition?</h3>
+            On the competition days all results will be uploaded to WCA Live. Just search for the competition name under the "upcoming" tab. After the competition has ended, it will take a few days for the official results to be uploaded to the WCA main site.
+          
+         
+       
+
+      <h2>More Information</h2>
+
+        <p>
+          More questions? <a href="/contact">Click me!</a> Contact us for any remaining questions you may have!
+        </p>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/client/src/app/pages/faqs/faqs.component.less b/client/src/app/pages/FAQ/FAQ.component.less
similarity index 100%
rename from client/src/app/pages/faqs/faqs.component.less
rename to client/src/app/pages/FAQ/FAQ.component.less
diff --git a/client/src/app/pages/faqs/faqs.component.spec.ts b/client/src/app/pages/FAQ/FAQ.component.spec.ts
similarity index 56%
rename from client/src/app/pages/faqs/faqs.component.spec.ts
rename to client/src/app/pages/FAQ/FAQ.component.spec.ts
index e36ce2cc..5e27abfc 100644
--- a/client/src/app/pages/faqs/faqs.component.spec.ts
+++ b/client/src/app/pages/FAQ/FAQ.component.spec.ts
@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { faqsComponent } from './faqs.component';
+import { FAQComponent } from './FAQ.component';
 
-describe('faqsComponent', () => {
-  let component: faqsComponent;
-  let fixture: ComponentFixture<faqsComponent>;
+describe('FAQComponent', () => {
+  let component: FAQComponent;
+  let fixture: ComponentFixture<FAQComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ faqsComponent ]
+      declarations: [ FAQComponent ]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(faqsComponent);
+    fixture = TestBed.createComponent(FAQComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/client/src/app/pages/FAQ/FAQ.component.ts b/client/src/app/pages/FAQ/FAQ.component.ts
new file mode 100644
index 00000000..3daf4669
--- /dev/null
+++ b/client/src/app/pages/FAQ/FAQ.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-FAQ',
+  templateUrl: './FAQ.component.html',
+})
+export class FAQComponent {
+}
diff --git a/client/src/app/pages/faqs/faqs.component.html b/client/src/app/pages/faqs/faqs.component.html
deleted file mode 100644
index b3222ca9..00000000
--- a/client/src/app/pages/faqs/faqs.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="container about-page">
-
-  <h1>Frequently asked questions</h1>
-
-  <div class="row">
-    <div class="col-full">
-
-    <p>
-      Questions that we are asked quite often, and some answers.
-    </p>
-
-      <h1>FAQS</h1>
-
-        <div>
-
-          <h3><b>1.</b> What can I do to help CubingZA?</h3> <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you can help.</p> 
-
-        </div>
-
-      <h2>More Information</h2>
-
-        <p>
-          More questions? <a href="/contact">Click me!</a> Contact us for any remaining questions you may have!
-        </p>
-    </div>
-  </div>
\ No newline at end of file
diff --git a/client/src/app/pages/faqs/faqs.component.ts b/client/src/app/pages/faqs/faqs.component.ts
deleted file mode 100644
index 514c92f6..00000000
--- a/client/src/app/pages/faqs/faqs.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-faqs',
-  templateUrl: './faqs.component.html',
-})
-export class faqsComponent {
-}

From 44c9ee1118b9326b790540d9d422dfba12d5872d Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Thu, 15 Aug 2024 17:48:48 +0200
Subject: [PATCH 16/50] Added a github issues link to the volunteering area.

---
 client/src/app/pages/volunteer/volunteer.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/pages/volunteer/volunteer.component.html b/client/src/app/pages/volunteer/volunteer.component.html
index 9d3dd5da..cf77e4d4 100644
--- a/client/src/app/pages/volunteer/volunteer.component.html
+++ b/client/src/app/pages/volunteer/volunteer.component.html
@@ -17,7 +17,7 @@ <h3>Volunteering at Events:</h3> <p> We always need help running competitions sm
 
       <h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
 
-      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: CubingZA Website Issues. A specific area where we could use help is improving the design of our competition announcement emails. </p>
+      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: CubingZA Website Issues. A specific area where we could use help is improving the design of our competition announcement emails. A great place to start is looking through the github repository and finding an issue to work on that interests you! Click <a href="https://github.com/CubingZA/CubingZA-Website/issues">Here!</a></p>
 
     <h2>More Information</h2>
 

From 421b862bdbccfa466e1612c0a591790edeef5d82 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 16 Aug 2024 13:31:15 +0200
Subject: [PATCH 17/50] Update
 client/src/app/pages/volunteer/volunteer.component.html

Co-authored-by: Brendan Gray <me@bgray.dev>
---
 client/src/app/pages/volunteer/volunteer.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/pages/volunteer/volunteer.component.html b/client/src/app/pages/volunteer/volunteer.component.html
index cf77e4d4..462374c0 100644
--- a/client/src/app/pages/volunteer/volunteer.component.html
+++ b/client/src/app/pages/volunteer/volunteer.component.html
@@ -17,7 +17,7 @@ <h3>Volunteering at Events:</h3> <p> We always need help running competitions sm
 
       <h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
 
-      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: CubingZA Website Issues. A specific area where we could use help is improving the design of our competition announcement emails. A great place to start is looking through the github repository and finding an issue to work on that interests you! Click <a href="https://github.com/CubingZA/CubingZA-Website/issues">Here!</a></p>
+      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: <a href="https://github.com/CubingZA/CubingZA-Website/issues">CubingZA Website Issues</a>.</p>
 
     <h2>More Information</h2>
 

From f5a6a5f65d7ecf74b23db62b7b80f0a84cb7131c Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 16 Aug 2024 13:34:51 +0200
Subject: [PATCH 18/50] Update app.routes.ts

Added lowercase.
---
 client/src/app/app.routes.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index df1f92d0..f20db605 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -11,7 +11,7 @@ import { ProvincialRecordsComponent } from './pages/provincial-records/provincia
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { TermsComponent } from './pages/terms/terms.component';
 import { VolunteerComponent } from './pages/volunteer/volunteer.component';
-import { FAQComponent } from './pages/FAQ/FAQ.component';
+import { FAQComponent } from './pages/faq/faq.component';
 
 export const AppRoutes: Routes = [
   { path: '', component: HomeComponent, title: 'CubingZA - Home' },

From ea780be2b02bdc249eb06afd76e6fd9662346a80 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Sat, 17 Aug 2024 09:37:17 +0200
Subject: [PATCH 19/50] Fixed some errors I was getting in the FAQ/faq problem.

---
 client/src/app/app.routes.ts                   | 2 +-
 client/src/app/pages/FAQ/FAQ.component.spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index f20db605..df1f92d0 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -11,7 +11,7 @@ import { ProvincialRecordsComponent } from './pages/provincial-records/provincia
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { TermsComponent } from './pages/terms/terms.component';
 import { VolunteerComponent } from './pages/volunteer/volunteer.component';
-import { FAQComponent } from './pages/faq/faq.component';
+import { FAQComponent } from './pages/FAQ/FAQ.component';
 
 export const AppRoutes: Routes = [
   { path: '', component: HomeComponent, title: 'CubingZA - Home' },
diff --git a/client/src/app/pages/FAQ/FAQ.component.spec.ts b/client/src/app/pages/FAQ/FAQ.component.spec.ts
index 5e27abfc..e15dacba 100644
--- a/client/src/app/pages/FAQ/FAQ.component.spec.ts
+++ b/client/src/app/pages/FAQ/FAQ.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { FAQComponent } from './FAQ.component';
+import { FAQComponent } from './faq.component';
 
 describe('FAQComponent', () => {
   let component: FAQComponent;

From 94c48a9c1bbabe4d4c747d827e019c24b15e0516 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Sun, 18 Aug 2024 21:56:38 +0200
Subject: [PATCH 20/50] Update client/src/app/pages/FAQ/FAQ.component.html

Co-authored-by: Brendan Gray <me@bgray.dev>
---
 client/src/app/pages/FAQ/FAQ.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/pages/FAQ/FAQ.component.html b/client/src/app/pages/FAQ/FAQ.component.html
index 2456fa02..7598a114 100644
--- a/client/src/app/pages/FAQ/FAQ.component.html
+++ b/client/src/app/pages/FAQ/FAQ.component.html
@@ -35,7 +35,7 @@ <h3><b>4.</b>Where can I view my results on the day of the competition?</h3>
       <h2>More Information</h2>
 
         <p>
-          More questions? <a href="/contact">Click me!</a> Contact us for any remaining questions you may have!
+          More questions? <a href="/contact">Contact us</a> for any remaining questions you may have!
         </p>
     </div>
   </div>

From dcc32f62ab0af4b4ee3be7be4f7ea0aef4522309 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Sun, 18 Aug 2024 21:57:00 +0200
Subject: [PATCH 21/50] Update
 client/src/app/pages/volunteer/volunteer.component.html

Co-authored-by: Brendan Gray <me@bgray.dev>
---
 client/src/app/pages/volunteer/volunteer.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/pages/volunteer/volunteer.component.html b/client/src/app/pages/volunteer/volunteer.component.html
index 462374c0..51a4894f 100644
--- a/client/src/app/pages/volunteer/volunteer.component.html
+++ b/client/src/app/pages/volunteer/volunteer.component.html
@@ -22,7 +22,7 @@ <h3>Website Design:</h3> <p> If you have skills or interest in software developm
     <h2>More Information</h2>
 
       <p>
-        Interested in volunteering? Contact us <a href="/contact">here!</a> 
+        Interested in volunteering? <a href="/contact">Contact us</a> to get involved.
         to learn more about current opportunities and how to get involved.
       </p>
     </div>

From 3c37a76f1fdecd5077e791f854b98371bfaa85d5 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:00:55 +0200
Subject: [PATCH 22/50] Hopefully fixed naming issues.

---
 client/src/app/app.routes.ts                           |  4 ++--
 client/src/app/components/navbar/navbar.component.html |  2 +-
 client/src/app/pages/FAQ/FAQ.component.html            |  4 ++--
 client/src/app/pages/FAQ/FAQ.component.spec.ts         | 10 +++++-----
 client/src/app/pages/FAQ/FAQ.component.ts              |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index df1f92d0..fcf20e2c 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -11,7 +11,7 @@ import { ProvincialRecordsComponent } from './pages/provincial-records/provincia
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { TermsComponent } from './pages/terms/terms.component';
 import { VolunteerComponent } from './pages/volunteer/volunteer.component';
-import { FAQComponent } from './pages/FAQ/FAQ.component';
+import { FaqComponent } from './pages/faq/faq.component';
 
 export const AppRoutes: Routes = [
   { path: '', component: HomeComponent, title: 'CubingZA - Home' },
@@ -24,7 +24,7 @@ export const AppRoutes: Routes = [
   { path: 'notifications', canActivate: [AuthGuard], component: NotificationsComponent, title: 'CubingZA - Notifications' },
   { path: 'contact', component: ContactComponent, title: 'CubingZA - Contact Us' },
   { path: 'volunteer', component: VolunteerComponent },
-  { path: 'FAQ', component: FAQComponent },
+  { path: 'faq', component: FaqComponent },
   ...AccountRoutes,
   {
     path: 'admin',
diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index f91b5090..4a539fe7 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -61,7 +61,7 @@
         <fa-icon [icon]="faBook" />
         <span class="collapsable-label">Volunteer</span> 
       </a></li> 
-      <li><a class="navbar-item" routerLink="/FAQ" [routerLinkActive]="['active']"> 
+      <li><a class="navbar-item" routerLink="/faq" [routerLinkActive]="['active']"> 
         <fa-icon [icon]="faQuestionCircle" />
         <span class="collapsable-label">FAQ</span> 
       </a></li> 
diff --git a/client/src/app/pages/FAQ/FAQ.component.html b/client/src/app/pages/FAQ/FAQ.component.html
index 7598a114..81065ac5 100644
--- a/client/src/app/pages/FAQ/FAQ.component.html
+++ b/client/src/app/pages/FAQ/FAQ.component.html
@@ -9,7 +9,7 @@ <h1>Frequently asked questions</h1>
       Questions that we are asked quite often, and some answers.
     </p>
 
-      <h1>FAQS</h1>
+      <h1>Questions and answers</h1>
 
         <div>
           
@@ -27,7 +27,7 @@ <h3><b>3.</b> Do I need to be at both days if I am only competing on one day?</h
             No, you only have to be there on the day that you are competing. Make sure to check out the schedule tab to see when you compete. We suggest arriving at the competition at least 30 minutes prior to your event in case we run ahead of schedule.
 
             <h3><b>4.</b>Where can I view my results on the day of the competition?</h3>
-            On the competition days all results will be uploaded to WCA Live. Just search for the competition name under the "upcoming" tab. After the competition has ended, it will take a few days for the official results to be uploaded to the WCA main site.
+            On the competition days all results will be uploaded to <a href="https://live.worldcubeassociation.org">WCA Live</a>. Just search for the competition name under the "upcoming" tab. After the competition has ended, it will take a few days for the official results to be uploaded to the WCA main site.
           
          
        
diff --git a/client/src/app/pages/FAQ/FAQ.component.spec.ts b/client/src/app/pages/FAQ/FAQ.component.spec.ts
index e15dacba..0c9bb0dc 100644
--- a/client/src/app/pages/FAQ/FAQ.component.spec.ts
+++ b/client/src/app/pages/FAQ/FAQ.component.spec.ts
@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { FAQComponent } from './faq.component';
+import { FaqComponent } from './faq.component';
 
 describe('FAQComponent', () => {
-  let component: FAQComponent;
-  let fixture: ComponentFixture<FAQComponent>;
+  let component: FaqComponent;
+  let fixture: ComponentFixture<FaqComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ FAQComponent ]
+      declarations: [ FaqComponent ]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(FAQComponent);
+    fixture = TestBed.createComponent(FaqComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/client/src/app/pages/FAQ/FAQ.component.ts b/client/src/app/pages/FAQ/FAQ.component.ts
index 3daf4669..0cf30427 100644
--- a/client/src/app/pages/FAQ/FAQ.component.ts
+++ b/client/src/app/pages/FAQ/FAQ.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-FAQ',
-  templateUrl: './FAQ.component.html',
+  selector: 'app-Faq',
+  templateUrl: './Faq.component.html',
 })
-export class FAQComponent {
+export class FaqComponent {
 }

From be51e620978c71e67a8799a976ba9afd4cdf7896 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:04:34 +0200
Subject: [PATCH 23/50] Rename FAQ.component.html to faq.component.html

---
 .../app/pages/FAQ/{FAQ.component.html => faq.component.html}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename client/src/app/pages/FAQ/{FAQ.component.html => faq.component.html} (99%)

diff --git a/client/src/app/pages/FAQ/FAQ.component.html b/client/src/app/pages/FAQ/faq.component.html
similarity index 99%
rename from client/src/app/pages/FAQ/FAQ.component.html
rename to client/src/app/pages/FAQ/faq.component.html
index 81065ac5..e2d7e5cf 100644
--- a/client/src/app/pages/FAQ/FAQ.component.html
+++ b/client/src/app/pages/FAQ/faq.component.html
@@ -39,4 +39,4 @@ <h2>More Information</h2>
         </p>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>

From ee5dbc020a1a2dd1ee20bfdcd3432f0f665340c0 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:04:54 +0200
Subject: [PATCH 24/50] Rename FAQ.component.ts to faq.component.ts

---
 client/src/app/pages/FAQ/{FAQ.component.ts => faq.component.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/app/pages/FAQ/{FAQ.component.ts => faq.component.ts} (100%)

diff --git a/client/src/app/pages/FAQ/FAQ.component.ts b/client/src/app/pages/FAQ/faq.component.ts
similarity index 100%
rename from client/src/app/pages/FAQ/FAQ.component.ts
rename to client/src/app/pages/FAQ/faq.component.ts

From 917d0b957243f38ff6d6e94222e31f91eca9b00d Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:05:11 +0200
Subject: [PATCH 25/50] Rename FAQ.component.spec.ts to faq.component.spec.ts

---
 .../pages/FAQ/{FAQ.component.spec.ts => faq.component.spec.ts}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/app/pages/FAQ/{FAQ.component.spec.ts => faq.component.spec.ts} (100%)

diff --git a/client/src/app/pages/FAQ/FAQ.component.spec.ts b/client/src/app/pages/FAQ/faq.component.spec.ts
similarity index 100%
rename from client/src/app/pages/FAQ/FAQ.component.spec.ts
rename to client/src/app/pages/FAQ/faq.component.spec.ts

From 03a1c3177d4cc7a7b7004f526da1101c87fafced Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:05:36 +0200
Subject: [PATCH 26/50] Rename FAQ.component.less to faq.component.less

---
 client/src/app/pages/FAQ/FAQ.component.less | 0
 client/src/app/pages/FAQ/faq.component.less | 1 +
 2 files changed, 1 insertion(+)
 delete mode 100644 client/src/app/pages/FAQ/FAQ.component.less
 create mode 100644 client/src/app/pages/FAQ/faq.component.less

diff --git a/client/src/app/pages/FAQ/FAQ.component.less b/client/src/app/pages/FAQ/FAQ.component.less
deleted file mode 100644
index e69de29b..00000000
diff --git a/client/src/app/pages/FAQ/faq.component.less b/client/src/app/pages/FAQ/faq.component.less
new file mode 100644
index 00000000..d3f5a12f
--- /dev/null
+++ b/client/src/app/pages/FAQ/faq.component.less
@@ -0,0 +1 @@
+

From 78589b3c5d06002786c0208b3e21ff90cb0af497 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:08:37 +0200
Subject: [PATCH 27/50] Rename faq.component.html to faq.component.html

---
 client/src/app/pages/{FAQ => faq}/faq.component.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/app/pages/{FAQ => faq}/faq.component.html (100%)

diff --git a/client/src/app/pages/FAQ/faq.component.html b/client/src/app/pages/faq/faq.component.html
similarity index 100%
rename from client/src/app/pages/FAQ/faq.component.html
rename to client/src/app/pages/faq/faq.component.html

From adde9f76127c6e714e7b3c4a459e9113078c61f1 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:09:14 +0200
Subject: [PATCH 28/50] Update and rename faq.component.less to
 faq.component.less

---
 client/src/app/pages/{FAQ => faq}/faq.component.less | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/app/pages/{FAQ => faq}/faq.component.less (100%)

diff --git a/client/src/app/pages/FAQ/faq.component.less b/client/src/app/pages/faq/faq.component.less
similarity index 100%
rename from client/src/app/pages/FAQ/faq.component.less
rename to client/src/app/pages/faq/faq.component.less

From 3683d1311d74de43a59f4e01fefc00174f201687 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:09:33 +0200
Subject: [PATCH 29/50] Rename faq.component.spec.ts to faq.component.spec.ts

---
 client/src/app/pages/{FAQ => faq}/faq.component.spec.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/app/pages/{FAQ => faq}/faq.component.spec.ts (100%)

diff --git a/client/src/app/pages/FAQ/faq.component.spec.ts b/client/src/app/pages/faq/faq.component.spec.ts
similarity index 100%
rename from client/src/app/pages/FAQ/faq.component.spec.ts
rename to client/src/app/pages/faq/faq.component.spec.ts

From b3639f097099e028a56ea3d9d1fa2932aa37eb0d Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:10:01 +0200
Subject: [PATCH 30/50] Rename faq.component.ts to faq.component.ts

---
 client/src/app/pages/{FAQ => faq}/faq.component.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename client/src/app/pages/{FAQ => faq}/faq.component.ts (100%)

diff --git a/client/src/app/pages/FAQ/faq.component.ts b/client/src/app/pages/faq/faq.component.ts
similarity index 100%
rename from client/src/app/pages/FAQ/faq.component.ts
rename to client/src/app/pages/faq/faq.component.ts

From 5503f8d6a4ae8e8ed78c0482952661d245139ac3 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Mon, 19 Aug 2024 17:56:12 +0200
Subject: [PATCH 31/50] Issues hopefully fixed.

---
 client/src/app/pages/faq/faq.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/pages/faq/faq.component.ts b/client/src/app/pages/faq/faq.component.ts
index 0cf30427..f843e47d 100644
--- a/client/src/app/pages/faq/faq.component.ts
+++ b/client/src/app/pages/faq/faq.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'app-Faq',
-  templateUrl: './Faq.component.html',
+  templateUrl: './faq.component.html',
 })
 export class FaqComponent {
 }

From 9c911d8e3dcbf48006e19b19f878d10e42195edd Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:26:25 +0200
Subject: [PATCH 32/50] Added FAQ and Volunteering app modules, also fixed
 imports and modules for about dropdown.

---
 client/src/app/app.module.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 7fda5651..377490f9 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 
 import { HomeComponent } from './pages/home/home.component';
-import { AboutComponent } from './pages/about/about.component';
+import { AboutComponent } from './pages/about_folder_test/about_us/about.component';
 import { ContactComponent } from './pages/contact/contact.component';
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { NotificationsComponent } from './pages/notifications/notifications.component';
@@ -16,6 +16,9 @@ import { NotificationsComponent } from './pages/notifications/notifications.comp
 import { ManageUsersComponent } from './pages/admin/manage-users/manage-users.component';
 import { ManageCompetitionsComponent } from './pages/admin/manage-competitions/manage-competitions.component';
 
+import { FaqComponent } from './pages/about_folder_test/faq/faq.component';
+import { VolunteerComponent } from './pages/about_folder_test/volunteer/volunteer.component';
+
 import { LoginComponent } from './account/login/login.component';
 import { SignupComponent } from './account/signup/signup.component';
 import { WcaLoginComponent } from './account/wcalogin/wcalogin.component';
@@ -70,6 +73,8 @@ import { EventSelectorComponent } from './components/event-selector/event-select
         SettingsComponent,
         VerifyComponent,
         RotatingCubeComponent,
+        FaqComponent,
+        VolunteerComponent,
         CubingzaLogoComponent,
         NavbarComponent,
         FooterComponent,

From 9ab87e1b43bf20495ce1d82e731b2f82df573c9d Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:27:18 +0200
Subject: [PATCH 33/50] Added about app route for about dropdown.

---
 client/src/app/app.routes.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index fcf20e2c..be1cf145 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -1,5 +1,4 @@
 import { Routes } from '@angular/router';
-import { AboutComponent } from './pages/about/about.component';
 import { AccountRoutes } from './account/account.routes';
 import { AuthGuard } from './account/auth.guard';
 import { AdminGuard } from './pages/admin/admin.guard';
@@ -10,12 +9,9 @@ import { ProvincialRankingsComponent } from './pages/provincial-rankings/provinc
 import { ProvincialRecordsComponent } from './pages/provincial-records/provincial-records.component';
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { TermsComponent } from './pages/terms/terms.component';
-import { VolunteerComponent } from './pages/volunteer/volunteer.component';
-import { FaqComponent } from './pages/faq/faq.component';
 
 export const AppRoutes: Routes = [
   { path: '', component: HomeComponent, title: 'CubingZA - Home' },
-  { path: 'about', component: AboutComponent, title: 'CubingZA - About' },
   { path: 'privacy', component: PrivacyComponent, title: 'CubingZA - Privacy Policy' },
   { path: 'terms', component: TermsComponent, title: 'CubingZA - Terms of Use' },
   { path: 'rankings', redirectTo: 'rankings/GT/333/single', pathMatch: 'full' },
@@ -23,14 +19,16 @@ export const AppRoutes: Routes = [
   { path: 'records', component: ProvincialRecordsComponent, title: 'CubingZA - Records' },
   { path: 'notifications', canActivate: [AuthGuard], component: NotificationsComponent, title: 'CubingZA - Notifications' },
   { path: 'contact', component: ContactComponent, title: 'CubingZA - Contact Us' },
-  { path: 'volunteer', component: VolunteerComponent },
-  { path: 'faq', component: FaqComponent },
   ...AccountRoutes,
   {
     path: 'admin',
     loadChildren: () => import('./pages/admin/admin.module').then(m => m.AdminModule),
     canMatch: [AdminGuard]
-  }
+  },
+  {
+    path: 'about',
+    loadChildren: () => import('./pages/about_folder_test/about.module').then(m => m.AboutModule),
+  },
 
 
 ];

From f9ffeb5fda11a1e843e4d4a41d4ec9af0f6ecc62 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:27:34 +0200
Subject: [PATCH 34/50] Added navbar dropdown for about.

---
 .../components/navbar/navbar.component.html   | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index 4a539fe7..e07dc4cf 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -48,23 +48,29 @@
           </a></li>
         </ul>
       </li>
-
-      <li><a class="navbar-item" routerLink="/about" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faInfoCircle" />
-        <span class="collapsable-label">About</span>
-      </a></li>
+      <!-- About Dropdown -->
+      <li class="navbar-submenu"> 
+        <div class="navbar-item">
+          <fa-icon [icon]="faInfoCircle" />
+          About
+          <fa-icon [icon]="faCaretDown" class="submenu-icon" /> 
+        </div>
+        <ul class="navbar-submenu-items">
+          <li><a class="navbar-item" routerLink="/about/about_us" [routerLinkActive]="['active']">
+            About Us
+          </a></li>
+          <li><a class="navbar-item" routerLink="/about/volunteer" [routerLinkActive]="['active']">
+            Volunteering
+          </a></li>
+          <li><a class="navbar-item" routerLink="/about/faq" [routerLinkActive]="['active']">
+            FAQ
+          </a></li>
+        </ul>
+      </li>
       <li><a class="navbar-item" routerLink="/contact" [routerLinkActive]="['active']">
         <fa-icon [icon]="faEnvelope" />
         <span class="collapsable-label">Contact</span>
       </a></li>
-      <li><a class="navbar-item" routerLink="/volunteer" [routerLinkActive]="['active']"> 
-        <fa-icon [icon]="faBook" />
-        <span class="collapsable-label">Volunteer</span> 
-      </a></li> 
-      <li><a class="navbar-item" routerLink="/faq" [routerLinkActive]="['active']"> 
-        <fa-icon [icon]="faQuestionCircle" />
-        <span class="collapsable-label">FAQ</span> 
-      </a></li> 
     </ul>
 
     <ul class="navbar-right">

From 5d54c449919e4512a1c1d53231dfa5e75ccfc4cd Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:28:09 +0200
Subject: [PATCH 35/50] Made the css or .less look better for the public drop
 down.

---
 client/src/app/components/navbar/navbar.component.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/app/components/navbar/navbar.component.less b/client/src/app/components/navbar/navbar.component.less
index 9ae14087..ef8c2b04 100644
--- a/client/src/app/components/navbar/navbar.component.less
+++ b/client/src/app/components/navbar/navbar.component.less
@@ -145,6 +145,7 @@
       z-index: 5000;
       background-color: @navbar-background-color;
       border: 1px solid @navbar-background-color-highlight;
+      border-radius: 5px;
 
       @media only screen and (max-width: @small-screen) {
         display: inline-flex;

From 59b8736968e314aba34be7b2d8a0ca7bdadd1340 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:39:14 +0200
Subject: [PATCH 36/50] Added a class to the HTML for about to make it the same
 colour as the other navbar items.

---
 client/src/app/components/navbar/navbar.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index e07dc4cf..8e05e6c6 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -52,7 +52,7 @@
       <li class="navbar-submenu"> 
         <div class="navbar-item">
           <fa-icon [icon]="faInfoCircle" />
-          About
+          <a class="about-dropdown-toggle" href="#">About </a>
           <fa-icon [icon]="faCaretDown" class="submenu-icon" /> 
         </div>
         <ul class="navbar-submenu-items">

From 4dc4af4b8669acf8425558ffd723de5ca33a0b1a Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:39:44 +0200
Subject: [PATCH 37/50] Added the colour css for the about class to make it the
 same colour as other text.

---
 client/src/app/components/navbar/navbar.component.less | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/app/components/navbar/navbar.component.less b/client/src/app/components/navbar/navbar.component.less
index ef8c2b04..c04b7359 100644
--- a/client/src/app/components/navbar/navbar.component.less
+++ b/client/src/app/components/navbar/navbar.component.less
@@ -79,6 +79,11 @@
     }
   }
 
+  .about-dropdown-toggle {
+    color: #dddddd; 
+  }
+  
+
   .navbar-item {
     display: block;
     box-sizing: border-box;

From d3e91f1489e2f6d3eb08f99b0fc59afd057651ca Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:40:34 +0200
Subject: [PATCH 38/50] Deleted old about components, as the new dropdown menu
 has one added.

---
 .../src/app/pages/about/about.component.html  | 42 -------------------
 .../src/app/pages/about/about.component.less  | 16 -------
 .../app/pages/about/about.component.spec.ts   | 36 ----------------
 client/src/app/pages/about/about.component.ts | 10 -----
 4 files changed, 104 deletions(-)
 delete mode 100644 client/src/app/pages/about/about.component.html
 delete mode 100644 client/src/app/pages/about/about.component.less
 delete mode 100644 client/src/app/pages/about/about.component.spec.ts
 delete mode 100644 client/src/app/pages/about/about.component.ts

diff --git a/client/src/app/pages/about/about.component.html b/client/src/app/pages/about/about.component.html
deleted file mode 100644
index 9b47ffe8..00000000
--- a/client/src/app/pages/about/about.component.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="container about-page">
-
-  <h1>About CubingZA</h1>
-
-  <div class="row">
-    <div class="col-full">
-
-      <div class="well">
-        <b>Speedcubing</b> <i>(n)</i> - The activity of solving a variety of twisty puzzles,
-        the most famous being the Rubik's Cube, as quickly as possible.
-      </div>
-
-      <p>
-        <i>Cubing South Africa</i> (<b>CubingZA</b>) was formed to support and promote cubing and speedcubing in South Africa.
-
-        South African speedcubers first started getting together in 2012, and the first unofficial competition had
-        just 3 competitors. Today, more 1400 South Africans have recorded times in official competitions.
-      </p>
-
-      <p>
-        CubingZA is a regional organisation of the World Cube Association, and was formed to help manage this rapidly growing community.
-        <a routerLink="/contact">Contact us</a> if you're interested in getting involved.
-      </p>
-
-      <h2>Competitions</h2>
-      <p>
-        <b>Competitions</b> are organised from time to time around the country. Competitions are held in accordance with the regulations
-        of the <a href="https://www.worldcubeassociation.org/" target="_blank" rel=noopener>World Cube Association (WCA)</a> and overseen by
-        South African <a href="https://www.worldcubeassociation.org/delegates" target="_blank" rel=noopener>WCA Delegates</a>.
-      </p>
-
-      <p>
-        A list of upcoming competitions is available on the <a routerLink="/">Home Page</a>. If there's a competition near you,
-        click the Register button, and you will be taken to the WCA website where you can register for the competition.
-      </p>
-      <p>
-        If you'd like to know what to expect at your first competition, watch this
-        <a href="https://www.youtube.com/watch?v=dPL3eV-A0ww" target="_blank" rel=noopener>tutorial video</a>.
-      </p>
-    </div>
-  </div>
-</div>
diff --git a/client/src/app/pages/about/about.component.less b/client/src/app/pages/about/about.component.less
deleted file mode 100644
index 8c861ce4..00000000
--- a/client/src/app/pages/about/about.component.less
+++ /dev/null
@@ -1,16 +0,0 @@
-@import '../../styles/variables.less';
-
-.about-page {
-  .col-full {
-    text-align: justify;
-  }
-}
-
-.well {
-  padding: 1.5em 2em;
-
-  background-color: @background-color-highlight;
-  border: 1px solid @border-color-soft;
-  border-radius: 0.5em;
-  box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
-}
\ No newline at end of file
diff --git a/client/src/app/pages/about/about.component.spec.ts b/client/src/app/pages/about/about.component.spec.ts
deleted file mode 100644
index d353ae4d..00000000
--- a/client/src/app/pages/about/about.component.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AboutComponent } from './about.component';
-import { RouterTestingModule } from '@angular/router/testing';
-
-describe('AboutComponent', () => {
-  let component: AboutComponent;
-  let fixture: ComponentFixture<AboutComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AboutComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(AboutComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should have a heading', () => {
-    const compiled = fixture.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('About CubingZA');
-  });
-
-  it('should have a section about competitions', () => {
-    const compiled = fixture.nativeElement;
-    expect(compiled.querySelector('h2').textContent).toContain('Competitions');
-  });
-
-
-});
diff --git a/client/src/app/pages/about/about.component.ts b/client/src/app/pages/about/about.component.ts
deleted file mode 100644
index 3e04f5ae..00000000
--- a/client/src/app/pages/about/about.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-about',
-  templateUrl: './about.component.html',
-  styleUrls: ['./about.component.less']
-})
-export class AboutComponent {
-
-}

From 3f2b7c292608a5a266ebb84edfc644faa3108aff Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:41:03 +0200
Subject: [PATCH 39/50] Added the typescript for the new about dropdown.

---
 .../about_folder_test/about-routing.module.ts    |  9 +++++++++
 .../app/pages/about_folder_test/about.module.ts  | 13 +++++++++++++
 .../app/pages/about_folder_test/about.routes.ts  | 16 ++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 client/src/app/pages/about_folder_test/about-routing.module.ts
 create mode 100644 client/src/app/pages/about_folder_test/about.module.ts
 create mode 100644 client/src/app/pages/about_folder_test/about.routes.ts

diff --git a/client/src/app/pages/about_folder_test/about-routing.module.ts b/client/src/app/pages/about_folder_test/about-routing.module.ts
new file mode 100644
index 00000000..b37aec50
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/about-routing.module.ts
@@ -0,0 +1,9 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { AboutRoutes } from './about.routes';
+
+@NgModule({
+  imports: [RouterModule.forChild(AboutRoutes)],
+  exports: [RouterModule]
+})
+export class AboutRoutingModule { }
diff --git a/client/src/app/pages/about_folder_test/about.module.ts b/client/src/app/pages/about_folder_test/about.module.ts
new file mode 100644
index 00000000..b537af66
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/about.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { AboutRoutingModule } from './about-routing.module';
+
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule,
+    AboutRoutingModule
+  ]
+})
+export class AboutModule { }
diff --git a/client/src/app/pages/about_folder_test/about.routes.ts b/client/src/app/pages/about_folder_test/about.routes.ts
new file mode 100644
index 00000000..5983e3ce
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/about.routes.ts
@@ -0,0 +1,16 @@
+import { Routes } from '@angular/router';
+import { FaqComponent } from './faq/faq.component';
+import { AboutComponent } from './about_us/about.component';
+import { VolunteerComponent } from './volunteer/volunteer.component';
+
+export const AboutRoutes: Routes = [
+  {
+    path: '',
+    children: [
+      { path: 'faq', component: FaqComponent, title: 'CubingZA - FAQ' },
+      { path: 'about_us', component: AboutComponent, title: 'CubingZA - About' },
+      { path: 'volunteer', component: VolunteerComponent, title: 'CubingZA - Volunteer' },
+      { path: '', redirectTo: 'users', pathMatch: 'full' }
+    ]
+  },
+];

From 44e3cd4e91fda523572975e64ce19e5eebbf568d Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:41:19 +0200
Subject: [PATCH 40/50] Added about component to the new dropdown

---
 .../about_us/about.component.html             | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 client/src/app/pages/about_folder_test/about_us/about.component.html

diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.html b/client/src/app/pages/about_folder_test/about_us/about.component.html
new file mode 100644
index 00000000..9b47ffe8
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/about_us/about.component.html
@@ -0,0 +1,42 @@
+<div class="container about-page">
+
+  <h1>About CubingZA</h1>
+
+  <div class="row">
+    <div class="col-full">
+
+      <div class="well">
+        <b>Speedcubing</b> <i>(n)</i> - The activity of solving a variety of twisty puzzles,
+        the most famous being the Rubik's Cube, as quickly as possible.
+      </div>
+
+      <p>
+        <i>Cubing South Africa</i> (<b>CubingZA</b>) was formed to support and promote cubing and speedcubing in South Africa.
+
+        South African speedcubers first started getting together in 2012, and the first unofficial competition had
+        just 3 competitors. Today, more 1400 South Africans have recorded times in official competitions.
+      </p>
+
+      <p>
+        CubingZA is a regional organisation of the World Cube Association, and was formed to help manage this rapidly growing community.
+        <a routerLink="/contact">Contact us</a> if you're interested in getting involved.
+      </p>
+
+      <h2>Competitions</h2>
+      <p>
+        <b>Competitions</b> are organised from time to time around the country. Competitions are held in accordance with the regulations
+        of the <a href="https://www.worldcubeassociation.org/" target="_blank" rel=noopener>World Cube Association (WCA)</a> and overseen by
+        South African <a href="https://www.worldcubeassociation.org/delegates" target="_blank" rel=noopener>WCA Delegates</a>.
+      </p>
+
+      <p>
+        A list of upcoming competitions is available on the <a routerLink="/">Home Page</a>. If there's a competition near you,
+        click the Register button, and you will be taken to the WCA website where you can register for the competition.
+      </p>
+      <p>
+        If you'd like to know what to expect at your first competition, watch this
+        <a href="https://www.youtube.com/watch?v=dPL3eV-A0ww" target="_blank" rel=noopener>tutorial video</a>.
+      </p>
+    </div>
+  </div>
+</div>

From 1e60d77895385205a3f4c2d8f0baa7fb7a1981d5 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:41:39 +0200
Subject: [PATCH 41/50] Added the rest of the about into new dropdown.

---
 .../about_us/about.component.less             | 16 +++++++++
 .../about_us/about.component.spec.ts          | 36 +++++++++++++++++++
 .../about_us/about.component.ts               | 10 ++++++
 3 files changed, 62 insertions(+)
 create mode 100644 client/src/app/pages/about_folder_test/about_us/about.component.less
 create mode 100644 client/src/app/pages/about_folder_test/about_us/about.component.spec.ts
 create mode 100644 client/src/app/pages/about_folder_test/about_us/about.component.ts

diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.less b/client/src/app/pages/about_folder_test/about_us/about.component.less
new file mode 100644
index 00000000..8c861ce4
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/about_us/about.component.less
@@ -0,0 +1,16 @@
+@import '../../styles/variables.less';
+
+.about-page {
+  .col-full {
+    text-align: justify;
+  }
+}
+
+.well {
+  padding: 1.5em 2em;
+
+  background-color: @background-color-highlight;
+  border: 1px solid @border-color-soft;
+  border-radius: 0.5em;
+  box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+}
\ No newline at end of file
diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.spec.ts b/client/src/app/pages/about_folder_test/about_us/about.component.spec.ts
new file mode 100644
index 00000000..d353ae4d
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/about_us/about.component.spec.ts
@@ -0,0 +1,36 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AboutComponent } from './about.component';
+import { RouterTestingModule } from '@angular/router/testing';
+
+describe('AboutComponent', () => {
+  let component: AboutComponent;
+  let fixture: ComponentFixture<AboutComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AboutComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AboutComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have a heading', () => {
+    const compiled = fixture.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('About CubingZA');
+  });
+
+  it('should have a section about competitions', () => {
+    const compiled = fixture.nativeElement;
+    expect(compiled.querySelector('h2').textContent).toContain('Competitions');
+  });
+
+
+});
diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.ts b/client/src/app/pages/about_folder_test/about_us/about.component.ts
new file mode 100644
index 00000000..3e04f5ae
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/about_us/about.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-about',
+  templateUrl: './about.component.html',
+  styleUrls: ['./about.component.less']
+})
+export class AboutComponent {
+
+}

From 0172f96dc7806977ebf43fbe4970bbc6d2e352af Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:41:57 +0200
Subject: [PATCH 42/50] Faq components added into the new dropdown.

---
 .../about_folder_test/faq/faq.component.html  | 42 +++++++++++++++++++
 .../about_folder_test/faq/faq.component.less  |  1 +
 .../faq/faq.component.spec.ts                 | 23 ++++++++++
 .../about_folder_test/faq/faq.component.ts    |  8 ++++
 4 files changed, 74 insertions(+)
 create mode 100644 client/src/app/pages/about_folder_test/faq/faq.component.html
 create mode 100644 client/src/app/pages/about_folder_test/faq/faq.component.less
 create mode 100644 client/src/app/pages/about_folder_test/faq/faq.component.spec.ts
 create mode 100644 client/src/app/pages/about_folder_test/faq/faq.component.ts

diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.html b/client/src/app/pages/about_folder_test/faq/faq.component.html
new file mode 100644
index 00000000..e2d7e5cf
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/faq/faq.component.html
@@ -0,0 +1,42 @@
+<div class="container about-page">
+
+  <h1>Frequently asked questions</h1>
+
+  <div class="row">
+    <div class="col-full">
+
+    <p>
+      Questions that we are asked quite often, and some answers.
+    </p>
+
+      <h1>Questions and answers</h1>
+
+        <div>
+          
+          <h2>CubingZA Questions</h2>
+
+            <h3><b>1.</b> What can I do to help CubingZA?</h3> <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you can help.</p> 
+
+          <h2>General Questions</h2>
+
+            <h3><b>2.</b>How do I stay in touch with other cubers?</h3> <p>Join the CubingZA Whatsapp community by clicking on <a href="https://chat.whatsapp.com/IIDXPTFGhJw7u3gUl4Nf4I">this link!</a></p> 
+
+          <h2>Competition Questions</h2>
+
+            <h3><b>3.</b> Do I need to be at both days if I am only competing on one day?</h3>
+            No, you only have to be there on the day that you are competing. Make sure to check out the schedule tab to see when you compete. We suggest arriving at the competition at least 30 minutes prior to your event in case we run ahead of schedule.
+
+            <h3><b>4.</b>Where can I view my results on the day of the competition?</h3>
+            On the competition days all results will be uploaded to <a href="https://live.worldcubeassociation.org">WCA Live</a>. Just search for the competition name under the "upcoming" tab. After the competition has ended, it will take a few days for the official results to be uploaded to the WCA main site.
+          
+         
+       
+
+      <h2>More Information</h2>
+
+        <p>
+          More questions? <a href="/contact">Contact us</a> for any remaining questions you may have!
+        </p>
+    </div>
+  </div>
+</div>
diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.less b/client/src/app/pages/about_folder_test/faq/faq.component.less
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/faq/faq.component.less
@@ -0,0 +1 @@
+
diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.spec.ts b/client/src/app/pages/about_folder_test/faq/faq.component.spec.ts
new file mode 100644
index 00000000..0c9bb0dc
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/faq/faq.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FaqComponent } from './faq.component';
+
+describe('FAQComponent', () => {
+  let component: FaqComponent;
+  let fixture: ComponentFixture<FaqComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FaqComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(FaqComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.ts b/client/src/app/pages/about_folder_test/faq/faq.component.ts
new file mode 100644
index 00000000..f843e47d
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/faq/faq.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-Faq',
+  templateUrl: './faq.component.html',
+})
+export class FaqComponent {
+}

From 9aa9a25772624404c275d881c21282808f2d66a6 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:42:19 +0200
Subject: [PATCH 43/50] Volunteering components added into the new dropdown.

---
 .../volunteer/volunteer.component.html        | 29 +++++++++++++++++++
 .../volunteer/volunteer.component.less        |  0
 .../volunteer/volunteer.component.spec.ts     |  9 ++++++
 .../volunteer/volunteer.component.ts          |  8 +++++
 4 files changed, 46 insertions(+)
 create mode 100644 client/src/app/pages/about_folder_test/volunteer/volunteer.component.html
 create mode 100644 client/src/app/pages/about_folder_test/volunteer/volunteer.component.less
 create mode 100644 client/src/app/pages/about_folder_test/volunteer/volunteer.component.spec.ts
 create mode 100644 client/src/app/pages/about_folder_test/volunteer/volunteer.component.ts

diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.html b/client/src/app/pages/about_folder_test/volunteer/volunteer.component.html
new file mode 100644
index 00000000..51a4894f
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/volunteer/volunteer.component.html
@@ -0,0 +1,29 @@
+<div class="container about-page">
+
+  <h1>Get Involved with CubingZA!</h1>
+
+  <div class="row">
+    <div class="col-full">
+
+    <p>
+      We're always looking for passionate individuals to help grow the cubing community in South Africa. 
+      Whether you have a few hours to spare or want to take on a more involved role, 
+      there are many ways to contribute.
+    </p>
+
+    <h1>Volunteer Opportunities</h1>
+
+      <h3>Volunteering at Events:</h3> <p> We always need help running competitions smoothly. This starts with the running, judging, and scrambling roles you're already familiar with, but where we really appreciate help is with setting up the day before, and taking down and packing up equipment after the competition. If you're interested in doing this, I suggest emailing the competition organisers in the week before the competition to find out when and how you can help. </p>
+
+      <h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
+
+      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: <a href="https://github.com/CubingZA/CubingZA-Website/issues">CubingZA Website Issues</a>.</p>
+
+    <h2>More Information</h2>
+
+      <p>
+        Interested in volunteering? <a href="/contact">Contact us</a> to get involved.
+        to learn more about current opportunities and how to get involved.
+      </p>
+    </div>
+  </div>
\ No newline at end of file
diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.less b/client/src/app/pages/about_folder_test/volunteer/volunteer.component.less
new file mode 100644
index 00000000..e69de29b
diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.spec.ts b/client/src/app/pages/about_folder_test/volunteer/volunteer.component.spec.ts
new file mode 100644
index 00000000..c43b605c
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/volunteer/volunteer.component.spec.ts
@@ -0,0 +1,9 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { VolunteerComponent } from './volunteer.component';
+
+describe('VolunteerComponent', () => {
+  it('should create', () => {
+    expect(new VolunteerComponent()).toBeTruthy(); 
+  });
+});
diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.ts b/client/src/app/pages/about_folder_test/volunteer/volunteer.component.ts
new file mode 100644
index 00000000..7172dd03
--- /dev/null
+++ b/client/src/app/pages/about_folder_test/volunteer/volunteer.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-volunteer',
+  templateUrl: './volunteer.component.html',
+})
+export class VolunteerComponent {
+}

From bd07378b8dcb22296e7c944cc0d45464ae9c6653 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:42:41 +0200
Subject: [PATCH 44/50] Got rid of old component files for the new dropdown
 component files.

---
 client/src/app/pages/faq/faq.component.html   | 42 -------------------
 client/src/app/pages/faq/faq.component.less   |  1 -
 .../src/app/pages/faq/faq.component.spec.ts   | 23 ----------
 client/src/app/pages/faq/faq.component.ts     |  8 ----
 .../pages/volunteer/volunteer.component.html  | 29 -------------
 .../pages/volunteer/volunteer.component.less  |  0
 .../volunteer/volunteer.component.spec.ts     |  9 ----
 .../pages/volunteer/volunteer.component.ts    |  8 ----
 8 files changed, 120 deletions(-)
 delete mode 100644 client/src/app/pages/faq/faq.component.html
 delete mode 100644 client/src/app/pages/faq/faq.component.less
 delete mode 100644 client/src/app/pages/faq/faq.component.spec.ts
 delete mode 100644 client/src/app/pages/faq/faq.component.ts
 delete mode 100644 client/src/app/pages/volunteer/volunteer.component.html
 delete mode 100644 client/src/app/pages/volunteer/volunteer.component.less
 delete mode 100644 client/src/app/pages/volunteer/volunteer.component.spec.ts
 delete mode 100644 client/src/app/pages/volunteer/volunteer.component.ts

diff --git a/client/src/app/pages/faq/faq.component.html b/client/src/app/pages/faq/faq.component.html
deleted file mode 100644
index e2d7e5cf..00000000
--- a/client/src/app/pages/faq/faq.component.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="container about-page">
-
-  <h1>Frequently asked questions</h1>
-
-  <div class="row">
-    <div class="col-full">
-
-    <p>
-      Questions that we are asked quite often, and some answers.
-    </p>
-
-      <h1>Questions and answers</h1>
-
-        <div>
-          
-          <h2>CubingZA Questions</h2>
-
-            <h3><b>1.</b> What can I do to help CubingZA?</h3> <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you can help.</p> 
-
-          <h2>General Questions</h2>
-
-            <h3><b>2.</b>How do I stay in touch with other cubers?</h3> <p>Join the CubingZA Whatsapp community by clicking on <a href="https://chat.whatsapp.com/IIDXPTFGhJw7u3gUl4Nf4I">this link!</a></p> 
-
-          <h2>Competition Questions</h2>
-
-            <h3><b>3.</b> Do I need to be at both days if I am only competing on one day?</h3>
-            No, you only have to be there on the day that you are competing. Make sure to check out the schedule tab to see when you compete. We suggest arriving at the competition at least 30 minutes prior to your event in case we run ahead of schedule.
-
-            <h3><b>4.</b>Where can I view my results on the day of the competition?</h3>
-            On the competition days all results will be uploaded to <a href="https://live.worldcubeassociation.org">WCA Live</a>. Just search for the competition name under the "upcoming" tab. After the competition has ended, it will take a few days for the official results to be uploaded to the WCA main site.
-          
-         
-       
-
-      <h2>More Information</h2>
-
-        <p>
-          More questions? <a href="/contact">Contact us</a> for any remaining questions you may have!
-        </p>
-    </div>
-  </div>
-</div>
diff --git a/client/src/app/pages/faq/faq.component.less b/client/src/app/pages/faq/faq.component.less
deleted file mode 100644
index d3f5a12f..00000000
--- a/client/src/app/pages/faq/faq.component.less
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/client/src/app/pages/faq/faq.component.spec.ts b/client/src/app/pages/faq/faq.component.spec.ts
deleted file mode 100644
index 0c9bb0dc..00000000
--- a/client/src/app/pages/faq/faq.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FaqComponent } from './faq.component';
-
-describe('FAQComponent', () => {
-  let component: FaqComponent;
-  let fixture: ComponentFixture<FaqComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ FaqComponent ]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(FaqComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/client/src/app/pages/faq/faq.component.ts b/client/src/app/pages/faq/faq.component.ts
deleted file mode 100644
index f843e47d..00000000
--- a/client/src/app/pages/faq/faq.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-Faq',
-  templateUrl: './faq.component.html',
-})
-export class FaqComponent {
-}
diff --git a/client/src/app/pages/volunteer/volunteer.component.html b/client/src/app/pages/volunteer/volunteer.component.html
deleted file mode 100644
index 51a4894f..00000000
--- a/client/src/app/pages/volunteer/volunteer.component.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="container about-page">
-
-  <h1>Get Involved with CubingZA!</h1>
-
-  <div class="row">
-    <div class="col-full">
-
-    <p>
-      We're always looking for passionate individuals to help grow the cubing community in South Africa. 
-      Whether you have a few hours to spare or want to take on a more involved role, 
-      there are many ways to contribute.
-    </p>
-
-    <h1>Volunteer Opportunities</h1>
-
-      <h3>Volunteering at Events:</h3> <p> We always need help running competitions smoothly. This starts with the running, judging, and scrambling roles you're already familiar with, but where we really appreciate help is with setting up the day before, and taking down and packing up equipment after the competition. If you're interested in doing this, I suggest emailing the competition organisers in the week before the competition to find out when and how you can help. </p>
-
-      <h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
-
-      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: <a href="https://github.com/CubingZA/CubingZA-Website/issues">CubingZA Website Issues</a>.</p>
-
-    <h2>More Information</h2>
-
-      <p>
-        Interested in volunteering? <a href="/contact">Contact us</a> to get involved.
-        to learn more about current opportunities and how to get involved.
-      </p>
-    </div>
-  </div>
\ No newline at end of file
diff --git a/client/src/app/pages/volunteer/volunteer.component.less b/client/src/app/pages/volunteer/volunteer.component.less
deleted file mode 100644
index e69de29b..00000000
diff --git a/client/src/app/pages/volunteer/volunteer.component.spec.ts b/client/src/app/pages/volunteer/volunteer.component.spec.ts
deleted file mode 100644
index c43b605c..00000000
--- a/client/src/app/pages/volunteer/volunteer.component.spec.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { VolunteerComponent } from './volunteer.component';
-
-describe('VolunteerComponent', () => {
-  it('should create', () => {
-    expect(new VolunteerComponent()).toBeTruthy(); 
-  });
-});
diff --git a/client/src/app/pages/volunteer/volunteer.component.ts b/client/src/app/pages/volunteer/volunteer.component.ts
deleted file mode 100644
index 7172dd03..00000000
--- a/client/src/app/pages/volunteer/volunteer.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-volunteer',
-  templateUrl: './volunteer.component.html',
-})
-export class VolunteerComponent {
-}

From 499b2f6d1cd1c54b42758d01877e1451c783045e Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:53:04 +0200
Subject: [PATCH 45/50] Added dropdown as the navbar was getting very
 cluttered, Move Volunteer and FAQ navbar links into a submenu #345 fixed, and
 FAQ section #38 fixed and Volunteer opportunities page #40 fixed which means
 #341 should be ready to be merged.

---
 client/src/app/app.module.ts                                | 6 +++---
 client/src/app/app.routes.ts                                | 2 +-
 .../{about_folder_test => about}/about-routing.module.ts    | 0
 .../app/pages/{about_folder_test => about}/about.module.ts  | 0
 .../app/pages/{about_folder_test => about}/about.routes.ts  | 0
 .../about_us/about.component.html                           | 0
 .../about_us/about.component.less                           | 0
 .../about_us/about.component.spec.ts                        | 0
 .../about_us/about.component.ts                             | 0
 .../{about_folder_test => about}/faq/faq.component.html     | 0
 .../{about_folder_test => about}/faq/faq.component.less     | 0
 .../{about_folder_test => about}/faq/faq.component.spec.ts  | 0
 .../pages/{about_folder_test => about}/faq/faq.component.ts | 0
 .../volunteer/volunteer.component.html                      | 0
 .../volunteer/volunteer.component.less                      | 0
 .../volunteer/volunteer.component.spec.ts                   | 0
 .../volunteer/volunteer.component.ts                        | 0
 17 files changed, 4 insertions(+), 4 deletions(-)
 rename client/src/app/pages/{about_folder_test => about}/about-routing.module.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/about.module.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/about.routes.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/about_us/about.component.html (100%)
 rename client/src/app/pages/{about_folder_test => about}/about_us/about.component.less (100%)
 rename client/src/app/pages/{about_folder_test => about}/about_us/about.component.spec.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/about_us/about.component.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/faq/faq.component.html (100%)
 rename client/src/app/pages/{about_folder_test => about}/faq/faq.component.less (100%)
 rename client/src/app/pages/{about_folder_test => about}/faq/faq.component.spec.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/faq/faq.component.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/volunteer/volunteer.component.html (100%)
 rename client/src/app/pages/{about_folder_test => about}/volunteer/volunteer.component.less (100%)
 rename client/src/app/pages/{about_folder_test => about}/volunteer/volunteer.component.spec.ts (100%)
 rename client/src/app/pages/{about_folder_test => about}/volunteer/volunteer.component.ts (100%)

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 377490f9..1d6986d1 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 
 import { HomeComponent } from './pages/home/home.component';
-import { AboutComponent } from './pages/about_folder_test/about_us/about.component';
+import { AboutComponent } from './pages/about/about_us/about.component';
 import { ContactComponent } from './pages/contact/contact.component';
 import { PrivacyComponent } from './pages/privacy/privacy.component';
 import { NotificationsComponent } from './pages/notifications/notifications.component';
@@ -16,8 +16,8 @@ import { NotificationsComponent } from './pages/notifications/notifications.comp
 import { ManageUsersComponent } from './pages/admin/manage-users/manage-users.component';
 import { ManageCompetitionsComponent } from './pages/admin/manage-competitions/manage-competitions.component';
 
-import { FaqComponent } from './pages/about_folder_test/faq/faq.component';
-import { VolunteerComponent } from './pages/about_folder_test/volunteer/volunteer.component';
+import { FaqComponent } from './pages/about/faq/faq.component';
+import { VolunteerComponent } from './pages/about/volunteer/volunteer.component';
 
 import { LoginComponent } from './account/login/login.component';
 import { SignupComponent } from './account/signup/signup.component';
diff --git a/client/src/app/app.routes.ts b/client/src/app/app.routes.ts
index be1cf145..66d46349 100644
--- a/client/src/app/app.routes.ts
+++ b/client/src/app/app.routes.ts
@@ -27,7 +27,7 @@ export const AppRoutes: Routes = [
   },
   {
     path: 'about',
-    loadChildren: () => import('./pages/about_folder_test/about.module').then(m => m.AboutModule),
+    loadChildren: () => import('./pages/about/about.module').then(m => m.AboutModule),
   },
 
 
diff --git a/client/src/app/pages/about_folder_test/about-routing.module.ts b/client/src/app/pages/about/about-routing.module.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/about-routing.module.ts
rename to client/src/app/pages/about/about-routing.module.ts
diff --git a/client/src/app/pages/about_folder_test/about.module.ts b/client/src/app/pages/about/about.module.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/about.module.ts
rename to client/src/app/pages/about/about.module.ts
diff --git a/client/src/app/pages/about_folder_test/about.routes.ts b/client/src/app/pages/about/about.routes.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/about.routes.ts
rename to client/src/app/pages/about/about.routes.ts
diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.html b/client/src/app/pages/about/about_us/about.component.html
similarity index 100%
rename from client/src/app/pages/about_folder_test/about_us/about.component.html
rename to client/src/app/pages/about/about_us/about.component.html
diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.less b/client/src/app/pages/about/about_us/about.component.less
similarity index 100%
rename from client/src/app/pages/about_folder_test/about_us/about.component.less
rename to client/src/app/pages/about/about_us/about.component.less
diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.spec.ts b/client/src/app/pages/about/about_us/about.component.spec.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/about_us/about.component.spec.ts
rename to client/src/app/pages/about/about_us/about.component.spec.ts
diff --git a/client/src/app/pages/about_folder_test/about_us/about.component.ts b/client/src/app/pages/about/about_us/about.component.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/about_us/about.component.ts
rename to client/src/app/pages/about/about_us/about.component.ts
diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.html b/client/src/app/pages/about/faq/faq.component.html
similarity index 100%
rename from client/src/app/pages/about_folder_test/faq/faq.component.html
rename to client/src/app/pages/about/faq/faq.component.html
diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.less b/client/src/app/pages/about/faq/faq.component.less
similarity index 100%
rename from client/src/app/pages/about_folder_test/faq/faq.component.less
rename to client/src/app/pages/about/faq/faq.component.less
diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.spec.ts b/client/src/app/pages/about/faq/faq.component.spec.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/faq/faq.component.spec.ts
rename to client/src/app/pages/about/faq/faq.component.spec.ts
diff --git a/client/src/app/pages/about_folder_test/faq/faq.component.ts b/client/src/app/pages/about/faq/faq.component.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/faq/faq.component.ts
rename to client/src/app/pages/about/faq/faq.component.ts
diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.html b/client/src/app/pages/about/volunteer/volunteer.component.html
similarity index 100%
rename from client/src/app/pages/about_folder_test/volunteer/volunteer.component.html
rename to client/src/app/pages/about/volunteer/volunteer.component.html
diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.less b/client/src/app/pages/about/volunteer/volunteer.component.less
similarity index 100%
rename from client/src/app/pages/about_folder_test/volunteer/volunteer.component.less
rename to client/src/app/pages/about/volunteer/volunteer.component.less
diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.spec.ts b/client/src/app/pages/about/volunteer/volunteer.component.spec.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/volunteer/volunteer.component.spec.ts
rename to client/src/app/pages/about/volunteer/volunteer.component.spec.ts
diff --git a/client/src/app/pages/about_folder_test/volunteer/volunteer.component.ts b/client/src/app/pages/about/volunteer/volunteer.component.ts
similarity index 100%
rename from client/src/app/pages/about_folder_test/volunteer/volunteer.component.ts
rename to client/src/app/pages/about/volunteer/volunteer.component.ts

From 200c1610ebbaa18a5daf0267d729235661a909e5 Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:05:51 +0200
Subject: [PATCH 46/50] Fixed the variables.less file path error.

---
 client/src/app/pages/about/about_us/about.component.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/pages/about/about_us/about.component.less b/client/src/app/pages/about/about_us/about.component.less
index 8c861ce4..7328fe2e 100644
--- a/client/src/app/pages/about/about_us/about.component.less
+++ b/client/src/app/pages/about/about_us/about.component.less
@@ -1,4 +1,4 @@
-@import '../../styles/variables.less';
+@import '../../../styles/variables.less';
 
 .about-page {
   .col-full {

From fdf54241623f8a10db15372320c131e9f6057397 Mon Sep 17 00:00:00 2001
From: AlphaSheep <brendan@alphasheep.co.za>
Date: Fri, 23 Aug 2024 20:27:59 +0200
Subject: [PATCH 47/50] Run prettier and clean up FAQ and Volunteer pages

---
 client/package-lock.json                      |  9 --
 .../components/navbar/navbar.component.html   | 91 ++++++++++---------
 .../pages/about/about_us/about.component.html | 20 ++--
 .../pages/about/about_us/about.component.less |  2 +-
 .../about/about_us/about.component.spec.ts    |  5 +-
 .../app/pages/about/faq/faq.component.html    | 49 +++++-----
 .../about/volunteer/volunteer.component.html  | 31 +++++--
 .../volunteer/volunteer.component.spec.ts     |  2 +-
 8 files changed, 108 insertions(+), 101 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 4ad17f6b..48880956 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -2760,15 +2760,6 @@
         "@angular/core": "^18.0.0"
       }
     },
-    "node_modules/@fortawesome/fontawesome-common-types": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz",
-      "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==",
-      "hasInstallScript": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@fortawesome/fontawesome-svg-core": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.6.0.tgz",
diff --git a/client/src/app/components/navbar/navbar.component.html b/client/src/app/components/navbar/navbar.component.html
index 8e05e6c6..3362b70e 100644
--- a/client/src/app/components/navbar/navbar.component.html
+++ b/client/src/app/components/navbar/navbar.component.html
@@ -1,8 +1,8 @@
 <div class="navbar">
 
   <div class="navbar-header">
-    <button type="button" class="navbar-toggle collapsed" aria-controls="navbar"
-      (click)="toggleCollapsed()" [ngClass]="{'open':!collapsed}">
+    <button type="button" class="navbar-toggle collapsed" aria-controls="navbar" (click)="toggleCollapsed()"
+      [ngClass]="{'open':!collapsed}">
       <span class="icon-bar"></span><span class="icon-bar"></span>
       <span class="icon-bar"></span><span class="icon-bar"></span>
       <span class="icon-bar"></span><span class="icon-bar"></span>
@@ -18,81 +18,86 @@
     <ul class="navbar-left">
 
       <li><a class="navbar-item" routerLink="/rankings" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faRankingStar" />
-        Rankings
-      </a></li>
+          <fa-icon [icon]="faRankingStar" />
+          Rankings
+        </a></li>
       <li><a class="navbar-item" routerLink="/records" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faTrophy" />
-        Records
-      </a></li>
+          <fa-icon [icon]="faTrophy" />
+          Records
+        </a></li>
 
       <li *ngIf="isLoggedIn()"><a class="navbar-item" routerLink="/notifications" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faMapLocationDot" />
-        Notifications
-      </a></li>
+          <fa-icon [icon]="faMapLocationDot" />
+          Notifications
+        </a></li>
 
       <li *ngIf="isAdmin()" class="navbar-submenu">
         <div class="navbar-item">
           <fa-icon [icon]="faScrewdriverWrench" />
           Admin
-          <fa-icon [icon]="faCaretDown" class="submenu-icon"/>
+          <fa-icon [icon]="faCaretDown" class="submenu-icon" />
         </div>
         <ul class="navbar-submenu-items">
           <li *ngIf="isAdmin()"><a class="navbar-item" routerLink="/admin/users" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faUsers"/>
-            Users
-          </a></li>
+              <fa-icon [icon]="faUsers" />
+              Users
+            </a></li>
           <li *ngIf="isAdmin()"><a class="navbar-item" routerLink="/admin/competitions" [routerLinkActive]="['active']">
-            <fa-icon [icon]="faCalendarDays" />
-            Competitions
-          </a></li>
+              <fa-icon [icon]="faCalendarDays" />
+              Competitions
+            </a></li>
         </ul>
       </li>
       <!-- About Dropdown -->
-      <li class="navbar-submenu"> 
+      <li class="navbar-submenu">
         <div class="navbar-item">
           <fa-icon [icon]="faInfoCircle" />
           <a class="about-dropdown-toggle" href="#">About </a>
-          <fa-icon [icon]="faCaretDown" class="submenu-icon" /> 
+          <fa-icon [icon]="faCaretDown" class="submenu-icon" />
         </div>
         <ul class="navbar-submenu-items">
           <li><a class="navbar-item" routerLink="/about/about_us" [routerLinkActive]="['active']">
-            About Us
-          </a></li>
+              <fa-icon [icon]="faInfoCircle" />
+              About Us
+            </a></li>
           <li><a class="navbar-item" routerLink="/about/volunteer" [routerLinkActive]="['active']">
-            Volunteering
-          </a></li>
+              <fa-icon [icon]="faBook" />
+              Volunteering
+            </a></li>
           <li><a class="navbar-item" routerLink="/about/faq" [routerLinkActive]="['active']">
-            FAQ
-          </a></li>
+              <fa-icon [icon]="faQuestionCircle" />
+              FAQ
+            </a></li>
         </ul>
       </li>
       <li><a class="navbar-item" routerLink="/contact" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faEnvelope" />
-        <span class="collapsable-label">Contact</span>
-      </a></li>
+          <fa-icon [icon]="faEnvelope" />
+          <span class="collapsable-label">Contact</span>
+        </a></li>
     </ul>
 
     <ul class="navbar-right">
       <li *ngIf="!isLoggedIn()"><a class="navbar-item" routerLink="/signup" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faUserPlus" />
-        <span class="collapsable-label">Signup</span>
-      </a></li>
+          <fa-icon [icon]="faUserPlus" />
+          <span class="collapsable-label">Signup</span>
+        </a></li>
       <li *ngIf="!isLoggedIn()"><a class="navbar-item" routerLink="/login" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faRightToBracket" />
-        <span class="collapsable-label">Login</span>
-      </a></li>
+          <fa-icon [icon]="faRightToBracket" />
+          <span class="collapsable-label">Login</span>
+        </a></li>
 
-      <li *ngIf="isLoggedIn()"><div class="navbar-item">Hello {{ getCurrentUserName() }}</div></li>
+      <li *ngIf="isLoggedIn()">
+        <div class="navbar-item">Hello {{ getCurrentUserName() }}</div>
+      </li>
       <li *ngIf="isLoggedIn()"><a class="navbar-item" routerLink="/settings" [routerLinkActive]="['active']">
-        <fa-icon [icon]="faGear" />
-        <span class="collapsable-label">Settings</span>
-      </a></li>
+          <fa-icon [icon]="faGear" />
+          <span class="collapsable-label">Settings</span>
+        </a></li>
       <li *ngIf="isLoggedIn()"><a class="navbar-item" (click)="logout()" href="#">
-        <fa-icon [icon]="faRightFromBracket" />
-        <span class="collapsable-label">Logout</span>
-      </a></li>
+          <fa-icon [icon]="faRightFromBracket" />
+          <span class="collapsable-label">Logout</span>
+        </a></li>
     </ul>
 
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client/src/app/pages/about/about_us/about.component.html b/client/src/app/pages/about/about_us/about.component.html
index 9b47ffe8..d466e92e 100644
--- a/client/src/app/pages/about/about_us/about.component.html
+++ b/client/src/app/pages/about/about_us/about.component.html
@@ -11,26 +11,32 @@ <h1>About CubingZA</h1>
       </div>
 
       <p>
-        <i>Cubing South Africa</i> (<b>CubingZA</b>) was formed to support and promote cubing and speedcubing in South Africa.
+        <i>Cubing South Africa</i> (<b>CubingZA</b>) was formed to support and promote cubing and speedcubing in South
+        Africa.
 
         South African speedcubers first started getting together in 2012, and the first unofficial competition had
         just 3 competitors. Today, more 1400 South Africans have recorded times in official competitions.
       </p>
 
       <p>
-        CubingZA is a regional organisation of the World Cube Association, and was formed to help manage this rapidly growing community.
+        CubingZA is a regional organisation of the World Cube Association, and was formed to help manage this rapidly
+        growing community.
         <a routerLink="/contact">Contact us</a> if you're interested in getting involved.
       </p>
 
       <h2>Competitions</h2>
       <p>
-        <b>Competitions</b> are organised from time to time around the country. Competitions are held in accordance with the regulations
-        of the <a href="https://www.worldcubeassociation.org/" target="_blank" rel=noopener>World Cube Association (WCA)</a> and overseen by
-        South African <a href="https://www.worldcubeassociation.org/delegates" target="_blank" rel=noopener>WCA Delegates</a>.
+        <b>Competitions</b> are organised from time to time around the country. Competitions are held in accordance with
+        the regulations
+        of the <a href="https://www.worldcubeassociation.org/" target="_blank" rel=noopener>World Cube Association
+          (WCA)</a> and overseen by
+        South African <a href="https://www.worldcubeassociation.org/delegates" target="_blank" rel=noopener>WCA
+          Delegates</a>.
       </p>
 
       <p>
-        A list of upcoming competitions is available on the <a routerLink="/">Home Page</a>. If there's a competition near you,
+        A list of upcoming competitions is available on the <a routerLink="/">Home Page</a>. If there's a competition
+        near you,
         click the Register button, and you will be taken to the WCA website where you can register for the competition.
       </p>
       <p>
@@ -39,4 +45,4 @@ <h2>Competitions</h2>
       </p>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client/src/app/pages/about/about_us/about.component.less b/client/src/app/pages/about/about_us/about.component.less
index 7328fe2e..7438dda4 100644
--- a/client/src/app/pages/about/about_us/about.component.less
+++ b/client/src/app/pages/about/about_us/about.component.less
@@ -12,5 +12,5 @@
   background-color: @background-color-highlight;
   border: 1px solid @border-color-soft;
   border-radius: 0.5em;
-  box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
 }
\ No newline at end of file
diff --git a/client/src/app/pages/about/about_us/about.component.spec.ts b/client/src/app/pages/about/about_us/about.component.spec.ts
index d353ae4d..9a200962 100644
--- a/client/src/app/pages/about/about_us/about.component.spec.ts
+++ b/client/src/app/pages/about/about_us/about.component.spec.ts
@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AboutComponent } from './about.component';
-import { RouterTestingModule } from '@angular/router/testing';
 
 describe('AboutComponent', () => {
   let component: AboutComponent;
@@ -9,9 +8,9 @@ describe('AboutComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ AboutComponent ]
+      declarations: [AboutComponent]
     })
-    .compileComponents();
+      .compileComponents();
 
     fixture = TestBed.createComponent(AboutComponent);
     component = fixture.componentInstance;
diff --git a/client/src/app/pages/about/faq/faq.component.html b/client/src/app/pages/about/faq/faq.component.html
index e2d7e5cf..98cc2d87 100644
--- a/client/src/app/pages/about/faq/faq.component.html
+++ b/client/src/app/pages/about/faq/faq.component.html
@@ -1,42 +1,37 @@
 <div class="container about-page">
 
-  <h1>Frequently asked questions</h1>
+  <h1>Frequently Asked Questions</h1>
 
   <div class="row">
     <div class="col-full">
 
-    <p>
-      Questions that we are asked quite often, and some answers.
-    </p>
+      <p>
+        These are answers to some of the questions we are asked quite often.
+      </p>
 
-      <h1>Questions and answers</h1>
+      <h4><b>1.</b> What can I do to help CubingZA?</h4>
+      <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you
+        can help.</p>
 
-        <div>
-          
-          <h2>CubingZA Questions</h2>
+      <h4><b>2.</b>How do I stay in touch with other cubers?</h4>
+      <p>Join the CubingZA Whatsapp community by clicking on <a
+          href="https://chat.whatsapp.com/IIDXPTFGhJw7u3gUl4Nf4I">this link</a>!</p>
 
-            <h3><b>1.</b> What can I do to help CubingZA?</h3> <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you can help.</p> 
+      <h4><b>3.</b> Do I need to be at both days if I am only competing on one day?</h4>
+      No, you only have to be there on the day that you are competing. Make sure to check out the schedule tab to see
+      when you compete. We suggest arriving at the competition at least 30 minutes prior to your event in case we run
+      ahead of schedule.
 
-          <h2>General Questions</h2>
-
-            <h3><b>2.</b>How do I stay in touch with other cubers?</h3> <p>Join the CubingZA Whatsapp community by clicking on <a href="https://chat.whatsapp.com/IIDXPTFGhJw7u3gUl4Nf4I">this link!</a></p> 
-
-          <h2>Competition Questions</h2>
-
-            <h3><b>3.</b> Do I need to be at both days if I am only competing on one day?</h3>
-            No, you only have to be there on the day that you are competing. Make sure to check out the schedule tab to see when you compete. We suggest arriving at the competition at least 30 minutes prior to your event in case we run ahead of schedule.
-
-            <h3><b>4.</b>Where can I view my results on the day of the competition?</h3>
-            On the competition days all results will be uploaded to <a href="https://live.worldcubeassociation.org">WCA Live</a>. Just search for the competition name under the "upcoming" tab. After the competition has ended, it will take a few days for the official results to be uploaded to the WCA main site.
-          
-         
-       
+      <h4><b>4.</b>Where can I view my results on the day of the competition?</h4>
+      On the competition days all results will be uploaded to <a href="https://live.worldcubeassociation.org">WCA
+        Live</a>. Just search for the competition name under the "upcoming" tab. After the competition has ended, it
+      will take a few days for the official results to be uploaded to the WCA main site.
 
       <h2>More Information</h2>
 
-        <p>
-          More questions? <a href="/contact">Contact us</a> for any remaining questions you may have!
-        </p>
+      <p>
+        More questions? <a href="/contact">Contact us</a> with any other questions you may have!
+      </p>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client/src/app/pages/about/volunteer/volunteer.component.html b/client/src/app/pages/about/volunteer/volunteer.component.html
index 51a4894f..39dffe81 100644
--- a/client/src/app/pages/about/volunteer/volunteer.component.html
+++ b/client/src/app/pages/about/volunteer/volunteer.component.html
@@ -5,21 +5,32 @@ <h1>Get Involved with CubingZA!</h1>
   <div class="row">
     <div class="col-full">
 
-    <p>
-      We're always looking for passionate individuals to help grow the cubing community in South Africa. 
-      Whether you have a few hours to spare or want to take on a more involved role, 
-      there are many ways to contribute.
-    </p>
+      <p>
+        We're always looking for passionate individuals to help grow the cubing community in South Africa.
+        Whether you have a few hours to spare or want to take on a more involved role,
+        there are many ways to contribute.
+      </p>
 
-    <h1>Volunteer Opportunities</h1>
+      <h2>Volunteer Opportunities</h2>
 
-      <h3>Volunteering at Events:</h3> <p> We always need help running competitions smoothly. This starts with the running, judging, and scrambling roles you're already familiar with, but where we really appreciate help is with setting up the day before, and taking down and packing up equipment after the competition. If you're interested in doing this, I suggest emailing the competition organisers in the week before the competition to find out when and how you can help. </p>
+      <h3>Volunteering at Events:</h3>
+      <p> We always need help running competitions smoothly. This starts with the running, judging, and scrambling roles
+        you may already have seen at competitions, but we also really appreciate help is with other tasks such as data
+        capture, setting up the day before, and taking down and packing up equipment after the competition.
+        If you're interested in helping with these tasks, please reach out to the competition organisers
+        in the week before the competition to find out when and how you can help. </p>
 
-      <h3>Community Outreach:</h3> <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at schools or community centers.  While we aren’t actively seeking out these opportunities, we would fully support and provide resources for any initiatives you start. </p>
+      <h3>Community Outreach:</h3>
+      <p> If you enjoy sharing your passion for cubing with others, perhaps you could help us with demonstrations at
+        schools or community centers. While we aren't actively seeking out these opportunities, we may be able to support
+        with any initiatives you start. </p>
 
-      <h3>Website Design:</h3> <p> If you have skills or interest in software development or graphic design, we have several tasks that might interest you. You can find these listed on our GitHub page: <a href="https://github.com/CubingZA/CubingZA-Website/issues">CubingZA Website Issues</a>.</p>
+      <h3>Website and Graphic Design:</h3>
+      <p> If you have skills or interest in software development or graphic design, we have several tasks that might
+        interest you. You can find these listed on our GitHub page: <a
+          href="https://github.com/CubingZA/CubingZA-Website/issues">CubingZA Website Issues</a>.</p>
 
-    <h2>More Information</h2>
+      <h2>More Information</h2>
 
       <p>
         Interested in volunteering? <a href="/contact">Contact us</a> to get involved.
diff --git a/client/src/app/pages/about/volunteer/volunteer.component.spec.ts b/client/src/app/pages/about/volunteer/volunteer.component.spec.ts
index c43b605c..cc7d10f9 100644
--- a/client/src/app/pages/about/volunteer/volunteer.component.spec.ts
+++ b/client/src/app/pages/about/volunteer/volunteer.component.spec.ts
@@ -4,6 +4,6 @@ import { VolunteerComponent } from './volunteer.component';
 
 describe('VolunteerComponent', () => {
   it('should create', () => {
-    expect(new VolunteerComponent()).toBeTruthy(); 
+    expect(new VolunteerComponent()).toBeTruthy();
   });
 });

From f8e12dc4b5d2c7b5593e20b4890fbb944c8192af Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Sat, 24 Aug 2024 09:53:44 +0200
Subject: [PATCH 48/50] Space was forgotten for some of the FAQ, makes it look
 neater.

---
 client/src/app/pages/about/faq/faq.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/app/pages/about/faq/faq.component.html b/client/src/app/pages/about/faq/faq.component.html
index 98cc2d87..edb93185 100644
--- a/client/src/app/pages/about/faq/faq.component.html
+++ b/client/src/app/pages/about/faq/faq.component.html
@@ -13,7 +13,7 @@ <h4><b>1.</b> What can I do to help CubingZA?</h4>
       <p>If you'd like to help out you can read through <a href="/volunteer">this page</a> to learn more about how you
         can help.</p>
 
-      <h4><b>2.</b>How do I stay in touch with other cubers?</h4>
+      <h4><b>2. </b>How do I stay in touch with other cubers?</h4>
       <p>Join the CubingZA Whatsapp community by clicking on <a
           href="https://chat.whatsapp.com/IIDXPTFGhJw7u3gUl4Nf4I">this link</a>!</p>
 
@@ -22,7 +22,7 @@ <h4><b>3.</b> Do I need to be at both days if I am only competing on one day?</h
       when you compete. We suggest arriving at the competition at least 30 minutes prior to your event in case we run
       ahead of schedule.
 
-      <h4><b>4.</b>Where can I view my results on the day of the competition?</h4>
+      <h4><b>4. </b>Where can I view my results on the day of the competition?</h4>
       On the competition days all results will be uploaded to <a href="https://live.worldcubeassociation.org">WCA
         Live</a>. Just search for the competition name under the "upcoming" tab. After the competition has ended, it
       will take a few days for the official results to be uploaded to the WCA main site.

From 0570b7b82eea7330a4d7e9c9c689a18a245dbbfb Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Sat, 14 Sep 2024 09:54:30 +0200
Subject: [PATCH 49/50] Added Fadiscord import for the new discord server.

---
 client/src/app/components/footer/footer.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/app/components/footer/footer.component.ts b/client/src/app/components/footer/footer.component.ts
index 99f89c24..bf32806c 100644
--- a/client/src/app/components/footer/footer.component.ts
+++ b/client/src/app/components/footer/footer.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { faGithub, faFacebook, faInstagram, faYoutube } from '@fortawesome/free-brands-svg-icons';
+import { faGithub, faFacebook, faInstagram, faYoutube, faDiscord } from '@fortawesome/free-brands-svg-icons';
 
 @Component({
   selector: 'app-footer',
@@ -12,4 +12,5 @@ export class FooterComponent {
   faFacebook = faFacebook;
   faInstagram = faInstagram;
   faYoutube = faYoutube;
+  faDiscord = faDiscord;
 }

From 4461baa147c57546136fe229ef6d2fe23636b6cd Mon Sep 17 00:00:00 2001
From: elfishhenry <109970614+elfishhenry@users.noreply.github.com>
Date: Sat, 14 Sep 2024 09:55:43 +0200
Subject: [PATCH 50/50] Added the footer for discord in the html.

---
 client/src/app/components/footer/footer.component.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/app/components/footer/footer.component.html b/client/src/app/components/footer/footer.component.html
index 480c61c9..af4de20d 100644
--- a/client/src/app/components/footer/footer.component.html
+++ b/client/src/app/components/footer/footer.component.html
@@ -14,5 +14,7 @@
     <a href="https://www.instagram.com/cubingza/" target="_blank" rel=noopener><fa-icon [icon]="faInstagram" aria-hidden="true" /> Instagram</a>
     <span class="separator">|</span>
     <a href="https://www.youtube.com/@CubingZA" target="_blank" rel=noopener><fa-icon [icon]="faYoutube" aria-hidden="true" /> Youtube</a>
+    <span class="separator">|</span>
+    <a href="https://discord.gg/njM4P93v" target="_blank" rel=noopener><fa-icon [icon]="faDiscord" aria-hidden="true" /> Discord</a>
   </div>
 </div>