ui improvements

Makefile

@@ -1,4 +1,4 @@
-VERSION :=$(shell git describe --tags)
+VERSION :=$(shell git describe --tags --always)
 LDFLAGS := "-s -w -X main.version=$(VERSION)"
 OUT_DIR := dist
 CMD := ./cmd/rmfakecloud

dockerbuild.sh

@@ -1,2 +1,2 @@
 export DOCKER_BUILDKIT=1
-docker build -t rmfakecloud --no-cache --build-arg VERSION="$(git describe --tags)" .
+docker build -t rmfakecloud --no-cache --build-arg VERSION="$(git describe --tags --always)" .

ui/README.md

@@ -1,68 +1 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.<br />
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br />
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.<br />
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br />
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
-
-### Analyzing the Bundle Size
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
-
-### Making a Progressive Web App
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
-
-### Advanced Configuration
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
-
-### Deployment
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
-
-### `npm run build` fails to minify
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
+# UI for rmfakecloud

ui/package.json

@@ -5,10 +5,13 @@
   "private": true,
   "dependencies": {
     "autoprefixer": "10.4.5",
-    "bootstrap": "5.2.0-beta1",
+    "bootstrap": "^5.2.0",
     "jwt-decode": "^3.1.2",
+    "moment": "^2.29.4",
+    "node-sass": "^9.0.0",
     "react": "^17.0.1",
-    "react-bootstrap": "^1.4.3",
+    "react-arborist": "^3.2.0",
+    "react-bootstrap": "^2.5.0",
     "react-dom": "^17.0.1",
     "react-dropzone": "^11.3.2",
     "react-dropzone-uploader": "^2.11.0",
@@ -17,6 +20,7 @@
     "react-router-dom": "^5.3.0",
     "react-toastify": "^8.1.1",
     "react-treebeard": "^3.2.4",
+    "sass": "^1.69.5",
     "typescript": "^4.4.4"
   },
   "scripts": {
@@ -41,14 +45,17 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
     "@types/node": "^16.11.4",
     "@types/react": "^17.0.31",
     "@types/react-dom": "^17.0.10",
     "@types/react-router-dom": "^5.3.1",
-    "react-scripts": "5.0.1"
+    "react-scripts": "5.0.1",
+    "sass-loader": "^13.3.2",
+    "webpack": "^5.89.0"
   },
   "proxy": "http://localhost:3000"
 }

ui/public/index.html

@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-bs-theme="dark">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="RM FakeApi"
-    />
     <title>rmfakecloud</title>
   </head>
-  <body>
+  <body style="background-color: #000; overflow-y: scroll">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
   </body>

ui/src/App.tsx

@@ -1,48 +1,48 @@
 import React, {useEffect} from "react";
-
-import Navigationbar from "./components/Navigation";
-import Login from "./components/Login";
-import UserList from "./components/UserList";
-import UserProfile from "./components/UserProfile";
-import Home from "./components/Home";
-import Documents from "./components/Documents";
-import NoMatch from "./components/NoMatch";
-
 import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
+import { ToastContainer } from 'react-toastify';
+
+import apiService from "./services/api.service";
 import { AuthProvider } from "./common/useAuthContext";
-import { PrivateRoute } from "./components/PrivateRoute";
-import CodeGenerator from "./components/CodeGenerator";
-import ResetPassword from "./components/ResetPassword";
 import Role from "./common/Role";
-import apiService from "./services/api.service";
-import { ToastContainer } from 'react-toastify';
+import { PrivateRoute } from "./components/PrivateRoute";
+import Navigationbar from "./components/Navigation";
+
+import Login from "./pages/Login";
+import Home from "./pages/Home";
+import About from "./pages/About";
+import Connect from "./pages/Connect";
+import Documents from "./pages/Documents";
+import Admin from "./pages/Admin";
+import NoMatch from "./pages/404";
+
 import 'react-toastify/dist/ReactToastify.css';
 import "bootstrap/dist/css/bootstrap.min.css";
 
 export default function App() {
+
   useEffect(() => {
     apiService.checkLogin()
   }, [])
+
   return (
     <>
-    <AuthProvider>
-      <Router>
-        <Navigationbar />
-        <div style={{ padding: "10px" }}>
-          <Switch>
-            <PrivateRoute exact path="/" component={Home} />
-            <PrivateRoute path="/documents" component={Documents} />
-            <PrivateRoute path="/generatecode" component={CodeGenerator} />
-            <PrivateRoute path="/resetPassword" component={ResetPassword} />
-            <PrivateRoute path="/users/:userid" component={UserProfile} /> 
-            <PrivateRoute path="/users" roles={[Role.Admin]} component={UserList} />
-            <Route path="/login" component={Login} />
-            <Route component={NoMatch} />
-          </Switch>
-        </div>
-      </Router>
-    </AuthProvider>
-    <ToastContainer autoClose={2000} />
+      <AuthProvider>
+        <Router>
+          <Navigationbar />
+            <Switch>
+              <PrivateRoute exact path="/" component={Home} />
+              <PrivateRoute path="/documents" component={Documents} />
+              <PrivateRoute path="/connect" component={Connect} />
+              <PrivateRoute path="/admin" roles={[Role.Admin]} component={Admin} />
+              <PrivateRoute path="/about" component={About} />
+
+              <Route path="/login" component={Login} />
+              <Route component={NoMatch} />
+            </Switch>
+        </Router>
+      </AuthProvider>
+      <ToastContainer autoClose={2000} />
     </>
   );
 }