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

use tabs #20

Merged
merged 1 commit into from
Jul 20, 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
4 changes: 3 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"useTabs": true
}
10 changes: 5 additions & 5 deletions apps/site/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "next/core-web-vitals",
"rules": {
"react/no-unescaped-entities": "off",
"@next/next/no-img-element": "off"
}
"extends": "next/core-web-vitals",
"rules": {
"react/no-unescaped-entities": "off",
"@next/next/no-img-element": "off"
}
}
6 changes: 3 additions & 3 deletions apps/site/next.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
experimental: {
appDir: true,
},
experimental: {
appDir: true,
},
};

module.exports = nextConfig;
68 changes: 34 additions & 34 deletions apps/site/package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{
"name": "site",
"version": "0.1.0",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"format:write": "prettier --write .",
"format:check": "prettier --check ."
},
"dependencies": {
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-navigation-menu": "^1.1.2",
"@sanity/client": "^6.1.2",
"@sanity/image-url": "^1.0.2",
"@types/node": "18.16.3",
"@types/react": "18.2.5",
"@types/react-dom": "18.2.3",
"bootstrap": "^5.2.3",
"eslint": "8.39.0",
"eslint-config-next": "13.4.0",
"lucide-react": "^0.240.0",
"next": "13.4.0",
"react": "18.2.0",
"react-bootstrap": "^2.7.4",
"react-dom": "18.2.0",
"sass": "^1.62.1",
"typescript": "5.0.4",
"zod": "^3.21.4"
},
"devDependencies": {
"clsx": "^1.2.1",
"server-only": "^0.0.1"
}
"name": "site",
"version": "0.1.0",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"format:write": "prettier --write .",
"format:check": "prettier --check ."
},
"dependencies": {
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-navigation-menu": "^1.1.2",
"@sanity/client": "^6.1.2",
"@sanity/image-url": "^1.0.2",
"@types/node": "18.16.3",
"@types/react": "18.2.5",
"@types/react-dom": "18.2.3",
"bootstrap": "^5.2.3",
"eslint": "8.39.0",
"eslint-config-next": "13.4.0",
"lucide-react": "^0.240.0",
"next": "13.4.0",
"react": "18.2.0",
"react-bootstrap": "^2.7.4",
"react-dom": "18.2.0",
"sass": "^1.62.1",
"typescript": "5.0.4",
"zod": "^3.21.4"
},
"devDependencies": {
"clsx": "^1.2.1",
"server-only": "^0.0.1"
}
}
48 changes: 24 additions & 24 deletions apps/site/src/app/(landing)/page.module.scss
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
@use "~@/lib/common/styles/hack-variables.scss" as variables;

.involvedButton {
border-color: transparent;
border-radius: 30px;
font-size: 24px;
font-weight: 600;
padding: 10px 25px;
background-color: variables.$red;
color: white;
max-width: 10em;
position: relative;
z-index: 10;
text-decoration: none;
border-color: transparent;
border-radius: 30px;
font-size: 24px;
font-weight: 600;
padding: 10px 25px;
background-color: variables.$red;
color: white;
max-width: 10em;
position: relative;
z-index: 10;
text-decoration: none;
}

.homeContent {
font-size: 26px;
font-size: 26px;

a {
color: variables.$darkest-blue;
text-decoration: none;
a {
color: variables.$darkest-blue;
text-decoration: none;

&:hover {
text-decoration: underline;
}
}
&:hover {
text-decoration: underline;
}
}
}

.homeCards {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
}

.events {
background-color: variables.$light-grey;
background-color: variables.$light-grey;
}
102 changes: 51 additions & 51 deletions apps/site/src/app/(landing)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,59 +5,59 @@ import Header from "@/lib/common/components/Header";
import styles from "./page.module.scss";

export default function Home() {
return (
<>
<Header title="Hack at UCI">
<a className={styles.involvedButton} href="#newsletter">
Get Involved
</a>
</Header>
return (
<>
<Header title="Hack at UCI">
<a className={styles.involvedButton} href="#newsletter">
Get Involved
</a>
</Header>

<main>
<div className={styles.homeContent}>
<section className={clsx(styles.about, "container")}>
<h2>About Us</h2>
<p>
Hack at UCI is a student-run organization established to provide
students with a platform to learn, grow, and develop technology of
the future. Established in 2013, our mission is to promote,
educate, and enhance the community around us by giving students
the platform to learn and create technology.
</p>
<Link href="/about">Read More About Us &gt;</Link>
</section>
<main>
<div className={styles.homeContent}>
<section className={clsx(styles.about, "container")}>
<h2>About Us</h2>
<p>
Hack at UCI is a student-run organization established to provide
students with a platform to learn, grow, and develop technology of
the future. Established in 2013, our mission is to promote,
educate, and enhance the community around us by giving students
the platform to learn and create technology.
</p>
<Link href="/about">Read More About Us &gt;</Link>
</section>

<section className={clsx(styles.events)}>
<div className="container">
<h2>Our Events</h2>
<p>
We aim to celebrate UC Irvine&lsquo;s spirit of innovation by
organizing ZotHacks, a beginner friendly hackathon, and HackUCI,
Orange County&lsquo;s largest hackathon. Furthermore, our
organization regularly host technical and professional
development workshops that teach students industry-relevant
skills.
</p>
<Link href="/events">View Upcoming Events &gt;</Link>
{/* <HomeCards /> */}
</div>
</section>
<section className={clsx(styles.events)}>
<div className="container">
<h2>Our Events</h2>
<p>
We aim to celebrate UC Irvine&lsquo;s spirit of innovation by
organizing ZotHacks, a beginner friendly hackathon, and HackUCI,
Orange County&lsquo;s largest hackathon. Furthermore, our
organization regularly host technical and professional
development workshops that teach students industry-relevant
skills.
</p>
<Link href="/events">View Upcoming Events &gt;</Link>
{/* <HomeCards /> */}
</div>
</section>

<section className={clsx(styles.sponsors, "container")}>
<h2>Thank you to Our Sponsors</h2>
<p>
Hack at UCI&lsquo;s hackathons and events wouldn&lsquo;t be
possible without the aid from our amazing sponsors that have
helped us over the years. Each donation goes right back into
creating an outstanding experience for everyone who attends.
</p>
<Link href="/sponsors">View Sponsorship Information &gt;</Link>
{/* <CurrentSponsors /> */}
</section>
</div>
<section className={clsx(styles.sponsors, "container")}>
<h2>Thank you to Our Sponsors</h2>
<p>
Hack at UCI&lsquo;s hackathons and events wouldn&lsquo;t be
possible without the aid from our amazing sponsors that have
helped us over the years. Each donation goes right back into
creating an outstanding experience for everyone who attends.
</p>
<Link href="/sponsors">View Sponsorship Information &gt;</Link>
{/* <CurrentSponsors /> */}
</section>
</div>

{/* <Newsletter /> */}
</main>
</>
);
{/* <Newsletter /> */}
</main>
</>
);
}
Loading
Loading