Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
b506b2d
Basic site layout planning
ww3637 Sep 27, 2020
7174154
Full site now overwrites pre-register files
ww3637 Oct 3, 2020
b89e555
Removed old assets
ww3637 Oct 21, 2020
3275a04
Updated main content name, brought over new asset
ww3637 Oct 24, 2020
7fc5ea5
Merge branch 'develop' into prototype
ww3637 Oct 26, 2020
23dc471
Removed section min-width
ww3637 Oct 29, 2020
6f0b831
Desktop site setup mostly good
ww3637 Oct 29, 2020
ef5d4e1
Converted a few remaining px-based values
ww3637 Oct 29, 2020
1b74349
Removed unused lines causing build failures
ww3637 Oct 29, 2020
3452bfd
Added alt text to BH logo
ww3637 Oct 29, 2020
db81383
Disabled eslint href warning
ww3637 Oct 29, 2020
ee463c2
Experimental resolution handling
ww3637 Oct 31, 2020
d06bbb8
Completed mobile resolution handling
ww3637 Oct 31, 2020
c088202
Adjusted input spacing
ww3637 Oct 31, 2020
a5bba0e
Cleanup old nav code
ww3637 Oct 31, 2020
a70d50d
Fixed minimized desktop wire bug
ww3637 Oct 31, 2020
86ee8a2
Adjusted min-height for sections
ww3637 Oct 31, 2020
6c07fba
Requested changes
ww3637 Nov 1, 2020
088121e
Merge pull request #966 from codeRIT/prototype
ww3637 Nov 1, 2020
1d822d5
Nav blur, shelf vertical position scaling removed, refactoring
ww3637 Nov 6, 2020
af01f93
flex-container refactoring
ww3637 Nov 6, 2020
dc11646
Increased spacing and added vertical scaling to hero text
ww3637 Nov 6, 2020
c4e3968
Added shadows to hero text and input
ww3637 Nov 6, 2020
d73e86c
Input autofill: removed bg color, fixed font size
ww3637 Nov 6, 2020
f4f743d
Hero content: centered on mobile, horizontal shift with height on des…
ww3637 Nov 7, 2020
c9cc10a
Adjusted MLH banner size and spacing
ww3637 Nov 7, 2020
16450ec
Adjusted input button arrow size and border
ww3637 Nov 7, 2020
d10f581
Nav: -blur, changed color, +opacity
ww3637 Nov 8, 2020
b261029
Fixed mobile input button svg getting slightly cropped
ww3637 Nov 9, 2020
ba89c57
Implemented basic schedule styling and layout
ww3637 Nov 15, 2020
76b113e
Added in new hero image
ww3637 Nov 15, 2020
ea0fa4e
Mobile layout is now default below a certain width
ww3637 Nov 15, 2020
7b7046a
Preparing schedule elements to take in data
ww3637 Nov 15, 2020
16fb432
Mobile nav bar color is no longer white
ww3637 Nov 15, 2020
da38ab3
Adjusted mobile hero image positioning
ww3637 Nov 15, 2020
7545483
Adjusted shelf size
ww3637 Nov 15, 2020
50754ad
Requested changes
ww3637 Nov 18, 2020
2aad63a
Add files via upload
vej2079 Nov 20, 2020
f7822f3
start of general section
Shadedog838 Nov 20, 2020
d7a19e4
adjusted faq section
vej2079 Nov 24, 2020
78cd221
Start of toggle functionality
ww3637 Nov 26, 2020
25d04fc
Events are now based on the selected day
ww3637 Nov 26, 2020
fd2162f
Requested changes
ww3637 Nov 28, 2020
5ae6253
added sass
vej2079 Nov 29, 2020
ca72576
Start of FAQ
ww3637 Nov 29, 2020
ae8b885
styling changes
Shadedog838 Nov 29, 2020
7b85a64
style change
Shadedog838 Nov 29, 2020
a2501e9
clean slider styling
Shadedog838 Nov 29, 2020
03933a0
update style
Shadedog838 Nov 29, 2020
fbc2415
update stlyes again
Shadedog838 Nov 29, 2020
1b90921
Merge branch 'schedule' into faq
ww3637 Nov 29, 2020
7d5ad86
Completed basic FAQ layout
ww3637 Nov 29, 2020
7f2401b
Button changes: hover, one button, positioning
Shadedog838 Nov 29, 2020
cb19eff
clip image
Shadedog838 Nov 29, 2020
8831c9e
Fix clip svg, tnx react :)
peterkos Nov 29, 2020
19e40b1
implementing clip
Shadedog838 Nov 29, 2020
d7734d2
fixing clip
Shadedog838 Nov 30, 2020
accd889
Lots of formatting changes
peterkos Nov 30, 2020
80ce1f1
working on clips
Shadedog838 Nov 30, 2020
73990b6
Streamline schedule implementation
peterkos Nov 30, 2020
7662977
Clip wire redo goodbye zindex you were never real
peterkos Nov 30, 2020
99e54db
Scaling okay for pins for now on medium screen
peterkos Nov 30, 2020
66e71ec
Cleaned up padding on about section
peterkos Nov 30, 2020
eef16b2
Fix bug with slider overflow
peterkos Nov 30, 2020
168cf9c
Remove extra line breaks
peterkos Nov 30, 2020
cd2ca36
Merge pull request #971 from codeRIT/schedule
peterkos Nov 30, 2020
c1ae0fe
Merge branch 'develop' into issue-967
peterkos Nov 30, 2020
b809cd5
Small code touchups
peterkos Nov 30, 2020
60043d8
Fix a typo
peterkos Nov 30, 2020
b94f7ea
Adding mobile styling
Shadedog838 Nov 30, 2020
e486a0a
Merge pull request #968 from codeRIT/issue-967
peterkos Nov 30, 2020
a15d5ac
Replace mailchimp form with register button
peterkos Dec 1, 2020
31eb358
No more button shadow; lighten effect used
peterkos Dec 1, 2020
cfd4a06
Added login button, refactored nav design
peterkos Dec 1, 2020
c75333d
Merge branch 'develop' into hero-preregister-enable
peterkos Dec 1, 2020
7ff9ebb
Fix hero bug
peterkos Dec 1, 2020
2064e83
Login button done :)
peterkos Dec 1, 2020
6b777e2
Make registration button bigger on mobile
peterkos Dec 1, 2020
9194c22
fix: Removes several unnecessary files and characters
cbaudouinjr Dec 1, 2020
e09e6a5
Fixed overflow, tweak some code
peterkos Dec 2, 2020
7f22a20
Strip trailing whitespace, tweak padding on faq
peterkos Dec 2, 2020
a7a8c7b
Cleanup styles, remove old FAQ attempt
peterkos Dec 2, 2020
c65f288
Add .circleci/config.yml
cbaudouinjr Dec 2, 2020
0300edc
Update config.yml
cbaudouinjr Dec 2, 2020
59c36e9
Update config.yml
cbaudouinjr Dec 2, 2020
d7ebd68
Updated config.yml
cbaudouinjr Dec 2, 2020
11101d1
Update config.yml
cbaudouinjr Dec 2, 2020
f4c7354
Merge branch 'develop' into faq
peterkos Dec 2, 2020
213e00f
Merge pull request #976 from codeRIT/circleci-project-setup
cbaudouinjr Dec 2, 2020
1e92f4c
Merge branch 'develop' into hero-preregister-enable
cbaudouinjr Dec 2, 2020
c0eccaf
Merge branch 'develop' into faq
cbaudouinjr Dec 2, 2020
b5e3bca
Merge pull request #974 from codeRIT/faq
peterkos Dec 2, 2020
ecdf123
Merge branch 'develop' into general
peterkos Dec 2, 2020
7f1f45c
Merge branch 'develop' into general
peterkos Dec 2, 2020
d5d5d33
Adds initial deployment code
cbaudouinjr Dec 2, 2020
602c47c
fix: Fixes tab issue
cbaudouinjr Dec 2, 2020
33b493b
fix: Config schema
cbaudouinjr Dec 2, 2020
90f7135
Updated config.yml
cbaudouinjr Dec 2, 2020
5c2a1cf
Merge pull request #977 from codeRIT/circleci-deploy
cbaudouinjr Dec 2, 2020
1dd3ebc
Attempting command in config
cbaudouinjr Dec 2, 2020
04f543d
Reduces to 1 workflow
cbaudouinjr Dec 2, 2020
b4e6a1b
Cleans job titles
cbaudouinjr Dec 2, 2020
a748071
Adding checkout
cbaudouinjr Dec 2, 2020
13baa52
Merge pull request #978 from codeRIT/deploy-fix
cbaudouinjr Dec 2, 2020
b097b6e
Removes shallow command
cbaudouinjr Dec 2, 2020
085866d
Merge pull request #979 from codeRIT/deploy-remove-shallow
cbaudouinjr Dec 2, 2020
e959f13
Adds extended no output timer
cbaudouinjr Dec 2, 2020
0844760
Merge pull request #980 from codeRIT/add-extended-timeout
cbaudouinjr Dec 2, 2020
304db42
Merge branch 'develop' into general
peterkos Dec 3, 2020
7d7d1a0
Fix target=“_blank” security risk
peterkos Dec 3, 2020
7fac013
Merge pull request #972 from codeRIT/general
peterkos Dec 3, 2020
086cee9
Merge branch 'develop' into hero-preregister-enable
peterkos Dec 3, 2020
7a30f16
Merge branch 'develop' into hero-preregister-enable
peterkos Dec 3, 2020
b1bb652
Tweak login button alignment + global line height
peterkos Dec 3, 2020
796748d
Merge pull request #975 from codeRIT/hero-preregister-enable
peterkos Dec 3, 2020
8ef2050
Remove old
peterkos Dec 3, 2020
324677f
Remove .buildpacks + leftover travis files
peterkos Dec 3, 2020
3f706c8
Install Parcel
peterkos Dec 3, 2020
c7f09e2
Install sass, fix .gitignore
peterkos Dec 3, 2020
42419ab
Copy over v1 assets
peterkos Dec 3, 2020
fde6b03
Create node.js.yml
cbaudouinjr Dec 4, 2020
5d7d1b1
Update node.js.yml
cbaudouinjr Dec 4, 2020
97c5aa7
Update node.js.yml
cbaudouinjr Dec 4, 2020
059ee78
Update node.js.yml
cbaudouinjr Dec 4, 2020
5b9ea8b
Update node.js.yml
cbaudouinjr Dec 4, 2020
7ee1bf9
Update node.js.yml
cbaudouinjr Dec 4, 2020
5f732da
Merge pull request #981 from codeRIT/cbaudouinjr-ghactions-1
cbaudouinjr Dec 4, 2020
5e90fb5
Navbar mostly done (desktop)
peterkos Dec 5, 2020
1e73531
Start of hero; implemented text (desktop)
peterkos Dec 5, 2020
7fc2f19
Initial attempt at desk, shelf, shapes
peterkos Dec 5, 2020
160136a
Merge branch 'develop' into restart
peterkos Dec 5, 2020
723d91e
Scaling idea for shelf asset
peterkos Dec 5, 2020
eb52879
Started general section
peterkos Dec 5, 2020
e389bd5
Add fontawesome + arrow on MLH button
peterkos Dec 5, 2020
6a95fa0
Started leadership
peterkos Dec 5, 2020
40a4698
Tweak section padding
peterkos Dec 5, 2020
b47ea06
Hero and nav tweaking
peterkos Dec 5, 2020
94b3a59
shelf-crop.svg -> shelf.svg
peterkos Dec 5, 2020
973eaea
More tweaks to hero font sizes
peterkos Dec 5, 2020
6b82cbf
Update readme to add stack info + new dev inst
peterkos Dec 6, 2020
d518c75
Add back in the public folder
peterkos Dec 6, 2020
1006b34
Rename public to resources folder
peterkos Dec 6, 2020
5e1d727
Hacky attempt to have parcel include static files
peterkos Dec 6, 2020
e146991
Copy static files done w/ plugin now!
peterkos Dec 9, 2020
3d03051
newline EOF whoops
peterkos Dec 9, 2020
182f080
Merge pull request #983 from codeRIT/restart
peterkos Dec 9, 2020
4105e05
Remove old error pages; auto-redirect to main site if there are any e…
peterkos Dec 10, 2020
ee08e79
Make staging deployment work with parcel (#992)
peterkos Dec 10, 2020
cb9b29b
Photo carousel for general hackathon section (#986)
peterkos Dec 10, 2020
22e236b
Add leadership images and tweak sizing (#991)
peterkos Dec 10, 2020
d4d4491
Fix fonts (#996)
peterkos Dec 10, 2020
9c38b20
Footer (#998)
peterkos Dec 10, 2020
1f8c17c
Schedule (#997)
peterkos Dec 10, 2020
9c24767
Replace CircleCI with GitHub Actions (for real) (#1006)
peterkos Dec 10, 2020
2894ffb
Fix job trigger syntax for build and deploy prod, use node 12 (#1009)
peterkos Dec 10, 2020
02a5c53
Creates Staging GitHub Action, changes Build name
cbaudouinjr Dec 11, 2020
e4f7bad
Merge pull request #1013 from codeRIT/bh-1010
cbaudouinjr Dec 11, 2020
39e9199
Fixes port issue with Staging GitHub Action
cbaudouinjr Dec 11, 2020
74f524c
Merge pull request #1014 from codeRIT/bh-1010b
cbaudouinjr Dec 11, 2020
17e7276
Force push to dokku staging (#1015)
peterkos Dec 11, 2020
e253d57
Implemented FAQ section (#1000)
cxs7700 Dec 11, 2020
bb9429c
Leadershp spacing tweaks (#1012)
peterkos Dec 11, 2020
85a9b2f
bh-1001 text scaling fix (#1005)
sjv01180 Dec 11, 2020
6aabbaf
Added 2 FAQs (#1021)
peterkos Dec 11, 2020
1e5d8d8
Links added; smooth scroll on link click too! (#1022)
peterkos Dec 11, 2020
4cfa57c
Various general section tweaks (#1020)
peterkos Dec 11, 2020
8904133
Merge branch 'master' into develop
peterkos Dec 11, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .buildpacks

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Build

on:
pull_request:
branches:
- master
- develop

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js 12
uses: actions/setup-node@v1
with:
node-version: '12'
- run: npm ci
- run: npm run build --if-present
28 changes: 28 additions & 0 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Deploy - Production

on:
push:
branches:
- master

jobs:
deploy-production:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: master
- run: node --version
- name: Install dependencies
run: npm ci
- name: Builder
run: npm run build
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build
allow_empty_commit: true
23 changes: 23 additions & 0 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Deploy - Staging

on:
push:
branches:
- develop

jobs:
deploy-staging:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: develop
- name: Push to Staging
uses: dokku/github-action@master
with:
git_push_flags: '--force'
git_remote_url: 'ssh://dokku@csh-cloud.oweb.co:22/brickhack-stage'
ssh_private_key: ${{ secrets.CODERIT_CLOUD_SSH_PRIVATE_KEY }}
113 changes: 108 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

Expand All @@ -22,3 +17,111 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
yarn.lock

# Visual Studio Code
/.vscode

# Created by https://www.toptal.com/developers/gitignore/api/node
# Edit at https://www.toptal.com/developers/gitignore?templates=node
# (modified to remove Grunt, etc.)

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lockt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test
.env*.local

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# End of https://www.toptal.com/developers/gitignore/api/node

3 changes: 3 additions & 0 deletions .sassrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"includePaths": ["node_modules"]
}
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .travis/deploy_stage.sh

This file was deleted.

Binary file removed .travis/marketing_rsa.enc
Binary file not shown.
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ The public facing website for BrickHack.

Ensure you have Git set up and [SSH access to GitHub](https://help.github.com/articles/connecting-to-github-with-ssh/). If you have Git but not SSH, you can clone using the HTTPS url, but you'll have to type in your GitHub credentials every time.

We use [ParcelJS](https://parceljs.org/) and [SASS](https://sass-lang.com/) (the SCSS variant) to build the mostly-static site. Where needed, FontAwesome and possibly React are peppered in.

### Cloning the directory

```bash
Expand All @@ -28,13 +30,15 @@ $ npm install
### Running the application

```
$ npm start
$ npm run dev
```

You should then be able to access the site at `localhost:3000`.
You should then be able to access the site at `localhost:1234`.

# Development & Deployment

All development work should be done locally in a new branch and/or fork. Then, make a pull request to have the code merged into the develop branch. Once the develop branch gets to a good state, it gets merged into the master branch for a production deployment.

Code pushed to any `codeRIT/brickhack.io` branch will automatically build on [Travis CI](https://travis-ci.org/codeRIT/brickhack.io) for tests. Any build on the master or develop branch will also trigger a deploy to GitHub Pages or our staging [Dokku](https://github.com/progrium/dokku) instance respectively.

(Note that we are currently converting to CircleCI, and if possible, GitHub Actions.)
3 changes: 3 additions & 0 deletions assets/back_clip.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading