From bbd158ec2609186cf1faa427da36a451fe644007 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Mon, 17 Jun 2024 16:22:06 -0400 Subject: [PATCH 1/8] add content for home, registration, and travel pages --- src/content/home.md | 10 ++++++---- src/content/registration.md | 8 ++++---- src/content/travel.md | 16 ++++++++++------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/content/home.md b/src/content/home.md index df7e794..63f65e8 100644 --- a/src/content/home.md +++ b/src/content/home.md @@ -11,11 +11,11 @@ Previous KNIT attendees and students are eligible to receive discounted pricing. See what [travel accommodations](/travel) are available, and [register now](/register)! - + --- -## What to Expect at KNIT 8? +## What to Expect at KNIT 9? We are excited to announce that FABRIC attendees will have the privilege to attend the NRP keynote about the NAIRR Pilot, given by Dr. Katie Antypas from the NSF Office of Advanced Cyberinfrastructure. Additional sessions include FABRIC keynotes from kc claffy and Arpit Gupta and an FPGA demo / tutorial led by Nik Sultana. We'll plan to share more information about our agenda in the coming weeks. @@ -23,7 +23,9 @@ The workshop will include small-group, hands-on FABRIC tutorial sessions and adv During the week, FABRIC and NRP will co-host two events — a demo night and a social program — giving attendees from both workshops a chance to connect and create pathways for collaboration. Additionally, attendees will have the chance to hear keynotes and plenary discussions built around the interests of both FABRIC users and NRP members. -##### Funding Details + + -This work is funded by NSF Grants No. CNS-1935966, CNS-2029261, CNS-2029235, CNS-2029200, CNS-2029260. +##### Funding Details +FABRIC is funded by NSF grants CNS-1935966, CNS-2029176, CNS-2029200, CNS-2029235, CNS-2029260, CNS-2029261 and CNS-2330891. diff --git a/src/content/registration.md b/src/content/registration.md index f09021f..30e8447 100644 --- a/src/content/registration.md +++ b/src/content/registration.md @@ -2,8 +2,8 @@ ## When -- Workshop: Tuesday March 19, 2024 – Thursday March 21, 2024 -- Registration deadline: Friday March 1, 2024 +- Workshop: Tuesday September 24 - Friday September 27, 2024 +- Registration deadline: Monday, September 2, 2024 ## Where @@ -14,8 +14,8 @@ San Diego Supercomputer Center, UC San Diego ## Cost - **Full registration** - - Early Bird: $200 (ends Feb. 1, 2024) + - Early Bird: $200 (ends July. 31, 2024) - Regular: $300 -- **Streaming pass**: $100 +- **Streaming pass**: $50 - **Student**: $100 - **Previous KNIT attendee**: $150 diff --git a/src/content/travel.md b/src/content/travel.md index 8fccefa..3c27a74 100644 --- a/src/content/travel.md +++ b/src/content/travel.md @@ -2,14 +2,18 @@ ## Hotel Block -February 16 is the last day reserve your room as part of our hotel block. -Our team has reserved a hotel block from the evening of -Monday March 18 through checkout on Thursday March 21 -at the Sheraton La Jolla Hotel. +September 4 is the last day to reserve your room as part of the hotel block. Our team has reserved a hotel block from the evening of Monday September 23 through checkout on Friday September 27 at the Residence Inn. -> Sheraton La Jolla Hotel +> Residence Inn -> 3299 Holiday Ct, La Jolla, CA 92037 +> 4601 Broadwas, Kansas City, MO 64112 Reservations can be made at the [hotel website](https://www.marriott.com/event-reservations/reservation-link.mi?id=1704930566970&key=GRP&app=resvlink). + + +## Travel Stipends + +Enim voluptate elit ad reprehenderit laborum laborum magna consequat nostrud. Et ut velit velit pariatur incididunt laborum id esse velit duis. Adipisicing aute do proident in cillum duis in dolore tempor ut in officia velit cillum quis. Sint enim sed nulla occaecat quis amet nostrud consequat commodo id irure quis. + + \ No newline at end of file From 99d397937c3d6d63a07891c81df21b2a4bdc0848 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Mon, 17 Jun 2024 16:22:40 -0400 Subject: [PATCH 2/8] change cfp to cfa (calls for action) and add cfa placeholder content and buttons --- src/content/cfa.md | 25 +++++++++++++++++++++++++ src/content/cfp.md | 5 ----- src/views/{cfp.js => cfa.js} | 6 +++--- src/views/index.js | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 src/content/cfa.md delete mode 100644 src/content/cfp.md rename src/views/{cfp.js => cfa.js} (61%) diff --git a/src/content/cfa.md b/src/content/cfa.md new file mode 100644 index 0000000..97c0ca0 --- /dev/null +++ b/src/content/cfa.md @@ -0,0 +1,25 @@ +# Calls for Action + +## Calls for Demos +Enim voluptate elit ad reprehenderit laborum laborum magna consequat nostrud. Et ut velit velit pariatur incididunt laborum id esse velit duis. Adipisicing aute do proident in cillum duis in dolore tempor ut in officia velit cillum quis. Sint enim sed nulla occaecat quis amet nostrud consequat commodo id irure quis. + +Enim voluptate elit ad reprehenderit laborum laborum magna consequat nostrud. Et ut velit velit pariatur incididunt laborum id esse velit duis. Adipisicing aute do proident in cillum duis in dolore tempor ut in officia velit cillum quis. Sint enim sed nulla occaecat quis amet nostrud consequat commodo id irure quis. + + + +## Calls for Tutorials +Incididunt id aliquip cillum in aliqua quis qui mollit exercitation in laborum. Nisi in dolore occaecat minim cillum dolor ut cupidatat. Lorem ipsum esse consectetur proident dolor consequat duis sed duis magna ullamco aliquip ut ut reprehenderit minim aliqua laborum proident laborum. + +Enim voluptate elit ad reprehenderit laborum laborum magna consequat nostrud. Et ut velit velit pariatur incididunt laborum id esse velit duis. Adipisicing aute do proident in cillum duis in dolore tempor ut in officia velit cillum quis. Sint enim sed nulla occaecat quis amet nostrud consequat commodo id irure quis. + + + + +## Calls for Presentations +In sit magna pariatur laborum id cillum excepteur nulla tempor occaecat fugiat dolor ut quis duis do in enim. Magna et enim velit in sed officia ut ut ut voluptate. + +Incididunt id aliquip cillum in aliqua quis qui mollit exercitation in laborum. Nisi in dolore occaecat minim cillum dolor ut cupidatat. Lorem ipsum esse consectetur proident dolor consequat duis sed duis magna ullamco aliquip ut ut reprehenderit minim aliqua laborum proident laborum. + + + +For more questions, email [Chelsea Davis](cdavis@renci.org) \ No newline at end of file diff --git a/src/content/cfp.md b/src/content/cfp.md deleted file mode 100644 index c28b268..0000000 --- a/src/content/cfp.md +++ /dev/null @@ -1,5 +0,0 @@ -# Call for Proposals - -Enim voluptate elit ad reprehenderit laborum laborum magna consequat nostrud. Et ut velit velit pariatur incididunt laborum id esse velit duis. Adipisicing aute do proident in cillum duis in dolore tempor ut in officia velit cillum quis. Sint enim sed nulla occaecat quis amet nostrud consequat commodo id irure quis. - -Lorem ipsum ullamco irure aliquip elit veniam occaecat adipisicing minim proident commodo occaecat dolor in aliquip sit dolor labore. Incididunt id aliquip cillum in aliqua quis qui mollit exercitation in laborum. Nisi in dolore occaecat minim cillum dolor ut cupidatat. Lorem ipsum esse consectetur proident dolor consequat duis sed duis magna ullamco aliquip ut ut reprehenderit minim aliqua laborum proident laborum. In sit magna pariatur laborum id cillum excepteur nulla tempor occaecat fugiat dolor ut quis duis do in enim. Magna et enim velit in sed officia ut ut ut voluptate. diff --git a/src/views/cfp.js b/src/views/cfa.js similarity index 61% rename from src/views/cfp.js rename to src/views/cfa.js index d3c7da9..3c9ddd2 100644 --- a/src/views/cfp.js +++ b/src/views/cfa.js @@ -1,12 +1,12 @@ -import cfp from '@content/cfp.md' +import cfa from '@content/cfa.md' import { Page } from '@components/layout' import { Markdown } from '@components/markdown' -export const CfpView = () => { +export const CfaView = () => { return ( - { cfp } + { cfa } ) } \ No newline at end of file diff --git a/src/views/index.js b/src/views/index.js index fd21046..e4d1720 100644 --- a/src/views/index.js +++ b/src/views/index.js @@ -1,4 +1,4 @@ -export * from './cfp' +export * from './cfa' export * from './home' export * from './not-found' export * from './registration' From 7f43d06d280a4b3f5c31452cdacba92a9711559f Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Mon, 17 Jun 2024 16:23:10 -0400 Subject: [PATCH 3/8] update cfa views and remove speaker, faqs and agenda pages from menu --- src/app.js | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/app.js b/src/app.js index a44b8ed..2deba80 100644 --- a/src/app.js +++ b/src/app.js @@ -2,13 +2,15 @@ import { Fragment } from 'react' import { Routes, Route } from 'react-router-dom' import { Menu } from '@components/menu' import { - CfpView, + CfaView, HomeView, MarkdownView, NotFoundView, RegistrationView, SpeakersView, TravelView, + FaqsView, + AgendaView } from './views' import { Header, Footer } from '@components/layout' @@ -24,21 +26,31 @@ const menuOptions = [ label: 'Registration', view: , }, - { - path: '/cfp', - label: 'CFP', - view: , - }, + // { + // path: '/agenda', + // label: 'Agenda', + // view: , + // }, { path: '/travel', label: 'Travel Info', view: , }, { - path: '/speakers', - label: 'Speakers', - view: , + path: '/cfa', + label: 'Calls for Action', + view: , }, + // { + // path: '/speakers', + // label: 'Speakers', + // view: , + // }, + // { + // path: '/faqs', + // label: 'FAQs', + // view: , + // }, ] // From 7f9c0aaa23fbbd0fb1507eb616a3817e4eec48c0 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Wed, 19 Jun 2024 23:53:24 -0400 Subject: [PATCH 4/8] update mailto link --- src/content/cfa.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/cfa.md b/src/content/cfa.md index 97c0ca0..0eee05d 100644 --- a/src/content/cfa.md +++ b/src/content/cfa.md @@ -22,4 +22,4 @@ Incididunt id aliquip cillum in aliqua quis qui mollit exercitation in laborum. -For more questions, email [Chelsea Davis](cdavis@renci.org) \ No newline at end of file +For more questions, email [Chelsea Davis](mailto:cdavis@renci.org) \ No newline at end of file From 9a0613e02e827da7d15dad61f1a1d2669cd3c510 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Wed, 19 Jun 2024 23:55:51 -0400 Subject: [PATCH 5/8] separate link components and move into dedicated link component folder --- src/components/link/external-link.js | 21 +++++ src/components/link/index.js | 4 + src/components/{link.js => link/link-icon.js} | 79 ++----------------- src/components/link/link.js | 44 +++++++++++ src/components/link/mail-to-link.js | 14 ++++ 5 files changed, 89 insertions(+), 73 deletions(-) create mode 100644 src/components/link/external-link.js create mode 100644 src/components/link/index.js rename src/components/{link.js => link/link-icon.js} (56%) create mode 100644 src/components/link/link.js create mode 100644 src/components/link/mail-to-link.js diff --git a/src/components/link/external-link.js b/src/components/link/external-link.js new file mode 100644 index 0000000..811e757 --- /dev/null +++ b/src/components/link/external-link.js @@ -0,0 +1,21 @@ +import { Fragment } from 'react' +import { BaseLinkPropTypes } from './' +import { ExternalLinkIcon } from './' +import { Button } from '@mui/joy' + +export const ExternalLink = ({ to, children, ...props }) => { + return ( + + { children } + + + ) +} + +ExternalLink.propTypes = { ...BaseLinkPropTypes } + diff --git a/src/components/link/index.js b/src/components/link/index.js new file mode 100644 index 0000000..905aa86 --- /dev/null +++ b/src/components/link/index.js @@ -0,0 +1,4 @@ +export * from './link' +export * from './link-icon' +export * from './external-link' +export * from './mail-to-link' \ No newline at end of file diff --git a/src/components/link.js b/src/components/link/link-icon.js similarity index 56% rename from src/components/link.js rename to src/components/link/link-icon.js index 84c5e96..7c2fb96 100644 --- a/src/components/link.js +++ b/src/components/link/link-icon.js @@ -1,73 +1,6 @@ -import { Fragment } from 'react' import PropTypes from 'prop-types' -import { Link as ReactLink } from 'react-router-dom' -import { NavLink as ReactNavLink } from 'react-router-dom' -// - -export const ExternalLink = ({ to, children }) => { - return ( - - { children } - - - ) -} - -export const MailtoLink = ({ to, children }) => { - return ( - - { children } - - - ) -} - -const BaseLinkPropTypes = { - to: PropTypes.string.isRequired, - children: PropTypes.node.isRequired, -} - -ExternalLink.propTypes = { ...BaseLinkPropTypes } -MailtoLink.propTypes = { ...BaseLinkPropTypes } - -// - -export const Link = ({ nav, to, children, ...props }) => { - // if this is a navigation menu link, we can bail out now. - if (nav) { - return { children } - } - // otherwise, we'll to determine the type of link and - // decorate it with an icon accordingly. - const externalUrlPattern = new RegExp(/^https?:\/\//) - const externalUrlMatch = externalUrlPattern.exec(to) - const mailtoPattern = new RegExp(/^mailto:/) - const mailtoMatch = mailtoPattern.exec(to) - const LinkComponent = externalUrlMatch - ? ExternalLink - : mailtoMatch - ? MailtoLink - : ReactLink - return {children} -} - -Link.propTypes = { - nav: PropTypes.bool, - ...BaseLinkPropTypes -} - -Link.defaultProps = { - nav: false, -} - -// - -const LinkIcon = ({ size, children }) => { +export const LinkIcon = ({ size, children }) => { return ( { ) } +ExternalLinkIcon.propTypes = { + size: PropTypes.number, +} + export const MailtoLinkIcon = ({ size = 12 }) => { return ( @@ -106,10 +43,6 @@ export const MailtoLinkIcon = ({ size = 12 }) => { ) } -ExternalLinkIcon.propTypes = { - size: PropTypes.number, -} - MailtoLinkIcon.propTypes = { size: PropTypes.number, -} +} \ No newline at end of file diff --git a/src/components/link/link.js b/src/components/link/link.js new file mode 100644 index 0000000..ad89c3b --- /dev/null +++ b/src/components/link/link.js @@ -0,0 +1,44 @@ +import { Fragment } from 'react' +import PropTypes from 'prop-types' +import { Link as ReactLink } from 'react-router-dom' +import { NavLink as ReactNavLink } from 'react-router-dom' +import { ExternalLink } from './' +import { MailtoLink } from './' +// + +export const BaseLinkPropTypes = { + to: PropTypes.string.isRequired, + children: PropTypes.node.isRequired, +} + +// + +export const Link = ({ nav, to, children, ...props }) => { + // if this is a navigation menu link, we can bail out now. + if (nav) { + return { children } + } + // otherwise, we'll to determine the type of link and + // decorate it with an icon accordingly. + const externalUrlPattern = new RegExp(/^https?:\/\//) + const externalUrlMatch = externalUrlPattern.exec(to) + const mailtoPattern = new RegExp(/^mailto:/) + const mailtoMatch = mailtoPattern.exec(to) + const LinkComponent = externalUrlMatch + ? ExternalLink + : mailtoMatch + ? MailtoLink + : ReactLink + return {children} +} + +Link.propTypes = { + nav: PropTypes.bool, + ...BaseLinkPropTypes +} + +Link.defaultProps = { + nav: false, +} + +// \ No newline at end of file diff --git a/src/components/link/mail-to-link.js b/src/components/link/mail-to-link.js new file mode 100644 index 0000000..bc5f1b9 --- /dev/null +++ b/src/components/link/mail-to-link.js @@ -0,0 +1,14 @@ +import { Fragment } from 'react' +import { BaseLinkPropTypes } from './' +import { MailtoLinkIcon } from './' + +export const MailtoLink = ({ to, children }) => { + return ( + + { children } + + + ) +} + +MailtoLink.propTypes = { ...BaseLinkPropTypes } \ No newline at end of file From fee4134e17d90886bc30927ccbaa1e443da0376b Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Thu, 20 Jun 2024 00:09:37 -0400 Subject: [PATCH 6/8] update footer --- src/components/layout/footer.js | 67 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/components/layout/footer.js b/src/components/layout/footer.js index 5f9949a..19d67b8 100644 --- a/src/components/layout/footer.js +++ b/src/components/layout/footer.js @@ -1,6 +1,10 @@ import { Divider, List, ListItem, Sheet, Stack, Typography } from '@mui/joy' import { KnitLogo } from '@components/brand' import { Link } from '@components/link' +import { + Container, + SIZES, +} from '@components/layout' export const Footer = () => { return ( @@ -16,6 +20,7 @@ export const Footer = () => { p: 2, py: 6, '.copyright': { color: 'var(--knit-palette-primary-900)', + marginTop: '1rem' }, '.links-list a': { color: 'var(--knit-palette-primary-400)', @@ -25,43 +30,39 @@ export const Footer = () => { }, }} > - + - - link - here's an external link - a link - and another - - - - - another link - so many links - last one - - - + + + + © { new Date().getFullYear() } + - + + + FABRIC Portal + Community Slack Channel + Contact Us + + + + - - - © { new Date().getFullYear() } ) } From c95a072c93459c585231294c4cd5005b94792446 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Fri, 28 Jun 2024 12:27:08 -0400 Subject: [PATCH 7/8] remove fabric text from hero --- src/components/brand.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/brand.js b/src/components/brand.js index 9bf5a02..0c00bc0 100644 --- a/src/components/brand.js +++ b/src/components/brand.js @@ -24,9 +24,10 @@ export const Brand = () => { }, }} > - FABRIC - + + 2024 + ) } From e5247295ab36b456ecd48626a23b2730f95975e4 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Fri, 28 Jun 2024 12:27:17 -0400 Subject: [PATCH 8/8] update typography styles --- src/theme/components.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/theme/components.js b/src/theme/components.js index 57b570c..5f28981 100644 --- a/src/theme/components.js +++ b/src/theme/components.js @@ -6,27 +6,29 @@ export const components = { color: theme.palette.primary[900], // color: 'var(--knit-palette-primary-900)', ...(ownerState.level === 'h1' && { - fontSize: '360%', + fontSize: '250%', color: theme.palette.primary[100], margin: '16px 0', + fontWeight: 600 }), ...(ownerState.level === 'h2' && { - fontSize: '250%', + fontSize: '175%', color: theme.palette.primary[400], margin: '16px 0', + fontWeight: 500, }), ...(ownerState.level === 'h3' && { - fontSize: '200%', + fontSize: '150%', color: theme.palette.secondary[900], margin: '16px 0', }), ...(ownerState.level === 'h4' && { - fontSize: '166%', + fontSize: '130%', color: theme.palette.secondary[400], margin: '16px 0', }), ...(ownerState.level === 'h5' && { - fontSize: '130%', + fontSize: '120%', color: theme.palette.tertiary[600], margin: '16px 0', }),