diff --git a/components/BioModal.js b/components/BioModal.js index 7c5152e..eedf4c6 100644 --- a/components/BioModal.js +++ b/components/BioModal.js @@ -39,8 +39,8 @@ const BioModal = props => {
{ display: 'flex', alignItems: 'center', flexDirection: 'column', + justifyContent: 'flex-start', zIndex: 300 }} onClick={event => event.preventDefault()} @@ -60,7 +61,10 @@ const BioModal = props => { faculty horizontal /> -
{props.person.bio}
+
+    + {props.person.bio}{' '} +
diff --git a/components/Person.js b/components/Person.js index 47c693f..e8d6023 100644 --- a/components/Person.js +++ b/components/Person.js @@ -1,5 +1,6 @@ import React from 'react'; import { Image, Transformation } from 'cloudinary-react'; +import Button from 'grommet/components/Button'; const Person = props => { return ( @@ -8,7 +9,8 @@ const Person = props => { display: 'flex', flexDirection: props.horizontal ? 'row' : 'column', alignItems: 'center', - margin: '1%' + margin: '1%', + ...props.style }} onClick={props.onClick} > @@ -37,7 +39,13 @@ const Person = props => { > {props.name} - {props.faculty ?
Faculty Advisor
: null} + {props.faculty ?
Faculty Advisor
: null} + {props.faculty && !props.horizontal ? ( + + ) : null} ); diff --git a/database.json b/database.json deleted file mode 100644 index 15d2791..0000000 --- a/database.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "group": [ - {"name": "Aaron Bergen", "src": "IMG_4926-e1510555983904", "id": "aaronbergen"}, - {"name": "Alex Desbans", "src": "FullSizeRender-6", "id": "alexdesbans"} - {"name": "Alex Kwon", "src": "Screen_Shot_2018-11-06_at_10.12.38_PM", "id": "alexkwon"} - ] -} - -1: -2: -3: {name: "Anika Arora", src: "AnikaArora", id: "anikaarora" -} -4: {name: "Ashley Zeng", src: "20180901_192217_HDR", id: "ashleyzeng" -} -5: {name: "Brandon Phan", src: "Screen_Shot_2018-11-06_at_10.16.39_PM", id: "brandonphan" -} -6: {name: "Cammi Phillips", src: "IMG_5538-e1511729257888", id: "cammiphillips" -} -7: {name: "Eamon Niknafs", src: "IMG_0132", id: "eamonniknafs" -} -8: {name: "Emir Karabeg", src: "IMG_4697", id: "emirkarabeg" -} -9: {name: "Ian Grimm", src: "Ian_Grimm", id: "iangrimm" -} -10: {name: "Jackie Ni", src: "UNADJUSTEDNONRAW_thumb_11fb", id: "jackieni" -} -11: {name: "Jenny King", src: "IMG_7681", id: "jennyking" -} -12: {name: "John King", src: "IMG_4130", id: "johnking" -} -13: {name: "Jonathan Stark", src: "IMG_4036-e1512758206108", id: "jonathanstark" -} -14: {name: "Julia Yuen", src: "JuliaYuen", id: "juliayuen" -} -15: {name: "Karishma Raghuram", src: "DSC_6277-e1511729414346", id: "karishmaraghuram" -} -16: {name: "Kelly Hong", src: "Screen_Shot_2018-11-06_at_10.17.52_PM", id: "kellyhong" -} -17: {name: "Lexi Brooks", src: "Screen-Shot-2017-11-16-at-12.53.07-PM", id: "lexibrooks" -} -18: {name: "Sasha Ronaghi", src: "Screen_Shot_2018-11-06_at_10.40.45_PM", id: "sasharonaghi" -} -19: {name: "Timothy Guo", src: "APC_0293", id: "timothyguo" -} -20: {name: "Trinity Cha", src: "Trinitycha", id: "trinitycha" -} -21: {name: "William Stomber", src: "Photo-on-5-18-17-at-5.09-PM", id: "williamstomber" -} \ No newline at end of file diff --git a/devserver.js b/devserver.js deleted file mode 100644 index 2cebc5f..0000000 --- a/devserver.js +++ /dev/null @@ -1,42 +0,0 @@ -const { createServer } = require('http'); -const express = require('express'); - -const next = require('next'); -const admin = require('firebase-admin'); -const serviceAccount = require('./firebasekeys.json'); - -const port = parseInt(process.env.PORT, 10) || 3000; -const dev = process.env.NODE_ENV !== 'production'; -const app = next({ dev }); - -//const handle = app.getRequestHandler(); -const routes = require('./routes'); -const handler = routes.getRequestHandler(app); - -const firebase = admin.initializeApp( - { - credential: admin.credential.cert(serviceAccount), - databaseURL: 'https://sage-prosthetics.firebaseio.com' - }, - 'server' -); - -console.log(process.env.NODE_ENV); - -app.prepare().then(() => { - const server = express(); - - server.use((req, res, next) => { - req.firebaseServer = firebase; - next(); - }); - - server.get('*', (req, res) => { - return handler(req, res); - }); - - server.listen(3001, err => { - if (err) throw err; - console.log('Ready on http://localhost:3001 (with a custom server)'); - }); -}); diff --git a/package.json b/package.json index 6e5a530..ff16e4e 100755 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "react-dropzone": "^8.0.3", "react-parallax": "^2.0.1", "react-particles-js": "^2.4.2", + "react-player": "^1.8.0", "react-pose": "^4.0.2", "react-redux": "^5.1.0", "react-scroll-parallax": "^1.3.5", @@ -38,7 +39,8 @@ "react-simple-popover": "^0.2.4", "react-transition-group": "^2.5.0", "redux": "^4.0.1", - "redux-thunk": "^2.3.0" + "redux-thunk": "^2.3.0", + "video-react": "^0.13.1" }, "devDependencies": { "babel-eslint": "^8.2.5", @@ -50,8 +52,8 @@ "eslint-plugin-react": "^7.9.1" }, "scripts": { - "dev": "node devserver.js NODE_ENV=development", + "dev": "NODE_ENV=development node server.js", "build": "next build", - "start": " node server.js NODE_ENV=production " + "start": "NODE_ENV=production node server.js " } } diff --git a/pages/Contact.js b/pages/Contact.js index 0eb7e88..9499cb9 100644 --- a/pages/Contact.js +++ b/pages/Contact.js @@ -5,6 +5,8 @@ import { getGroup } from '../redux/actions'; import { Image, Transformation } from 'cloudinary-react'; import * as types from '../redux/types.js'; import NextSeo from 'next-seo'; +import { Player } from 'video-react'; +import ReactPlayer from 'react-player'; import FormField from 'grommet/components/FormField'; import Button from 'grommet/components/Button'; @@ -77,8 +79,13 @@ class Contact extends Component { return