From 4d11611747ab62351d42f87005c9ff5d23c9bc29 Mon Sep 17 00:00:00 2001 From: Simon Dao Date: Sat, 20 Apr 2024 16:58:12 -0700 Subject: [PATCH 1/4] replaced the home page about section with links to our social media --- assets/css/styles.css | 6 + assets/images/logos/media/discord-logo.svg | 2 +- assets/images/logos/media/facebook-logo.svg | 1 + assets/images/logos/media/instagram-logo.svg | 4 + assets/images/logos/media/linkedin-logo.svg | 1 + index.html | 111 +++++++++---------- scripts/script.js | 19 +++- 7 files changed, 82 insertions(+), 62 deletions(-) create mode 100644 assets/images/logos/media/facebook-logo.svg create mode 100644 assets/images/logos/media/instagram-logo.svg create mode 100644 assets/images/logos/media/linkedin-logo.svg diff --git a/assets/css/styles.css b/assets/css/styles.css index 9bb9ceb..e9672a8 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -13,6 +13,12 @@ body { font-family: "Poppins", sans-serif; } +.icon { + width: 24px; /* Set the desired width */ + height: 24px; /* Set the desired height */ + fill: #333; /* Set the color of the icon */ +} + h1, h2, h3, diff --git a/assets/images/logos/media/discord-logo.svg b/assets/images/logos/media/discord-logo.svg index 63bf9c5..489702e 100644 --- a/assets/images/logos/media/discord-logo.svg +++ b/assets/images/logos/media/discord-logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/assets/images/logos/media/facebook-logo.svg b/assets/images/logos/media/facebook-logo.svg new file mode 100644 index 0000000..357c196 --- /dev/null +++ b/assets/images/logos/media/facebook-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/logos/media/instagram-logo.svg b/assets/images/logos/media/instagram-logo.svg new file mode 100644 index 0000000..c8b14a9 --- /dev/null +++ b/assets/images/logos/media/instagram-logo.svg @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/assets/images/logos/media/linkedin-logo.svg b/assets/images/logos/media/linkedin-logo.svg new file mode 100644 index 0000000..48532d4 --- /dev/null +++ b/assets/images/logos/media/linkedin-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/index.html b/index.html index a753ed7..a373916 100644 --- a/index.html +++ b/index.html @@ -5,32 +5,27 @@ + content="width=device-width, initial-scale=1, shrink-to-fit=no" /> + with hundreds of students, professors, faculty, and industry leaders in attendance." /> + content="Computer Science Students, University of Washington Bothell, ACM, Association for Computing Machinery, Contact Computer Science Club, University Club, Software Engineer, Event planning, university sponsorships" /> UWB ACM + type="image/x-icon" /> + src="https://www.googletagmanager.com/gtag/js?id=UA-179568770-1"> + crossorigin="anonymous"> + crossorigin="anonymous"> + crossorigin="anonymous"> + crossorigin="anonymous" /> + crossorigin="anonymous"> @@ -111,25 +100,22 @@

Machinery

- About Us + About + Us Our Events + href="https://uwb.presence.io/events/acm">Our Events
+ class="col-lg-5 col-md-12 col-sm-12 order-first text-lg-left text-center">
+ alt + class="rounded-circle img-fluid" />
@@ -143,24 +129,40 @@

- We prepare students for tomorrow's tech challenges + Join Our Community

-

- The Association for Computing Machinery (ACM) Chapter at UW - Bothell was first founded in 1997, and through each iteration, it - has implemented great changes and improvements. The current - chapter was re-established in Fall 2017, facilitating - collaboration among students with a focus on fostering - professional and educational development in the field of computer - science. -

+
+ +
+ Discord +
Discord
+
+ + +
+ Instagram +
Instagram
+
+ + +
+ Linkedin +
Linkedin
+
+ + +
+ Facebook +
Facebook
+
+ +
about + alt="about" />
@@ -180,9 +182,8 @@

Our Recurring Events

interested in learning more: Check out our events page! + href="https://uwb.presence.io/events/acm">Check out our events + page!

@@ -280,19 +281,12 @@

Regardless of what you are or where you want to go, the ACM wants you to be involved and contribute to our positive impact!
- Contact Us! + Contact + Us!
- Our Events! + href="https://uwb.presence.io/events/acm">Our Events!

@@ -309,8 +303,7 @@

onclick="topFunction()" id="movetop" class="bg-primary" - title="Go to top" - > + title="Go to top"> diff --git a/scripts/script.js b/scripts/script.js index 3fb8f53..fb05193 100644 --- a/scripts/script.js +++ b/scripts/script.js @@ -1,3 +1,8 @@ +const DISCORD_INVITE_LINK = "https://discord.gg/Bg9vZvBP9A"; +const LINKEDIN_INVITE_LINK = "https://www.linkedin.com/company/uwb-acm-club/mycompany/"; +const INSTAGRAM_INVITE_LINK = "https://www.instagram.com/uwb_acm/"; +const FACEBOOK_INVITE_LINK = "https://www.facebook.com/uwbacm/"; + // Close hamburger menu when click elsewhere $(document).on("click", function () { return $(".collapse").collapse("hide"); @@ -61,12 +66,12 @@ function loadFooter() {
- -
+

Quick Links

+ +
+

Connect With Us

+ +
From 7582eda7651eb5733b599899bd711050f5644aa5 Mon Sep 17 00:00:00 2001 From: Simon Dao Date: Sat, 20 Apr 2024 17:12:17 -0700 Subject: [PATCH 2/4] added image to the socials section --- about.html | 4 ++-- assets/images/socials.svg | 1 + index.html | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 assets/images/socials.svg diff --git a/about.html b/about.html index 8fe5926..d9363a0 100644 --- a/about.html +++ b/about.html @@ -353,8 +353,8 @@

Join the ACM

Note that all Officer positions are unpaid and volunteer.

- Hiring Closed Until Fall 2021Join Us
diff --git a/assets/images/socials.svg b/assets/images/socials.svg new file mode 100644 index 0000000..1e63b6a --- /dev/null +++ b/assets/images/socials.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/index.html b/index.html index a373916..b6e49e1 100644 --- a/index.html +++ b/index.html @@ -123,7 +123,7 @@

- +
@@ -160,7 +160,7 @@
Facebook
about
From 9d41b01a75c5c463481cee151b7ca1710ca002f8 Mon Sep 17 00:00:00 2001 From: Simon Nguyen Dao <55553313+Simon-Dao@users.noreply.github.com> Date: Mon, 6 May 2024 13:16:30 -0700 Subject: [PATCH 3/4] minor changes to text --- hiring.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hiring.html b/hiring.html index f3bd160..c261850 100644 --- a/hiring.html +++ b/hiring.html @@ -105,7 +105,7 @@

Become an Officer!

+ style="font-size: 40px;">Join Our Team!

What to Expect

style="width: 80%;">

- 1. Apply + 1. Fill out our Application
2. Behavioral Interview
From 808eb4bebb9cba90927e22aef6e006c9ceb816a5 Mon Sep 17 00:00:00 2001 From: Simon Nguyen Dao <55553313+Simon-Dao@users.noreply.github.com> Date: Mon, 6 May 2024 13:34:31 -0700 Subject: [PATCH 4/4] fixed about us page --- about.html | 2 +- hiring.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/about.html b/about.html index d9363a0..f4fb304 100644 --- a/about.html +++ b/about.html @@ -353,7 +353,7 @@

Join the ACM

Note that all Officer positions are unpaid and volunteer.

- Join Us diff --git a/hiring.html b/hiring.html index c261850..1a3b18d 100644 --- a/hiring.html +++ b/hiring.html @@ -104,8 +104,8 @@

-

Join Our Team!

+

Join Our Team!

+

Note that all Officer positions are unpaid and volunteer.