Merge pull request #962 from codeRIT/develop

Bring improvements in resolution handling to master
codeRIT · Sep 23, 2020 · 1d48b86 · 1d48b86
2 parents fccbd2b + 12c8527
commit 1d48b86
Show file tree

Hide file tree

Showing 7 changed files with 334 additions and 297 deletions.
diff --git a/README.md b/README.md
@@ -8,19 +8,33 @@ The public facing website for BrickHack.
 
 # Getting Started
 
-#### Code environment
+## Code environment
 
-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, however you'll have to type in your GitHub credentials every time.
+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.
+
+### Cloning the directory
 
 ```bash
-$ git clone git@github.com:codeRIT/brickhack.io.git
+$ git clone https://github.com/codeRIT/brickhack.io.git
 $ cd brickhack.io
 ```
 
-You should then be able to open the code in your editor of choice.
+### Installing dependencies
+
+```
+$ npm install
+```
+
+### Running the application
+
+```
+$ npm start
+```
+
+You should then be able to access the site at `localhost:3000`.
 
 # 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 respectfully.
+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.
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
     <meta name="keywords" content="hackathons, hackathon, hack-a-thon, programming, hardware, development, design, rit"/>
     <meta name="theme-color" content="#000000"/>
 

diff --git a/src/covid-popover.js b/src/covid-popover.js
@@ -27,7 +27,7 @@ class CovidPopover extends React.Component {
                     placement="top"
                     overlay={
                         <Popover id="popover-basic" >
-                            <PopoverTitle as="h3">{this.props.title}</PopoverTitle>
+                            <PopoverTitle as="h3">COVID-19 Notice</PopoverTitle>
                             <PopoverContent>
                                 {this.props.content}
                             </PopoverContent>

diff --git a/src/index.js b/src/index.js
@@ -4,9 +4,19 @@ import PreRegister from './preregister';
 import 'bootstrap/dist/css/bootstrap.css';
 import './index.scss';
 
+const hiringMessage = `Hey, you.
+You’re finally awake.
+You were trying to see the code, right?
+Walked right into that hiring message, same as us.
+If you’d like to work on this website and other cool projects with hackathons, send an email over to [email protected]!`
+
+console.log(hiringMessage);
+
+//comment generated via javascript instead of in HTML so the hiring message text is only in one place
+const comment = document.createComment("\n"+hiringMessage.toString()+"\n");
+document.insertBefore(comment, document.firstChild);
 
 ReactDOM.render(
     <PreRegister/>,
     document.getElementById('root'),
 );
-