diff --git a/.cache/redux.state b/.cache/redux.state index f84222e3..7eb63cd6 100644 Binary files a/.cache/redux.state and b/.cache/redux.state differ diff --git a/src/components/Announcement.tsx b/src/components/Announcement.tsx index d0d6d29c..c4b080b4 100644 --- a/src/components/Announcement.tsx +++ b/src/components/Announcement.tsx @@ -2,7 +2,7 @@ import React from "react"; import styled, { createGlobalStyle, css } from 'styled-components'; export const StickerStyle = styled.div` -border: 1px solid red; +border: 1px solid black; display: flex; flex-direction: column; justify-content: center; diff --git a/src/components/HomeNav.tsx b/src/components/HomeNav.tsx index d149fa0c..f3f771fe 100644 --- a/src/components/HomeNav.tsx +++ b/src/components/HomeNav.tsx @@ -1,80 +1,7 @@ import { Link } from "gatsby"; import React from "react"; import styled from 'styled-components' -// import { graphql } from "gatsby" - -const navLinks = [ - { - rsvp: { - link: 'https://www.meetup.com/TypeScriptNYC/events/251309133/', - description: 'RSVP to our next event', - time: 'now' - } - }, - { - codeOfConduct: { - link: '/code-of-conduct', - description: 'Read our code of conduct', - time: '' - } - }, - { - slack: { - link: 'https://slack.com/signin', - description: 'Join our slack', - time: '' - } - }, - { - venueInstructions: { - link: 'google.com', - description: 'Go to the venue and check in', - time: 'in 5 days' - } - }, - { - speakers: { - link: 'google.com', - description: 'speaker stuff here', - time: '7PM' - } - }, - { - end: { - link: '', - description: 'Social hour', - time: '9PM' - } - }, - { - speak: { - link: 'mailto:thefrankharvey@gmail.com', - description: 'Be a future speaker', - time: '' - } - }, - { - pastMeetups: { - link: '/past-meetups', - description: 'See past meetups', - time: '' - } - }, - { - aboutUs: { - link: '/about', - description: 'Learn more about us', - time: '' - } - }, - { - becomeASponsor: { - link: '/faq', - description: 'Become a sponsor', - time: '' - } - }, -] +import navItems from '../data/nav-items.js'; export const NavFlexContainer = styled.div` border: 3px solid green; @@ -85,15 +12,15 @@ align-items: center; width:100%; `; -export const NavItemsContainer = styled.div` -// border: 3px solid green; +export const NavItemRowsContainer = styled.div` +border: 3px solid green; display: flex; flex-direction: column; justify-content: center; align-items: center; width:100%; @media (min-width: 576px) { - width:30%; + width:50%; max-width:300px; } `; @@ -116,7 +43,7 @@ align-items: flex-start; width:80% `; -export const NavItem = styled.div` +export const NavItemRow = styled.div` // border: 1px solid green; display: flex; flex-direction: row; @@ -125,20 +52,20 @@ align-items: center; width:100% `; -const makeNavLinks = (navLinks) => { - if (navLinks.length > 0) { - return navLinks.map((item) => { +const makeNavLinks = (navItems) => { + if (navItems.length > 0) { + return navItems.map((item) => { const itemContents = Object.values(item)[0]; let { link, description, time } = itemContents; - return + return

{`${time}`}

{fillRightColumn(link, description)} -
+ }) } } @@ -162,12 +89,12 @@ const fillRightColumn = (link, description) => { } export default function HomeNav() { - + console.log(navItems.list) return ( - - {makeNavLinks(navLinks)} - + + {makeNavLinks(navItems.list)} + ) diff --git a/src/components/layout.tsx b/src/components/layout.tsx index 3852bb6a..6faa85b7 100644 --- a/src/components/layout.tsx +++ b/src/components/layout.tsx @@ -4,7 +4,6 @@ import Header from "./Header"; import Footer from "./Footer"; export const LayoutContainer = styled.div` - border: 1px solid red; width: 100%; position: relative; max-width: 600px; diff --git a/src/data/nav-items.js b/src/data/nav-items.js new file mode 100644 index 00000000..c921356c --- /dev/null +++ b/src/data/nav-items.js @@ -0,0 +1,74 @@ +export default { + list: [ + { + rsvp: { + link: 'https://www.meetup.com/TypeScriptNYC/events/251309133/', + description: 'RSVP to our next event', + time: 'now' + } + }, + { + codeOfConduct: { + link: '/code-of-conduct', + description: 'Read our code of conduct', + time: '' + } + }, + { + slack: { + link: 'https://slack.com/signin', + description: 'Join our slack', + time: '' + } + }, + { + venueInstructions: { + link: 'google.com', + description: 'Go to the venue and check in', + time: 'in 5 days' + } + }, + { + speakers: { + link: 'google.com', + description: 'speaker stuff here', + time: '7PM' + } + }, + { + end: { + link: '', + description: 'Social hour', + time: '9PM' + } + }, + { + speak: { + link: 'mailto:thefrankharvey@gmail.com', + description: 'Be a future speaker', + time: '' + } + }, + { + pastMeetups: { + link: '/past-meetups', + description: 'See past meetups', + time: '' + } + }, + { + aboutUs: { + link: '/about', + description: 'Learn more about us', + time: '' + } + }, + { + becomeASponsor: { + link: '/faq', + description: 'Become a sponsor', + time: '' + } + }, +] +}; \ No newline at end of file diff --git a/src/pages/index.tsx b/src/pages/index.tsx index f6139110..0114426c 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -5,7 +5,6 @@ import HomeNav from "../components/HomeNav"; // import { graphql } from "gatsby"; export const PageContainer = styled.div` - border: 1px solid red; width: 100%; position: relative; display:flex;