Skip to content

Commit

Permalink
Complete Landing Page (#19)
Browse files Browse the repository at this point in the history
* Add base content to landing page

* Adjust layout of landing page

Adjust font sizing and weight

* Add schedule graphic

* Adjust schedule margins and mobile sizing

* Adjust alignment of hero image on mobile

* Add FAQ

Add sponsor links
Adjust positioning of certain elements

* Add image scaling sets and webp support

Upgrarde typescript

* Adjust MLH badge z-index

* Adjust centering of stats figure

Fix outdoor header placement

* Enable webp support

Use image sourcesets on indoor drawiing

* Enable webp in React code

* Update nginx config

Enable gzip
Enable caching for static assets
Remove .Identifier files

* Add sponsor logos

Remove unused assets

* Add accessibility labels

* Update text

* Modify FAQ text

* Add smooth scrolling

Update hero text and positioning
Reorganize package.json
  • Loading branch information
dellisd committed Dec 17, 2020
1 parent 0ed4f41 commit 0e30d4e
Show file tree
Hide file tree
Showing 136 changed files with 1,159 additions and 173 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ yarn-error.log*
!.yarn/plugins
!.yarn/sdks
!.yarn/versions

.vscode
*.Identifier
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "4.0.5-pnpify",
"version": "4.1.3-pnpify",
"main": "./lib/typescript.js",
"type": "commonjs"
}
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ RUN yarn && yarn build

FROM nginx:1.19.2
COPY --from=builder /watershed-frontend/build /usr/share/nginx/html
COPY nginx.conf /etc/nginx/conf.d/default.conf

LABEL org.opencontainers.image.source https://github.com/cuhacking/watershed-frontend
55 changes: 55 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Configuration for watershed-frontend docker image
server {
listen 80;
listen [::]:80;
server_name localhost;

gzip on;
gzip_types text/plain application/javascript;

location ~* \.(jpg|jpeg|png|gif|ico|css|js|webp|woff2|svg)$ {
root /usr/share/nginx/html;
index index.html index.htm;
expires 365d;
}

#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;

location / {
root /usr/share/nginx/html;
index index.html index.htm;
}

#error_page 404 /404.html;

# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}

# proxy the PHP scripts to Apache listening on 127.0.0.1:80
#
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}

# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
# root html;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include fastcgi_params;
#}

# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}
24 changes: 13 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,17 @@
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/react-fontawesome": "^0.1.13",
"@n8tb1t/use-scroll-position": "^2.0.3",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^26.0.14",
"@types/node": "^14.11.10",
"@types/react": "^16.9.53",
"@types/react-dom": "^16.9.8",
"@types/react-router-dom": "^5.1.6",
"fontsource-dm-sans": "^3.1.5",
"fontsource-montserrat-alternates": "^3.1.5",
"fontsource-work-sans": "^3.1.6",
"react": "^16.14.0",
"react-collapse": "^5.1.0",
"react-dom": "^16.14.0",
"react-is": "^17.0.1",
"react-rellax-wrapper": "^1.0.6",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3",
"styled-components": "^5.2.0",
"typescript": "^4.0.5"
"styled-components": "^5.2.0"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -50,7 +42,17 @@
]
},
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/jest": "^26.0.14",
"@types/node": "^14.11.10",
"@types/react": "^16.9.53",
"@types/react-collapse": "^5",
"@types/react-dom": "^16.9.8",
"@types/react-router-dom": "^5.1.6",
"@types/styled-components": "^5.1.4",
"@yarnpkg/pnpify": "^2.3.3"
"@yarnpkg/pnpify": "^2.3.3",
"typescript": "^4.1.3"
}
}
Binary file modified public/favicon.ico
Binary file not shown.
12 changes: 3 additions & 9 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,12 @@
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="theme-color" content="#030a16" />
<meta
name="description"
content="Web site created using create-react-app"
content=" To cap off this crazy year, cuHacking is bundling up and getting warm at home for its first ever virtual hackathon!"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<script async defer data-domain="2021.cuhacking.com" src="https://analytics.cuhacking.com/js/plausible.js"></script>
<!--
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/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand All @@ -25,7 +19,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>cuHacking 2021: Snowed In</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file removed public/logo192.png
Binary file not shown.
Binary file removed public/logo512.png
Binary file not shown.
25 changes: 0 additions & 25 deletions public/manifest.json

