From 99e2c5040246f7b32a384b5ed53af8769d377f37 Mon Sep 17 00:00:00 2001 From: Ryan Hodge Date: Tue, 14 Jan 2025 14:21:37 -0500 Subject: [PATCH] Fixing owl logo --- src/assets/pics/logos/TransRoboOwl.svg | 150 +++++++++---------------- src/pages/events/EventList.tsx | 7 +- src/pages/events/EventListStyles.tsx | 4 + src/pages/events/Events.tsx | 7 +- src/pages/events/EventsStyles.tsx | 3 +- src/pages/home/Home.tsx | 34 ++---- src/pages/home/HomeStyles.tsx | 39 +++++-- src/tools/services/getEvents.tsx | 6 +- 8 files changed, 115 insertions(+), 135 deletions(-) diff --git a/src/assets/pics/logos/TransRoboOwl.svg b/src/assets/pics/logos/TransRoboOwl.svg index 2f2b509..4ffe60d 100644 --- a/src/assets/pics/logos/TransRoboOwl.svg +++ b/src/assets/pics/logos/TransRoboOwl.svg @@ -1,151 +1,103 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https://forms.gle/rp6BY6h4doLkZQ2E8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/pages/events/EventList.tsx b/src/pages/events/EventList.tsx index ac0996e..bef2467 100644 --- a/src/pages/events/EventList.tsx +++ b/src/pages/events/EventList.tsx @@ -3,6 +3,8 @@ import { EventObject } from '../../tools/CustomTypes' import Styles from './EventListStyles' +const dayOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'] + class EventList extends React.Component<{events: EventObject[], loading: boolean}, never> { render (): React.ReactElement { if (this.props.events.length === 0) { @@ -14,8 +16,11 @@ class EventList extends React.Component<{events: EventObject[], loading: boolean return (

{event.title}

-
+

{!isNaN(event.date.getMonth()) ? `${event.date.getMonth() + 1}/${event.date.getDate()}` : 'TBD'}

+

+ {event?.weekly ? `Weekly on ${dayOfWeek[event.date.getDay()]}'s` : ''} +

Location: {event.location}

