Skip to content
This repository was archived by the owner on May 17, 2020. It is now read-only.

Commit 75a0ce0

Browse files
adriandarianadriandarian
authored
Updating website (#91)
Updating website
2 parents 694c278 + 99aaf00 commit 75a0ce0

File tree

10 files changed

+107
-51
lines changed

10 files changed

+107
-51
lines changed

‎client/src/App.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React, { Component } from 'react';
22
import { Switch, Route } from "react-router-dom"; //Switch and Route Library
33

4-
import Footer from './component//Footer/Footer.jsx';
5-
import NavigationBar from './component/Header/NavigationBar.jsx'
4+
import Footer from './component/Footer';
5+
import NavigationBar from './component/Header'
66
import Routes from './routes';
77

88
class App extends Component {

‎client/src/component/FAQ/faq.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ h3 {
101101
font-size: 1.15rem;
102102
font-weight: 400;
103103
border-bottom: 1px solid #e5e5e5;
104+
text-decoration: none;
104105
}
105106

106107
.accordion a:hover,

‎client/src/component/Footer/Footer.jsx‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎client/src/component/Footer/index.jsx‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import React from 'react';
2+
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
3+
import { faEnvelope, faCode} from '@fortawesome/free-solid-svg-icons';
4+
import {faFacebook, faInstagram, faGithub, faSlack} from '@fortawesome/free-brands-svg-icons';
5+
import './footer.css'
6+
7+
const Footer = () => {
8+
return (
9+
<article className="App-footer" id="Footer">
10+
<section className="Footer-container"> {/* container with social icon and ownership */}
11+
<nav className="Footer-social"> {/* social icon section */}
12+
<a href="mailto:[email protected]?subject=HackMerced Questions&amp;body=Dear HackMerced," style={{ color: '#0000' }}> {/* mail to hackmerced email */}
13+
<FontAwesomeIcon icon={faEnvelope} className="fa"/> {/* email icon */}
14+
</a>
15+
<a href="https://www.facebook.com/events/2812074535483939/" target="_blank" rel="noopener noreferrer" style={{ color: '#0000' }}> {/* goes to HackMerced fb */}
16+
<FontAwesomeIcon icon={faFacebook} className="fa"/> {/* fb icon */}
17+
</a>
18+
<a href="https://www.instagram.com/hackmerced/" target="_blank" rel="noopener noreferrer" style={{ color: '#0000' }}> {/* goes to HackMerced IG*/}
19+
<FontAwesomeIcon icon={faInstagram} className="fa"/> {/* instagram icon */}
20+
</a>
21+
<a href="https://join.slack.com/t/hackmerced-v/shared_invite/enQtODUyNzkxMDY2NjkyLTZiODAyZjNiYTFjZTlkYTQ0NDVhOGQ5OTI3OTEzNjAxMDBiZTdjY2QyMTI0ZGE4MTlhMmNhMGYyNzQzOGNhZTI" target="_blank" rel="noopener noreferrer" style={{ color: '#0000' }}> {/* we haven't created a HackMerced Slack so this is temporary */}
22+
<FontAwesomeIcon icon={faSlack} className="fa"/> {/* slack icon */}
23+
</a>
24+
<a href="https://github.com/HackMerced" target="_blank" rel="noopener noreferrer" style={{ color: '#0000' }}> {/* link to HackMerced github repo since we are opensource */}
25+
<FontAwesomeIcon icon={faGithub} className="fa"/>
26+
</a>
27+
<a href="https://devpost.com/hackathons?utf8=%E2%9C%93&search=HackMerced&challenge_type=all&sort_by=Recently+Added" target="_blank" rel="noopener noreferrer" style={{ color: '#0000' }}> {/* we don't have a HackMerced V devpost link up yet so this is temporary */}
28+
<FontAwesomeIcon icon={faCode} className="fa"/> {/* Font Awesome didn't have a DevPost icon so this is closest thing */}
29+
</a>
30+
</nav>
31+
</section>
32+
<section className="credits"> <span className="copyright">© 2020 HackMerced. All Rights Reserved.</span></section> {/* Copyright for HackMerced */}
33+
</article>
34+
);
35+
}
36+
export default Footer;

‎client/src/component/Header/MLH-Banner/banner.css‎

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,59 @@
1-
.App-banner{
2-
/*Adjusting position of the banner to the top left corner*/
3-
width:8.5%;
4-
position: absolute;
5-
top: -5px;
6-
padding-left: 20px;
7-
1+
/* Extra small devices (phones, 600px and down) */
2+
@media only screen and (max-width: 600px) {
3+
.App-banner{
4+
/*Adjusting position of the banner to the top left corner*/
5+
width: 130px;
6+
position: absolute;
7+
top: -5px;
8+
padding-left: 20px;
9+
z-index: 100;
10+
}
11+
}
12+
13+
/* Small devices (portrait tablets and large phones, 600px and up) */
14+
@media only screen and (min-width: 600px) {
15+
.App-banner{
16+
/*Adjusting position of the banner to the top left corner*/
17+
width: 130px;
18+
position: absolute;
19+
top: -5px;
20+
padding-left: 20px;
21+
z-index: 100;
22+
}
23+
}
24+
25+
/* Medium devices (landscape tablets, 768px and up) */
26+
@media only screen and (min-width: 768px) {
27+
.App-banner{
28+
/*Adjusting position of the banner to the top left corner*/
29+
width: 130px;
30+
position: absolute;
31+
top: -5px;
32+
padding-left: 20px;
33+
z-index: 100;
34+
}
35+
}
36+
37+
/* Large devices (laptops/desktops, 992px and up) */
38+
@media only screen and (min-width: 992px) {
39+
.App-banner{
40+
/*Adjusting position of the banner to the top left corner*/
41+
width: 150px;
42+
position: absolute;
43+
top: -5px;
44+
padding-left: 20px;
45+
z-index: 100;
46+
}
47+
}
48+
49+
/* Extra large devices (large laptops and desktops, 1200px and up) */
50+
@media only screen and (min-width: 1200px) {
51+
.App-banner{
52+
/*Adjusting position of the banner to the top left corner*/
53+
width: 150px;
54+
position: absolute;
55+
top: -5px;
56+
padding-left: 20px;
57+
z-index: 100;
58+
}
859
}

client/src/component/Header/NavigationBar.jsx renamed to client/src/component/Header/index.jsx

File renamed without changes.

‎client/src/component/Schedule/Schedule.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Schedule-Background {
2-
background-image: linear-gradient(rgb(168, 182, 214) 65%, rgb(231, 217, 210));
2+
background-image: linear-gradient(rgb(231, 217, 210) 0%, rgb(168, 182, 214) 60%, rgb(231, 217, 210));
33
}
44

55
#Schedule-Body {

‎client/src/component/Title/Title.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
.title-title {
1515
position: relative;
16-
width: 750px;
16+
width: 80%;
1717
background: linear-gradient(
1818
180deg,
1919
rgba(168, 182, 214, 1) 43%,
2020
rgba(254, 200, 213, 0.45) 73%,
2121
rgba(231, 217, 210, 1) 100%
2222
);
2323
padding-top: 1vh;
24-
padding-left: 10px;
24+
padding-left: 2%;
2525
color: white;
2626
font-size: 30px;
2727
height: 100vh;

‎client/src/component/Title/index.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ class Title extends React.Component {
1111
{/* Headers */}
1212
<h2>HACK'M</h2>
1313
<h4>December 7, 2019</h4>
14-
<div id="js-show-modal" class="launch-button">
14+
<div id="js-show-modal" className="launch-button">
1515
<a href="https://localhackday.mlh.io/build/locations/2418">
1616
Sign Up Here
17-
<div class="launch-button__glare"></div>
17+
<div className="launch-button__glare"></div>
1818
</a>
1919
</div>
2020
{/* popup button trigger */}

‎client/src/index.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import React from 'react';
22
import { BrowserRouter } from 'react-router-dom';
33
import ReactDOM from 'react-dom'; //Router Library
4+
import { library } from '@fortawesome/fontawesome-svg-core'
5+
import { fab, faFacebookSquare } from '@fortawesome/free-brands-svg-icons'
6+
import { faCoffee } from '@fortawesome/free-solid-svg-icons'
7+
48
import './index.css';
59
import App from './App';
610
import * as serviceWorker from './serviceWorker';
7-
import { library } from '@fortawesome/fontawesome-svg-core'
8-
import { fab } from '@fortawesome/free-brands-svg-icons'
9-
import { faCheckSquare, faCoffee } from '@fortawesome/free-solid-svg-icons'
1011

11-
library.add(fab, faCheckSquare, faCoffee)
12+
library.add(fab, faFacebookSquare, faCoffee)
1213

1314
ReactDOM.render((
1415
<BrowserRouter> {/* Added Route to main website */}

0 commit comments

Comments
 (0)