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

Fixes #7

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0902ce5
Footer initial push (component not complete)
praneershrest Oct 27, 2021
5f655ab
Text completed
joshpeng1999 Nov 16, 2021
82825b1
Schedule section completed
joshpeng1999 Nov 21, 2021
7655fd6
Frequent Questions component completed
joshpeng1999 Nov 23, 2021
1416d32
Sponsors complete set up
joshpeng1999 Nov 28, 2021
0f09f9f
Finish About page
joshpeng1999 Dec 20, 2021
e29e0aa
Update exec photos and alignment
joshpeng1999 Dec 22, 2021
09a02f5
Update Footer.module.scss
joshpeng1999 Dec 22, 2021
31df51f
Removed sponsors
joshpeng1999 Dec 22, 2021
8b730e3
fix image issues and button overflow
joshpeng1999 Dec 22, 2021
3835c33
About page all done. commits for what???
alikhamesy Dec 22, 2021
0439c75
Merge branch 'dev' into FrequentQuestions
alikhamesy Dec 22, 2021
88bbcd4
faq it, i'm done
alikhamesy Dec 22, 2021
7a09ce6
merge dev, app.tsx conflicts
alikhamesy Dec 22, 2021
212e140
everything
alikhamesy Dec 22, 2021
ebe8c3d
change discord dark color
alikhamesy Dec 22, 2021
8545106
update metadata for index.html
praneershrest Dec 23, 2021
4b5e7cd
Merge pull request #3 from sfusurge/metadata
praneershrest Dec 23, 2021
724eecf
merge with dev and fix conflicts
praneershrest Dec 23, 2021
173d46d
make sponsors mobile friendly
alikhamesy Dec 23, 2021
73bd29f
desktop nav
alikhamesy Dec 23, 2021
751318e
fixes
Dec 24, 2021
5f0a1a0
remove jeanette
Dec 24, 2021
7186187
change apply now button
Dec 24, 2021
3189438
comment out code for when applications open
Dec 24, 2021
245df7c
apply now
Dec 24, 2021
b771d0e
comment out tracks and fix sponsor us button to send email
Dec 24, 2021
e54ca3e
add hussain
Dec 24, 2021
3876819
Merge pull request #5 from sfusurge/update-copy
gracelu0 Dec 24, 2021
363d165
fix year
Dec 24, 2021
0b378bf
Merge pull request #6 from sfusurge/update-copy
gracelu0 Dec 24, 2021
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
39 changes: 37 additions & 2 deletions package-lock.json

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

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@types/webpack-env": "^1.16.3"
}
}
Binary file removed public/favicon.ico
Binary file not shown.
5 changes: 5 additions & 0 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<meta name="description" content="StormHacks is a 24-hour virtual hackathon accredited by Major League Hacking (MLH), a global league for student hackathons." />
<meta name="keywords" content="stromhacks,stormhacks 2022,sfu surge,surge,hackathon,sfu," />
<meta name="og:site_name" content="stormhacks" />
<meta name="og:url" content="https://www.stormhacks.com/"/>
<meta name="og:image" content="%PUBLIC_URL%/logo.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand All @@ -25,7 +29,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>StormHacks</title>
</head>

<body>
Expand Down
Binary file added public/logo.png
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 public/logo192.png
Binary file not shown.
Binary file removed public/logo512.png
Binary file not shown.
1 change: 1 addition & 0 deletions src/App.module.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.App {
text-align: center;
position: relative;
}
42 changes: 32 additions & 10 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,42 @@ import styles from './App.module.scss'

import ThemeProvider from './context/Theme'

import Home from './pages/Home'
import Nav from './components/Nav'
import Footer from './components/Footer'
import Schedule from './pages/Schedule'
import About from './pages/About'
import FAQ from './pages/Faq'
import Sponsors from './pages/Sponsors'
import ScrollProvider from './context/Scroll'
import ScrollContainer from './components/ScrollContainer'

function App() {
return (
<ThemeProvider>
<div className={styles.App}>
<Router>
<Switch>
<Route path="/" exact>
<Home />
</Route>
</Switch>
</Router>
</div>
<ScrollProvider>
<ScrollContainer>
<div className={styles.App}>
<Router>
<Nav />
<Switch>
<Route path="/" exact>
<About />
</Route>
<Route path="/faq">
<FAQ />
</Route>
<Route path="/schedule">
<Schedule />
</Route>
<Route path="/sponsors">
<Sponsors />
</Route>
</Switch>
<Footer />
</Router>
</div>
</ScrollContainer>
</ScrollProvider>
</ThemeProvider>
)
}
Expand Down
45 changes: 45 additions & 0 deletions src/assets/backgrounds/blushPinkBackground.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/backgrounds/footer-mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/backgrounds/footer.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 added src/assets/backgrounds/hotPinkBackground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading