Skip to content

Commit

Permalink
Feature: SVG ZotHacks Title animation
Browse files Browse the repository at this point in the history
* update: created getSchedule file

* update: synced sanity data with schedule component

* feat: update event schema

* feat: group events by day

* feat: format date ranges

* fix: group events by America/Los_Angeles day

* fix: event order asc

* fix: remove resources from nav

---------

Co-authored-by: Tyler Yu <tyleryy@uci.edu>

Fix frontend issues on resources page (#103)

* fix: backend description text overflow

* feat: new ResourceCard component

removed unused assets

* fix: key prop error

* fix: remove unused components

* fix: references to unused images

* refactor: short-circuit and color fixes

* Fix transformed filter glitches for webkit

- Include `translateZ(0)` when applying transform to drop shadow filter

---------

Co-authored-by: Taesung Hwang <taesungh@uci.edu>

fix: title and location mobile alignment (#109)

feat: frontend resources section

feat: starter packs section

removed placeholder config files

feat: add day of week to schedule (#110)

* feat: add day of week to schedule

* fix: replace weekday list with date format

* fix: long month and date format

update: restore resources link in navbar

fix: timezone inconsistencies (#119)

* fix: timezone inconsistencies

* fix: timezone inconsistencies

fix: backend resources grid issue

feature: clipboard paper animation (#116)

undefined

Feature/clipboard animation update (#123)

* feature: clipboard paper animation

* fix: padding adjustment on date

* fix: border radius and page animation update

feat: incident response form

fix: remove open in new window icon

Setup animated countdown on schedule page (#93)

* setup: basic framer countdown

* fix: removed useRef, changed animation exit value

* update: temporarily disabled slide up animation

* fix: conditional day render

* fix: precompute time

* fix: margin for the countdown

* update: added loading bar

* fix: rename to Loader

* feat: time until hacking countdown timer

* fix: clipboard styling

---------

Co-authored-by: Tyler Yu <tyleryy@uci.edu>
Co-authored-by: Alexander Liu <a@alexanderliu.com>

fix: match time zones on server and client

fix: missing date-fns-tz import (#126)

fix: disable page scroll x (#125)

refactor: move homepage from views folder to app folder

refactor: convert components to arrow functions and reexport

feat: devpost

fix: changed import path

fix: added ease and moved component
  • Loading branch information
alexanderl19 authored and tyleryy committed Nov 3, 2023
1 parent 66e401b commit 8dbdbca
Show file tree
Hide file tree
Showing 66 changed files with 757 additions and 408 deletions.
28 changes: 22 additions & 6 deletions apps/sanity/schemas/event.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,50 @@
import { defineType, defineField } from "sanity";
import { defineType, defineField, defineArrayMember } from "sanity";
import { CalendarClock } from "lucide-react";

export default defineType({
name: "event",
title: "Event",
icon: CalendarClock,
type: "document",
fields: [
defineField({
name: "title",
title: "Title",
type: "string",
validation: (Rule) => Rule.required(),
}),
defineField({
name: "location",
title: "Location",
type: "string",
}),
defineField({
name: "virtual",
title: "Virtual Meeting Link",
type: "url",
}),
defineField({
name: "startTime",
title: "Start Time",
type: "datetime",
validation: (Rule) => Rule.required(),
}),
defineField({
name: "endTime",
title: "End Time",
type: "datetime",
validation: (Rule) => Rule.required(),
}),
defineField({
name: "category",
title: "Category",
name: "organization",
title: "Organization",
type: "string",
}),
defineField({
name: "host",
title: "Host",
type: "string",
name: "hosts",
title: "Hosts",
type: "array",
of: [defineArrayMember({ type: "string" })],
}),
defineField({
name: "description",
Expand Down
4 changes: 3 additions & 1 deletion apps/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
"@types/react": "18.2.20",
"@types/react-dom": "^18.2.0",
"bootstrap": "^5.3.1",
"clsx": "^2.0.0",
"date-fns-tz": "^2.0.0",
"eslint": "8.46.0",
"eslint-config-next": "^13.4.1",
"framer-motion": "^10.16.4",
Expand All @@ -29,4 +31,4 @@
"typescript": "5.1.6",
"zod": "^3.22.2"
}
}
}
File renamed without changes.
File renamed without changes
File renamed without changes.
23 changes: 23 additions & 0 deletions apps/site/src/app/(home)/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export const revalidate = 60;

import Landing from "./sections/Landing";
import Intro from "./sections/Intro";
import Mentor from "./sections/Mentor";
import Sponsors from "./sections/Sponsors";
import FAQ from "./sections/FAQ";

import styles from "./page.module.scss";

const Home = () => {
return (
<div className={styles.home}>
<Landing />
<Intro />
<Mentor />
<Sponsors />
<FAQ />
</div>
);
};

export default Home;
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import styles from "./FAQ.module.scss";
import star from "@/assets/images/star.png";
import eraser from "@/assets/images/eraser.png";

export default async function FAQ() {
const FAQ = async () => {
const questions = await getQuestions();
const faq = questions[0]["faqs"].map(({ _key, question, answer }) => ({
_key: _key,
Expand All @@ -28,4 +28,6 @@ export default async function FAQ() {
</div>
</section>
);
}
};

export default FAQ;
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ interface FAQAccordion {
}[];
}

export default function FAQAccordion({ faq }: FAQAccordion) {
const FAQAccordion: React.FC<FAQAccordion> = ({ faq }) => {
return (
<Accordion className={styles.accordion} alwaysOpen>
{faq.map(({ _key, question, answer }) => (
Expand All @@ -28,4 +28,6 @@ export default function FAQAccordion({ faq }: FAQAccordion) {
))}
</Accordion>
);
}
};

export default FAQAccordion;
1 change: 1 addition & 0 deletions apps/site/src/app/(home)/sections/FAQ/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./FAQ";
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import hackDoodle from "@/assets/images/hack-doodle.png";

import styles from "./Intro.module.scss";

export default function Intro() {
const Intro = () => {
return (
<Container as="section">
<div className={styles.intro}>
Expand Down Expand Up @@ -37,4 +37,6 @@ export default function Intro() {
</div>
</Container>
);
}
};

export default Intro;
1 change: 1 addition & 0 deletions apps/site/src/app/(home)/sections/Intro/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Intro";
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { HackSticker, HeartSticker } from "@/components/Sticker/Stickers";

import styles from "./ApplyButton.module.scss";

export default function ApplyButton() {
const ApplyButton = () => {
return (
<StickerPosition
stickers={[
Expand All @@ -28,4 +28,6 @@ export default function ApplyButton() {
</Button>
</StickerPosition>
);
}
};

export default ApplyButton;
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"use client";
import ApplyButton from "@/views/Home/components/ApplyButton/ApplyButton";
import Title from "@/views/Home/components/Title/Title";
import ApplyButton from "./ApplyButton";
import Title from "@/app/(home)/sections/Landing/Title";
import styles from "./Landing.module.scss";

function Landing() {
const Landing = () => {
return (
<div className={styles.landing}>
<Title />
Expand All @@ -12,6 +12,6 @@ function Landing() {
<ApplyButton />
</div>
);
}
};

export default Landing;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { motion, Variants } from "framer-motion";
import { cubicBezier, motion, Variants } from "framer-motion";
import styles from "./Title.module.scss";

export default function Title() {
Expand All @@ -12,6 +12,7 @@ export default function Title() {
staggerChildren: 0.2,
pathLength: {
duration: 0.6,
ease: cubicBezier(0.5, 1, 0.89, 1),
},
strokeOpacity: {
duration: 0.05,
Expand Down
1 change: 1 addition & 0 deletions apps/site/src/app/(home)/sections/Landing/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Landing";
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import styles from "./Mentor.module.scss";

const MENTOR_APP_URL = "/mentor";

export default function Mentor() {
const Mentor = () => {
const mentorHeader = (
<h2 className="mb-3 text-start">Interested in becoming a mentor?</h2>
);
Expand Down Expand Up @@ -51,4 +51,6 @@ export default function Mentor() {
</div>
</Container>
);
}
};

export default Mentor;
1 change: 1 addition & 0 deletions apps/site/src/app/(home)/sections/Mentor/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Mentor";
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import clip from "./clip.svg";

const builder = imageUrlBuilder(client);

export default async function Sponsors() {
const Sponsors = async () => {
const sponsors = await getSponsors();

return (
Expand All @@ -29,4 +29,6 @@ export default async function Sponsors() {
</div>
</section>
);
}
};

export default Sponsors;
1 change: 1 addition & 0 deletions apps/site/src/app/(home)/sections/Sponsors/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "./Sponsors";
3 changes: 0 additions & 3 deletions apps/site/src/app/page.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions apps/site/src/app/schedule/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { Schedule } from "@/views";
import { Maintenance } from "@/views";

export const revalidate = 60;

// When set to any value
const Component = process.env.MAINTENANCE_MODE_SCHEDULE
? Maintenance
: Schedule;

export default Component;
export default Component;
4 changes: 4 additions & 0 deletions apps/site/src/assets/icons/open-new-window.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/site/src/assets/images/api-reference-tag.png
Binary file not shown.
3 changes: 0 additions & 3 deletions apps/site/src/assets/images/clear_tape_left.svg

This file was deleted.

3 changes: 0 additions & 3 deletions apps/site/src/assets/images/clear_tape_right.svg

This file was deleted.

Binary file not shown.
Binary file removed apps/site/src/assets/images/flask_project_button.png
Binary file not shown.
Binary file not shown.
17 changes: 17 additions & 0 deletions apps/site/src/assets/images/resource-link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/site/src/assets/images/tape.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 15 additions & 1 deletion apps/site/src/components/NavBar/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function NavBar() {

return (
<div className={styles.nav}>
<Navbar expand="md" className={`bg-body-tertiary ${styles.navbar}`}>
<Navbar expand="lg" className={`bg-body-tertiary ${styles.navbar}`}>
<Container fluid>
<Navbar.Brand />
<Navbar.Toggle aria-controls="basic-navbar-nav" />
Expand Down Expand Up @@ -51,6 +51,20 @@ export default function NavBar() {
>
Schedule
</Link>
<Link
href="https://forms.gle/6GUGYnVoFhAAxVkL8"
className={styles.notActive}
target="_blank"
>
Incident Form
</Link>
<Link
href="https://zothacks-2023.devpost.com/"
className={styles.notActive}
target="_blank"
>
Devpost
</Link>
</Nav>
</Navbar.Collapse>
</Container>
Expand Down
8 changes: 8 additions & 0 deletions apps/site/src/lib/styles/globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,11 @@ section.container {
@include bootstrap.padding-top($container-padding);
@include bootstrap.padding-bottom($container-padding);
}

html,
body {
overflow-x: hidden;
}
body {
position: relative;
}
23 changes: 0 additions & 23 deletions apps/site/src/views/Home/Home.tsx

This file was deleted.

5 changes: 5 additions & 0 deletions apps/site/src/views/Resources/Resources.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ import styles from "./Resources.module.scss";
import Landing from "./sections/Landing/Landing";
import ApiResources from "./sections/ApiResources/ApiResources";
import BackendResources from "./sections/BackendResources/BackendResources";
import FrontendResources from "./sections/FrontendResources/FrontendResources";
import StarterPacks from "./sections/StarterPacks/StarterPacks";

export default function Resources() {
return (
<div className={styles.resources}>
<Landing />
<ApiResources />
<BackendResources />
<FrontendResources />
<StarterPacks />
</div>
);
}
Loading

0 comments on commit 8dbdbca

Please sign in to comment.