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.

Sign up for GitHub

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

Jump to bottom

Change title from VenusHacks 2023 to VenusHacks 2024 #239

Merged
merged 3 commits into from
Feb 15, 2024
Merged

Change title from VenusHacks 2023 to VenusHacks 2024 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5d7fe5
update site for 2024 launch
waalbert Feb 15, 2024
93a9021
fix: build issues
waalbert Feb 15, 2024
a883c3b
update: title tag from VenusHacks 2023 to VenusHacks 2024
waalbert Feb 15, 2024
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
Binary file modified public/favicon.ico
View file
Open in desktop
Binary file not shown.
46 changes: 27 additions & 19 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
<html lang="en">
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-159147239-1"></script>
<script
async
src="https://www.googletagmanager.com/gtag/js?id=UA-159147239-1"
></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
function gtag() {
dataLayer.push(arguments);
}
gtag("js", new Date());

gtag('config', 'UA-159147239-1');
gtag("config", "UA-159147239-1");
</script>

<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="UC Irvine's women-centric hackathon!"
/>
<meta name="description" content="UC Irvine's women-centric hackathon!" />
<link rel="apple-touch-icon" href="logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
Expand All @@ -34,7 +36,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>VenusHacks 2023</title>
<title>VenusHacks 2024</title>
<link
rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
Expand All @@ -43,11 +45,11 @@
/>

<script src="https://use.fontawesome.com/733e69044c.js"></script>
<link rel="preconnect" href="https://fonts.gstatic.com">
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Rubik:wght@400;500;600;700&display=swap"
rel="stylesheet"
>
/>

<!-- Start Single Page Apps for GitHub Pages -->
<script type="text/javascript">
Expand All @@ -61,16 +63,22 @@
// When the single page app is loaded further down in this file,
// the correct url will be waiting in the browser's history for
// the single page app to route accordingly.
(function(l) {
if (l.search[1] === '/' ) {
var decoded = l.search.slice(1).split('&').map(function(s) {
return s.replace(/~and~/g, '&')
}).join('?');
window.history.replaceState(null, null,
l.pathname.slice(0, -1) + decoded + l.hash
(function (l) {
if (l.search[1] === "/") {
var decoded = l.search
.slice(1)
.split("&")
.map(function (s) {
return s.replace(/~and~/g, "&");
})
.join("?");
window.history.replaceState(
null,
null,
l.pathname.slice(0, -1) + decoded + l.hash
);
}
}(window.location))
})(window.location);
</script>
<!-- End Single Page Apps for GitHub Pages -->
</head>
Expand Down
32 changes: 7 additions & 25 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,16 @@
import React from 'react';
import { Route, Switch, Router } from 'react-router-dom';
import history from './history';
import './App.scss';
import React from "react";
import { Route, Switch, Router } from "react-router-dom";
import history from "./history";
import "./App.scss";

import {
Home,
Schedule,
Resources,
Workshops,
NotFound
} from 'app/views';

import {
Nav
} from 'app/components';
import { Home, NotFound } from "app/views";

function App() {
return (
<div className='App'>
<div className="App">
<Router history={history}>
<Nav history={history} />
<Switch>
<Route exact path='/' component={Home} />
<Route exact path='/schedule' component={Schedule} />
<Route exact path='/resources' component={Resources} />
<Route exact path='/workshops' component={Workshops} />
<Route exact path='/devpost' component={() => window.location.replace("https://venushacks-2023.devpost.com/")} />
<Route exact path='/feedback' component={() => window.location.replace("https://docs.google.com/forms/d/e/1FAIpQLSeZn-cH2uNgX1w-WbBIzqTQ2qpT81Sk6jDdcDxvYAbJFe1UVg/viewform")} />
<Route exact path='/midway' component={() => window.location.replace("https://forms.gle/3imPJg2UWXGXjvGT7")} />
<Route exact path='/report' component={() => window.location.replace("https://forms.gle/xzPqKT4YgSWWdRqv8")} />
<Route exact path="/" component={Home} />
<Route path="*" component={NotFound} />
</Switch>
</Router>
Expand Down
8 changes: 4 additions & 4 deletions src/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@

h4 {
font-size: 30px;
margin-bottom: .5em;
margin-bottom: 0.5em;
}

h3 {
font-size: 40px;
margin-bottom: .5em;
margin-bottom: 0.5em;
}

h2 {
font-size: 60px;
margin-bottom: .5em;
margin-bottom: 0.5em;
}

h1 {
font-size: 80px;
margin-bottom: .3em;
margin-bottom: 0.3em;
}

button {
Expand Down
Loading
Loading