Skip to content

Commit 9b2ca07

Browse files
peterkosww3637vej2079Shadedog838cbaudouinjr
authored
BrickHack 7 Full Site Release (#1025)
* Basic site layout planning * Full site now overwrites pre-register files * Removed old assets * Updated main content name, brought over new asset * Removed section min-width * Desktop site setup mostly good * Converted a few remaining px-based values * Removed unused lines causing build failures * Added alt text to BH logo * Disabled eslint href warning * Experimental resolution handling * Completed mobile resolution handling * Adjusted input spacing * Cleanup old nav code * Fixed minimized desktop wire bug * Adjusted min-height for sections * Requested changes * Nav blur, shelf vertical position scaling removed, refactoring * flex-container refactoring * Increased spacing and added vertical scaling to hero text * Added shadows to hero text and input * Input autofill: removed bg color, fixed font size * Hero content: centered on mobile, horizontal shift with height on desktop * Adjusted MLH banner size and spacing * Adjusted input button arrow size and border * Nav: -blur, changed color, +opacity * Fixed mobile input button svg getting slightly cropped * Implemented basic schedule styling and layout * Added in new hero image * Mobile layout is now default below a certain width * Preparing schedule elements to take in data * Mobile nav bar color is no longer white * Adjusted mobile hero image positioning * Adjusted shelf size * Requested changes * Add files via upload * start of general section * adjusted faq section * Start of toggle functionality * Events are now based on the selected day * Requested changes * added sass * Start of FAQ * styling changes * style change * clean slider styling * update style * update stlyes again * Completed basic FAQ layout * Button changes: hover, one button, positioning * clip image * Fix clip svg, tnx react :) Signed-off-by: Peter Kos <pkos91@icloud.com> * implementing clip * fixing clip * Lots of formatting changes - Strip trailing newlines - Remove extra newlines between properties Signed-off-by: Peter Kos <pkos91@icloud.com> * working on clips * Streamline schedule implementation Signed-off-by: Peter Kos <pkos91@icloud.com> * Clip wire redo goodbye zindex you were never real Signed-off-by: Peter Kos <pkos91@icloud.com> * Scaling okay for pins for now on medium screen Still needs fix on large + small #responsive #web2.0 #netscape Signed-off-by: Peter Kos <pkos91@icloud.com> * Cleaned up padding on about section Signed-off-by: Peter Kos <pkos91@icloud.com> * Fix bug with slider overflow Signed-off-by: Peter Kos <pkos91@icloud.com> * Remove extra line breaks Signed-off-by: Peter Kos <pkos91@icloud.com> * Small code touchups Signed-off-by: Peter Kos <pkos91@icloud.com> * Fix a typo Signed-off-by: Peter Kos <pkos91@icloud.com> * Adding mobile styling * Replace mailchimp form with register button Signed-off-by: Peter Kos <pkos91@icloud.com> * No more button shadow; lighten effect used Signed-off-by: Peter Kos <pkos91@icloud.com> * Added login button, refactored nav design Signed-off-by: Peter Kos <pkos91@icloud.com> * Fix hero bug Signed-off-by: Peter Kos <pkos91@icloud.com> * Login button done :) Signed-off-by: Peter Kos <pkos91@icloud.com> * Make registration button bigger on mobile Signed-off-by: Peter Kos <pkos91@icloud.com> * fix: Removes several unnecessary files and characters * Fixed overflow, tweak some code * Strip trailing whitespace, tweak padding on faq Signed-off-by: Peter Kos <pkos91@icloud.com> * Cleanup styles, remove old FAQ attempt Signed-off-by: Peter Kos <pkos91@icloud.com> * Add .circleci/config.yml * Update config.yml * Update config.yml * Updated config.yml * Update config.yml * Adds initial deployment code * fix: Fixes tab issue * fix: Config schema * Updated config.yml * Attempting command in config * Reduces to 1 workflow * Cleans job titles * Adding checkout * Removes shallow command * Adds extended no output timer * Fix target=“_blank” security risk Signed-off-by: Peter Kos <pkos91@icloud.com> * Tweak login button alignment + global line height Signed-off-by: Peter Kos <pkos91@icloud.com> * Remove old Signed-off-by: Peter Kos <pkos91@icloud.com> * Remove .buildpacks + leftover travis files Signed-off-by: Peter Kos <pkos91@icloud.com> * Install Parcel Signed-off-by: Peter Kos <pkos91@icloud.com> * Install sass, fix .gitignore Signed-off-by: Peter Kos <pkos91@icloud.com> * Copy over v1 assets Signed-off-by: Peter Kos <pkos91@icloud.com> * Create node.js.yml * Update node.js.yml * Update node.js.yml * Update node.js.yml * Update node.js.yml * Update node.js.yml * Navbar mostly done (desktop) Strange logo size MLH badge doesn’t overflow properly Added scaffolding for rest of site Signed-off-by: Peter Kos <pkos91@icloud.com> * Start of hero; implemented text (desktop) Signed-off-by: Peter Kos <pkos91@icloud.com> * Initial attempt at desk, shelf, shapes Signed-off-by: Peter Kos <pkos91@icloud.com> * Scaling idea for shelf asset Signed-off-by: Peter Kos <pkos91@icloud.com> * Started general section Signed-off-by: Peter Kos <pkos91@icloud.com> * Add fontawesome + arrow on MLH button Signed-off-by: Peter Kos <pkos91@icloud.com> * Started leadership Signed-off-by: Peter Kos <pkos91@icloud.com> * Tweak section padding Signed-off-by: Peter Kos <pkos91@icloud.com> * Hero and nav tweaking Signed-off-by: Peter Kos <pkos91@icloud.com> * shelf-crop.svg -> shelf.svg Signed-off-by: Peter Kos <pkos91@icloud.com> * More tweaks to hero font sizes Signed-off-by: Peter Kos <pkos91@icloud.com> * Update readme to add stack info + new dev inst Signed-off-by: Peter Kos <pkos91@icloud.com> * Add back in the public folder Signed-off-by: Peter Kos <pkos91@icloud.com> * Rename public to resources folder Signed-off-by: Peter Kos <pkos91@icloud.com> * Hacky attempt to have parcel include static files Current solution: manually copy them over in the build script. Alternatively, we can also just never remove the build directory and only update it, and keep the static files in there. However it will make it slightly harder to access/edit those files, given that they’ll be scattered around with the other output from parcel. parcel-bundler/parcel#2099 Signed-off-by: Peter Kos <pkos91@icloud.com> * Copy static files done w/ plugin now! Now everything in `resources` will be copied into `build` on build! Signed-off-by: Peter Kos <pkos91@icloud.com> * newline EOF whoops Signed-off-by: Peter Kos <pkos91@icloud.com> * Remove old error pages; auto-redirect to main site if there are any errors (#984) * Remove error pages and associated resources Signed-off-by: Peter Kos <pkos91@icloud.com> * Fix public URL so redirect (and GH pages) work Signed-off-by: Peter Kos <pkos91@icloud.com> * Make staging deployment work with parcel (#992) * Add static.json for heroku-buildpack-static Signed-off-by: Peter Kos <pkos91@icloud.com> * Added buildpack run script https://elements.heroku.com/buildpacks/parcelconnect/heroku-buildpack-run Signed-off-by: Peter Kos <pkos91@icloud.com> * Turns out we need to INSTALL our plugins :) Signed-off-by: Peter Kos <pkos91@icloud.com> * newline EOF Signed-off-by: Peter Kos <pkos91@icloud.com> * Photo carousel for general hackathon section (#986) * Start of slider - Add jQuery - Add slick-slider Signed-off-by: Peter Kos <pkos91@icloud.com> * Lots of slider progress Signed-off-by: Peter Kos <pkos91@icloud.com> * Progress on clip tweaks; will do more tomorrow Signed-off-by: Peter Kos <pkos91@icloud.com> * Tweaks Signed-off-by: Peter Kos <pkos91@icloud.com> * Tweak z-index to be simpler (hopefully), dummy img Signed-off-by: Peter Kos <pkos91@icloud.com> * Clip size tweaks Signed-off-by: Peter Kos <pkos91@icloud.com> * Added in photos! Signed-off-by: Peter Kos <pkos91@icloud.com> * Add leadership images and tweak sizing (#991) * added leadership images Signed-off-by: Peter Kos <pkos91@icloud.com> * Refactor img-border-radius Will use w/ gallery Signed-off-by: Peter Kos <pkos91@icloud.com> * Remove temp bit Signed-off-by: Peter Kos <pkos91@icloud.com> * Fix fonts (#996) Signed-off-by: Peter Kos <pkos91@icloud.com> * Footer (#998) * Started footer almost done needs links Signed-off-by: Peter Kos <pkos91@icloud.com> * Added all footer links Signed-off-by: Peter Kos <pkos91@icloud.com> * Remove twitter lang=en Co-authored-by: Chris Baudouin, Jr. <cjb5326@rit.edu> * Update index.html Co-authored-by: Chris Baudouin, Jr. <cjb5326@rit.edu> Co-authored-by: Chris Baudouin, Jr. <cjb5326@rit.edu> * Schedule (#997) * Started schedule HTML done Styling started Signed-off-by: Peter Kos <pkos91@icloud.com> * More progress on events Signed-off-by: Peter Kos <pkos91@icloud.com> * Toggle schedule working Signed-off-by: Peter Kos <pkos91@icloud.com> * Cleanup Signed-off-by: Peter Kos <pkos91@icloud.com> * Sequential event color assignment Signed-off-by: Peter Kos <pkos91@icloud.com> * Added events Signed-off-by: Peter Kos <pkos91@icloud.com> * Tweak event font sizing; all p is 1.2em Signed-off-by: Peter Kos <pkos91@icloud.com> * Replace CircleCI with GitHub Actions (for real) (#1006) * Remove circleci Signed-off-by: Peter Kos <pkos91@icloud.com> * Add new deploy script, rename old Signed-off-by: Peter Kos <pkos91@icloud.com> * Whoops, using proper script Signed-off-by: Peter Kos <pkos91@icloud.com> * Add github token Signed-off-by: Peter Kos <pkos91@icloud.com> * Rename deploy name Signed-off-by: Peter Kos <pkos91@icloud.com> * Fix job trigger syntax for build and deploy prod, use node 12 (#1009) * Fix job trigger syntax for build and deploy prod Signed-off-by: Peter Kos <pkos91@icloud.com> * Just node 12 Signed-off-by: Peter Kos <pkos91@icloud.com> * Creates Staging GitHub Action, changes Build name * Fixes port issue with Staging GitHub Action * Force push to dokku staging (#1015) Signed-off-by: Peter Kos <pkos91@icloud.com> * Implemented FAQ section (#1000) * layout and content with some initial styling * added js for accordion * finishing touches on icons * removed noopener * contact url, question and answer styles * Refactored :) Signed-off-by: Peter Kos <pkos91@icloud.com> * Animations working!! Signed-off-by: Peter Kos <pkos91@icloud.com> * cleaning up unnecessary styles * Added question content, fixed link color in card Signed-off-by: Peter Kos <pkos91@icloud.com> * Tweak panel p styling Make margin styling a bit better but messier Signed-off-by: Peter Kos <pkos91@icloud.com> * Remove unnesesecary outline none Signed-off-by: Peter Kos <pkos91@icloud.com> Co-authored-by: cxs7700 <cxs7700@g.rit.edu> Co-authored-by: Peter Kos <pkos91@icloud.com> * Leadershp spacing tweaks (#1012) * Tweak leadership position spacing Signed-off-by: Peter Kos <pkos91@icloud.com> * Some minor tweaks for leadership Signed-off-by: Peter Kos <pkos91@icloud.com> * Test remove director name Signed-off-by: Peter Kos <pkos91@icloud.com> * Padding and container tweaks for leadership Signed-off-by: Peter Kos <pkos91@icloud.com> * bh-1001 text scaling fix (#1005) * initial commit * initial commit * fixed laptop-l herotext scaling * removed swap files * changed left padding and width value for laptop screens * further decreased hero left padding for smaller screen support * Tweak margins slightly, tweak media queries Signed-off-by: Peter Kos <pkos91@icloud.com> Co-authored-by: Peter Kos <pkos91@icloud.com> * Added 2 FAQs (#1021) * Added 2 FAQs Signed-off-by: Peter Kos <pkos91@icloud.com> * typos! Signed-off-by: Peter Kos <pkos91@icloud.com> * Links added; smooth scroll on link click too! (#1022) Signed-off-by: Peter Kos <pkos91@icloud.com> * Various general section tweaks (#1020) * Fix width of general cols to be 60/40 Signed-off-by: Peter Kos <pkos91@icloud.com> * Fix button link thing Signed-off-by: Peter Kos <pkos91@icloud.com> * Factor button effect out for (most) place exc card Signed-off-by: Peter Kos <pkos91@icloud.com> Co-authored-by: ww2497 <ww2497@rit.edu> Co-authored-by: William Wu <31863372+ww2497@users.noreply.github.com> Co-authored-by: vej2079 <70078219+vej2079@users.noreply.github.com> Co-authored-by: Shadedog838 <32343626+Shadedog838@users.noreply.github.com> Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu> Co-authored-by: Chris Baudouin, Jr <chrisbaudouinjr@icloud.com> Co-authored-by: Christopher Savan <christophersavan@gmail.com> Co-authored-by: cxs7700 <cxs7700@g.rit.edu> Co-authored-by: Samuel Velasquez <46058951+sjv01180@users.noreply.github.com>
1 parent 0932231 commit 9b2ca07

