Skip to content
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
f28516f
More opaque
peterkos Dec 22, 2020
26574c6
Merge pull request #1074 from codeRIT/bh-1069
peterkos Dec 22, 2020
69d37e5
Changed README badge
ww2497 Dec 22, 2020
0adb83d
Merge pull request #1076 from codeRIT/bh-1016
peterkos Dec 22, 2020
583b530
turning autoplay back on
sjmiller7 Jan 3, 2021
5ce8520
Merge pull request #1080 from codeRIT/bh-1079
peterkos Jan 3, 2021
abb6aa6
Highlighting nav items with scroll (#1064)
ww2497 Jan 5, 2021
f1c15bd
Bh-970 large screen layout (#1053)
sjv01180 Jan 5, 2021
01d730f
fixed shelf clipping bug on large screen sizes (#1089)
JeremyRudman Jan 5, 2021
5b86ac7
Sponsors section (#1088)
peterkos Jan 6, 2021
78f8e7e
Hero section parallax (#1091)
ww2497 Jan 7, 2021
5e65b50
Carousel image clips over the front clip on mobile on tap/slide (#1078)
ww2497 Jan 7, 2021
3576d62
Adding social media summary cards (#1095)
sjmiller7 Jan 7, 2021
6146df5
Update shipping FAQ, team size (#1086)
peterkos Jan 8, 2021
8b7dd50
Fix hover effect (#1098)
peterkos Jan 8, 2021
3bcabad
Merge branch 'master' into develop
peterkos Jan 8, 2021
d1f5a4c
Integrating with FeaturePeek (#1108)
cbaudouinjr Jan 19, 2021
80ac751
Integrating with FeaturePeek
peterkos Jan 19, 2021
8851253
Fix build script, damn featurepeek
peterkos Jan 19, 2021
851bc20
Merge pull request #1110 from codeRIT/featurepeek/integrate-2111820484
cbaudouinjr Jan 21, 2021
bfcacdb
Removes Dokku files/integrations (#1113)
cbaudouinjr Jan 23, 2021
b10de84
Update FAQ (#1114)
ww2497 Jan 24, 2021
0b53fec
Add Prizes section (#1117)
peterkos Jan 25, 2021
8751152
Add wegmans, stickermule (#1120)
peterkos Jan 25, 2021
c8e6d4c
making schedule match prizes with border-top (#1122)
sjmiller7 Jan 26, 2021
da3dbc4
new media query for mobile nav (#1123)
sjmiller7 Jan 26, 2021
49528ca
stickermule link update (#1129)
sjmiller7 Jan 26, 2021
d07799c
Merge branch 'master' into develop
peterkos Jan 26, 2021
5d76292
adding line about timezone (#1124)
sjmiller7 Jan 26, 2021
9590382
restructuring assets folder (#1126)
sjmiller7 Jan 29, 2021
1b30d57
Hotfix redirect brickhack.io/apply to apply.brickhack.io (#1135)
peterkos Jan 30, 2021
6554286
Merge branch 'master' into develop
peterkos Jan 30, 2021
fdcb665
Added dynamic schedule (#1139)
Feb 5, 2021
a99b5ac
update faq (#1143)
peterkos Feb 5, 2021
53c528b
Hotfix timezones on schedule (#1147)
peterkos Feb 5, 2021
f24eea1
mtbank->mttech (#1144)
peterkos Feb 5, 2021
c0d2dec
Merge branch 'master' into develop
peterkos Feb 5, 2021
3851b13
Update ricky hero svgs to use the ones on Notion, adjust color of sit…
sjv01180 Feb 6, 2021
6eb8bc7
Schedule dates are shown in local timezone (#1148)
Feb 6, 2021
19df6fc
Gallery (#1103)
peterkos Feb 10, 2021
a23ca33
Removed outdated comment
Feb 10, 2021
3bf8a5e
Added event sorting code
Feb 10, 2021
a787758
Renamed sortEvents to compareEvents
Feb 11, 2021
8ad29dc
Merge pull request #1158 from codeRIT/bh-1157
Feb 11, 2021
398aa74
New schedule design with pre-event workshop support (no mobile) (#1160)
peterkos Feb 12, 2021
229ea6b
Added more sponsor logos (#1164)
ww2497 Feb 13, 2021
473a87a
Schedule 2.0 Mobile (#1163)
peterkos Feb 13, 2021
1e30cde
Merge branch 'master' into develop
peterkos Feb 13, 2021
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
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ jobs:
node-version: '12'
- run: npm ci
- run: npm run build --if-present
env:
IDENTITY_POOL_ID: ${{ secrets.IDENTITY_POOL_ID }}
2 changes: 2 additions & 0 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
run: npm ci
- name: Builder
run: npm run build
env:
IDENTITY_POOL_ID: ${{ secrets.IDENTITY_POOL_ID }}
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@ jobs:
run: npm install
- name: Build
run: npm run build
env:
IDENTITY_POOL_ID: ${{ secrets.IDENTITY_POOL_ID }}
- name: Ping FeaturePeek
run: bash <(curl -s https://peek.run/ci)
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@ $ npm run dev

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

### Environment variables

The images in the [gallery](https://brickhack.io/gallery) are hosted on our AWS S3 instance.

GitHub Actions (our CI/CD) uses a repository secret to store the environment variable.

For local development on the gallery:
- Create a `.env` file in the root of the project
- Add `IDENTITY_POOL_ID="key"` to the top, where `key` is the AWS IAM key.

**Note: Ask the Engineering team lead (@peterkos) for an AWS key if you do not have one.**

# 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.
Expand Down
172 changes: 86 additions & 86 deletions resources/gallery/brickhack_2.svg → assets/gallery/bh2Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading