Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Discord button footer link #371

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
960d44e
Feat: Added the app route for the new volunteer component.
elfishhenry Aug 12, 2024
34d389e
Feat: Volunteer navbar addition.
elfishhenry Aug 12, 2024
76919fe
Feat: Html for new volunteer page: Issue #40
elfishhenry Aug 12, 2024
362ed91
Empty styling file for volunteering component.
elfishhenry Aug 12, 2024
bac6e8a
Enhancement/feat: Added ts component for volunteering page. Issue #40.
elfishhenry Aug 12, 2024
1d76c2e
Faqs App route.
elfishhenry Aug 12, 2024
d2f6862
Faqs example html.
elfishhenry Aug 12, 2024
b4d88bf
Faqs compenent html
elfishhenry Aug 12, 2024
90efb17
Empty faqs, styling file.
elfishhenry Aug 12, 2024
f548dcc
Faqs ts component.
elfishhenry Aug 12, 2024
af83940
Enhancement: Changed the the copy and pasted testing spec and gave it…
elfishhenry Aug 13, 2024
7c7dec4
Added the Html for the volunteering opportunities.
elfishhenry Aug 13, 2024
3a883d1
Enhancement: Added better navbar fontawesome icons relating to the ne…
elfishhenry Aug 13, 2024
117c12c
Enhancement: Adding similar formatting to other pages to make the web…
elfishhenry Aug 13, 2024
3029a48
Merge branch 'CubingZA:master' into master
elfishhenry Aug 15, 2024
02fad33
Enhancement: Changed Faqs to FAQ + added FAQS
elfishhenry Aug 15, 2024
44c9ee1
Added a github issues link to the volunteering area.
elfishhenry Aug 15, 2024
791c620
Merge branch 'master' of https://github.com/elfishhenry/CubingZA-Website
elfishhenry Aug 15, 2024
421b862
Update client/src/app/pages/volunteer/volunteer.component.html
elfishhenry Aug 16, 2024
f5a6a5f
Update app.routes.ts
elfishhenry Aug 16, 2024
ea780be
Fixed some errors I was getting in the FAQ/faq problem.
elfishhenry Aug 17, 2024
94c48a9
Update client/src/app/pages/FAQ/FAQ.component.html
elfishhenry Aug 18, 2024
dcc32f6
Update client/src/app/pages/volunteer/volunteer.component.html
elfishhenry Aug 18, 2024
3c37a76
Hopefully fixed naming issues.
elfishhenry Aug 19, 2024
be51e62
Rename FAQ.component.html to faq.component.html
elfishhenry Aug 19, 2024
ee5dbc0
Rename FAQ.component.ts to faq.component.ts
elfishhenry Aug 19, 2024
917d0b9
Rename FAQ.component.spec.ts to faq.component.spec.ts
elfishhenry Aug 19, 2024
03a1c31
Rename FAQ.component.less to faq.component.less
elfishhenry Aug 19, 2024
78589b3
Rename faq.component.html to faq.component.html
elfishhenry Aug 19, 2024
adde9f7
Update and rename faq.component.less to faq.component.less
elfishhenry Aug 19, 2024
3683d13
Rename faq.component.spec.ts to faq.component.spec.ts
elfishhenry Aug 19, 2024
b3639f0
Rename faq.component.ts to faq.component.ts
elfishhenry Aug 19, 2024
5503f8d
Issues hopefully fixed.
elfishhenry Aug 19, 2024
f755c3d
Merge branch 'master' into master
elfishhenry Aug 22, 2024
9c911d8
Added FAQ and Volunteering app modules, also fixed imports and module…
elfishhenry Aug 23, 2024
9ab87e1
Added about app route for about dropdown.
elfishhenry Aug 23, 2024
f9ffeb5
Added navbar dropdown for about.
elfishhenry Aug 23, 2024
5d54c44
Made the css or .less look better for the public drop down.
elfishhenry Aug 23, 2024
59b8736
Added a class to the HTML for about to make it the same colour as the…
elfishhenry Aug 23, 2024
4dc4af4
Added the colour css for the about class to make it the same colour a…
elfishhenry Aug 23, 2024
d3e91f1
Deleted old about components, as the new dropdown menu has one added.
elfishhenry Aug 23, 2024
3f2b7c2
Added the typescript for the new about dropdown.
elfishhenry Aug 23, 2024
44e3cd4
Added about component to the new dropdown
elfishhenry Aug 23, 2024
1e60d77
Added the rest of the about into new dropdown.
elfishhenry Aug 23, 2024
0172f96
Faq components added into the new dropdown.
elfishhenry Aug 23, 2024
9aa9a25
Volunteering components added into the new dropdown.
elfishhenry Aug 23, 2024
bd07378
Got rid of old component files for the new dropdown component files.
elfishhenry Aug 23, 2024
499b2f6
Added dropdown as the navbar was getting very cluttered, Move Volunte…
elfishhenry Aug 23, 2024
200c161
Fixed the variables.less file path error.
elfishhenry Aug 23, 2024
fdf5424
Run prettier and clean up FAQ and Volunteer pages
AlphaSheep Aug 23, 2024
2aaa070
Merge pull request #1 from CubingZA/feature/about-submenu
elfishhenry Aug 24, 2024
f8e12dc
Space was forgotten for some of the FAQ, makes it look neater.
elfishhenry Aug 24, 2024
434d2b1
Merge branch 'CubingZA:master' into master
elfishhenry Aug 27, 2024
69350a6
Merge branch 'CubingZA:master' into master
elfishhenry Sep 7, 2024
86491ca
Merge branch 'CubingZA:master' into master
elfishhenry Sep 11, 2024
0570b7b
Added Fadiscord import for the new discord server.
elfishhenry Sep 14, 2024
4461baa
Added the footer for discord in the html.
elfishhenry Sep 14, 2024
00697db
Merge branch 'master' into discord-button
elfishhenry Sep 18, 2024
13769e0
Merge branch 'master' into discord-button
elfishhenry Oct 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/src/app/components/footer/footer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion client/src/app/components/footer/footer.component.ts
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -12,4 +12,5 @@ export class FooterComponent {
faFacebook = faFacebook;
faInstagram = faInstagram;
faYoutube = faYoutube;
faDiscord = faDiscord;
}