diff --git a/package-lock.json b/package-lock.json index 582b343..1c6a576 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1721,6 +1721,35 @@ } } }, + "@fortawesome/fontawesome-common-types": { + "version": "0.2.34", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz", + "integrity": "sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA==" + }, + "@fortawesome/fontawesome-svg-core": { + "version": "1.2.34", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.34.tgz", + "integrity": "sha512-0KNN0nc5eIzaJxlv43QcDmTkDY1CqeN6J7OCGSs+fwGPdtv0yOQqRjieopBCmw+yd7uD3N2HeNL3Zm5isDleLg==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.34" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "5.15.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.2.tgz", + "integrity": "sha512-ZfCU+QjaFsdNZmOGmfqEWhzI3JOe37x5dF4kz9GeXvKn/sTxhqMtZ7mh3lBf76SvcYY5/GKFuyG7p1r4iWMQqw==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.34" + } + }, + "@fortawesome/react-fontawesome": { + "version": "0.1.14", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.14.tgz", + "integrity": "sha512-4wqNb0gRLVaBm/h+lGe8UfPPivcbuJ6ecI4hIgW0LjI7kzpYB9FkN0L9apbVzg+lsBdcTf0AlBtODjcSX5mmKA==", + "requires": { + "prop-types": "^15.7.2" + } + }, "@hapi/address": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", diff --git a/package.json b/package.json index 521644b..bc387b5 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,9 @@ "version": "0.1.0", "private": true, "dependencies": { + "@fortawesome/fontawesome-svg-core": "^1.2.34", + "@fortawesome/free-solid-svg-icons": "^5.15.2", + "@fortawesome/react-fontawesome": "^0.1.14", "@material-ui/core": "^4.11.3", "@sanity/client": "^2.1.0", "@testing-library/jest-dom": "^5.11.4", diff --git a/src/components/Blog.js b/src/components/Blog.js index 26b935a..770f902 100644 --- a/src/components/Blog.js +++ b/src/components/Blog.js @@ -5,7 +5,7 @@ import hero from "./assets/img/olympian_hero.png"; export default function Blog(props) { return ( -
+

 Potentia 

 Robotics 

diff --git a/src/components/Contact.js b/src/components/Contact.js index 911443e..f29a170 100644 --- a/src/components/Contact.js +++ b/src/components/Contact.js @@ -114,7 +114,7 @@ class ContactForm extends Component { return ( <> - + diff --git a/src/components/Events.js b/src/components/Events.js index de21bae..950d619 100644 --- a/src/components/Events.js +++ b/src/components/Events.js @@ -5,7 +5,7 @@ import hero from "./assets/img/olympian_hero.png"; export default function Events(props) { return ( -
+

 Potentia 

 Robotics 

diff --git a/src/components/Home.js b/src/components/Home.js index 66c2643..f2f535a 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -1,7 +1,13 @@ import React from "react"; import "./assets/Home.scss"; import hero from "./assets/img/olympian_hero.png"; +import team_picture from "./assets/img/team_picture.png"; +import olympian_waving from "./assets/img/olympian_waving.png"; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import { faArrowCircleRight } from '@fortawesome/free-solid-svg-icons' +import {Spring} from 'react-spring/renderprops' +const element = export default function Home(props) { return ( @@ -39,6 +45,50 @@ export default function Home(props) {

+
+ +
+ +
+
+ + { props=> ( +
+ + + + + +
+ )} + +
); } diff --git a/src/components/Navbar.js b/src/components/Navbar.js index 0380ba7..d14e6b2 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -70,12 +70,12 @@ export default function Navbar(props) { Contact Us -
  • + {/*
  • {" "} Donate -
    • + */}
  • {" "} diff --git a/src/components/Olympian.js b/src/components/Olympian.js index 6e670ac..097a2d4 100644 --- a/src/components/Olympian.js +++ b/src/components/Olympian.js @@ -5,7 +5,7 @@ import hero from "./assets/img/olympian_hero.png"; export default function Events(props) { return ( -
    +

     Potentia 

     Robotics 

    diff --git a/src/components/Sponsors.js b/src/components/Sponsors.js index cd44d5a..9cef34b 100644 --- a/src/components/Sponsors.js +++ b/src/components/Sponsors.js @@ -1,6 +1,7 @@ import React, { Component } from "react"; import {createGlobalStyle} from 'styled-components'; import {Container, Row, Col} from "react-bootstrap" +import {Spring} from 'react-spring/renderprops' import './assets/Sponsors.scss' @@ -44,6 +45,26 @@ class Sponsors extends Component {
    +
    + + { props=> ( +
    + + + + + +
    + )} +     +
    +
    + +
    ); } diff --git a/src/components/assets/Blog.scss b/src/components/assets/Blog.scss index 7f78285..c16a5c6 100644 --- a/src/components/assets/Blog.scss +++ b/src/components/assets/Blog.scss @@ -41,8 +41,9 @@ $desktop-small: 1250px; box-sizing: border-box; } -.hero { +.hero-temp { pointer-events: none; + overflow: hidden; // height: 86vh; } diff --git a/src/components/assets/Home.scss b/src/components/assets/Home.scss index 89b4f21..b3506e1 100644 --- a/src/components/assets/Home.scss +++ b/src/components/assets/Home.scss @@ -215,3 +215,60 @@ $desktop-small: 1250px; color: #009dff; } +.picture-redirect-wrapper { + position: relative; + display: flex; + flex-direction: row; + justify-content: center; + width: 100%; + padding-bottom: 20px; + font-family: Inter, sans-serif; + // border-style: solid; + + // background: rgb(235, 235, 235); +} + +.about-us-content { + margin: 0 auto; + width: 47%; + margin-left: 2vw; + // padding-left: 2vw; + // padding-right: 2vw; + // padding-top: 1vw; + padding-bottom: 1vw; + background: rgb(233, 253, 235); +} + +.about-us-link-wrapper { + display: flex; + justify-content: center; + margin-top: 1vw; +} + +.about-us-link { + text-decoration: none; + color: #009dff; + font-family: Poppins, sans-serif; + font-size: 1.4vw; +} + +.about-us-link:hover { + text-decoration: none; + color: #048fe6; +} + +.meet-olympian-content { + margin: 0 auto; + width: 47%; + margin-right: 2vw; + padding-bottom: 1vw; + background: rgb(255, 237, 248); +} + +.team-picture { + max-width: 100%; +} + +.olympian-waving { + max-width: 100%; +} \ No newline at end of file diff --git a/src/components/assets/Olympian.scss b/src/components/assets/Olympian.scss index 7f78285..c16a5c6 100644 --- a/src/components/assets/Olympian.scss +++ b/src/components/assets/Olympian.scss @@ -41,8 +41,9 @@ $desktop-small: 1250px; box-sizing: border-box; } -.hero { +.hero-temp { pointer-events: none; + overflow: hidden; // height: 86vh; } diff --git a/src/components/assets/contact.scss b/src/components/assets/contact.scss index 43b1293..6936862 100644 --- a/src/components/assets/contact.scss +++ b/src/components/assets/contact.scss @@ -59,11 +59,11 @@ body { border-radius:10px; width: 20%; left: 40%; - margin-bottom: 5vw; + margin-bottom: 1vw; text-align: center; padding: 0 2%; position:relative; - top:2em; + // top:2em; @media only screen and (max-width: $large) { width: 35%; left: 35%; @@ -122,4 +122,8 @@ body { .bottom { height: 0.5vw; +} + +.contact-main { + padding-bottom: 3em; } \ No newline at end of file diff --git a/src/components/assets/img/olympian_waving.png b/src/components/assets/img/olympian_waving.png new file mode 100644 index 0000000..483d4aa Binary files /dev/null and b/src/components/assets/img/olympian_waving.png differ diff --git a/src/components/assets/img/olympian_waving3.png b/src/components/assets/img/olympian_waving3.png new file mode 100644 index 0000000..eeb7bed Binary files /dev/null and b/src/components/assets/img/olympian_waving3.png differ diff --git a/src/components/assets/img/olympianwaving2.png b/src/components/assets/img/olympianwaving2.png new file mode 100644 index 0000000..e7ce27a Binary files /dev/null and b/src/components/assets/img/olympianwaving2.png differ diff --git a/src/components/assets/img/team_picture.png b/src/components/assets/img/team_picture.png new file mode 100644 index 0000000..04a30da Binary files /dev/null and b/src/components/assets/img/team_picture.png differ