Skip to content

Commit 4864b6a

Browse files
feat(frontend): typescript added and minor bug fix
1 parent c23cbff commit 4864b6a

20 files changed

Lines changed: 1508 additions & 353 deletions

File tree

frontend/.prettierrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ module.exports = {
33
tabWidth: 2,
44
semi: true,
55
singleQuote: false,
6-
};
6+
};

frontend/package-lock.json

Lines changed: 362 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"react": "^17.0.1",
1010
"react-dom": "^17.0.1",
1111
"react-router-dom": "^5.2.0",
12-
"react-scripts": "4.0.1",
12+
"react-scripts": "^4.0.3",
1313
"web-vitals": "^0.2.4"
1414
},
1515
"scripts": {

frontend/src/Routes.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "./App.css";
22
import React from "react";
3-
import HomePage from "./components/homePage";
3+
import HomePage from "./pages/homePage";
44
import Nav from "./components/nav";
55
import { Route, Switch } from "react-router-dom";
66

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import React from "react";
12
import styles from "./style.module.css";
23

3-
function AboutUs() {
4+
const AboutUs: React.FC = () => {
45
return (
56
<div id="about" className={styles.container}>
67
<div className={styles.content}>
@@ -37,6 +38,6 @@ function AboutUs() {
3738
</div>
3839
</div>
3940
);
40-
}
41+
};
4142

4243
export default AboutUs;
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import React from "react";
12
import styles from "./style.module.css";
23
import NavLinks from "../navLinks";
34

4-
function HomeNav() {
5+
const HomeNav: React.FC = () => {
56
return (
67
<div className={styles.container}>
78
<div className={styles.buttons}>
@@ -16,6 +17,6 @@ function HomeNav() {
1617
<img className={styles.vector} src="./ComponentTMP_0-image7.png" alt="" />
1718
</div>
1819
);
19-
}
20+
};
2021

2122
export default HomeNav;

frontend/src/components/nav/index.jsx

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import React from "react";
2+
import styles from "./style.module.css";
3+
import { useState } from "react";
4+
import NavLinks from "../navLinks";
5+
6+
const Nav: React.FC = () => {
7+
const [navState, setNavState] = useState<null | string>(null);
8+
const openNav = () => {
9+
if (navState === null) setNavState(styles.activeNav);
10+
else setNavState(null);
11+
};
12+
return (
13+
<div className={styles.container}>
14+
<ul className={`${styles.navContainer} ${navState}`}>
15+
<svg
16+
onClick={openNav}
17+
xmlns="http://www.w3.org/2000/svg"
18+
width="33"
19+
height="22"
20+
viewBox="0 0 33 22"
21+
>
22+
<g id="Group_6" data-name="Group 6" transform="translate(-13 -13)">
23+
<rect
24+
id="Rectangle_1"
25+
data-name="Rectangle 1"
26+
width="33"
27+
height="4"
28+
rx="2"
29+
transform="translate(13 13)"
30+
fill="#42a9dc"
31+
/>
32+
<rect
33+
id="Rectangle_2"
34+
data-name="Rectangle 2"
35+
width="24"
36+
height="4"
37+
rx="2"
38+
transform="translate(13 22)"
39+
fill="#42a9dc"
40+
/>
41+
<rect
42+
id="Rectangle_3"
43+
data-name="Rectangle 3"
44+
width="30"
45+
height="4"
46+
rx="2"
47+
transform="translate(13 31)"
48+
fill="#42a9dc"
49+
/>
50+
</g>
51+
</svg>
52+
<NavLinks />
53+
</ul>
54+
</div>
55+
);
56+
};
57+
58+
export default Nav;

frontend/src/components/navLinks/index.jsx renamed to frontend/src/components/navLinks/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import React from "react";
12
import styles from "./style.module.css";
23
import { Link } from "react-router-dom";
34

4-
function NavLinks() {
5+
const NavLinks: React.FC = () => {
56
return (
67
<>
78
<Link to="" className={styles.Link}>
@@ -24,6 +25,6 @@ function NavLinks() {
2425
</Link>
2526
</>
2627
);
27-
}
28+
};
2829

2930
export default NavLinks;

0 commit comments

Comments
 (0)