1,016 files changed

Lines changed: 7139 additions & 24379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildpacks

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/build.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Build
5+
6+
on:
7+
pull_request:
8+
branches:
9+
- master
10+
- develop
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Use Node.js 12
20+
uses: actions/setup-node@v1
21+
with:
22+
node-version: '12'
23+
- run: npm ci
24+
- run: npm run build --if-present
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Deploy - Production
5+
6+
on:
7+
push:
8+
branches:
9+
- master
10+
11+
jobs:
12+
deploy-production:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
with:
17+
ref: master
18+
- run: node --version
19+
- name: Install dependencies
20+
run: npm ci
21+
- name: Builder
22+
run: npm run build
23+
- name: Deploy
24+
uses: peaceiris/actions-gh-pages@v3
25+
with:
26+
github_token: ${{ secrets.GITHUB_TOKEN }}
27+
publish_dir: ./build
28+
allow_empty_commit: true
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Deploy - Staging
5+
6+
on:
7+
push:
8+
branches:
9+
- develop
10+
11+
jobs:
12+
deploy-staging:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
with:
17+
ref: develop
18+
- name: Push to Staging
19+
uses: dokku/github-action@master
20+
with:
21+
git_push_flags: '--force'
22+
git_remote_url: 'ssh://dokku@csh-cloud.oweb.co:22/brickhack-stage'
23+
ssh_private_key: ${{ secrets.CODERIT_CLOUD_SSH_PRIVATE_KEY }}

