Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
29f886f
MLH Code of Conduct button no longer hidden on mobile
ww3637 Jul 25, 2020
070c22f
Nav-bar fixed, sections take up screen height & are vertically centered
ww3637 Jul 25, 2020
ea45587
Basic link to codeRIT added to the console
ww3637 Aug 1, 2020
d5f856d
Updated the console hiring message
ww3637 Aug 8, 2020
154bdf3
Merge branch 'contact-us' of https://github.com/codeRIT/brickhack.io …
ww3637 Aug 18, 2020
ff52dc2
Variable names changed to follow camelCase
ww3637 Aug 22, 2020
8cbf4c4
Bumped up desktop hero image by 75px
ww3637 Aug 22, 2020
ccd80a1
Merge branch 'develop' into centering
ww3637 Aug 22, 2020
fff778e
Merge branch 'develop' into centering
ww3637 Aug 22, 2020
aa9235f
Merge branch 'develop' into centering
ww3637 Aug 22, 2020
43694fa
Changed the console comment into an HTML comment
ww3637 Aug 22, 2020
0b7b9ba
Hiring msg. is now an HTML comment & console msg
ww3637 Aug 24, 2020
63da218
COVID-19 headers are no longer vars
ww3637 Aug 24, 2020
3e9af21
refactor: Fixes README typo
cbaudouinjr Aug 26, 2020
d145260
Merge pull request #950 from codeRIT/bh-typo
cbaudouinjr Aug 26, 2020
a4d67f2
Update src/index.js
ww3637 Aug 29, 2020
cd3550f
Comment on why the hiring comment is in JS added
ww3637 Aug 29, 2020
0d9f6db
Merge branch 'develop' into hiring
ww3637 Sep 5, 2020
e7b3d9f
Changes to the sponsorship text styling
ww3637 Sep 5, 2020
3532aa7
Merge branch 'develop' into centering
ww3637 Sep 5, 2020
1fa70e5
Merge pull request #938 from codeRIT/centering
ww3637 Sep 5, 2020
444fb6c
Merge branch 'develop' into hiring
ww3637 Sep 6, 2020
3eaaa25
Merge pull request #939 from codeRIT/hiring
ww3637 Sep 6, 2020
3981dc4
+content min-height, adjusted media query cutoffs
ww3637 Sep 12, 2020
001cb3f
Mobile no longer zooms upon selecting input forms
ww3637 Sep 12, 2020
2e90a37
Merge pull request #957 from codeRIT/issue-954
ww3637 Sep 13, 2020
b5f1ba9
Basic build instructions
ww3637 Sep 18, 2020
4dfbe7d
Contact text is now blue
ww3637 Sep 18, 2020
d5db23a
Section only has a min-height on desktop
ww3637 Sep 18, 2020
c49ece6
Merge pull request #961 from codeRIT/issue-960
ww3637 Sep 19, 2020
cecb22f
Bumped up desktop min-height
ww3637 Sep 19, 2020
dfd75e9
Fixed issues with styles reliant on $desktop-width
ww3637 Sep 19, 2020
2e5e352
Missed some tablet styling w/ dependencies on $d-w
ww3637 Sep 19, 2020
5d9b25b
Merge branch 'develop' into issue-953
ww3637 Sep 20, 2020
fdf7ac7
Changed SASS indentation from 2 spaces to tabs
ww3637 Sep 20, 2020
dc98cb5
Accidentally removed min-height line
ww3637 Sep 20, 2020
7d4f14c
Update src/index.scss
ww3637 Sep 22, 2020
12c8527
Merge pull request #955 from codeRIT/issue-953
peterkos Sep 22, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
2 changes: 1 addition & 1 deletion src/covid-popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 11 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 engineering@coderit.org!`

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'),
);

Loading