diff --git a/package-lock.json b/package-lock.json index dfa3271..d1c1a64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7401,6 +7401,20 @@ "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, + "iframe-resizer": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-4.2.11.tgz", + "integrity": "sha512-fj5vX5kkpRbMb5Qje6veIDzqoJpnCEqUDdSOwASOeQHYmb8hLYX6Ev2yXf3jjMs2MclwcYY3chyZ3diGKcr8DA==" + }, + "iframe-resizer-react": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/iframe-resizer-react/-/iframe-resizer-react-1.0.4.tgz", + "integrity": "sha512-j2AFgVe6ZhvUVu4VbEvUB4lUadmCwdg4tIYgL9TRdWubL1477Xv0wl8xVC9ETky3+81ngnbOYFLaUIkBOESJFQ==", + "requires": { + "iframe-resizer": "^4.2.10", + "warning": "^4.0.3" + } + }, "ignore": { "version": "5.1.8", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", @@ -14425,6 +14439,14 @@ "makeerror": "1.0.x" } }, + "warning": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "requires": { + "loose-envify": "^1.0.0" + } + }, "watchpack": { "version": "1.7.5", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", diff --git a/package.json b/package.json index eed4724..2e91f8e 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", + "iframe-resizer-react": "^1.0.4", "react": "^17.0.1", "react-dom": "^17.0.1", "react-router-dom": "^5.2.0", diff --git a/public/images/hero.png b/public/images/hero.png index 2f400df..ae3acf2 100644 Binary files a/public/images/hero.png and b/public/images/hero.png differ diff --git a/public/images/segments/get-involved.jpg b/public/images/segments/get-involved.jpg new file mode 100644 index 0000000..942266a Binary files /dev/null and b/public/images/segments/get-involved.jpg differ diff --git a/public/images/segments/news-and-happenings.jpg b/public/images/segments/news-and-happenings.jpg new file mode 100644 index 0000000..8285b5a Binary files /dev/null and b/public/images/segments/news-and-happenings.jpg differ diff --git a/public/images/segment-1.jpg b/public/images/segments/old/segment-1.jpg similarity index 100% rename from public/images/segment-1.jpg rename to public/images/segments/old/segment-1.jpg diff --git a/public/images/segment-2.jpg b/public/images/segments/old/segment-2.jpg similarity index 100% rename from public/images/segment-2.jpg rename to public/images/segments/old/segment-2.jpg diff --git a/public/images/segment-3.jpg b/public/images/segments/old/segment-3.jpg similarity index 100% rename from public/images/segment-3.jpg rename to public/images/segments/old/segment-3.jpg diff --git a/public/images/segments/who-we-are.jpg b/public/images/segments/who-we-are.jpg new file mode 100644 index 0000000..63ff0e0 Binary files /dev/null and b/public/images/segments/who-we-are.jpg differ diff --git a/public/images/who-we-are/excomm.png b/public/images/who-we-are/excomm.png new file mode 100644 index 0000000..7bbec80 Binary files /dev/null and b/public/images/who-we-are/excomm.png differ diff --git a/public/images/who-we-are/officers.jpg b/public/images/who-we-are/officers.jpg new file mode 100644 index 0000000..5014a0d Binary files /dev/null and b/public/images/who-we-are/officers.jpg differ diff --git a/src/App.tsx b/src/App.tsx index 1521bf5..eb08c08 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,7 +14,20 @@ const notfound = React.lazy(() => import('./pages/404')); const officers = React.lazy(() => import('./pages/officers')); const committee = React.lazy(() => import('./pages/committee')); const classcouncil = React.lazy(() => import('./pages/classcouncil')); -const loading = () =>

Loading...

; +const loading = ( +
+

Loading...

+
+); +const feedback = React.lazy(() => import('./pages/feedback')); export default function App() { return ( @@ -30,6 +43,7 @@ export default function App() { + diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index a676f3f..ce0f290 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -17,9 +17,9 @@ export default function Footer() { alt='Footer Banner' />
- {footer.columns.map((col) => { + {footer.columns.map((col, index) => { return ( -
+
); diff --git a/src/components/Hero.tsx b/src/components/Hero.tsx index d59e805..c317fd9 100644 --- a/src/components/Hero.tsx +++ b/src/components/Hero.tsx @@ -17,8 +17,8 @@ export default function Hero({ alt='Background' style={{ width: '100vw', - height: '60vh', - objectFit: 'cover', + maxHeight: '60vh', + objectFit: 'contain', }} />
diff --git a/src/components/InitiativeRow.tsx b/src/components/InitiativeRow.tsx index 78866f0..5e7f2fd 100644 --- a/src/components/InitiativeRow.tsx +++ b/src/components/InitiativeRow.tsx @@ -14,7 +14,7 @@ export default function InitiativeRow({ } return ( -
+
{thumbUrl ? {initiative.name} : null}
diff --git a/src/components/MemberRow.tsx b/src/components/MemberRow.tsx index e04a1c7..6cb1405 100644 --- a/src/components/MemberRow.tsx +++ b/src/components/MemberRow.tsx @@ -8,7 +8,7 @@ export default function MemberRow({ member }: { member: SGA.MemberDocument }) { } return ( -
+
{thumbUrl ? ( {member.name} diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index ff9b211..628840f 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -63,20 +63,22 @@ let pages = [ url: '/involved', title: 'Get Involved', }, + { + url: '/feedback', + title: 'Feedback', + }, ]; -export function Submenu({ items }) {} - export default function Navbar() { return (
- + TJ SGA {pages.map((page) => { if ('items' in page) { return ( -
+
{page.title} diff --git a/src/components/RecentNews.tsx b/src/components/RecentNews.tsx index 5d27770..e95d1a4 100644 --- a/src/components/RecentNews.tsx +++ b/src/components/RecentNews.tsx @@ -16,7 +16,7 @@ export default function RecentNews() {

Recent News

{news.map((article) => { - return ; + return ; })} All News
diff --git a/src/components/SegmentGroup.tsx b/src/components/SegmentGroup.tsx index 5a35278..d4a3e4a 100644 --- a/src/components/SegmentGroup.tsx +++ b/src/components/SegmentGroup.tsx @@ -4,19 +4,19 @@ export default function InfoColumnGroup() { return (
- +
{excomm && diff --git a/src/pages/feedback.tsx b/src/pages/feedback.tsx new file mode 100644 index 0000000..252478f --- /dev/null +++ b/src/pages/feedback.tsx @@ -0,0 +1,26 @@ +import React from 'react'; +import Hero from '../components/Hero'; + +const feedbackFormURL = + 'https://docs.google.com/forms/d/e/1FAIpQLSeO8CN666WSb-jw0johyLMLb00rFz-bCtXaPeWpTSvbSqBBLw/viewform?embedded=true'; + +export default function FeedbackPage() { + return ( + <> + +
+ +
+ + ); +} diff --git a/src/pages/officers.tsx b/src/pages/officers.tsx index 4118d66..2ce803f 100644 --- a/src/pages/officers.tsx +++ b/src/pages/officers.tsx @@ -14,7 +14,7 @@ export default function Officers() { return ( <> - +
{officers ? officers.map((officer) => {