Merge pull request #24 from WISVCH/updates

Updates

package.json

@@ -1,11 +1,8 @@
 {
   "name": "symposium-2022",
-  "version": "0.2.0",
+  "version": "0.0.1",
   "homepage": "https://symposium.ch.tudelft.nl/2022",
   "private": true,
-  "engines": {
-    "node": ">=9"
-  },
   "dependencies": {
     "classnames": "^2.2.5",
     "history": "^4.7.2",
@@ -22,13 +19,14 @@
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "react-router-redux": "^5.0.0-alpha.9",
-    "react-scripts": "5.0.1",
+    "react-scripts": "^2.0.0",
     "redux": "^3.7.2",
     "redux-actions": "^2.4.0",
     "redux-devtools-extension": "^2.13.2",
     "redux-saga": "^0.16.0",
     "reselect": "^3.0.1",
-    "styled-components": "^3.3.3"
+    "styled-components": "^3.3.3",
+    "video-react": "^0.14.1"
   },
   "scripts": {
     "deploy": "npm run build && firebase deploy",
@@ -38,5 +36,11 @@
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   },
-  "devDependencies": {}
+  "devDependencies": {},
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }

src/components/Committee/data.js

@@ -1,11 +1,11 @@
-import Scott from 'assets/committee/Scott.jpg'
-import Waded from 'assets/committee/Waded.jpg'
-import Thomas from 'assets/committee/Thomas.jpg'
-import Jolijn from 'assets/committee/Jolijn.jpg'
-import Darwin from 'assets/committee/Darwin.jpg'
-import Marjolein from 'assets/committee/Marjolein.jpg'
-import Merel from 'assets/committee/Merel.jpg'
-import Amanda from 'assets/committee/Amanda.jpg'
+import Scott from '../../assets/committee/Scott.jpg'
+import Waded from '../../assets/committee/Waded.jpg'
+import Thomas from '../../assets/committee/Thomas.jpg'
+import Jolijn from '../../assets/committee/Jolijn.jpg'
+import Darwin from '../../assets/committee/Darwin.jpg'
+import Marjolein from '../../assets/committee/Marjolein.jpg'
+import Merel from '../../assets/committee/Merel.jpg'
+import Amanda from '../../assets/committee/Amanda.jpg'
 
 export default [
   {

src/components/Committee/index.js

@@ -1,7 +1,7 @@
 import React from 'react'
 
-import { Row, Column } from 'components/lib'
-import Person from 'components/Person'
+import { Row, Column } from '../lib'
+import Person from '../Person'
 
 import commissioners from './data'
 

src/components/CvA/Member.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import styled from 'styled-components'
-import { theme, media } from 'utilities/styles'
+import { theme, media } from '../../utilities/styles'
 
-import { H3, Text } from 'components/lib'
+import { H3, Text } from '../lib'
 
 const Member = styled.div`
   height: 8em;

src/components/CvA/index.js

@@ -2,8 +2,8 @@ import React from 'react'
 
 import cva from './members'
 
-import { Row, Column } from 'components/lib'
-import Texture from 'components/Texture'
+import { Row, Column } from '../lib'
+import Texture from '../Texture'
 import Member from './Member'
 
 const RelRow = Row.extend`

src/components/CvA/members.js

@@ -1,10 +1,10 @@
-import tud from 'assets/partners/tudelft.png'
-import tno from 'assets/partners/tno.png'
-import erasmus from 'assets/partners/Erasmus.png'
-import delft from 'assets/partners/Delft.png'
-import brunel from 'assets/partners/Brunel.png'
-import shell from 'assets/partners/Shell.png'
-import oord from 'assets/partners/van_oord.png'
+import tud from '../../assets/partners/tudelft.png'
+import tno from '../../assets/partners/tno.png'
+import erasmus from '../../assets/partners/Erasmus.png'
+import delft from '../../assets/partners/Delft.png'
+import brunel from '../../assets/partners/Brunel.png'
+import shell from '../../assets/partners/Shell.png'
+import oord from '../../assets/partners/van_oord.png'
 
 
 

src/components/Event/index.js

@@ -1,11 +1,11 @@
 import React from 'react'
 import styled from 'styled-components'
-import { theme } from 'utilities/styles'
+import { theme } from '../../utilities/styles'
 
-import { H2, H3, Link, Text, Markdown, Row, Column } from 'components/lib'
-import Section from 'components/Section'
+import { H2, H3, Link, Text, Markdown, Row, Column } from '../lib'
+import Section from '../Section'
 
-import speakers from 'components/Speakers/data'
+import speakers from '../Speakers/data'
 
 const format = d =>
   d.toUTCString().split(' ')[4].substring(0, 5)

src/components/Footer/Info.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import styled from 'styled-components'
-import { theme } from 'utilities/styles'
+import { theme } from '../../utilities/styles'
 
-import { Text, H3 } from 'components/lib'
+import { Text, H3 } from '../lib'
 import Section from './Section'
 
 const Info = Section.extend`

src/components/Footer/Partners.js

@@ -1,7 +1,7 @@
 import React from 'react'
-import { theme, opacity } from 'utilities/styles'
+import { theme, opacity } from '../../utilities/styles'
 
-import { H2, H4, Text, Row, Column } from 'components/lib'
+import { H2, H4, Text, Row, Column } from '../lib'
 import Section from './Section'
 import Partner from './Partner'
 

src/components/Footer/Section.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
-import Section from 'components/Section'
+import Section from '../Section'
 
 export default styled(Section)`
   ${media.small`padding: 1em 0;`}

src/components/Footer/data.js

@@ -1,13 +1,13 @@
-import timman from 'assets/partners/timmanfonds.png'
+import timman from '../../assets/partners/timmanfonds.png'
 
-import tudelft from 'assets/partners/tudelft.png'
-import ch from 'assets/partners/ch.png'
-import ing from 'assets/partners/ing.png'
-import abn from 'assets/partners/abn_amro.png'
-import deloitte from 'assets/partners/deloitte.png'
-import thales from 'assets/partners/thales.png'
-import riskquest from 'assets/partners/riskquest.png'
-import harvest from 'assets/partners/harvest.png'
+import tudelft from '../../assets/partners/tudelft.png'
+import ch from '../../assets/partners/ch.png'
+import ing from '../../assets/partners/ing.png'
+import abn from '../../assets/partners/abn_amro.png'
+import deloitte from '../../assets/partners/deloitte.png'
+import thales from '../../assets/partners/thales.png'
+import riskquest from '../../assets/partners/riskquest.png'
+import harvest from '../../assets/partners/harvest.png'
 
 export default [
   {

src/components/Header/GhostLogo.js

@@ -1,9 +1,9 @@
 import React from 'react'
 
-import fingerprint from 'assets/logo/animation/fingerprint.svg'
-import circle_2 from 'assets/logo/animation/cirkel_2.svg'
-import circle_3 from 'assets/logo/animation/cirkel_3.svg'
-import animation_stylesheet from 'assets/logo/animation/rotating_logo.css'
+import fingerprint from '../../assets/logo/animation/fingerprint.svg'
+import circle_2 from '../../assets/logo/animation/cirkel_2.svg'
+import circle_3 from '../../assets/logo/animation/cirkel_3.svg'
+import animation_stylesheet from '../../assets/logo/animation/rotating_logo.css'
 
 /* 
 The below code can be used to display a static image.

src/components/Header/index.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import styled from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
-import { Wrapper, H1, H2, Text, Button } from 'components/lib'
+import { Wrapper, H1, H2, Text, Button } from '../lib'
 import GhostLogo from './GhostLogo'
 import ScrollDown from './ScrollDown'
 import ThankMessage from '../ThankMessage'

src/components/Host/index.js

@@ -1,7 +1,7 @@
 import React from 'react'
 
-import Person from 'components/Person'
-import TBD_person from 'assets/speakers/gabriella-ader.png'
+import Person from '../Person'
+import TBD_person from '../../assets/speakers/gabriella-ader.png'
 
 const host = [
   {

src/components/IntroImage.js

@@ -2,7 +2,7 @@ import React from 'react'
 import styled from 'styled-components'
 import { connect } from 'react-redux'
 
-import image from 'assets/test/t3.jpg'
+import image from '../assets/test/t3.jpg'
 
 const Overlay = styled.div.attrs({
   style: ({scrollTop, windowHeight}) => ({

src/components/Introduction.js

@@ -1,11 +1,11 @@
 import React from 'react'
 import styled from 'styled-components'
-import { theme, media, darken } from 'utilities/styles'
+import { theme, media, darken } from '../utilities/styles'
 
-import { H2, Text } from 'components/lib'
-import Texture from 'components/Texture'
+import { H2, Text } from '../components/lib'
+import Texture from '../components/Texture'
 
-import Scott from 'assets/committee/Scott_cutout.png'
+import Scott from '../assets/committee/Scott_cutout.png'
 
 const IntroTexture = Texture.extend`
   ${media.not.medium`

src/components/Navigation/Link.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import styled from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
 import { NavLink } from 'react-router-dom'
 

src/components/Navigation/Logo.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
-import logo from 'assets/logo/sympo-logo-klein.svg'
+import logo from '../../assets/logo/sympo-logo-klein.svg'
 
 export default styled.img.attrs({
   src: () => logo,

src/components/Navigation/index.js

@@ -1,12 +1,12 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import styled from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
-import * as navigation from 'selectors/navigation'
+import * as navigation from '../../selectors/navigation'
 
 import { Link } from 'react-router-dom'
-import { Wrapper } from 'components/lib'
+import { Wrapper } from '../lib'
 import StyledLink from './Link'
 import NavLogo from './Logo'
 

src/components/PageTexture.js

@@ -1,4 +1,4 @@
-import Texture from 'components/Texture'
+import Texture from './Texture'
 
 export default Texture.extend`
   left: 50%; top: -50vh;

src/components/Person/Avatar.js

@@ -30,7 +30,7 @@ const Avatar = styled.img.attrs({
 `
 
 export default ({link, ...rest}) => link
-  ? <a href={link} target="_blank">
+  ? <a href={link} target="_blank" rel="noopener noreferrer">
       <Avatar {...rest} />
     </a>
   : <Avatar {...rest} />

src/components/Person/Info.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import styled, { css } from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
-import { H3, Text } from 'components/lib'
+import { H3, Text } from '../lib'
 
 const Info = styled.div`
   display: inline-block;

src/components/Person/Links.js

@@ -1,10 +1,10 @@
 import React from 'react'
 import styled from 'styled-components'
 
-import web from 'assets/icons/web.svg'
-import twitter from 'assets/icons/twitter.svg'
-import linkedin from 'assets/icons/linkedin.svg'
-import lumc from 'assets/icons/lumc.svg'
+import web from '../../assets/icons/web.svg'
+import twitter from '../../assets/icons/twitter.svg'
+import linkedin from '../../assets/icons/linkedin.svg'
+import lumc from '../../assets/icons/lumc.svg'
 
 const PersonLinks = styled.div`
   margin: 1em -.25em 0;

src/components/Person/Social.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import styled, { css } from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
 import Avatar from './Avatar'
 import Links from './Links'

src/components/Person/index.js

@@ -1,11 +1,11 @@
 import React from 'react'
 import styled, { css } from 'styled-components'
-import { media } from 'utilities/styles'
+import { media } from '../../utilities/styles'
 
 import Social from './Social'
 import Info from './Info'
 
-import unknown from 'assets/speakers/unknown.svg'
+import unknown from '../../assets/speakers/unknown.svg'
 
 const Person = styled.div`
   margin: 4em 0;

src/components/Program/EventContent.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import styled, { css } from 'styled-components'
-import { theme, opacity, media } from 'utilities/styles'
+import { theme, opacity, media } from '../../utilities/styles'
 
-import { H3, Text } from 'components/lib'
+import { H3, Text } from '../lib'
 
 const EventContent = styled.div`
   position: relative;

src/components/Program/EventTime.js

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { Text } from 'components/lib'
+import { Text } from '../lib'
 
 const format = d =>
   d.toUTCString().split(' ')[4].substring(0, 5)

src/components/Program/data.js

@@ -1,17 +1,17 @@
-import TBD_person from 'assets/speakers/TBD_person.png'
-import Gabriella from 'assets/speakers/gabriella-ader.png'
-import Ronald from 'assets/speakers/foto_ronald_prins.jpg'
-import Klaas from 'assets/speakers/klaas-slooten.jpg'
-import Zeno from 'assets/speakers/zenogeradts.jpg'
-import Stefanie from 'assets/speakers/stefanie.jpg'
-import Workshops from 'assets/partners/workshop_partners.png'
-import MaryPaul from 'assets/speakers/Mary_Paul.jpg'
+import TBD_person from '../../assets/speakers/TBD_person.png'
+import Gabriella from '../../assets/speakers/gabriella-ader.png'
+import Ronald from '../../assets/speakers/foto_ronald_prins.jpg'
+import Klaas from '../../assets/speakers/klaas-slooten.jpg'
+import Zeno from '../../assets/speakers/zenogeradts.jpg'
+import Stefanie from '../../assets/speakers/stefanie.jpg'
+import Workshops from '../../assets/partners/workshop_partners.png'
+import MaryPaul from '../../assets/speakers/Mary_Paul.jpg'
 
-import MaryPaulSlides from 'assets/speakers/slides/MaryPaul.pdf'
-import KlaasSlootenSlides from 'assets/speakers/slides/KlaasSlooten.pdf'
-import RonaldPrinsSlides from 'assets/speakers/slides/RonaldPrins.pdf'
-import ZenoGeradtsSlides from 'assets/speakers/slides/ZenoGeradts.pdf'
-import StefanieVonkSlides from 'assets/speakers/slides/StefanieVonk.pdf'
+import MaryPaulSlides from '../../assets/speakers/slides/MaryPaul.pdf'
+import KlaasSlootenSlides from '../../assets/speakers/slides/KlaasSlooten.pdf'
+import RonaldPrinsSlides from '../../assets/speakers/slides/RonaldPrins.pdf'
+import ZenoGeradtsSlides from '../../assets/speakers/slides/ZenoGeradts.pdf'
+import StefanieVonkSlides from '../../assets/speakers/slides/StefanieVonk.pdf'
 
 
 

src/components/Program/index.js

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { H2 } from 'components/lib'
+import { H2 } from '../lib'
 import Event from './Event'
 
 import events from './data'