Merge branch 'main' into 1386-remote-folder-cleanup

Author: kriswest

.github/workflows/dependency-review.yml

@@ -21,6 +21,6 @@ jobs:
         with:
           comment-summary-in-pr: always
           fail-on-severity: high
-          allow-licenses: MIT, MIT-0, Apache-2.0, BSD-3-Clause, BSD-3-Clause-Clear, ISC, BSD-2-Clause, Unlicense, CC0-1.0, 0BSD, X11, MPL-2.0, MPL-1.0, MPL-1.1, MPL-2.0, OFL-1.1, Zlib, BlueOak-1.0.0
+          allow-licenses: MIT, MIT-0, Apache-2.0, BSD-3-Clause, BSD-3-Clause-Clear, ISC, BSD-2-Clause, Unlicense, CC0-1.0, 0BSD, X11, MPL-2.0, MPL-1.0, MPL-1.1, MPL-2.0, OFL-1.1, Zlib, BlueOak-1.0.0, Ubuntu-font-1.0
           fail-on-scopes: development, runtime
           allow-dependencies-licenses: 'pkg:npm/caniuse-lite'

index.html

@@ -31,28 +31,6 @@
     <link rel="manifest" href="/manifest.json" />
     <link rel="shortcut icon" href="/favicon.ico" />
     <link rel="apple-touch-icon" sizes="76x76" href="/apple-icon.png" />
-    <link rel="stylesheet" href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css" />
-
-    <script
-      src="https://cdn.jsdelivr.net/chartist.js/0.11.0/chartist.min.js"
-      integrity="sha384-BnJvHBnDyKVZFn8I5i6LHXOscPlizGS+cgZi1crgdHmjU9lVKXwtNsqXQ521P++Z"
-      crossorigin="anonymous"
-    ></script>
-    <link
-      rel="stylesheet"
-      href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons"
-    />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
-    <link
-      rel="stylesheet"
-      href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    />
-
-    <link
-      rel="stylesheet"
-      type="text/css"
-      href="https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css"
-    />
 
     <!--
           Notice the use of / in the tags above.

package-lock.json

@@ -85,6 +85,7 @@
   },
   "dependencies": {
     "@aws-sdk/credential-providers": "^3.980.0",
+    "@fontsource/roboto": "^5.2.9",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "4.11.3",
     "@primer/octicons-react": "^19.21.2",
@@ -102,12 +103,14 @@
     "express-http-proxy": "^2.1.2",
     "express-rate-limit": "^8.2.1",
     "express-session": "^1.19.0",
+    "font-awesome": "^4.7.0",
     "history": "5.3.0",
     "isomorphic-git": "^1.36.3",
     "jsonwebtoken": "^9.0.3",
     "load-plugin": "^6.0.3",
     "lodash": "^4.17.23",
     "lusca": "^1.7.0",
+    "material-design-icons": "^3.0.1",
     "moment": "^2.30.1",
     "mongodb": "^5.9.2",
     "openid-client": "^6.8.1",
@@ -172,8 +175,8 @@
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.54.0",
     "vite": "^7.3.1",
-    "vitest": "^3.2.4",
-    "vite-tsconfig-paths": "^5.1.4"
+    "vite-tsconfig-paths": "^5.1.4",
+    "vitest": "^3.2.4"
   },
   "optionalDependencies": {
     "@esbuild/darwin-arm64": "^0.27.2",

package.json

@@ -1,9 +1,20 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route, Routes, Navigate } from 'react-router-dom';
+
+// Styles
+import 'font-awesome/css/font-awesome.min.css';
+import '@fontsource/roboto/300.css';
+import '@fontsource/roboto/400.css';
+import '@fontsource/roboto/500.css';
+import '@fontsource/roboto/700.css';
+import 'material-design-icons/iconfont/material-icons.css';
+import 'diff2html/bundles/css/diff2html.min.css';
+
+// Auth provider
 import { AuthProvider } from './ui/auth/AuthProvider';
 
-// core components
+// Core components
 import Dashboard from './ui/layouts/Dashboard';
 import Login from './ui/views/Login/Login';
 import './ui/assets/css/material-dashboard-react.css';