diff --git a/package-lock.json b/package-lock.json index df276ce8a..a2d822adb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.9.12", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/students-ts-config": "*", "@mate-academy/stylelint-config": "*", "@types/node": "^20.14.10", @@ -1184,10 +1184,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.9.12", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", - "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz", + "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 919fbd42b..77fc93ccf 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "devDependencies": { "@cypress/react18": "^2.0.1", - "@mate-academy/scripts": "^1.9.12", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/students-ts-config": "*", "@mate-academy/stylelint-config": "*", "@types/node": "^20.14.10", diff --git a/src/App.css b/src/App.css new file mode 100644 index 000000000..bbb4a70df --- /dev/null +++ b/src/App.css @@ -0,0 +1,3 @@ +iframe { + display: none; +}/*# sourceMappingURL=App.css.map */ \ No newline at end of file diff --git a/src/App.css.map b/src/App.css.map new file mode 100644 index 000000000..e5169759d --- /dev/null +++ b/src/App.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["App.scss","App.css"],"names":[],"mappings":"AAAA;EACE,aAAA;ACCF","file":"App.css"} \ No newline at end of file diff --git a/src/App.tsx b/src/App.tsx index adcb8594e..ae72b4b2d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,20 +1,28 @@ -import { PeoplePage } from './components/PeoplePage'; import { Navbar } from './components/Navbar'; +import { Routes, Route, Navigate } from 'react-router-dom'; +import { HomePage } from './components/HomePage'; +import { PeoplePage } from './components/PeoplePage'; +import { NotFoundPage } from './components/NotFoundPage/NotFoundPage'; +import { HashRouter } from 'react-router-dom'; import './App.scss'; -export const App = () => { - return ( +export const App = () => ( +
-
+
-

Home Page

-

Page not found

- + + }> + }> + } /> + } /> + }> +
-
+
- ); -}; + +); diff --git a/src/components/HomePage/HomePage.tsx b/src/components/HomePage/HomePage.tsx new file mode 100644 index 000000000..e4cd51ac5 --- /dev/null +++ b/src/components/HomePage/HomePage.tsx @@ -0,0 +1,3 @@ +export const HomePage = () => { + return

Home Page

; +}; diff --git a/src/components/HomePage/index.ts b/src/components/HomePage/index.ts new file mode 100644 index 000000000..11e53da67 --- /dev/null +++ b/src/components/HomePage/index.ts @@ -0,0 +1 @@ +export * from './HomePage'; diff --git a/src/components/Loader/Loader.css b/src/components/Loader/Loader.css new file mode 100644 index 000000000..243caac85 --- /dev/null +++ b/src/components/Loader/Loader.css @@ -0,0 +1,25 @@ +.Loader { + display: flex; + width: 100%; + justify-content: center; + align-items: center; +} + +.Loader__content { + border-radius: 50%; + width: 2em; + height: 2em; + margin: 1em auto; + border: 0.3em solid #ddd; + border-left-color: #000; + animation: load8 1.2s infinite linear; +} + +@keyframes load8 { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} diff --git a/src/components/Loader/Loader.css.map b/src/components/Loader/Loader.css.map new file mode 100644 index 000000000..7255ff4a7 --- /dev/null +++ b/src/components/Loader/Loader.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["Loader.scss","Loader.css"],"names":[],"mappings":"AAAA;EACE,aAAA;EACA,WAAA;EACA,uBAAA;EACA,mBAAA;ACCF;ADCE;EACE,kBAAA;EACA,UAAA;EACA,WAAA;EACA,gBAAA;EACA,wBAAA;EACA,uBAAA;EACA,qCAAA;ACCJ;;ADGA;EACE;IACE,uBAAA;ECAF;EDEA;IACE,yBAAA;ECAF;AACF","file":"Loader.css"} \ No newline at end of file diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx deleted file mode 100644 index 3f63898b2..000000000 --- a/src/components/Navbar.tsx +++ /dev/null @@ -1,26 +0,0 @@ -export const Navbar = () => { - return ( - - ); -}; diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx new file mode 100644 index 000000000..f87d5743e --- /dev/null +++ b/src/components/Navbar/Navbar.tsx @@ -0,0 +1,39 @@ +import { NavLink } from 'react-router-dom'; + +export const Navbar = () => { + return ( + + ); +}; diff --git a/src/components/Navbar/index.ts b/src/components/Navbar/index.ts new file mode 100644 index 000000000..e8a656233 --- /dev/null +++ b/src/components/Navbar/index.ts @@ -0,0 +1 @@ +export * from './Navbar'; diff --git a/src/components/NotFoundPage/NotFoundPage.tsx b/src/components/NotFoundPage/NotFoundPage.tsx new file mode 100644 index 000000000..87fe719a7 --- /dev/null +++ b/src/components/NotFoundPage/NotFoundPage.tsx @@ -0,0 +1,3 @@ +export const NotFoundPage = () => { + return

Page not found

; +}; diff --git a/src/components/NotFoundPage/index.ts b/src/components/NotFoundPage/index.ts new file mode 100644 index 000000000..6197aa75a --- /dev/null +++ b/src/components/NotFoundPage/index.ts @@ -0,0 +1 @@ +export * from './NotFoundPage'; diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx deleted file mode 100644 index c9c819cd3..000000000 --- a/src/components/PeopleFilters.tsx +++ /dev/null @@ -1,96 +0,0 @@ -export const PeopleFilters = () => { - return ( -