From 65bae17e581ce2808a7ec18d549bfce6c094e79b Mon Sep 17 00:00:00 2001 From: NullDefault Date: Mon, 8 Feb 2021 19:54:40 -0500 Subject: [PATCH] final refactor commit before 1.0! --- src/assets/SVG/swooshX.svg | 2 +- src/components/Footer.js | 4 ++-- src/components/{Logo.js => LandingLogo.js} | 2 +- src/components/adminInterfaces/TicketInterface.js | 8 +++++--- src/pages/admin.js | 2 +- src/pages/contact.js | 4 ++-- src/pages/landing.js | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) rename src/components/{Logo.js => LandingLogo.js} (95%) diff --git a/src/assets/SVG/swooshX.svg b/src/assets/SVG/swooshX.svg index 48e81d6..54efcbc 100644 --- a/src/assets/SVG/swooshX.svg +++ b/src/assets/SVG/swooshX.svg @@ -1 +1 @@ -Swoosh X Logo \ No newline at end of file +Swoosh X LandingLogo \ No newline at end of file diff --git a/src/components/Footer.js b/src/components/Footer.js index 66dca46..7bbe1bc 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -12,17 +12,17 @@ import { FaHandsHelping } from 'react-icons/fa'; import { ImBlog } from 'react-icons/im'; import { MdGroup } from 'react-icons/md'; import { GiTeamIdea } from 'react-icons/gi'; -import { RiMoneyDollarCircleFill } from 'react-icons/ri'; import { NavLink } from './NavLink'; import tedxTextLogo from '../assets/PNG/tedxDrewUTextLogo.png'; import { tedxRed } from '../utils/tedxColors'; // commented out for now: +// import { RiMoneyDollarCircleFill } from 'react-icons/ri'; // Sponsors export const Footer = (props) => - + diff --git a/src/components/Logo.js b/src/components/LandingLogo.js similarity index 95% rename from src/components/Logo.js rename to src/components/LandingLogo.js index 56792a8..53f733a 100644 --- a/src/components/Logo.js +++ b/src/components/LandingLogo.js @@ -3,7 +3,7 @@ import spaceBg from '../assets/GIF/minimalistGifBg.gif'; import logo from '../assets/SVG/swooshX.svg'; -export const Logo = (props) => { +export const LandingLogo = (props) => { const filter = useColorModeValue(`brightness(1)`, `brightness(.75)`); return { +const documentId = '04AySeIdnaNag5ZRQ10L'; + +export const TicketInterface = () => { const color = useColorModeValue('black', 'white'); const [ticketToggle, setTicketToggle] = useState(false); const [updating, setUpdating] = useState(false); @@ -42,7 +44,7 @@ export const TicketInterface = (props) => { const setNewLink = async () => { setUpdating(true); const response = db.collection('ticketData') - .doc('04AySeIdnaNag5ZRQ10L') + .doc(documentId) .update({ link: nextLink, toggle: ticketToggle, @@ -56,7 +58,7 @@ export const TicketInterface = (props) => { setUpdating(true); const newToggle = !ticketToggle; const response = db.collection('ticketData') - .doc('04AySeIdnaNag5ZRQ10L') + .doc(documentId) .update({ link: link, toggle: newToggle, diff --git a/src/pages/admin.js b/src/pages/admin.js index 3aa2b82..3c11b5e 100644 --- a/src/pages/admin.js +++ b/src/pages/admin.js @@ -115,7 +115,7 @@ export const Admin = () => { - + diff --git a/src/pages/contact.js b/src/pages/contact.js index 0bab16b..084b4f2 100644 --- a/src/pages/contact.js +++ b/src/pages/contact.js @@ -79,12 +79,12 @@ export const Contact = () => { Name - setName(e.currentTarget.value)} /> + setName(e.currentTarget.value)} /> How you like to be called. Pronouns - setPronouns(e.currentTarget.value)} /> + setPronouns(e.currentTarget.value)} /> Your preferred pronouns. diff --git a/src/pages/landing.js b/src/pages/landing.js index 76070f0..e1ebeac 100644 --- a/src/pages/landing.js +++ b/src/pages/landing.js @@ -1,5 +1,5 @@ import { Box, Grid, Heading, useColorModeValue, VStack } from '@chakra-ui/react'; -import { Logo } from '../components/Logo'; +import { LandingLogo } from '../components/LandingLogo'; import { tedxRed } from '../utils/tedxColors'; export const Landing = () => { @@ -9,7 +9,7 @@ export const Landing = () => { - + Event News Coming Soon