This file was deleted.

Binary file added src/assets/img/hero/png-1080/base.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 added src/assets/img/hero/png-1080/layer-0.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 added src/assets/img/hero/png-1080/layer-1.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 added src/assets/img/hero/png-1080/layer-10.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 added src/assets/img/hero/png-1080/layer-2.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 added src/assets/img/hero/png-1080/layer-3.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 added src/assets/img/hero/png-1080/layer-4.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 added src/assets/img/hero/png-1080/layer-5.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 added src/assets/img/hero/png-1080/layer-6.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 added src/assets/img/hero/png-1080/layer-7.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 added src/assets/img/hero/png-1080/layer-8.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 added src/assets/img/hero/png-1080/layer-9.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 added src/assets/img/hero/png-1440/base.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 added src/assets/img/hero/png-1440/layer-0.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 added src/assets/img/hero/png-1440/layer-1.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 added src/assets/img/hero/png-1440/layer-10.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 added src/assets/img/hero/png-1440/layer-2.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 added src/assets/img/hero/png-1440/layer-3.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 added src/assets/img/hero/png-1440/layer-4.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 added src/assets/img/hero/png-1440/layer-5.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 added src/assets/img/hero/png-1440/layer-6.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 added src/assets/img/hero/png-1440/layer-7.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 added src/assets/img/hero/png-1440/layer-8.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 added src/assets/img/hero/png-1440/layer-9.png
Binary file added src/assets/img/hero/png-720/base.png
Binary file added src/assets/img/hero/png-720/layer-0.png
Binary file added src/assets/img/hero/png-720/layer-1.png
Binary file added src/assets/img/hero/png-720/layer-10.png
Binary file added src/assets/img/hero/png-720/layer-2.png
Binary file added src/assets/img/hero/png-720/layer-3.png
Binary file added src/assets/img/hero/png-720/layer-4.png
Binary file added src/assets/img/hero/png-720/layer-5.png
Binary file added src/assets/img/hero/png-720/layer-6.png
Binary file added src/assets/img/hero/png-720/layer-7.png
Binary file added src/assets/img/hero/png-720/layer-8.png
Binary file added src/assets/img/hero/png-720/layer-9.png
Binary file added src/assets/img/hero/png-original/base.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added src/assets/img/hero/webp-1080/base.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-0.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-1.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-10.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-2.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-3.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-4.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-5.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-6.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-7.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-8.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1080/layer-9.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/base.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-0.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-1.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-10.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-2.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-3.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-4.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-5.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-6.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-7.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-8.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-1440/layer-9.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/base.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-0.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-1.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-10.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-2.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-3.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-4.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-5.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-6.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-7.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-8.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-720/layer-9.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/base.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-0.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-1.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-10.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-2.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-3.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-4.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-5.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-6.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-7.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-8.webp
Binary file not shown.
Binary file added src/assets/img/hero/webp-original/layer-9.webp
Binary file not shown.
Binary file added src/assets/img/indoor/1080.png
Binary file added src/assets/img/indoor/1080.webp
Binary file not shown.
Binary file added src/assets/img/indoor/1440.png
Binary file added src/assets/img/indoor/1440.webp
Binary file not shown.
Binary file added src/assets/img/indoor/720.png
Binary file added src/assets/img/indoor/720.webp
Binary file not shown.
Binary file added src/assets/img/indoor/original.png
Binary file added src/assets/img/indoor/original.webp
Binary file not shown.
19 changes: 19 additions & 0 deletions src/assets/img/schedule-graphic.svg

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/assets/img/sponsors/fdm-group.svg
120 changes: 120 additions & 0 deletions src/assets/img/sponsors/macadamian.svg
Loading

0 comments on commit 0e30d4e

Please sign in to comment.