Skip to content

Commit 1d48b86

Browse files
authored
Merge pull request #962 from codeRIT/develop
Bring improvements in resolution handling to master
2 parents fccbd2b + 12c8527 commit 1d48b86

File tree

7 files changed

+334
-297
lines changed

7 files changed

+334
-297
lines changed

README.md

+19-5
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,33 @@ The public facing website for BrickHack.
88

99
# Getting Started
1010

11-
#### Code environment
11+
## Code environment
1212

13-
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.
13+
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.
14+
15+
### Cloning the directory
1416

1517
```bash
16-
$ git clone git@github.com:codeRIT/brickhack.io.git
18+
$ git clone https://github.com/codeRIT/brickhack.io.git
1719
$ cd brickhack.io
1820
```
1921

20-
You should then be able to open the code in your editor of choice.
22+
### Installing dependencies
23+
24+
```
25+
$ npm install
26+
```
27+
28+
### Running the application
29+
30+
```
31+
$ npm start
32+
```
33+
34+
You should then be able to access the site at `localhost:3000`.
2135

2236
# Development & Deployment
2337

2438
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.
2539

26-
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.
40+
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.

public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8"/>
5-
<meta name="viewport" content="width=device-width, initial-scale=1"/>
5+
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
66
<meta name="keywords" content="hackathons, hackathon, hack-a-thon, programming, hardware, development, design, rit"/>
77
<meta name="theme-color" content="#000000"/>
88

src/covid-popover.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CovidPopover extends React.Component {
2727
placement="top"
2828
overlay={
2929
<Popover id="popover-basic" >
30-
<PopoverTitle as="h3">{this.props.title}</PopoverTitle>
30+
<PopoverTitle as="h3">COVID-19 Notice</PopoverTitle>
3131
<PopoverContent>
3232
{this.props.content}
3333
</PopoverContent>

src/index.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@ import PreRegister from './preregister';
44
import 'bootstrap/dist/css/bootstrap.css';
55
import './index.scss';
66

7+
const hiringMessage = `Hey, you.
8+
You’re finally awake.
9+
You were trying to see the code, right?
10+
Walked right into that hiring message, same as us.
11+
If you’d like to work on this website and other cool projects with hackathons, send an email over to [email protected]!`
12+
13+
console.log(hiringMessage);
14+
15+
//comment generated via javascript instead of in HTML so the hiring message text is only in one place
16+
const comment = document.createComment("\n"+hiringMessage.toString()+"\n");
17+
document.insertBefore(comment, document.firstChild);
718

819
ReactDOM.render(
920
<PreRegister/>,
1021
document.getElementById('root'),
1122
);
12-

0 commit comments

Comments
 (0)