0.8.0

mrJO1N · Jul 18, 2024 · fc2155c · fc2155c
1 parent 33c6c03
commit fc2155c
Show file tree

Hide file tree

Showing 34 changed files with 368 additions and 191 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,3 +3,7 @@
 - complete server dev
 - complete general environment (bat,bash)
 - complete frontend environment
+
+## 0.8.0
+
+- complete frontend
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "3205.client",
-  "version": "0.4.0",
+  "version": "0.8.0",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^5.17.0",
@@ -10,6 +10,9 @@
     "@types/node": "^16.18.102",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
+    "axios": "^1.7.2",
+    "joi": "^17.13.3",
+    "joi-browser": "^13.4.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-scripts": "5.0.1",

diff --git a/client/public/favicon.ico b/client/public/favicon.ico
diff --git a/client/public/index.html b/client/public/index.html
@@ -2,42 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
     <title>React App</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
 </html>
diff --git a/client/public/logo192.png b/client/public/logo192.png
diff --git a/client/public/logo512.png b/client/public/logo512.png
diff --git a/client/public/manifest.json b/client/public/manifest.json
diff --git a/client/public/robots.txt b/client/public/robots.txt
diff --git a/client/src/API/main.ts b/client/src/API/main.ts
@@ -0,0 +1,14 @@
+import axios from "axios";
+export async function getUsers(email?: string, num?: string) {
+  let urlQuery = [];
+
+  if (email) urlQuery.push(`email=${email}`);
+  if (num) urlQuery.push(`number=${num}`);
+
+  const url = "http://localhost/api/users/?" + urlQuery.join("&");
+
+  return await axios
+    .get(url)
+    .catch((error) => console.error(error.message))
+    .then((res) => res?.data);
+}
diff --git a/client/src/App.css b/client/src/App.css
@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

diff --git a/client/src/App.test.tsx b/client/src/App.test.tsx
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -1,24 +1,23 @@
-import React from 'react';
-import logo from './logo.svg';
-import './App.css';
+import React, { useEffect, useState } from "react";
+import "./App.css";
+import { getUsers } from "./API/main";
+import { UI } from "./components/UI/main";
+import FindUserForm from "./components/FindUserForm";
+import UserList from "./components/UserList";
+import { UserI } from "./types";
 
 function App() {
+  const [userList, setUserList] = useState<UserI[]>([]);
+
+  useEffect(() => {
+    getUsers().then((users) => setUserList(users));
+  }, []);
+
   return (
     <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.tsx</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
+      <FindUserForm setUserList={setUserList} />
+      <hr style={{ padding: "0 0px", margin: "10px 0" }} />
+      <UserList users={userList} />
     </div>
   );
 }