diff --git a/public/homepage_image.png b/public/homepage_image.png index 8d15193..07330eb 100644 Binary files a/public/homepage_image.png and b/public/homepage_image.png differ diff --git a/public/projects/GitHub_Lockup_Black.png b/public/projects/GitHub_Lockup_Black.png new file mode 100755 index 0000000..1471f31 Binary files /dev/null and b/public/projects/GitHub_Lockup_Black.png differ diff --git a/public/projects/GitHub_Lockup_White.png b/public/projects/GitHub_Lockup_White.png new file mode 100755 index 0000000..cff0d76 Binary files /dev/null and b/public/projects/GitHub_Lockup_White.png differ diff --git a/public/projects/UB-edusources-logo.png b/public/projects/UB-edusources-logo.png new file mode 100644 index 0000000..d2eb010 Binary files /dev/null and b/public/projects/UB-edusources-logo.png differ diff --git a/public/projects/UB-edusources-logo_dia.png b/public/projects/UB-edusources-logo_dia.png new file mode 100644 index 0000000..929c5f2 Binary files /dev/null and b/public/projects/UB-edusources-logo_dia.png differ diff --git a/public/projects/planktondrift.png b/public/projects/planktondrift.png deleted file mode 100644 index 0bc5b41..0000000 Binary files a/public/projects/planktondrift.png and /dev/null differ diff --git a/public/projects/plasticparcelslogo.png b/public/projects/plasticparcelslogo.png deleted file mode 100644 index 6df99b5..0000000 Binary files a/public/projects/plasticparcelslogo.png and /dev/null differ diff --git a/public/projects/plasticparcelslogo_dia.png b/public/projects/plasticparcelslogo_dia.png deleted file mode 100644 index 97ab17d..0000000 Binary files a/public/projects/plasticparcelslogo_dia.png and /dev/null differ diff --git a/public/projects/virtual_ship_logo.png b/public/projects/virtual_ship_logo.png deleted file mode 100644 index 81f2dd2..0000000 Binary files a/public/projects/virtual_ship_logo.png and /dev/null differ diff --git a/public/projects/virtual_ship_logo_dia.png b/public/projects/virtual_ship_logo_dia.png deleted file mode 100644 index d19bad6..0000000 Binary files a/public/projects/virtual_ship_logo_dia.png and /dev/null differ diff --git a/public/projects/virtualfleet_logo.png b/public/projects/virtualfleet_logo.png deleted file mode 100644 index c0f50dc..0000000 Binary files a/public/projects/virtualfleet_logo.png and /dev/null differ diff --git a/public/projects/virtualfleet_logo_dia.png b/public/projects/virtualfleet_logo_dia.png deleted file mode 100644 index 1175b63..0000000 Binary files a/public/projects/virtualfleet_logo_dia.png and /dev/null differ diff --git a/public/projects/yt_logo_fullcolor_almostblack_digital.png b/public/projects/yt_logo_fullcolor_almostblack_digital.png new file mode 100644 index 0000000..eba8341 Binary files /dev/null and b/public/projects/yt_logo_fullcolor_almostblack_digital.png differ diff --git a/public/projects/yt_logo_fullcolor_white_digital.png b/public/projects/yt_logo_fullcolor_white_digital.png new file mode 100644 index 0000000..e2f46d0 Binary files /dev/null and b/public/projects/yt_logo_fullcolor_white_digital.png differ diff --git a/public/virtualship-assets/logo-horo.png b/public/virtualship-assets/logo-horo.png new file mode 100644 index 0000000..d4a9c1a Binary files /dev/null and b/public/virtualship-assets/logo-horo.png differ diff --git a/public/virtualship-assets/logo-horo.svg b/public/virtualship-assets/logo-horo.svg new file mode 100644 index 0000000..0f93447 --- /dev/null +++ b/public/virtualship-assets/logo-horo.svg @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VirtualShip + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/virtualship-assets/logo-horo_dia.png b/public/virtualship-assets/logo-horo_dia.png new file mode 100644 index 0000000..263c743 Binary files /dev/null and b/public/virtualship-assets/logo-horo_dia.png differ diff --git a/public/virtualship-assets/logo-horo_dia.svg b/public/virtualship-assets/logo-horo_dia.svg new file mode 100644 index 0000000..c0c3e6a --- /dev/null +++ b/public/virtualship-assets/logo-horo_dia.svg @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VirtualShip + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/virtualship-assets/logo-no-text_dia.png b/public/virtualship-assets/logo-no-text_dia.png new file mode 100644 index 0000000..c9f46cb Binary files /dev/null and b/public/virtualship-assets/logo-no-text_dia.png differ diff --git a/public/virtualship-assets/logo-no-text_dia.svg b/public/virtualship-assets/logo-no-text_dia.svg new file mode 100644 index 0000000..180197e --- /dev/null +++ b/public/virtualship-assets/logo-no-text_dia.svg @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/virtualship-assets/logo_no-text.png b/public/virtualship-assets/logo_no-text.png new file mode 100644 index 0000000..ad8beeb Binary files /dev/null and b/public/virtualship-assets/logo_no-text.png differ diff --git a/public/virtualship-assets/logo_no-text.svg b/public/virtualship-assets/logo_no-text.svg new file mode 100644 index 0000000..a518d6e --- /dev/null +++ b/public/virtualship-assets/logo_no-text.svg @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/virtualship-assets/virtual_ship_logo.png b/public/virtualship-assets/virtual_ship_logo.png deleted file mode 100644 index 3895ee3..0000000 Binary files a/public/virtualship-assets/virtual_ship_logo.png and /dev/null differ diff --git a/public/virtualship-assets/virtual_ship_logo_inverted.png b/public/virtualship-assets/virtual_ship_logo_inverted.png deleted file mode 100644 index 20662d1..0000000 Binary files a/public/virtualship-assets/virtual_ship_logo_inverted.png and /dev/null differ diff --git a/src/components/features.js b/src/components/features.js index 57c768e..3148d08 100644 --- a/src/components/features.js +++ b/src/components/features.js @@ -17,7 +17,7 @@ export const Features = () => { const features = React.useMemo(() => data, []) return ( - + Key Features & Capabilities diff --git a/src/components/findus.js b/src/components/findus.js new file mode 100644 index 0000000..8cd5cbf --- /dev/null +++ b/src/components/findus.js @@ -0,0 +1,60 @@ +import { + Box, + Container, + Image, + Text, + Link, + Grid, + GridItem, + Tooltip, +} from '@chakra-ui/react' +import { ColorModeImage } from '@/components/ColorModeImage' +import React from 'react' +import { FindUs as data } from '@/data/findus' + +import { Heading } from '@/components/mdx' + +export const FindUs = () => { + const findus = React.useMemo(() => data, []) + return ( + + + + Find us on + + + + + {findus.map((item, index) => ( + + + + + + ))} + + + + + ) +} diff --git a/src/components/footer.js b/src/components/footer.js index b555ced..126c811 100644 --- a/src/components/footer.js +++ b/src/components/footer.js @@ -55,42 +55,27 @@ export const Footer = () => { > - © {new Date().getFullYear()}, VirtualShip developers. Apache 2.0 - Licensed. + © {new Date().getFullYear()}, VirtualShip developers. - - - Parcels - - {footerItems.parcels.map((item) => { - return ( - - {item.label} - - ) - })} + Apache 2.0 Licensed. Resources + {footerItems.resources.map((item) => { return ( { })} - Community - {footerItems.community.map((item) => { + Documentation + {footerItems.documentation.map((item) => { return ( { + const getstarted = React.useMemo(() => data, []) + const [activeIndex, setActiveIndex] = React.useState(null) + return ( + + + + Get started as + + + + + {getstarted.map((item, index) => ( + + ))} + + {activeIndex !== null && ( + + {getstarted[activeIndex].text} + + )} + + + + ) +} diff --git a/src/components/header.js b/src/components/header.js index 70d69ac..cec365c 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -77,8 +77,8 @@ export const Header = () => { > diff --git a/src/components/hero-banner.js b/src/components/hero-banner.js index 46d5b10..e640b34 100644 --- a/src/components/hero-banner.js +++ b/src/components/hero-banner.js @@ -4,8 +4,8 @@ import { Image, Link } from '@/components/mdx' export const HeroBanner = () => { return ( - - + + { Explore the ocean with a virtual research vessel - + VirtualShip provides a framework to plan and conduct a virtual research expedition, receiving measurements as if they were coming from actual oceanographic instruments. @@ -52,22 +52,6 @@ export const HeroBanner = () => { objectFit='contain' > } - - - - diff --git a/src/components/index.js b/src/components/index.js index 09ce04e..55a07b9 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,5 +1,7 @@ export { Banner } from '@/components/banner' export { Projects } from '@/components/projects' +export { FindUs } from '@/components/findus' +export { GetStarted } from '@/components/getstarted' export { Funders } from '@/components/funders' export { Features } from '@/components/features' export { Footer } from '@/components/footer' diff --git a/src/components/layout.js b/src/components/layout.js index dbeb288..ff710a9 100644 --- a/src/components/layout.js +++ b/src/components/layout.js @@ -56,7 +56,7 @@ export const Layout = ({ rel='icon' type='image/png' sizes='96x96' - href='/virtualship-assets/virtual_ship_logo_no-text.png' + href='/virtualship-assets/logo_no-text.png' /> diff --git a/src/components/paper.js b/src/components/paper.js new file mode 100644 index 0000000..30c3155 --- /dev/null +++ b/src/components/paper.js @@ -0,0 +1,51 @@ +import { + AccordionItem, + AccordionButton, + AccordionPanel, + AccordionIcon, + Box, + Text, + Link, + Stack, +} from '@chakra-ui/react' + +export const Paper = ({ title, published_info, authors, doi, abstract }) => { + return ( + +

+ + + + + {title} + + {authors} + + {published_info} + + { + e.stopPropagation() + }} + > + View paper + + + +

+ + {abstract} + + + ) +} diff --git a/src/components/video-demo.js b/src/components/video-demo.js index 8fba14b..2165334 100644 --- a/src/components/video-demo.js +++ b/src/components/video-demo.js @@ -5,10 +5,7 @@ import React from 'react' export const VideoDemo = () => { return ( - - - Getting started with VirtualShip - + { w='150px' h='auto' objectFit='contain' - lightSrc='/virtualship-assets/virtual_ship_logo_no-text.png' - darkSrc='/virtualship-assets/virtual_ship_logo_no-text.png' + lightSrc='/virtualship-assets/logo_no-text.png' + darkSrc='/virtualship-assets/logo_no-text_dia.png' alt='Parcels logo' /> diff --git a/src/pages/index.js b/src/pages/index.js index 51d1736..7747197 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -1,4 +1,11 @@ -import { Projects, Features, HeroBanner, Funders } from '@/components' +import { + Projects, + Features, + HeroBanner, + Funders, + FindUs, + GetStarted, +} from '@/components' import { VideoDemo } from '@/components/video-demo' import { Layout } from '@/components/layout' @@ -14,8 +21,10 @@ export default function IndexPage() { // enableBanner > + + {/* TODO uncomment when projects are ready */} diff --git a/src/pages/publications.js b/src/pages/publications.js new file mode 100644 index 0000000..3b1f597 --- /dev/null +++ b/src/pages/publications.js @@ -0,0 +1,42 @@ +import { Layout } from '@/components/layout' +import { Box, Container, Heading, Text, Accordion } from '@chakra-ui/react' +import { VSPublications } from '@/data/publications' +import { Paper } from '@/components/paper' + +const vspublications = () => { + return ( + + + + + VirtualShip publications + + + + + + {VSPublications.reverse().map((paper, index, array) => ( + + ))} + + + + + ) +} + +export default vspublications