Skip to content

Commit

Permalink
Merge pull request #6 from UWB-ACM/launch
Browse files Browse the repository at this point in the history 
Launch into Main
  • Loading branch information
@alan-lai1738
alan-lai1738 authored Mar 24, 2024
2 parents 6505cb1 + 5b355bd commit bd814c3
Show file tree
Hide file tree
Showing 19 changed files with 132 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 2 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
This was the website for UWB Hacks in Person 2023... but we are now converting it to 2024!
UWB HACKS AI 2024

Old 2023 link: https://uwb-acm.github.io/uwb-hacks23/

2024 Link: None. WIP.

## Assigned Sections:

- **Alan:** Splash screen, Headers
- **Logan:** Tracks
- **Bon:** Schedule, About the Event
- **Tushar:** FAQ
- **Joshua:** Footers

**Goal:** Make it look website-ready for 2024. Deadline for completion is March 4th.
Link: https://uwb-acm.github.io/uwb-hacks24/
36 changes: 18 additions & 18 deletions asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"files": {
"main.css": "/uwb-hacks23/static/css/main.f3604261.css",
"main.js": "/uwb-hacks23/static/js/main.6c135985.js",
"static/js/977.4288c011.chunk.js": "/uwb-hacks23/static/js/977.4288c011.chunk.js",
"static/js/787.3a400261.chunk.js": "/uwb-hacks23/static/js/787.3a400261.chunk.js",
"static/media/grid.png": "/uwb-hacks23/static/media/grid.7c3d9e70b68002b91368.png",
"static/media/uwbhacksai2024.png": "/uwb-hacks23/static/media/uwbhacksai2024.dca938372495b2b7deb6.png",
"static/media/cropped_husky.PNG": "/uwb-hacks23/static/media/cropped_husky.7e5e29cab44c4950fafc.PNG",
"static/media/club_logos.png": "/uwb-hacks23/static/media/club_logos.f7dbf2d9c53b4251e6fd.png",
"static/media/paw.png": "/uwb-hacks23/static/media/paw.743f5969edc044edca9a.png",
"static/media/Stacker-GOzYm.otf": "/uwb-hacks23/static/media/Stacker-GOzYm.92ecde0d0dce6f668812.otf",
"static/media/Stacker-jE03l.ttf": "/uwb-hacks23/static/media/Stacker-jE03l.f41bace54b6afb764279.ttf",
"static/media/Code_of_Conduct.pdf": "/uwb-hacks23/static/media/Code_of_Conduct.3935d5e488836e006de9.pdf",
"static/media/avanade.png": "/uwb-hacks23/static/media/avanade.57aa2db0cebde6cb8a24.png",
"index.html": "/uwb-hacks23/index.html",
"main.f3604261.css.map": "/uwb-hacks23/static/css/main.f3604261.css.map",
"main.6c135985.js.map": "/uwb-hacks23/static/js/main.6c135985.js.map",
"977.4288c011.chunk.js.map": "/uwb-hacks23/static/js/977.4288c011.chunk.js.map",
"787.3a400261.chunk.js.map": "/uwb-hacks23/static/js/787.3a400261.chunk.js.map"
"main.css": "/uwb-hacks24/static/css/main.f3604261.css",
"main.js": "/uwb-hacks24/static/js/main.6c135985.js",
"static/js/977.4288c011.chunk.js": "/uwb-hacks24/static/js/977.4288c011.chunk.js",
"static/js/787.3a400261.chunk.js": "/uwb-hacks24/static/js/787.3a400261.chunk.js",
"static/media/grid.png": "/uwb-hacks24/static/media/grid.7c3d9e70b68002b91368.png",
"static/media/uwbhacksai2024.png": "/uwb-hacks24/static/media/uwbhacksai2024.dca938372495b2b7deb6.png",
"static/media/cropped_husky.PNG": "/uwb-hacks24/static/media/cropped_husky.7e5e29cab44c4950fafc.PNG",
"static/media/club_logos.png": "/uwb-hacks24/static/media/club_logos.f7dbf2d9c53b4251e6fd.png",
"static/media/paw.png": "/uwb-hacks24/static/media/paw.743f5969edc044edca9a.png",
"static/media/Stacker-GOzYm.otf": "/uwb-hacks24/static/media/Stacker-GOzYm.92ecde0d0dce6f668812.otf",
"static/media/Stacker-jE03l.ttf": "/uwb-hacks24/static/media/Stacker-jE03l.f41bace54b6afb764279.ttf",
"static/media/Code_of_Conduct.pdf": "/uwb-hacks24/static/media/Code_of_Conduct.3935d5e488836e006de9.pdf",
"static/media/avanade.png": "/uwb-hacks24/static/media/avanade.57aa2db0cebde6cb8a24.png",
"index.html": "/uwb-hacks24/index.html",
"main.f3604261.css.map": "/uwb-hacks24/static/css/main.f3604261.css.map",
"main.6c135985.js.map": "/uwb-hacks24/static/js/main.6c135985.js.map",
"977.4288c011.chunk.js.map": "/uwb-hacks24/static/js/977.4288c011.chunk.js.map",
"787.3a400261.chunk.js.map": "/uwb-hacks24/static/js/787.3a400261.chunk.js.map"
},
"entrypoints": [
"static/css/main.f3604261.css",
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"><meta charset="utf-8"/><link rel="icon" href="/uwb-hacks23/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="UWB Hacks 2024" content="UWB Hacks 2024. Hackathon Hosted by the ACM at The University of Washington Bothell."/><link rel="apple-touch-icon" href="/uwb-hacks23/logo192.png"/><link rel="manifest" href="/uwb-hacks23/manifest.json"/><title>UWB Hacks AI</title><script defer="defer" src="/uwb-hacks23/static/js/main.6c135985.js"></script><link href="/uwb-hacks23/static/css/main.f3604261.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script></body></html>
<!doctype html><html lang="en"><head><link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"><meta charset="utf-8"/><link rel="icon" href="/uwb-hacks24/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="UWB Hacks 2024" content="UWB Hacks 2024. Hackathon Hosted by the ACM at The University of Washington Bothell."/><link rel="apple-touch-icon" href="/uwb-hacks24/logo192.png"/><link rel="manifest" href="/uwb-hacks24/manifest.json"/><title>UWB Hacks AI</title><script defer="defer" src="/uwb-hacks24/static/js/main.6c135985.js"></script><link href="/uwb-hacks24/static/css/main.f3604261.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script></body></html>
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"homepage": "https://uwb-acm.github.io/uwb-hacks23",
"name": "uwb-hacks23",
"homepage": "https://uwb-acm.github.io/uwb-hacks24",
"name": "uwb-hacks24",
"version": "0.1.0",
"private": true,
"dependencies": {
Expand Down
10 changes: 5 additions & 5 deletions src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ function App() {
<Header />
<Routes className="max-w-md">
<Route path="*" element={<Home />} />
<Route path="/uwb-hacks23" element={<Home />} />
{/** <Route path="/uwb-hacks23/Registration" element={<Register />} />*/}
<Route path="/uwb-hacks23/Schedule" element={<Schedule />} />
<Route path="/uwb-hacks23/FAQ" element={<FAQ />} />
<Route path="/uwb-hacks23/Contact" element={<ContactUs />} />
<Route path="/uwb-hacks24" element={<Home />} />
{/** <Route path="/uwb-hacks24/Registration" element={<Register />} />*/}
<Route path="/uwb-hacks24/Schedule" element={<Schedule />} />
<Route path="/uwb-hacks24/FAQ" element={<FAQ />} />
<Route path="/uwb-hacks24/Contact" element={<ContactUs />} />
</Routes>
<Footer />
</BrowserRouter>
Expand Down
2 changes: 1 addition & 1 deletion src/Home/About.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function About() {
</div>
<div className="w-20 h-20"></div>
<div className="w-72 min-[500px]:w-[30rem] min-[400px]:w-[24rem]">
<div className="font-normal text-xl text-yellow" style={{ margin: '0 20px' }} >UWB Hacks In Person is the 8th annual hackathon at the University of Washington, Bothell. The UWB ACM intends to bring students with diverse skill sets together to make connections and create something useful and/or fun. <br/><br/> Our hackathon is a great way for college students to network, get hands-on experience in programming, and solve problems in teams. Whether this is your first or five-hundredth hackathon, come join UWB Hacks AI this year for a fun time!</div>
<div className="font-normal text-xl text-yellow" style={{ margin: '0 20px' }} >UWB Hacks AI is the 7th annual hackathon at the University of Washington, Bothell. The UWB ACM intends to bring students with diverse skill sets together to make connections and create something useful and/or fun. <br/><br/> Our hackathon is a great way for college students to network, get hands-on experience in programming, and solve problems in teams. Whether this is your first or five-hundredth hackathon, come join UWB Hacks AI this year for a fun time!</div>
</div>

</div>
Expand Down
10 changes: 5 additions & 5 deletions src/Home/FAQ.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function FAQ() {
The venue for in-person activities will be the top floor of the Activities and Recreation Center (ARC) at UW Bothell. <br /><br />
We will have a Discord channel devoted to the hackathon that you can use to keep track of the schedule and to ask questions or attend virtual events.
</CollapseButton>
<CollapseButton buttonID="faqb2" buttonText="How will UWB Hacks In Person run?">
<CollapseButton buttonID="faqb2" buttonText="How will UWB HACKS AI run?">
This will be a hybrid event, with in-person and virtual offerings. The venue for in-person activities will be the top floor of the Activities and Recreation Center (ARC) at UW Bothell. <br /><br />
Friday 10am-2pm: Opening Ceremony, Team Building, FREE SNACKS! <br /><br />
Saturday 9am-4pm: Development Workshops, Seminars, Coding + FREE PIZZA <br /><br />
Expand All @@ -32,10 +32,10 @@ function FAQ() {
<CollapseButton buttonID="faqb5" buttonText="What if I don't have a team?">
You are welcome to work individually or with a team. <br /><br />
Friday, we will have an in-person Opening Ceremony and Team Building time, from 10:00am until 2:00pm. Free snacks will be provided. The top floor of the Activities and Recreation Center (ARC) at UW Bothell is reserved. <br /><br />
If you are struggling to find a team or don't have a team and want to work with one, we recommend you join our UWB Hacks In Person Discord. There is a '#team-formation' channel where you can find other people looking for teams.
If you are struggling to find a team or don't have a team and want to work with one, we recommend you join our UWB Hacks AI Discord. There is a '#team-formation' channel where you can find other people looking for teams.
</CollapseButton>
<CollapseButton buttonID="faqb6" buttonText="How many people can be on a team?">
We have a limit of 5 members per team. Any more than 5 members would potentially reduce team production and cause further difficulties for your projects.
We have a limit of 3 members per team. Any more than 3 members would potentially reduce team production and cause further difficulties for your projects.
</CollapseButton>
<CollapseButton buttonID="faqb7" buttonText="What are tracks?">
In Hackathons, tracks are used to help you come up with ideas and help guide you through your project. For example: a project for the Education track could be an app that helps students keep track of their school and personal life to maintain a healthy work life balance.
Expand All @@ -44,12 +44,12 @@ function FAQ() {
Behave Appropriately: This is an event on a university campus, and thus you should act as you would on campus. Inappropriate behavior or posts are not acceptable under any circumstances. <br /><br />
<a className="font-bold text-yellow" target="_blank" href={COC}>Read our code of conduct</a>
</CollapseButton>
<CollapseButton buttonID="faqb9" buttonText="Does UWB Hacks In Person cost money?">
<CollapseButton buttonID="faqb9" buttonText="Does UWB Hacks AI cost money?">
This event is entirely free! No sign up or registration fees required. <br /><br />
Parking on campus does cost $1.75 per hour and is on an hourly basis. For more information about parking, check <a className="font-bold text-white" target="_blank" href='https://www.uwb.edu/commuter-services/parking/parking-permits#daily-parking '>here</a>
</CollapseButton>
<CollapseButton buttonID="faqb10" buttonText="What if I have a question that wasn't answered in the FAQ?">
Please feel free to reach out to event organizers in the “#organizer-discussion” channel of the UWB Hacks In Person Discord or fill out the <NavLink to="/uwb-hacks23/Contact" className=" cursor-pointer text-white font-bold"> contact form. </NavLink>
Please feel free to reach out to event organizers in the “#organizer-discussion” channel of the UWB Hacks AI Discord or fill out the <NavLink to="/uwb-hacks24/Contact" className=" cursor-pointer text-white font-bold"> contact form. </NavLink>
</CollapseButton>


Expand Down
4 changes: 2 additions & 2 deletions src/Home/Footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {NavLink, useLocation} from "react-router-dom";
//import {Link} from "react-scroll";
export default function Footer() {
const location = useLocation();
if (location.pathname !== "/uwb-hacks23" && location.pathname !== "/uwb-hacks23/") {
if (location.pathname !== "/uwb-hacks24" && location.pathname !== "/uwb-hacks24/") {
return <></>
}

Expand Down Expand Up @@ -82,7 +82,7 @@ export default function Footer() {
</div>
{/* The contact column is a placeholder column for now
<div style={{margin: '55px 9% 0 9%', color: 'white'}}>
<NavLink to="/uwb-hacks23/Contact" className='hover:text-white'>
<NavLink to="/uwb-hacks24/Contact" className='hover:text-white'>
<div className='font-SecularOne' style={{fontSize: '24px'}}>Contact Us</div>
<textarea
style={{
Expand Down
Loading

0 comments on commit bd814c3

Please sign in to comment.