Skip to content

Commit

Permalink
final refactor commit before 1.0!
Browse files Browse the repository at this point in the history
  • Loading branch information
NullDefault committed Feb 9, 2021
1 parent a510ca2 commit 65bae17
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/assets/SVG/swooshX.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
// <NavLink href="/sponsors">Sponsors <Icon as={RiMoneyDollarCircleFill} /></NavLink>

export const Footer = (props) => <Flex as="footer" py="8rem" bg="black" color="white" {...props}>
<VStack spacing="24px">
<Image src={tedxTextLogo} w="60vmin"/>
<Image src={tedxTextLogo} w="60vmin" />
<Stack direction={['column', 'row']} align="center">
<VStack w={'50%'}>
<Text pl="8%" fontSize="lg">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Logo.js → src/components/LandingLogo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Box
Expand Down
8 changes: 5 additions & 3 deletions src/components/adminInterfaces/TicketInterface.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import { useEffect, useState } from 'react';
import { parseFeedbackIcon } from '../../utils/parseFeedbackIcon';
import { db } from '../../firebase';

export const TicketInterface = (props) => {
const documentId = '04AySeIdnaNag5ZRQ10L';

export const TicketInterface = () => {
const color = useColorModeValue('black', 'white');
const [ticketToggle, setTicketToggle] = useState(false);
const [updating, setUpdating] = useState(false);
Expand All @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export const Admin = () => {
<AccordionIcon />
</AccordionButton>
<AccordionPanel pb={4}>
<TeamInterface/>
<TeamInterface />
</AccordionPanel>
</AccordionItem>

Expand Down
4 changes: 2 additions & 2 deletions src/pages/contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ export const Contact = () => {
<HStack w="100%">
<FormControl id="name" isInvalid={name === ''}>
<FormLabel>Name</FormLabel>
<Input type="name" value={name} onChange={e => setName(e.currentTarget.value)} />
<Input value={name} onChange={e => setName(e.currentTarget.value)} />
<FormHelperText>How you like to be called.</FormHelperText>
</FormControl>
<FormControl id="pronouns" isInvalid={pronouns === ''}>
<FormLabel>Pronouns</FormLabel>
<Input type="pronouns" value={pronouns} onChange={e => setPronouns(e.currentTarget.value)} />
<Input value={pronouns} onChange={e => setPronouns(e.currentTarget.value)} />
<FormHelperText>Your preferred pronouns.</FormHelperText>
</FormControl>
</HStack>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/landing.js
Original file line number Diff line number Diff line change
@@ -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 = () => {
Expand All @@ -9,7 +9,7 @@ export const Landing = () => {
<Box textAlign="center" fontSize="xl" bg="primary" color={color}>
<Grid minH="100vh" p={3}>
<VStack spacing={4}>
<Logo h="40vmin" pointerEvents="none" />
<LandingLogo h="40vmin" pointerEvents="none" />
<Heading as="h1" size="2xl" color={tedxRed} pb={12}>
Event News Coming Soon
</Heading>
Expand Down

0 comments on commit 65bae17

Please sign in to comment.