Skip to content

Commit da68a0c

Browse files
peterkosww2497sjmiller7sjv01180JeremyRudman
authored
BrickHack 7 Updates (#1156)
* Update ricky hero svgs to use the ones on Notion, adjust color of site (#1138) * changed color and replaced desk files with those on notion * update node and reinstall * another push with the same changes to package-lock * ignore this * updated package-lock for lockfile fix attempt * upgraded npm to fix the package-lock file * need something to push * fservent error fix attempt * update fservent fix * third attempt of fservent update * no warnings on fservent nor lockfile. Please work * fix nit Co-authored-by: Peter Kos <[email protected]> * Schedule dates are shown in local timezone (#1148) * Schedule dates are shown in local timezone * Added timezone message * Update index.html Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Peter Kos <[email protected]> * Gallery (#1103) * Header and flex box for gallery (#1102) * Remove old gallery * Setup gallery link * header for gallery * images flex box * indentation corrected * resolved issues * changes part 3 lol * resolved issue - favicon and description * resolved css issue * newline & semicolon resolved Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Saranya Dadi <[email protected]> * adding navbar * newline at end of js * fixes and refactoring js * fixes * Update sass/gallery.scss Co-authored-by: Peter Kos <[email protected]> * Update sass/gallery.scss Co-authored-by: Peter Kos <[email protected]> * Gallery Image Popup (#1107) * adding html/css for modal * making the modal open/close * fixing stuff * scss fixes * fixes * fixing the modal * fixes * Gallery Mobile Styling + CSS Cleanup (#1111) * attempt 1 at cliping images * mobile gallery + css cleanup * fixes * Dynamically adding images (#1115) * first bit of changes * attempts at dynamic * FIx IAM credentials * putting image into modal * fixing image loading * comment fix * fixing my comment Co-authored-by: Peter Kos <[email protected]> * trying to add lazy * more attempts at Lazy loading * Revert "more attempts at Lazy loading" This reverts commit a61ba2f. * Revert "trying to add lazy" This reverts commit 22a9145. * Lazy load background images in gallery (#1119) * adding lazy * fixing modal * header information * Dynamic loading + transitions!!!!! * getting the last of the gallery content up Co-authored-by: sjmiller7 <[email protected]> * Gallery thumbnail images and added logos (#1137) * attempts at adding logos * making thumbnails appear * CD/local dev now uses .env for IAM auth; update README w/ local dev instructions (#1132) * Add keys.js generation as part of GH actions Would be ncie to refactor later to chain the build job * switch from keys.js to env var * Update readme to include IAM env settings * Update build to use env var * Remove TODO * Env var CI/CD is now valid YAML :) * Update gallery button w/ new icon + text * fixing ios links issue * Adjusting gallery modal design (#1151) * adjusting modal design * fixing modal scroll breakpoint & dumb padding * Fix package lock sync from backmerge Co-authored-by: SaranyaDadi <[email protected]> Co-authored-by: Saranya Dadi <[email protected]> Co-authored-by: sjmiller7 <[email protected]> Co-authored-by: sjmiller7 <[email protected]> * Removed outdated comment * Added event sorting code * Renamed sortEvents to compareEvents * New schedule design with pre-event workshop support (no mobile) (#1160) * Start new schedule; add binder ringz * tabs animation * tabs :) * tabs toggle hell yeah * tab toggling works fully * Schedule contnet layout fixed * Pre-event layout prog; 2 other pages work * Pre events work * color pre event thing * full schedule toggle done * Fix bug * More space on top and fix other bug * fix things * fix js range * no pointer * beeg tabs * Added more sponsor logos (#1164) * Schedule 2.0 Mobile (#1163) * progress on mobile * Progress * Aligning things and fix specifity roadblock * Tab spacing and tweak section on very small screen * style fix Co-authored-by: ww2497 <[email protected]> Co-authored-by: sjmiller7 <[email protected]> Co-authored-by: William Wu <[email protected]> Co-authored-by: Samuel Velasquez <[email protected]> Co-authored-by: JeremyRudman <[email protected]> Co-authored-by: sjmiller7 <[email protected]> Co-authored-by: Chris Baudouin, Jr <[email protected]> Co-authored-by: Colby Gallup <[email protected]> Co-authored-by: SaranyaDadi <[email protected]> Co-authored-by: Saranya Dadi <[email protected]>
1 parent dbd7e06 commit da68a0c

File tree

940 files changed

+2478
-2745
lines changed

Some content is hidden

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

940 files changed

+2478
-2745
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ jobs:
2222
node-version: '12'
2323
- run: npm ci
2424
- run: npm run build --if-present
25+
env:
26+
IDENTITY_POOL_ID: ${{ secrets.IDENTITY_POOL_ID }}

.github/workflows/deploy-production.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
run: npm ci
2121
- name: Builder
2222
run: npm run build
23+
env:
24+
IDENTITY_POOL_ID: ${{ secrets.IDENTITY_POOL_ID }}
2325
- name: Deploy
2426
uses: peaceiris/actions-gh-pages@v3
2527
with:

.github/workflows/deploy-staging.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ jobs:
1616
run: npm install
1717
- name: Build
1818
run: npm run build
19+
env:
20+
IDENTITY_POOL_ID: ${{ secrets.IDENTITY_POOL_ID }}
1921
- name: Ping FeaturePeek
2022
run: bash <(curl -s https://peek.run/ci)

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,18 @@ $ npm run dev
3535

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

38+
### Environment variables
39+
40+
The images in the [gallery](https://brickhack.io/gallery) are hosted on our AWS S3 instance.
41+
42+
GitHub Actions (our CI/CD) uses a repository secret to store the environment variable.
43+
44+
For local development on the gallery:
45+
- Create a `.env` file in the root of the project
46+
- Add `IDENTITY_POOL_ID="key"` to the top, where `key` is the AWS IAM key.
47+
48+
**Note: Ask the Engineering team lead (@peterkos) for an AWS key if you do not have one.**
49+
3850
# Development & Deployment
3951

4052
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.
Lines changed: 86 additions & 86 deletions
Loading
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)