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.

Sign up for GitHub

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

add build, bug fixes, text changes #281

Merged
merged 7 commits into from
Nov 12, 2024
Merged

add build, bug fixes, text changes #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
929a309
feat: changed TBD to WAC To The Future for theme change and removed F…
aryap9162 Nov 10, 2024
c23523d
Merge pull request #279 from worldaffairsconference/dev-Arya
ZeendaBean24 Nov 10, 2024
36e47f7
feat: removed merch pop-up file
aryap9162 Nov 10, 2024
46ecb40
fix: fix supporter and remove vertical divider
ZeendaBean24 Nov 10, 2024
93581d6
Merge pull request #280 from worldaffairsconference/dev-Arya
ZeendaBean24 Nov 10, 2024
b1445b0
fix: remove merch popup dependencies in other files
ZeendaBean24 Nov 10, 2024
7adcf0d
build: add build and fix faq not loading for deployed website
ZeendaBean24 Nov 10, 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
76 changes: 0 additions & 76 deletions src/lib/components/AnnouncementBanner.svelte
View file
Open in desktop

This file was deleted.

44 changes: 26 additions & 18 deletions src/routes/(other)/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Components
import Tooltip from "$lib/components/Tooltip.svelte";
import ScrollAnimations from "./ScrollAnimations.svelte";
import AnnouncementBanner from "$lib/components/AnnouncementBanner.svelte";
// import AnnouncementBanner from "$lib/components/AnnouncementBanner.svelte";

const user = $page.data.session?.user as User | undefined;

Expand Down Expand Up @@ -43,28 +43,15 @@

const timeUntilConference = calculateDaysUntilDate(new Date(2025, 3, 5)); // Change when the date is confirmed
</script>
<style>
.glow {
text-shadow: 0 0 10px rgba(255, 255, 255, 0.8),
0 0 20px rgba(255, 255, 255, 0.6),
0 0 30px rgba(255, 255, 255, 0.4);
transition: text-shadow 0.3s ease-in-out;
}

.glow:hover {
text-shadow: 0 0 15px rgba(255, 255, 255, 1),
0 0 25px rgba(255, 255, 255, 0.8),
0 0 35px rgba(255, 255, 255, 0.6);
}
</style>
<section
class="pt-[4rem] md:pt-[6rem] text-center flex flex-col items-center h-screen w-screen absolute inset-0 z-20"
>
<h2
class="text-[1.4rem] sm:text-[1.6rem] lg:text-[1.9rem] uppercase mb-2.5 lg:mb-3.5 text-transparent bg-clip-text bg-gradient-to-r from-primary to-secondary px-3"
>
<span>Theme</span>
<span class="italic">TBD</span>
<span class="italic">WAC To The Future</span>
</h2>
<div class="w-5/6 mx-auto">
<h1
Expand Down Expand Up @@ -108,18 +95,22 @@
</a>
{/if}
<div id="statsSection" class="w-full text-center">
<h2 class="text-transparent text-2xl sm:text-4xl font-bold mb-4 bg-clip-text bg-gradient-to-br from-white to-secondary">WAC has reached</h2>
<h2
class="text-transparent text-2xl sm:text-4xl font-bold mb-4 bg-clip-text bg-gradient-to-br from-white to-secondary"
>
WAC has reached
</h2>
<span class="text-white text-lg md:text-2xl glow">10k+ students</span>
<span class="text-secondary mx-2">・</span>
<span class="text-white text-lg md:text-2xl glow">80+ schools</span>
<span class="text-secondary mx-2">・</span>
<span class="text-white text-lg md:text-2xl glow">35+ countries</span>

</div>
</section>

<ScrollAnimations />

<AnnouncementBanner />
<!-- <AnnouncementBanner /> -->

<!--
<section
Expand Down Expand Up @@ -182,3 +173,20 @@
</form>
</div>
</section> -->

<style>
.glow {
text-shadow:
0 0 10px rgba(255, 255, 255, 0.8),
0 0 20px rgba(255, 255, 255, 0.6),
0 0 30px rgba(255, 255, 255, 0.4);
transition: text-shadow 0.3s ease-in-out;
}

.glow:hover {
text-shadow:
0 0 15px rgba(255, 255, 255, 1),
0 0 25px rgba(255, 255, 255, 0.8),
0 0 35px rgba(255, 255, 255, 0.6);
}
</style>
19 changes: 9 additions & 10 deletions src/routes/(other)/Footer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import branksomeLogo from "$lib/assets/images/logos/branksome.webp";
import uccLogo from "$lib/assets/images/logos/ucc.webp";
import famersEdgeLogo from "$lib/assets/images/logos/farmers-edge.webp";

interface Social {
name: string;
Expand Down Expand Up @@ -45,12 +44,12 @@
}
];

const supporters: Credit[] = [
{
name: "Farmers Edge",
logo: famersEdgeLogo
}
];
// const supporters: Credit[] = [
// {
// name: "Farmers Edge",
// logo: famersEdgeLogo
// }
// ];
</script>

<footer class="bg-zinc-950">
Expand All @@ -77,10 +76,10 @@
</div>

<!-- Vertical divider -->
<div class="w-0.5 bg-zinc-600 my-6 md:my-3"></div>
<!-- <div class="w-0.5 bg-zinc-600 my-6 md:my-3"></div> -->

<div class="grow">
<div
<!-- <div
class="text-zinc-400 mb-3 text-[0.7rem] lg:text-[0.8rem] uppercase"
>
Supporters
Expand All @@ -95,7 +94,7 @@
class="h-[2rem] lg:h-[2.25rem]"
/>
{/each}
</div>
</div> -->
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/routes/(other)/ScrollAnimations.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,9 @@
});

async function loadVideoSection() {
videoSection = await import("./Video.svelte");
videoSection = await import("./Video.svelte");
}

const handleWindowResize = () => {
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(other)/team/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
position: string;
image: string;
}

const chairs: TeamMember[] = [
{
name: "Darwin Li",
Expand Down
Loading