diff --git a/.buildpacks b/.buildpacks deleted file mode 100644 index 62efc72a1..000000000 --- a/.buildpacks +++ /dev/null @@ -1 +0,0 @@ -https://github.com/mars/create-react-app-buildpack.git \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1ea469c15..c5783dd79 100644 --- a/.gitignore +++ b/.gitignore @@ -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 @@ -23,5 +18,110 @@ yarn-debug.log* yarn-error.log* yarn.lock -# Visual Studeio Code +# 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 + diff --git a/.sassrc b/.sassrc new file mode 100644 index 000000000..8cc4283b0 --- /dev/null +++ b/.sassrc @@ -0,0 +1,3 @@ +{ + "includePaths": ["node_modules"] +} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d51d2214c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: node_js -node_js: - - "stable" -cache: - directories: - - node_modules -before_script: - - echo -e "Host csh-cloud.oweb.co\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -script: - - npm run build - -deploy: - - provider: script - script: bash .travis/deploy_stage.sh - on: - branch: develop - repo: codeRIT/brickhack.io - - provider: pages - skip_cleanup: true - github_token: $gh_deploy_token - local_dir: build - on: - branch: master - repo: codeRIT/brickhack.io diff --git a/.travis/deploy_stage.sh b/.travis/deploy_stage.sh deleted file mode 100644 index 2fadbb6d0..000000000 --- a/.travis/deploy_stage.sh +++ /dev/null @@ -1,7 +0,0 @@ -eval "$(ssh-agent -s)" # start the ssh agent -openssl aes-256-cbc -K $encrypted_fb724e9ad24a_key -iv $encrypted_fb724e9ad24a_iv -in .travis/marketing_rsa.enc -out .travis/marketing_rsa -d -chmod 600 .travis/marketing_rsa # this key should have push access -ssh-add .travis/marketing_rsa -git remote add deploy dokku@csh-cloud.oweb.co:brickhack-stage -git fetch --unshallow -git push --force deploy develop:master diff --git a/.travis/marketing_rsa.enc b/.travis/marketing_rsa.enc deleted file mode 100644 index b9b2b295e..000000000 Binary files a/.travis/marketing_rsa.enc and /dev/null differ diff --git a/Procfile b/Procfile deleted file mode 100644 index 2577a4f63..000000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: bin/boot \ No newline at end of file diff --git a/README.md b/README.md index b9bc79eb5..204cc65f8 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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.) diff --git a/src/bh7-assets/back_clip.svg b/assets/back_clip.svg similarity index 100% rename from src/bh7-assets/back_clip.svg rename to assets/back_clip.svg diff --git a/assets/desk1.svg b/assets/desk1.svg new file mode 100644 index 000000000..c32c90400 --- /dev/null +++ b/assets/desk1.svg @@ -0,0 +1,142 @@ + + + diff --git a/assets/desk2.svg b/assets/desk2.svg new file mode 100644 index 000000000..e82981ef8 --- /dev/null +++ b/assets/desk2.svg @@ -0,0 +1,222 @@ + + + diff --git a/assets/desk3.svg b/assets/desk3.svg new file mode 100644 index 000000000..a09cb4e66 --- /dev/null +++ b/assets/desk3.svg @@ -0,0 +1,199 @@ + + + diff --git a/src/bh7-assets/front_clip.svg b/assets/front_clip.svg similarity index 100% rename from src/bh7-assets/front_clip.svg rename to assets/front_clip.svg diff --git a/src/bh7-assets/logo.svg b/assets/logo.svg similarity index 100% rename from src/bh7-assets/logo.svg rename to assets/logo.svg diff --git a/assets/shapes.svg b/assets/shapes.svg new file mode 100644 index 000000000..564afc0a6 --- /dev/null +++ b/assets/shapes.svg @@ -0,0 +1,53 @@ + + + diff --git a/assets/shelf.svg b/assets/shelf.svg new file mode 100644 index 000000000..5c0108011 --- /dev/null +++ b/assets/shelf.svg @@ -0,0 +1,8 @@ + + + diff --git a/index.html b/index.html new file mode 100644 index 000000000..91585a49c --- /dev/null +++ b/index.html @@ -0,0 +1,151 @@ + + +
+BRICKHACK 7
+RIT's Premiere Hackathon
+FEB 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY
+ REGISTER +A Hackathon is an invention marathon. Any student can attend! Really, any student... and it's completely free.
+Students work in teams and mentors are present to offer help. Sponsors attend to help, recruit, and promote their products. Teams compete in different categories and prizes are awarded, but everyone learns and everyone wins!
+Come spend 24 hours with us at BrickHack and dedicate time to learn, collaborate, build, and innovate.
+
+ Michael
+Van Leeuwen
+President
+
+ Abhaya Tamrakar
+BrickHack
+Director
+
+ May Ren
+Design
+Director
+
+ Peter Kos
+Engineering
+Director
+
+ Mark Maluenda
+Community
+Outreach Director
+
+ Olivia Simmons
+Logistics
+Co-Director
+
+ Makenna M.
+Logistics
+Co-Director
+
+ Mira Antolovich
+Logistics
+Co-Director
+
+ Kevin Zhou
+Treasurer
+
+ Pardeep Singh
+Sponsorship
+Director
+