diff --git a/src/frontend/src/pages/AdminPage/LoginPage/index.tsx b/src/frontend/src/pages/AdminPage/LoginPage/index.tsx
index 6109278c4..74cc75d07 100644
--- a/src/frontend/src/pages/AdminPage/LoginPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/LoginPage/index.tsx
@@ -1,29 +1,28 @@
-import { FaApple, FaGithub } from "react-icons/fa";
+import { useNavigate } from "react-router-dom";
import { Button } from "../../../components/ui/button";
import { Input } from "../../../components/ui/input";
-import { GoogleIcon } from "../../../icons/Google";
-import { useNavigate } from "react-router-dom";
export default function LoginAdminPage() {
-
const navigate = useNavigate();
function loginAdmin() {
navigate("/admin/");
}
-
+
return (
⛓️
-
- Admin
-
+ Admin
-
diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx
index 6f1c8fea1..e598af8b4 100644
--- a/src/frontend/src/pages/AdminPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/index.tsx
@@ -1,8 +1,9 @@
import _ from "lodash";
-import { Pencil, Trash2, X } from "lucide-react";
+import { X } from "lucide-react";
import { useEffect, useRef, useState } from "react";
import PaginatorComponent from "../../components/PaginatorComponent";
import ShadTooltip from "../../components/ShadTooltipComponent";
+import IconComponent from "../../components/genericIconComponent";
import { Button } from "../../components/ui/button";
import { Input } from "../../components/ui/input";
import {
@@ -15,7 +16,6 @@ import {
} from "../../components/ui/table";
import ConfirmationModal from "../../modals/ConfirmationModal";
import UserManagementModal from "../../modals/UserManagementModal";
-import IconComponent from "../../components/genericIconComponent";
export default function AdminPage() {
const [inputValue, setInputValue] = useState("");
@@ -249,154 +249,153 @@ export default function AdminPage() {
return (
<>
-
-
-
-
-
-
-
- Welcome back!
-
-
- Here's a list of all users!
-
+
+
+
+
+
+
+
+ Welcome back!
+
+
+ Here's a list of all users!
+
+
+
-
-
- {userList.current.length === 0 && (
- <>
-
-
There's no users left :)
-
-
- )}
- {userList.current.length > 0 && (
- <>
-
-
-
handleFilterUsers(e.target.value)}
- />
- {inputValue.length > 0 && (
-
-
-
-
-
- User
- Password
-
-
-
-
- {filterUserList.map((user, index) => (
-
-
- {user.user}
-
-
- {user.password}
-
-
-
- {
- handleEditUser(index, user);
- }}
- >
-
-
-
-
-
- {
- handleDeleteUser(index);
- }}
- >
-
-
-
-
-
-
+ >
+
+
+
+ User
+ Password
+
- ))}
-
-
-
- {
- handleChangePagination(pageSize, pageIndex);
- }}
- >
-
- )}
+
+
+ {filterUserList.map((user, index) => (
+
+
+ {user.user}
+
+
+ {user.password}
+
+
+
+ {
+ handleEditUser(index, user);
+ }}
+ >
+
+
+
+
+
+ {
+ handleDeleteUser(index);
+ }}
+ >
+
+
+
+
+
+
+
+ ))}
+
+
+
+
{
+ handleChangePagination(pageSize, pageIndex);
+ }}
+ >
+
+ )}
+
-
-
-
-
);
}
diff --git a/src/frontend/src/pages/signUpPage/index.tsx b/src/frontend/src/pages/signUpPage/index.tsx
index 444c31bc8..797ef62b6 100644
--- a/src/frontend/src/pages/signUpPage/index.tsx
+++ b/src/frontend/src/pages/signUpPage/index.tsx
@@ -1,104 +1,157 @@
-import _ from "lodash";
+import * as Form from "@radix-ui/react-form";
+import { useState } from "react";
import { FaApple, FaGithub } from "react-icons/fa";
+import InputComponent from "../../components/inputComponent";
import { Button } from "../../components/ui/button";
import { Input } from "../../components/ui/input";
-import { GoogleIcon } from "../../icons/Google";
-import { useContext, useState } from "react";
import { CONTROL_INPUT_STATE } from "../../constants/constants";
+import { GoogleIcon } from "../../icons/Google";
import { inputHandlerEventType, inputStateType } from "../../types/components";
-import { alertContext } from "../../contexts/alertContext";
import { Link } from "react-router-dom";
-import InputComponent from "../../components/inputComponent";
+import IconComponent from "../../components/genericIconComponent";
export default function SignUp(): JSX.Element {
- const [inputState, setInputState] = useState
(CONTROL_INPUT_STATE);
-
- const {
- setErrorData,
- errorOpen,
- } = useContext(alertContext);
+ const [inputState, setInputState] =
+ useState(CONTROL_INPUT_STATE);
const { password, cnfPassword, username } = inputState;
- function handleInput({ target: { name, value } }: inputHandlerEventType): void {
- setInputState((prev) => ({ ...prev, [name]: value }));
- };
-
- function handleSignUpPass() {
- if (password !== cnfPassword) {
- const errorDat = {
- title: "Passwords are not equal",
- };
- return setErrorData(errorDat);
- }
- let err = [];
- Object.keys(inputState)
- .forEach((key) => {
- if (inputState[key] === '') {
- err.push(key);
- }
- });
- setErrorData({
- title: "Mandatory fields are empty",
- list: err,
- });
- }
+ function handleInput({
+ target: { name, value },
+ }: inputHandlerEventType): void {
+ setInputState((prev) => ({ ...prev, [name]: value }));
+ }
return (
-
-
-
⛓️
-
- Sign up to LangFlow
-
-
-
or
-
-
handleInput({ target: { name: 'password', value } })}
- password={true}
- placeholder="Password"
- />
- handleInput({ target: { name: 'cnfPassword', value } })}
- password={true}
- placeholder="Confirm your password"
- />
-
-
-
-
-
-
+
+
⛓️
+
+ Sign up to LangFlow
+
+
+
+
+
+
+
or
+
+
+
+ Username *
+
+
+
+ {
+ handleInput({ target: { name: "username", value } });
+ }}
+ value={username}
+ className="w-full"
+ required
+ placeholder="Username"
+ />
+
+
+
+ Please enter your username
+
+
+
+
+
+
+ Password *
+
+
+
+ {
+ handleInput({ target: { name: "password", value } });
+ }}
+ value={password}
+ password={true}
+ placeholder="Password"
+ className="w-full"
+ />
+
+
+
+ Please enter a password
+
+
+ {password != cnfPassword && (
+
+ Passwords do not match
+
+ )}
+
+
+
+
+
+ Confirm your password{" "}
+ *
+
+
+
+ {
+ handleInput({ target: { name: "cnfPassword", value } });
+ }}
+ value={cnfPassword}
+ password={true}
+ />
+
+
+
+ Please confirm your password
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+