diff --git a/src/pages/events/EventListStyles.tsx b/src/pages/events/EventListStyles.tsx index 232db5a..9c0d8ab 100644 --- a/src/pages/events/EventListStyles.tsx +++ b/src/pages/events/EventListStyles.tsx @@ -65,5 +65,9 @@ export default class EventListStyles { & > div > p { margin: 0; } + + & > div > .day-of-week { + ${FONT_FAMILY.BODY} + } ` } diff --git a/src/pages/events/Events.tsx b/src/pages/events/Events.tsx index e7417e7..f5efbea 100644 --- a/src/pages/events/Events.tsx +++ b/src/pages/events/Events.tsx @@ -10,7 +10,7 @@ import Contact from '../general/contact/Contact' import { EventObject } from '../../tools/CustomTypes' import { COLORS } from '../../tools/Constants' import { getEvents } from '../../tools/services/getEvents' -import EventSignUp from './EventSignUp' +// import EventSignUp from './EventSignUp' import EVENT_SIGNUP_INFO from '../../data/EventSignUpInfo' export type EventsState = { @@ -59,9 +59,10 @@ class Events extends React.Component{

Events

- + {/* Uncomment for event sign-ups */} + {/* {EVENT_SIGNUP_INFO.map((event, i) => )} - + */} {this.renderEvents(parseFloat(width) * 0.03)} diff --git a/src/pages/events/EventsStyles.tsx b/src/pages/events/EventsStyles.tsx index d3a1f31..735b238 100644 --- a/src/pages/events/EventsStyles.tsx +++ b/src/pages/events/EventsStyles.tsx @@ -9,7 +9,8 @@ export default class EventsStyles { align-items: center; grid-template-rows: calc(var(--vh) * .2) - calc(var(--vh) * .2) + /* Uncomment for event sign-ups */ + /* calc(var(--vh) * .2) */ calc(var(--vh) * ${props => props.numOfEvents === 0 ? 1 : props.numOfEvents} * .2) calc(var(--vh) * .2); diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx index a3ed5dc..ead2966 100644 --- a/src/pages/home/Home.tsx +++ b/src/pages/home/Home.tsx @@ -12,9 +12,9 @@ import Button from '../general/button/Button' // Images import nasaLogo from '../../assets/pics/logos/nasa.png' import HOME_CAROUSEL_INFO from '../../data/HomeCarouselInfo' -import TOwl from '../../assets/pics/logos/TransRoboOwl.svg' const TEAMS = `https://teams.microsoft.com/l/team/19%3aeaf903fd81cd48eba95d8e769ed78544%40thread.tacv2/conversations?groupId=8f 78ecbb-62f3-4b2c-bda7-7488eca908ee&tenantId=716e81ef-b522-4473-8e31-10bd02ccf6e5` + const Home = (): React.ReactElement => { return ( @@ -36,37 +36,27 @@ const Home = (): React.ReactElement => { NASA - -

- Owl - Sign up and contact us on teams!

-
-
- + + +

Sign up and contact us on teams!

+
+
+ + - +

Help Temple Space Exploration get to the moon!

- + {/* TODO: Put in a merchandise section */} diff --git a/src/pages/home/HomeStyles.tsx b/src/pages/home/HomeStyles.tsx index 31d7771..f8f57e3 100644 --- a/src/pages/home/HomeStyles.tsx +++ b/src/pages/home/HomeStyles.tsx @@ -1,6 +1,7 @@ import styled from 'styled-components' import { COLORS, FONT_FAMILY } from '../../tools/Constants' +import TOwl from '../../assets/pics/logos/TransRoboOwl.svg' export default class HomeStyles { @@ -54,7 +55,38 @@ export default class HomeStyles { ${FONT_FAMILY.SUBTITLE} ` + static readonly SectionHeaderGradient = styled.div` + display: flex; + height: 100%; + background: linear-gradient(200deg, ${COLORS.PRIMARY}, #996b72, ${COLORS.PRIMARY}); + ` + static readonly SectionHeader = styled.div` + display: flex; + justify-content: center; + width: 100%; + flex-direction: column; + background-image: url(${TOwl}); + background-repeat: no-repeat no-repeat; + background-position: center; + row-gap: 10%; + height: 80%; + align-self: center; + + & > h2 { + text-align: center; + ${FONT_FAMILY.SECONDARY_TITLE} + } + + & > .button-container { + width: 100%; + display: flex; + column-gap: 10%; + justify-content: center; + } + ` + + static readonly MerchHeader = styled.div` display: flex; flex-direction: column; align-items: center; @@ -76,13 +108,6 @@ export default class HomeStyles { justify-content: center; align-items: center; } - - & > img { - width: 50%; // Set the width of the image - height: 50%; // Set the height of the image - float: left; - /* margin: 0 0 0 -500px; */ - } ` static readonly VideoSource = styled.div` diff --git a/src/tools/services/getEvents.tsx b/src/tools/services/getEvents.tsx index a8f4648..6e785a0 100644 --- a/src/tools/services/getEvents.tsx +++ b/src/tools/services/getEvents.tsx @@ -30,8 +30,10 @@ function handleWeeklyEvents(events: EventObject[]): EventObject[] { // Handle weekly dates events.forEach(event => { const currentDayForWeek = new Date() - if (event.weekly) { - event.date.setDate(currentDayForWeek.getDate() + (7 + event.date.getDay() - currentDayForWeek.getDay()) % 7) + const dayOffset = (7 + event.date.getDay() - currentDayForWeek.getDay()) % 7 + if (event.weekly && event.date < currentDayForWeek) { + const newDate = currentDayForWeek.getTime() + dayOffset * 24 * 60 * 60 * 1000 + event.date = new Date(newDate) } })