Skip to content

Commit 19df6fc

Browse files
peterkosSaranyaDadisd1259sjmiller7
authored
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]>
1 parent 6eb8bc7 commit 19df6fc

File tree

930 files changed

+737
-1711
lines changed

Some content is hidden

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

930 files changed

+737
-1711
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.

gallery.html

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>BrickHack Gallery</title>
5+
<meta charset="utf-8"/>
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta name="keywords" content="hackathons, hackathon, hack-a-thon, programming, hardware, development, design, rit"/>
8+
<meta name="description" content="Photos of previous BrickHack events.">
9+
10+
<!-- Favicons -->
11+
<link rel="apple-touch-icon" sizes="180x180" href="resources/favicon/apple-touch-icon.png">
12+
<link rel="icon" type="image/png" sizes="32x32" href="resources/favicon/favicon-32x32.png">
13+
<link rel="icon" type="image/png" sizes="16x16" href="resources/favicon/favicon-16x16.png">
14+
15+
<!-- Fonts -->
16+
<link rel="preconnect" href="https://fonts.gstatic.com">
17+
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
18+
</head>
19+
<body>
20+
<div id="modal">
21+
<i class="fas fa-times" id="close-modal"></i>
22+
<img id="modal-img" src="https://images.unsplash.com/photo-1567309254107-5babef35b7b4?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=1351&q=80" alt="image"/>
23+
</div>
24+
<div id="modal-background"></div>
25+
<nav>
26+
<div id="mobile-menu">
27+
<i class="fas fa-bars" id="toggler"></i>
28+
</div>
29+
<div class="navlinks">
30+
<a class="navlink" href="#bh6-nav">BH6</a>
31+
<a class="navlink" href="#bh5-nav">BHV</a>
32+
<a class="navlink" href="#bh4-nav">BH4</a>
33+
<a class="navlink" href="#bh3-nav">BH3</a>
34+
<a class="navlink" href="#bh2-nav">BH2</a>
35+
<a class="navlink" href="#bh1-nav">BH</a>
36+
</div>
37+
<div class="navlinks">
38+
<a href="./index.html">Next BrickHack</a>
39+
</div>
40+
</nav>
41+
<!-- BH6 -->
42+
<div class="header" id="first-header">
43+
<a id="bh6-nav" class="navpoints"></a>
44+
<img src="./assets/gallery/bh6Logo.svg" alt="Brickhack 6 logo"/>
45+
<h1>BrickHack 6</h1>
46+
<br>
47+
<p>February 8 & 9, 2020</p>
48+
<p>40 schools - 590 hackers - 24 hours</p>
49+
</div>
50+
<div class="image-container" id="bh6"></div>
51+
<!-- BH5 -->
52+
<div class="header">
53+
<a id="bh5-nav" class="navpoints"></a>
54+
<img src="./assets/gallery/bhVLogo.svg" alt="Brickhack V logo"/>
55+
<h1>BrickHack V</h1>
56+
<br>
57+
<p>February 16 & 17, 2019</p>
58+
<p>40 schools - 590 hackers - 24 hours</p>
59+
</div>
60+
<div class="image-container" id="bh5"></div>
61+
<!-- BH4 -->
62+
<div class="header">
63+
<a id="bh4-nav" class="navpoints"></a>
64+
<img src="./assets/gallery/bh4Logo.png" alt="Brickhack 4 logo"/>
65+
<h1>BrickHack 4</h1>
66+
<br>
67+
<p>January 27 & 28, 2018</p>
68+
<p>17 schools - 510 hackers - 24 hours</p>
69+
</div>
70+
<div class="image-container" id="bh4"></div>
71+
<!-- BH3 -->
72+
<div class="header">
73+
<a id="bh3-nav" class="navpoints"></a>
74+
<img src="./assets/gallery/bh3Logo.svg" alt="Brickhack 3 logo"/>
75+
<h1>BrickHack 3</h1>
76+
<br>
77+
<p>February 11 & 12, 2017</p>
78+
<p>33 schools - 500 hackers - 24 hours</p>
79+
</div>
80+
<div class="image-container" id="bh3"></div>
81+
<!-- BH2 -->
82+
<div class="header">
83+
<a id="bh2-nav" class="navpoints"></a>
84+
<img src="./assets/gallery/bh2Logo.svg" alt="Brickhack 2 logo"/>
85+
<h1>BrickHack 2</h1>
86+
<br>
87+
<p>March 5 & 6, 2016</p>
88+
<p>25 schools - 360 hackers - 24 hours</p>
89+
</div>
90+
<div class="image-container" id="bh2"></div>
91+
<!-- BH1 -->
92+
<div class="header">
93+
<a id="bh1-nav" class="navpoints"></a>
94+
<img src="./assets/gallery/bhLogo.svg" alt="Brickhack logo"/>
95+
<h1>BrickHack</h1>
96+
<br>
97+
<p>April 18 & 19, 2015</p>
98+
<p>20 schools - 320 hackers - 24 hours</p>
99+
</div>
100+
<div class="image-container" id="bh"></div>
101+
<!-- This is where Parcel imports are located! (SASS, etc.) -->
102+
<script src="./gallery.js"></script>
103+
</body>
104+
</html>

0 commit comments

Comments
 (0)