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

Implement components and front page #259

Merged
merged 25 commits into from
Mar 1, 2024
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
2 changes: 2 additions & 0 deletions react/ucmacm-website/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.1.0.cjs
4,913 changes: 3,927 additions & 986 deletions react/ucmacm-website/package-lock.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion react/ucmacm-website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"format": "prettier . --write"
},
"dependencies": {
"@icons-pack/react-simple-icons": "^9.3.0",
"@nextui-org/react": "^2.2.9",
"framer-motion": "^10.16.16",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand All @@ -33,5 +36,6 @@
"tailwindcss": "^3.4.1",
"typescript": "5.3.3",
"vite": "^5.1.4"
}
},
"packageManager": "[email protected]"
}
42 changes: 0 additions & 42 deletions react/ucmacm-website/src/App.css

This file was deleted.

19 changes: 2 additions & 17 deletions react/ucmacm-website/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
// import { useState } from 'react'
import "./App.css";
// import Navbar from './components/Navbar'
// import LandingPage from './components/LandingPage'

import ProjectShowcase from "./components/ProjectShowcase";
import Front from "./pages/front.tsx";
function App() {
// const [count, setCount] = useState(0)

return (
<>
{/* <Navbar/> */}
{/* <LandingPage/> */}
{/* <LandingInfoPage/> */}
{/* <Card description={"hello"}/>

<Card description={"hello"}/>
<Card description={"hello"}/> */}

<ProjectShowcase />
<Front />
</>
);
}
Expand Down
Binary file added react/ucmacm-website/src/assets/acm_logo_v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
53 changes: 53 additions & 0 deletions react/ucmacm-website/src/components/GlobalFooter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// import "../index.css";
import {
SiInstagram,
SiGithub,
SiDiscord,
} from "@icons-pack/react-simple-icons";
import { Link } from "@nextui-org/react";

function GlobalFooter() {
return (
<>
<div>
<svg
className="z-0 w-full h-full"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 1440 320"
>
<path
width="100"
height="100"
fill="#00e1bfcc"
fillOpacity="1"
d="M0,96L80,80C160,64,320,32,480,53.3C640,75,800,149,960,154.7C1120,160,1280,96,1360,64L1440,32L1440,320L1360,320C1280,320,1120,320,960,320C800,320,640,320,480,320C320,320,160,320,80,320L0,320Z"
></path>
</svg>

<div className="bg-landing opacity-80 w-full max-h-max py-8 top-4 gap-16 text-center">
<div className="flex flex-row justify-center gap-x-12">
<div>
<Link href="https://www.instagram.com/ucmacm/" color="foreground">
<SiInstagram size={32} />
</Link>
</div>
<div>
<Link href="https://github.com/UCMercedACM" color="foreground">
<SiGithub size={32} />
</Link>
</div>
<div>
<Link href="https://bit.ly/acm_ucm-discord" color="foreground">
<SiDiscord size={32} />
</Link>
</div>
</div>
<p className="pt-8">Copyright 2024</p>
<p className="py-2">Written and programmed by ACM @ UCM</p>
</div>
</div>
</>
);
}

export default GlobalFooter;
64 changes: 64 additions & 0 deletions react/ucmacm-website/src/components/GlobalNavbar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import React from "react";
import {
Navbar,
NavbarBrand,
NavbarContent,
NavbarMenuToggle,
NavbarItem,
Link,
NavbarMenu,
NavbarMenuItem,
} from "@nextui-org/react";
import ACMLogo from "../assets/acm_logo_v2.png";
function GlobalNavbar() {
const [isMenuOpen, setIsMenuOpen] = React.useState(false);

const UCMACMLogo = () => <img src={ACMLogo} width={76} height={76} />;
// Come back later for the others
const menuItems = ["SIGs", "Events"];
return (
<>
<Navbar
onMenuOpenChange={setIsMenuOpen}
className="bg-landing opacity-80 "
position="static"
>
<NavbarContent>
<NavbarMenuToggle
aria-label={isMenuOpen ? "Close menu" : "Open menu"}
className="lg:hidden"
/>
<NavbarBrand>
<Link href="/">
<UCMACMLogo />
</Link>
</NavbarBrand>
</NavbarContent>

<NavbarContent className="hidden sm:flex gap-6" justify="center">
<NavbarItem>
<Link color="foreground" href="#">
SIGs
</Link>
</NavbarItem>
<NavbarItem>
<Link color="foreground" href="#">
Events
</Link>
</NavbarItem>
</NavbarContent>
<NavbarMenu>
{menuItems.map((item, index) => (
<NavbarMenuItem key={`${item}-${index}`}>
<Link color="foreground" className="w-full" href="#" size="lg">
{item}
</Link>
</NavbarMenuItem>
))}
</NavbarMenu>
</Navbar>
</>
);
}

export default GlobalNavbar;
5 changes: 0 additions & 5 deletions react/ucmacm-website/src/components/Goals.tsx

This file was deleted.

36 changes: 0 additions & 36 deletions react/ucmacm-website/src/components/LandingInfoPage.tsx

This file was deleted.

12 changes: 0 additions & 12 deletions react/ucmacm-website/src/components/LandingPage.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions react/ucmacm-website/src/components/Navbar.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions react/ucmacm-website/src/components/ProjectShowcase.tsx

This file was deleted.

21 changes: 21 additions & 0 deletions react/ucmacm-website/src/components/WaveHeader.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import "../index.css";
function WaveHeader() {
return (
<>
<div className="bg-landing opacity-80 py-8 w-full max-h-max top-16 gap-16 flex-col flex">
<p>hi</p>
</div>
<div className="z-0 gap-16 flex">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1440 320">
<path
fill="#00e1bf"
fillOpacity="0.8"
d="M0,256L80,224C160,192,320,128,480,122.7C640,117,800,171,960,192C1120,213,1280,203,1360,197.3L1440,192L1440,0L1360,0C1280,0,1120,0,960,0C800,0,640,0,480,0C320,0,160,0,80,0L0,0Z"
></path>
</svg>
</div>
</>
);
}

export default WaveHeader;
4 changes: 4 additions & 0 deletions react/ucmacm-website/src/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

.home {
background-color: rgba(0, 225, 191, 0.8);
}
Empty file.
7 changes: 6 additions & 1 deletion react/ucmacm-website/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import React from "react";
import ReactDOM from "react-dom/client";

import App from "./App.tsx";
import "./index.css";

import { NextUIProvider } from "@nextui-org/react";

ReactDOM.createRoot(document.getElementById("root")!).render(
<React.StrictMode>
<App />
<NextUIProvider>
<App />
</NextUIProvider>
</React.StrictMode>,
);
Loading
Loading