Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add img-res-load #76

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Add img-res-load #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added src/Assets/nick-lowres.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/nickumbrella-lowres.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
121 changes: 64 additions & 57 deletions src/components/About/about.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,67 @@
import "./about.css"
import nickumbrella from "./../../Assets/nickumbrella.svg"
import logo from "./../../Assets/logo.svg"


import {Container, Row, Col, Particle} from "react-bootstrap"


function About(){
return (
<section>
<Container id="about">
<Container>
<Row>

{/* Nick image */}

<Col lg={5} >
<img src={nickumbrella}
alt="Nick with an umbrella"
className="img-fluid about-nick"
style={{ maxHeight: "580px" }}
></img>
</Col>

{/* About Text */}

<Col md={7} >

<img src={logo} alt="logo" className="about-logo" width="500px" ></img>

<p class="about-text">
A student-run hackathon with the goal to empower hackers of all levels to turn their ideas into reality, with the help of the workshops and resources we make available. In 48 hours, you will be able to develop a project, network with other students from all over the world and learn together!
</p>

<div className="helloWorld">
Hello World!
</div>

<p class="about-text">
We will be conducting several workshops to provide anyone with the chance to learn about multiple skills and resources that will help turn ideas into a real project!
<br/>
Beginner-level hackers should <span className="blue">implement what they learned from the workshops </span> into their proposal!
</p>

</Col>



</Row>

</Container>
import "./about.css";
import nickumbrella from "./../../Assets/nickumbrella.svg";
import logo from "./../../Assets/logo.svg";

import { Container, Row, Col, Particle } from "react-bootstrap";

function About() {
return (
<section>
<Container id="about">
<Container>
<Row>
{/* Nick image */}

<Col lg={5}>
<img
style={{
background:
'url("./../../Assets/nickumbrella-lowres.png") no-repeat',
maxHeight: "580px",
}}
src={nickumbrella}
alt="Nick with an umbrella"
className="img-fluid about-nick"
></img>
</Col>

{/* About Text */}

<Col md={7}>
<img
src={logo}
alt="logo"
className="about-logo"
width="500px"
></img>

<p class="about-text">
A student-run hackathon with the goal to empower hackers of all
levels to turn their ideas into reality, with the help of the
workshops and resources we make available. In 48 hours, you will
be able to develop a project, network with other students from
all over the world and learn together!
</p>

<div className="helloWorld">Hello World!</div>

<p class="about-text">
We will be conducting several workshops to provide anyone with
the chance to learn about multiple skills and resources that
will help turn ideas into a real project!
<br />
Beginner-level hackers should{" "}
<span className="blue">
implement what they learned from the workshops{" "}
</span>{" "}
into their proposal!
</p>
</Col>
</Row>
</Container>
</section>
)
</Container>
</section>
);
}

export default About


export default About;
99 changes: 48 additions & 51 deletions src/components/Home/home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,51 @@
import "./home.css"
import prin from "./../../Assets/prin.svg"
import nick from "./../../Assets/nick.svg"
import {Container, Row, Col, Particle} from "react-bootstrap"


function Home(){
return (
<section>
<Container id="home">
<Container className="home-section">
<Row>
<Col lg={7} >

{/* Heading */}

<div className="quote">
A virtual hackathon to turn ideas into
<span className="blackPart"> reality</span>
</div>

<div className="dates">
OCT 08 - OCT 09
</div>

{/* Register Button */}

<div style={{ padding: 20 }}>
<a href="https://forms.gle/Nw7pjuKdSwySp1Wf8">
<button className="register">Get notified!</button>
</a>
<img src={prin} className="prin"></img>
</div>
</Col>

{/* Nick image */}

<Col lg={5}>
<img src={nick}
alt="Nick holding a computer"
className="img-fluid home-nick"
></img>
</Col>
</Row>

</Container>
import "./home.css";
import prin from "./../../Assets/prin.svg";
import nick from "./../../Assets/nick.svg";
import { Container, Row, Col, Particle } from "react-bootstrap";

function Home() {
return (
<section>
<Container id="home">
<Container className="home-section">
<Row>
<Col lg={7}>
{/* Heading */}

<div className="quote">
A virtual hackathon to turn ideas into
<span className="blackPart"> reality</span>
</div>

<div className="dates">OCT 08 - OCT 09</div>

{/* Register Button */}

<div style={{ padding: 20 }}>
<a href="https://forms.gle/Nw7pjuKdSwySp1Wf8">
<button className="register">Get notified!</button>
</a>
<img src={prin} className="prin"></img>
</div>
</Col>

{/* Nick image */}

<Col lg={5}>
<img
style={{
background: 'url("./../../Assets/nick-lowres.png") no-repeat',
}}
src={nick}
alt="Nick holding a computer"
className="img-fluid home-nick"
></img>
</Col>
</Row>
</Container>
</section>
)
</Container>
</section>
);
}

export default Home


export default Home;