Skip to content

Commit

Permalink
Merge pull request #291 from Tech-Start-UCalgary/teamsPage
Browse files Browse the repository at this point in the history
Add Teams Page and galatea sponsor, redesign components and sections, add GitHub link to footer, start migrate to Styled Components, refactoring
  • Loading branch information
Niyousha99 authored Jan 27, 2022
2 parents c5daaec + 6769ab1 commit 4360adc
Show file tree
Hide file tree
Showing 75 changed files with 1,688 additions and 1,545 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"editor.formatOnSave": true,
"editor.formatOnPaste": false,
"editor.formatOnPaste": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
Expand Down
165 changes: 152 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
"@types/react-router-dom": "^5.1.7",
"@types/react-scroll": "^1.8.2",
"aos": "^2.3.4",
"axios": "^0.21.1",
"axios": "^0.21.4",
"cors": "^2.8.5",
"express": "^4.17.1",
"framer-motion": "^4.1.17",
"lottie-react": "^2.1.0",
"material-design-icons": "^3.0.1",
"packages": "0.0.8",
Expand All @@ -35,12 +36,13 @@
"react-dom": "^17.0.1",
"react-elastic-carousel": "^0.11.4",
"react-icons": "^4.2.0",
"react-intersection-observer": "^8.33.1",
"react-particles-js": "^3.4.1",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.2",
"react-scroll": "^1.8.2",
"react-visibility-sensor": "^5.1.1",
"styled-components": "^5.2.1",
"styled-components": "^5.3.3",
"typescript": "^4.1.5",
"web-vitals": "^1.1.0"
},
Expand All @@ -58,14 +60,19 @@
},
"browserslist": {
"production": [
">0.2%",
">0.3%",
"not ie 11",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
"last 1 safari version",
">0.3%",
"not ie 11",
"not dead",
"not op_mini all"
]
},
"devDependencies": {
Expand Down
12 changes: 12 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,20 @@
--turquoise-green: #8bffa5;
--turquoise-blue: #70f0e8;
--secondary-grey: rgba(34, 34, 34, 0.95);
--title-size: clamp(1.4rem, calc(15vw + 1rem), 8rem);
--chonky-header-size: 4.75rem;
--thicc-subheading-size: 2.5rem;
--babyHeading-size: 1.6rem;
--chonky-header-weight: 900;
--regular-font: 1rem;
font-family: "Inter", Tahoma, sans-serif;

/* Section backgrounds*/
--dark-background: linear-gradient(
to bottom,
rgb(19, 19, 19),
rgb(26, 26, 26)
);
}

.chonkyHeading {
Expand All @@ -38,6 +46,10 @@
margin-bottom: 0px;
}

.chonkyHeading--noMargin {
margin: 0px;
}

.chonkyHeading--dynamic {
font-size: clamp(1rem, calc(8vw + 1rem), 3.5rem);
}
Expand Down
7 changes: 5 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import HomePage from "pages/HomePage";
import DocsPage from "pages/DocsPage";
import SparkPage from "pages/SparkPage";
import ApplyPage from "pages/ApplyPage";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
import Navbar from "components/Navbar";
import Footer from "components/Footer/Footer";
import "./App.css";
import Particles from "react-particles-js";
import Aos from "aos";
import "aos/dist/aos.css";
import ScrollToTop from "components/ScrollToTop";
import TeamPage from "pages/TeamPage";

function App() {
//
Expand All @@ -25,6 +25,9 @@ function App() {
<Navbar />
<div className="content">
<Switch>
<Route path="/team">
<TeamPage />
</Route>
<Route path="/resources">
<DocsPage />
</Route>
Expand Down
Loading

0 comments on commit 4360adc

Please sign in to comment.