.gitignore

Lines changed: 108 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
22

3-
# dependencies
4-
/node_modules
5-
/.pnp
6-
.pnp.js
7-
83
# testing
94
/coverage
105

@@ -22,3 +17,111 @@ npm-debug.log*
2217
yarn-debug.log*
2318
yarn-error.log*
2419
yarn.lock
20+
21+
# Visual Studio Code
22+
/.vscode
23+
24+
# Created by https://www.toptal.com/developers/gitignore/api/node
25+
# Edit at https://www.toptal.com/developers/gitignore?templates=node
26+
# (modified to remove Grunt, etc.)
27+
28+
### Node ###
29+
# Logs
30+
logs
31+
*.log
32+
npm-debug.log*
33+
yarn-debug.log*
34+
yarn-error.log*
35+
lerna-debug.log*
36+
37+
# Diagnostic reports (https://nodejs.org/api/report.html)
38+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
39+
40+
# Runtime data
41+
pids
42+
*.pid
43+
*.seed
44+
*.pid.lockt
45+
46+
# Bower dependency directory (https://bower.io/)
47+
bower_components
48+
49+
# node-waf configuration
50+
.lock-wscript
51+
52+
# Compiled binary addons (https://nodejs.org/api/addons.html)
53+
build/Release
54+
55+
# Dependency directories
56+
node_modules/
57+
jspm_packages/
58+
59+
# TypeScript v1 declaration files
60+
typings/
61+
62+
# TypeScript cache
63+
*.tsbuildinfo
64+
65+
# Optional npm cache directory
66+
.npm
67+
68+
# Optional eslint cache
69+
.eslintcache
70+
71+
# Microbundle cache
72+
.rpt2_cache/
73+
.rts2_cache_cjs/
74+
.rts2_cache_es/
75+
.rts2_cache_umd/
76+
77+
# Optional REPL history
78+
.node_repl_history
79+
80+
# Output of 'npm pack'
81+
*.tgz
82+
83+
# Yarn Integrity file
84+
.yarn-integrity
85+
86+
# dotenv environment variables file
87+
.env
88+
.env.test
89+
.env*.local
90+
91+
# parcel-bundler cache (https://parceljs.org/)
92+
.cache
93+
.parcel-cache
94+
95+
# Next.js build output
96+
.next
97+
98+
# Nuxt.js build / generate output
99+
.nuxt
100+
dist
101+
102+
# Gatsby files
103+
.cache/
104+
# Comment in the public line in if your project uses Gatsby and not Next.js
105+
# https://nextjs.org/blog/next-9-1#public-directory-support
106+
# public
107+
108+
# vuepress build output
109+
.vuepress/dist
110+
111+
# Serverless directories
112+
.serverless/
113+
114+
# FuseBox cache
115+
.fusebox/
116+
117+
# DynamoDB Local files
118+
.dynamodb/
119+
120+
# TernJS port file
121+
.tern-port
122+
123+
# Stores VSCode versions used for testing VSCode extensions
124+
.vscode-test
125+
126+
# End of https://www.toptal.com/developers/gitignore/api/node
127+

.sassrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"includePaths": ["node_modules"]
3+
}

.travis.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.travis/deploy_stage.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

.travis/marketing_rsa.enc

-3.31 KB
Binary file not shown.

Procfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)