diff --git a/README.md b/README.md index 7c5eebd..35e6d39 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This is currently being hosted by: TheCubeHamster LS-x21 solar138 +Sawbez diff --git a/client/public/index.html b/client/public/index.html index dad3f07..50e6d71 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -30,7 +30,8 @@ Within our completely student built team, we use our problem solving, critical thinking and analytical skills to create a competitive robot within 6 weeks. The club was created in 2008 and initially worked in the garage of one of our mentors. In the first few years of the club we struggled, but always managed to bring a robot to competitions. During that time, our team never managed to advance to the elimination rounds of any competitions, but by 2014, the Spartabots had made it through two district competitions, getting second place in one of them, and qualified for regionals." /> - + + The Spartabots diff --git a/client/src/App.js b/client/src/App.js index 2c6ad83..810d57f 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -1,25 +1,25 @@ import { - BrowserRouter as Router, + Navigate, Route, + BrowserRouter as Router, Routes, - Navigate, } from "react-router-dom"; -import Home from "./pages/Home"; -import Sponsors from "./pages/Sponsors"; -import FontDemo from "./pages/FontDemo"; -import About from "./pages/About"; import Footer from "./components/Footer"; -import Join from "./pages/Join"; -import Login from "./pages/Login"; -import Dashboard from "./pages/Dashboard"; import Sidebar from "./components/Sidebar"; import TopBar from "./components/TopBar"; import { useAuthContext } from "./hooks/useAuthContext"; -import NotFound from "./pages/NotFound"; +import About from "./pages/About"; import AccountManage from "./pages/AccountManage"; import AddAccount from "./pages/AddAccount"; import ComingSoon from "./pages/ComingSoon"; +import Dashboard from "./pages/Dashboard"; +import FontDemo from "./pages/FontDemo"; +import Home from "./pages/Home"; +import Join from "./pages/Join"; +import Login from "./pages/Login"; +import NotFound from "./pages/NotFound"; import Purchase from "./pages/Purchase"; +import Sponsors from "./pages/Sponsors"; function App() { const { user } = useAuthContext(); return ( diff --git a/client/src/components/Card.js b/client/src/components/Card.js index bfc0d66..55a9cbf 100644 --- a/client/src/components/Card.js +++ b/client/src/components/Card.js @@ -1,5 +1,5 @@ import LazyImage from "./LazyImage"; -const Card = ({ title, text, image }) => { +const Card = ({ title, text, image, alt }) => { return (
@@ -9,7 +9,7 @@ const Card = ({ title, text, image }) => {

{text}

- +
diff --git a/client/src/components/Footer.js b/client/src/components/Footer.js index cf8d94a..398ed06 100644 --- a/client/src/components/Footer.js +++ b/client/src/components/Footer.js @@ -104,9 +104,9 @@ export default function Footer() {

-
+

Learn -

+

Onshape @@ -129,9 +129,9 @@ export default function Footer() {

-
+

Useful links -

+

Design Calculator -

+

-
+

Contact -

+

{alt} ) : ( - + // An empty alt tag is required for accessibility + ); }; diff --git a/client/src/pages/Home.js b/client/src/pages/Home.js index 8f6c0c6..806181e 100644 --- a/client/src/pages/Home.js +++ b/client/src/pages/Home.js @@ -1,11 +1,11 @@ +import { useEffect } from "react"; import Card from "../components/Card.js"; -import Splash from "../components/Splash.js"; import InfoBlock from "../components/InfoBlock.js"; -import { useEffect } from "react"; -import intakeImage from "../graphics/images/Intake-min.jpg"; -import groupImage from "../graphics/images/GroupPhoto-min.jpg"; -import competitionImage from "../graphics/images/Competition-min.jpg"; +import Splash from "../components/Splash.js"; import botImage from "../graphics/images/Bot.jpg"; +import competitionImage from "../graphics/images/Competition-min.jpg"; +import groupImage from "../graphics/images/GroupPhoto-min.jpg"; +import intakeImage from "../graphics/images/Intake-min.jpg"; const Home = () => { useEffect(() => { @@ -20,16 +20,19 @@ const Home = () => { title="ABOUT US" text="Created in 2008, our team participates in the FIRST Robotics Competition as team 2976. We are a high school club operating at Skyline High School, Sammamish, WA." image={groupImage} + alt="Group photo of the Spartabots team" />