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

Set up Home page content including Landing #21

Merged
merged 21 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions apps/site/next.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const path = require('path');
const path = require("path");

/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
sassOptions: {
includePaths: [path.join(__dirname, "src", "lib", "styles")]
}
includePaths: [path.join(__dirname, "src", "lib", "styles")],
},
};

module.exports = nextConfig;
2 changes: 1 addition & 1 deletion apps/site/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function RootLayout({
<FontProvider />
<body>
<NavBar />
{children}
<main>{children}</main>
<Footer />
</body>
</html>
Expand Down
2 changes: 1 addition & 1 deletion apps/site/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { Landing as default } from "@/views";
export { Home as default } from "@/views";
7 changes: 4 additions & 3 deletions apps/site/src/components/NavBar/NavBar.module.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "bootstrap-utils" as utils;
@use "zothacks-theme" as theme;

.nav {
position: sticky;
Expand Down Expand Up @@ -37,17 +38,17 @@

.homeActive {
@extend .text;
color: utils.$green;
color: theme.$green;
}

.resourcesActive {
@extend .text;
color: utils.$blue;
color: theme.$blue;
}

.scheduleActive {
@extend .text;
color: utils.$navbar-red;
color: theme.$navbar-red;
}

@include utils.media-breakpoint-down(md) {
Expand Down
7 changes: 5 additions & 2 deletions apps/site/src/lib/styles/_bootstrap-utils.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
@import "./zothacks-theme";

@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/variables-dark";
@import "~bootstrap/scss/maps";
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/utilities";

// bootstrap overrides
$font-family-base: var(--next-font-fuzzy-bubbles);
$font-size-base: 1.25rem;
$headings-font-weight: 700;
5 changes: 0 additions & 5 deletions apps/site/src/lib/styles/_zothacks-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,3 @@ $light-blue: #81deeb;
$blue: #3902fd;
$purple: #6600b6;
$navbar-red: #ff0000;

// bootstrap overrides
$font-family-base: var(--next-font-fuzzy-bubbles);
$font-size-base: 1.25rem;
$headings-font-weight: 700;
17 changes: 17 additions & 0 deletions apps/site/src/views/Home/Home.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@use "bootstrap-utils" as bootstrap;

$container-padding: 6rem;

.home {
h2 {
text-align: center;
}

:global {
section.container {
// responsive padding
@include bootstrap.padding-top($container-padding);
@include bootstrap.padding-bottom($container-padding);
}
}
}
23 changes: 23 additions & 0 deletions apps/site/src/views/Home/Home.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use client";

import Landing from "./sections/Landing/Landing";
import About from "./sections/About/About";
import Mentors from "./sections/Mentors/Mentors";
import Sponsors from "./sections/Sponsors/Sponsors";
import FAQ from "./sections/FAQ/FAQ";

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

function Home() {
return (
<div className={styles.home}>
<Landing />
<About />
<Mentors />
<Sponsors />
<FAQ />
</div>
);
}

export default Home;
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
@use "bootstrap-utils" as bootstrap;
@use "zothacks-theme" as theme;

$highlighter: rgba(theme.$yellow, 0.7);
$skew-amount: -30deg;

.applyButton {
@include bootstrap.button-variant(
$highlighter,
$highlighter,
$hover-border: theme.$black,
$active-border: theme.$black
);
@include bootstrap.rfs(6rem, --bs-btn-padding-x);
--bs-btn-font-weight: bold;
--bs-btn-border-width: 4px;

@include bootstrap.font-size(bootstrap.$h2-font-size);

transform: skew($skew-amount);
// unskew children
> * {
transform: skew(-$skew-amount);
}

box-shadow:
2px 3px 8px rgba(black, 0.2),
4px 6px 16px rgba(black, 0.2);

&:hover,
&:focus {
text-decoration: underline;
box-shadow:
2px 3px 16px rgba(black, 0.3),
4px 6px 32px rgba(black, 0.3);
}
}
15 changes: 15 additions & 0 deletions apps/site/src/views/Home/components/ApplyButton/ApplyButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import Button from "react-bootstrap/Button";

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

export default function ApplyButton() {
return (
<Button
className={styles.applyButton}
href="https://hack.ics.uci.edu/" // TODO: Change to application site link
variant=""
samderanova marked this conversation as resolved.
Show resolved Hide resolved
>
<div>Apply</div>
</Button>
);
}
11 changes: 11 additions & 0 deletions apps/site/src/views/Home/sections/About/About.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Container from "react-bootstrap/Container";

function About() {
return (
<Container as="section">
<h2>About</h2>
</Container>
);
}

export default About;
11 changes: 11 additions & 0 deletions apps/site/src/views/Home/sections/FAQ/FAQ.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Container from "react-bootstrap/Container";

function FAQ() {
return (
<Container as="section">
<h2>FAQ</h2>
</Container>
);
}

export default FAQ;
10 changes: 10 additions & 0 deletions apps/site/src/views/Home/sections/Landing/Landing.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.landing {
min-height: 62vh;

display: flex;
flex-direction: column;
justify-content: center;
align-items: center;

text-align: center;
}
14 changes: 14 additions & 0 deletions apps/site/src/views/Home/sections/Landing/Landing.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import ApplyButton from "@/views/Home/components/ApplyButton/ApplyButton";

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

function Landing() {
return (
<div className={styles.landing}>
<h1>ZotHacks 2023</h1>
<ApplyButton />
</div>
);
}

export default Landing;
11 changes: 11 additions & 0 deletions apps/site/src/views/Home/sections/Mentors/Mentors.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Container from "react-bootstrap/Container";

function Mentors() {
return (
<Container as="section">
<h2>Mentors</h2>
</Container>
);
}

export default Mentors;
11 changes: 11 additions & 0 deletions apps/site/src/views/Home/sections/Sponsors/Sponsors.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Container from "react-bootstrap/Container";

function Sponsors() {
return (
<Container as="section">
<h2>Sponsors</h2>
</Container>
);
}

export default Sponsors;
Empty file.
9 changes: 0 additions & 9 deletions apps/site/src/views/Landing/Landing.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion apps/site/src/views/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export { default as Landing } from "./Landing/Landing";
export { default as Home } from "./Home/Home";
export { default as Resources } from "./Resources/Resources";
export { default as Schedule } from "./Schedule/Schedule";
Loading