Merge branch 'sudo'

Author: yp969803

.husky/pre-commit

@@ -12,6 +12,7 @@
     "eslint-config-prettier": "^9.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-hot-toast": "^2.4.1",
     "react-query": "^3.39.3",
     "react-redux": "^8.1.3",
     "react-router-dom": "^6.16.0",
@@ -71,6 +72,6 @@
     "husky": "^8.0.3",
     "prettier": "^3.0.3",
     "sass": "^1.68.0",
-    "typescript": "^5.2.2"
+    "typescript": "^4.9.5"
   }
 }

package-lock.json

@@ -1,15 +1,27 @@
-import axios from 'axios';
+import axios, { AxiosResponse } from 'axios';
 import { BACKEND_URL } from 'envConstants';
 
+
+export interface FileUpload{
+   
+  message: string,
+  isSuccessful: boolean,
+  statusCode: number,
+
+}
+
+
+
+
 export const uploadIcon = async (
   authorizationToken: string,
   orgName: string,
   file: File
-) => {
+):Promise<AxiosResponse<FileUpload>> => {
   const url = BACKEND_URL + '/api/protected/file/upload/' + orgName;
   const formData = new FormData();
   formData.append('file', file);
-  const respnse = await axios.post(url, formData, {
+  const respnse = await axios.post<FileUpload>(url, formData, {
     headers: {
       Accept: 'application/json',
       Authorization: `Bearer ${authorizationToken}`,

package.json

@@ -1,11 +1,23 @@
-import axios from 'axios';
+import axios, { AxiosResponse } from 'axios';
 import { BACKEND_URL } from 'envConstants';
 
 export interface organizationBody {
   name: string;
   description: string;
 }
 
+
+export interface AllOrgs{
+  organizations: {
+    id: number,
+    name: string,
+    description: string|null
+  }[]
+}
+
+
+
+
 export const deleteOrg = async (
   authorizationToken: string,
   orgName: string
@@ -195,9 +207,9 @@ export const getOrg = async (authorizationToken: string, orgName: string) => {
   return respnse;
 };
 
-export const getAllOrgs = async (authorizationToken: string) => {
+export const getAllOrgs = async (authorizationToken: string): Promise<AxiosResponse<AllOrgs>> => {
   const url = BACKEND_URL + '/api/protected/org/getAllOrg';
-  const respnse = await axios.get(url, {
+  const respnse = await axios.get<AllOrgs>(url, {
     headers: {
       Accept: 'application/json',
       Authorization: `Bearer ${authorizationToken}`,

src/app/api/file.ts

@@ -9,6 +9,14 @@ export interface UserData{
 }
 
 
+
+export interface AllUserData{
+  users: {
+    id: number,
+    username: string
+  }[]
+}
+
 export const getUser= async (authorizationToken: string):Promise<AxiosResponse<UserData>> => {
   const url = BACKEND_URL + '/api/protected/user/getUser';
 
@@ -24,9 +32,9 @@ export const getUser= async (authorizationToken: string):Promise<AxiosResponse<U
 
 };
 
-export const getAllUser = async (authorizationToken: string) => {
+export const getAllUser = async (authorizationToken: string):Promise<AxiosResponse<AllUserData>> => {
   const url = BACKEND_URL + '/api/protected/user/all';
-  const respnse = await axios.get(url, {
+  const respnse = await axios.get<AllUserData>(url, {
     headers: {
       Accept: 'application/json',
       Authorization: `Bearer ${authorizationToken}`,

src/app/api/organization.ts

@@ -2,12 +2,13 @@ import React from 'react';
 import Navbar from 'app/components/navbar';
 import BasicRoutes from 'app/routes/BasicRoutes';
 import './index.scss';
-
+import { Toaster } from 'react-hot-toast';
 function App() {
   return (
     <>
       <Navbar />
       <BasicRoutes />
+      <Toaster/>
     </>
   );
 }

src/app/api/user.ts

@@ -6,6 +6,7 @@ import AddProject from 'features/AddProject';
 import Error from 'features/Error';
 import WorkspaceView from 'features/workspace-view';
 import Login from 'features/login';
+import AddWorkspace from 'features/AddWorkspace';
 const BasicRoutes = () => {
   return (
     <Routes>
@@ -14,6 +15,7 @@ const BasicRoutes = () => {
       <Route path={'/addproject'} element={<AddProject />} />
       <Route path={'/workspace-view'} element={<WorkspaceView />} />
       <Route path={'/login'} element={<Login />} />
+      <Route path={'/addWorkspace'} element={<AddWorkspace />} />
       <Route path={'/*'} element={<Error />} />
     </Routes>
   );