Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f597bfd
Header and flex box for gallery (#1102)
SaranyaDadi Jan 10, 2021
2a9b27e
adding navbar
sjmiller7 Jan 12, 2021
6f4787f
newline at end of js
sjmiller7 Jan 15, 2021
acf2aaf
fixes and refactoring js
sjmiller7 Jan 19, 2021
baab95f
fixes
sjmiller7 Jan 20, 2021
3fb18a9
Update sass/gallery.scss
sjmiller7 Jan 21, 2021
3e9a29d
Update sass/gallery.scss
sjmiller7 Jan 21, 2021
f8652d8
Merge pull request #1105 from codeRIT/bh-1083
sjmiller7 Jan 21, 2021
f09bd8b
Gallery Image Popup (#1107)
sjmiller7 Jan 22, 2021
8f02e9f
Gallery Mobile Styling + CSS Cleanup (#1111)
sjmiller7 Jan 23, 2021
64dcbe4
Dynamically adding images (#1115)
sjmiller7 Jan 24, 2021
22a9145
trying to add lazy
sjmiller7 Jan 25, 2021
a61ba2f
more attempts at Lazy loading
sjmiller7 Jan 25, 2021
e83a823
Revert "more attempts at Lazy loading"
peterkos Jan 25, 2021
3c7f7a5
Revert "trying to add lazy"
peterkos Jan 25, 2021
0e5aa1b
Lazy load background images in gallery (#1119)
peterkos Jan 26, 2021
20ea725
Merge branch 'develop' into bh-1026
peterkos Jan 26, 2021
35c60df
Gallery thumbnail images and added logos (#1137)
sjmiller7 Jan 31, 2021
dfb4f6f
CD/local dev now uses .env for IAM auth; update README w/ local dev i…
peterkos Jan 31, 2021
d3d0a7d
Merge branch 'develop' into bh-1026
peterkos Jan 31, 2021
92be41a
Remove TODO
peterkos Jan 31, 2021
f9a5670
Env var CI/CD is now valid YAML :)
peterkos Jan 31, 2021
489156d
Update gallery button w/ new icon + text
peterkos Jan 31, 2021
e6d2938
fixing ios links issue
sjmiller7 Feb 2, 2021
4e8f91c
Adjusting gallery modal design (#1151)
sjmiller7 Feb 9, 2021
dcbe95f
Merge branch 'develop' into bh-1026
peterkos Feb 10, 2021
aceb3e1
Fix package lock sync from backmerge
peterkos Feb 10, 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
104 changes: 104 additions & 0 deletions gallery.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<!DOCTYPE html>
<html>
<head>
<title>BrickHack Gallery</title>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="keywords" content="hackathons, hackathon, hack-a-thon, programming, hardware, development, design, rit"/>
<meta name="description" content="Photos of previous BrickHack events.">

<!-- Favicons -->
<link rel="apple-touch-icon" sizes="180x180" href="resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="resources/favicon/favicon-16x16.png">

<!-- Fonts -->
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
</head>
<body>
<div id="modal">
<i class="fas fa-times" id="close-modal"></i>
<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"/>
</div>
<div id="modal-background"></div>
<nav>
<div id="mobile-menu">
<i class="fas fa-bars" id="toggler"></i>
</div>
<div class="navlinks">
<a class="navlink" href="#bh6-nav">BH6</a>
<a class="navlink" href="#bh5-nav">BHV</a>
<a class="navlink" href="#bh4-nav">BH4</a>
<a class="navlink" href="#bh3-nav">BH3</a>
<a class="navlink" href="#bh2-nav">BH2</a>
<a class="navlink" href="#bh1-nav">BH</a>
</div>
<div class="navlinks">
<a href="./index.html">Next BrickHack</a>
</div>
</nav>
<!-- BH6 -->
<div class="header" id="first-header">
<a id="bh6-nav" class="navpoints"></a>
<img src="./assets/gallery/bh6Logo.svg" alt="Brickhack 6 logo"/>
<h1>BrickHack 6</h1>
<br>
<p>February 8 & 9, 2020</p>
<p>40 schools - 590 hackers - 24 hours</p>
</div>
<div class="image-container" id="bh6"></div>
<!-- BH5 -->
<div class="header">
<a id="bh5-nav" class="navpoints"></a>
<img src="./assets/gallery/bhVLogo.svg" alt="Brickhack V logo"/>
<h1>BrickHack V</h1>
<br>
<p>February 16 & 17, 2019</p>
<p>40 schools - 590 hackers - 24 hours</p>
</div>
<div class="image-container" id="bh5"></div>
<!-- BH4 -->
<div class="header">
<a id="bh4-nav" class="navpoints"></a>
<img src="./assets/gallery/bh4Logo.png" alt="Brickhack 4 logo"/>
<h1>BrickHack 4</h1>
<br>
<p>January 27 & 28, 2018</p>
<p>17 schools - 510 hackers - 24 hours</p>
</div>
<div class="image-container" id="bh4"></div>
<!-- BH3 -->
<div class="header">
<a id="bh3-nav" class="navpoints"></a>
<img src="./assets/gallery/bh3Logo.svg" alt="Brickhack 3 logo"/>
<h1>BrickHack 3</h1>
<br>
<p>February 11 & 12, 2017</p>
<p>33 schools - 500 hackers - 24 hours</p>
</div>
<div class="image-container" id="bh3"></div>
<!-- BH2 -->
<div class="header">
<a id="bh2-nav" class="navpoints"></a>
<img src="./assets/gallery/bh2Logo.svg" alt="Brickhack 2 logo"/>
<h1>BrickHack 2</h1>
<br>
<p>March 5 & 6, 2016</p>
<p>25 schools - 360 hackers - 24 hours</p>
</div>
<div class="image-container" id="bh2"></div>
<!-- BH1 -->
<div class="header">
<a id="bh1-nav" class="navpoints"></a>
<img src="./assets/gallery/bhLogo.svg" alt="Brickhack logo"/>
<h1>BrickHack</h1>
<br>
<p>April 18 & 19, 2015</p>
<p>20 schools - 320 hackers - 24 hours</p>
</div>
<div class="image-container" id="bh"></div>
<!-- This is where Parcel imports are located! (SASS, etc.) -->
<script src="./gallery.js"></script>
</body>
</html>
Loading