-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
28 changed files
with
1,183 additions
and
1,151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| Robotics Website | ||
|
|
||
| Built using React | ||
| Built using React |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,38 @@ | ||
| import js from '@eslint/js' | ||
| import globals from 'globals' | ||
| import react from 'eslint-plugin-react' | ||
| import reactHooks from 'eslint-plugin-react-hooks' | ||
| import reactRefresh from 'eslint-plugin-react-refresh' | ||
| import js from "@eslint/js"; | ||
| import globals from "globals"; | ||
| import react from "eslint-plugin-react"; | ||
| import reactHooks from "eslint-plugin-react-hooks"; | ||
| import reactRefresh from "eslint-plugin-react-refresh"; | ||
|
|
||
| export default [ | ||
| { ignores: ['dist'] }, | ||
| { ignores: ["dist"] }, | ||
| { | ||
| files: ['**/*.{js,jsx}'], | ||
| files: ["**/*.{js,jsx}"], | ||
| languageOptions: { | ||
| ecmaVersion: 2020, | ||
| globals: globals.browser, | ||
| parserOptions: { | ||
| ecmaVersion: 'latest', | ||
| ecmaVersion: "latest", | ||
| ecmaFeatures: { jsx: true }, | ||
| sourceType: 'module', | ||
| sourceType: "module", | ||
| }, | ||
| }, | ||
| settings: { react: { version: '18.3' } }, | ||
| settings: { react: { version: "18.3" } }, | ||
| plugins: { | ||
| react, | ||
| 'react-hooks': reactHooks, | ||
| 'react-refresh': reactRefresh, | ||
| "react-hooks": reactHooks, | ||
| "react-refresh": reactRefresh, | ||
| }, | ||
| rules: { | ||
| ...js.configs.recommended.rules, | ||
| ...react.configs.recommended.rules, | ||
| ...react.configs['jsx-runtime'].rules, | ||
| ...react.configs["jsx-runtime"].rules, | ||
| ...reactHooks.configs.recommended.rules, | ||
| 'react/jsx-no-target-blank': 'off', | ||
| 'react-refresh/only-export-components': [ | ||
| 'warn', | ||
| "react/jsx-no-target-blank": "off", | ||
| "react-refresh/only-export-components": [ | ||
| "warn", | ||
| { allowConstantExport: true }, | ||
| ], | ||
| }, | ||
| }, | ||
| ] | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,19 @@ | ||
| import React from 'react'; | ||
| import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; | ||
| import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; | ||
|
|
||
| import Home from './components/Home'; | ||
| import About from './components/About'; | ||
| import Contact from './components/Contact'; | ||
| import Home from "./components/Home"; | ||
| // import About from './components/About'; | ||
| // import Contact from './components/Contact'; | ||
|
|
||
| const App = () => { | ||
| return ( | ||
| <Router> | ||
| <Routes> | ||
| <Route path="/" element={<Home />} /> | ||
| {/* <Route path="/about" element={<About />} /> | ||
| return ( | ||
| <Router> | ||
| <Routes> | ||
| <Route path="/" element={<Home />} /> | ||
| {/* <Route path="/about" element={<About />} /> | ||
| <Route path="/contact" element={<Contact />} /> */} | ||
| </Routes> | ||
| </Router> | ||
| ); | ||
| </Routes> | ||
| </Router> | ||
| ); | ||
| }; | ||
|
|
||
| export default App; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,56 @@ | ||
| import React, { useEffect } from 'react'; | ||
| import { FaLinkedin, FaGithub } from 'react-icons/fa'; | ||
| import { useEffect } from "react"; | ||
| import { FaLinkedin, FaGithub } from "react-icons/fa"; | ||
|
|
||
| import Header from './Header'; | ||
| import Footer from './Footer' | ||
| import Blurb from './Blurb'; | ||
| // import Header from './Header'; | ||
| // import Footer from './Footer' | ||
| import Blurb from "./Blurb"; | ||
|
|
||
| import "../styles/About.css" | ||
| import teamPhoto from '../assets/memberPhotos/teamPhoto.jpg' | ||
| import { MEMBERS } from './details/teamDetails'; | ||
| import "../styles/About.css"; | ||
| // import teamPhoto from '../assets/memberPhotos/teamPhoto.jpg' | ||
| import { MEMBERS } from "./details/teamDetails"; | ||
|
|
||
| const About = () => { | ||
| // Fade in and up. | ||
| useEffect(() => { | ||
| const aboutContainer = document.querySelector('.aboutContainer'); | ||
| aboutContainer.classList.add('fade-in-up'); | ||
| }, []); | ||
|
|
||
| return ( | ||
| <div> | ||
| <div className="aboutContainer" id='aboutContainer'> | ||
|
|
||
| <Blurb/> | ||
|
|
||
| <div className="team-section-container"> | ||
| <h1 className='meet-the-team'>Meet the Team</h1> | ||
|
|
||
| <div className="teamContainer"> | ||
| {MEMBERS.map((member) => ( | ||
| <div key={member.id} className="teamMember"> | ||
| <img src={member.image} alt={member.name}/> | ||
| <div className="desc"> | ||
| <div className="title"> | ||
| <h3 className="name">{member.name}</h3> | ||
| {/* <div className="social-icons"> | ||
| // Fade in and up. | ||
| useEffect(() => { | ||
| const aboutContainer = document.querySelector(".aboutContainer"); | ||
| aboutContainer.classList.add("fade-in-up"); | ||
| }, []); | ||
|
|
||
| return ( | ||
| <div> | ||
| <div className="aboutContainer" id="aboutContainer"> | ||
| <Blurb /> | ||
|
|
||
| <div className="team-section-container"> | ||
| <h1 className="meet-the-team">Meet the Team</h1> | ||
|
|
||
| <div className="teamContainer"> | ||
| {MEMBERS.map((member) => ( | ||
| <div key={member.id} className="teamMember"> | ||
| <img src={member.image} alt={member.name} /> | ||
| <div className="desc"> | ||
| <div className="title"> | ||
| <h3 className="name">{member.name}</h3> | ||
| {/* <div className="social-icons"> | ||
| <a href={`${member.linkedin}`} target="_blank" rel="noopener noreferrer"> | ||
| <FaLinkedin className="linkedin-icon" /> | ||
| </a> | ||
| <a href={`${member.github}`} target="_blank" rel="noopener noreferrer"> | ||
| <FaGithub className="github-icon"/> | ||
| </a> | ||
| </div> */} | ||
| </div> | ||
| <p className="role">{member.role}</p> | ||
| <p className="bio">{member.bio}</p> | ||
| </div> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| </div> | ||
| <p className="role">{member.role}</p> | ||
| <p className="bio">{member.bio}</p> | ||
| </div> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
|
|
||
| export default About; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| import React, { useState, useEffect } from 'react'; | ||
| import emailjs from '@emailjs/browser'; | ||
| import Header from './Header'; | ||
| import Footer from './Footer'; | ||
| import '../styles/Contact.css'; | ||
| import React, { useState, useEffect } from "react"; | ||
| import emailjs from "@emailjs/browser"; | ||
| import Header from "./Header"; | ||
| import Footer from "./Footer"; | ||
| import "../styles/Contact.css"; | ||
|
|
||
| const Contact = () => { | ||
| useEffect(() => { | ||
| const aboutContainer = document.querySelector('.contactContainer'); | ||
| aboutContainer.classList.add('fade-in-up'); | ||
| const aboutContainer = document.querySelector(".contactContainer"); | ||
| aboutContainer.classList.add("fade-in-up"); | ||
| }, []); | ||
|
|
||
| const [formData, setFormData] = useState({ | ||
| name: '', | ||
| email: '', | ||
| message: '' | ||
| name: "", | ||
| email: "", | ||
| message: "", | ||
| }); | ||
|
|
||
| const handleChange = (e) => { | ||
|
|
@@ -23,32 +23,52 @@ const Contact = () => { | |
| const handleSubmit = (e) => { | ||
| e.preventDefault(); | ||
|
|
||
| emailjs.sendForm(import.meta.env.REACT_APP_EMAILJS_SERVICE_ID, import.meta.env.REACT_APP_EMAILJS_TEMPLATE_ID, e.target, import.meta.env.REACT_APP_EMAILJS_PUBLIC_KEY) | ||
| .then((result) => { | ||
| alert("Thanks for contacting us! We'll be in touch within 1-2 business days."); | ||
| }, (error) => { | ||
| alert("Oops, the email couldn't send! Try again tomorrow, or email us with our email instead."); | ||
| }); | ||
| emailjs | ||
| .sendForm( | ||
| import.meta.env.REACT_APP_EMAILJS_SERVICE_ID, | ||
| import.meta.env.REACT_APP_EMAILJS_TEMPLATE_ID, | ||
| e.target, | ||
| import.meta.env.REACT_APP_EMAILJS_PUBLIC_KEY, | ||
| ) | ||
| .then( | ||
| (result) => { | ||
| alert( | ||
| "Thanks for contacting us! We'll be in touch within 1-2 business days.", | ||
| ); | ||
| }, | ||
| (error) => { | ||
| alert( | ||
| "Oops, the email couldn't send! Try again tomorrow, or email us with our email instead.", | ||
| ); | ||
| }, | ||
| ); | ||
|
|
||
| setFormData({ name: '', email: '', message: '' }); | ||
| setFormData({ name: "", email: "", message: "" }); | ||
| }; | ||
|
|
||
| return ( | ||
| <div id='contactForm'> | ||
| <div className='contactContainer'> | ||
| <h2 id='title'>Email us directly, or contact us using the form anonymously!</h2> | ||
|
|
||
| <div className='info'> | ||
| <div className='contactInfo'> | ||
| <div id="contactForm"> | ||
| <div className="contactContainer"> | ||
| <h2 id="title"> | ||
| Email us directly, or contact us using the form anonymously! | ||
| </h2> | ||
|
|
||
| <div className="info"> | ||
| <div className="contactInfo"> | ||
| <h2>Email</h2> | ||
| <p>[email protected]</p> | ||
|
|
||
| <h2>Address</h2> | ||
| <p>Hacklab, Deerfield Hall<br/>1535 Outer Circle<br/>Mississauga, ON</p> | ||
| <p> | ||
| Hacklab, Deerfield Hall | ||
| <br /> | ||
| 1535 Outer Circle | ||
| <br /> | ||
| Mississauga, ON | ||
| </p> | ||
| </div> | ||
|
|
||
| <form className='contactForm' onSubmit={handleSubmit}> | ||
| <form className="contactForm" onSubmit={handleSubmit}> | ||
| <label> | ||
| Name: | ||
| <input | ||
|
|
@@ -85,6 +105,6 @@ const Contact = () => { | |
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| export default Contact; | ||
Oops, something went wrong.