update package and add baseroot

Melvynx · Jan 17, 2021 · 748a843 · 748a843
1 parent 4054713
commit 748a843
Show file tree

Hide file tree

Showing 3 changed files with 417 additions and 508 deletions.
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "projetq",
+  "name": "vonqey",
   "version": "0.1.0",
   "private": true,
-  "homepage": "https://melvynx.github.io/tools/",
+  "homepage": "",
   "dependencies": {
     "@material-ui/core": "^4.8.1",
     "@material-ui/icons": "^4.5.1",
@@ -20,7 +20,7 @@
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-router-dom": "^5.1.2",
-    "react-scripts": "3.3.0",
+    "react-scripts": "^3.4.1",
     "react-transition-group": "^4.3.0",
     "typescript": "~3.7.2"
   },

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,67 +1,67 @@
-import React from "react";
+import React from 'react';
 
 import {
   CssBaseline,
   ThemeProvider,
   createMuiTheme,
   Box,
-  responsiveFontSizes
-} from "@material-ui/core";
-import { Switch, HashRouter as Router, Route } from "react-router-dom";
-import RandomSentence from "./page/RandomSentence";
-import HomePage from "./page/HomePage";
-import BaseCalculator from "./page/BaseCalculator";
-import GitHubPages from "./page/GitHubPages";
-import Footer from "./components/App/Footer";
-import Forum from "./page/Forum";
+  responsiveFontSizes,
+} from '@material-ui/core';
+import { Switch, HashRouter as Router, Route } from 'react-router-dom';
+import RandomSentence from './page/RandomSentence';
+import HomePage from './page/HomePage';
+import BaseCalculator from './page/BaseCalculator';
+import GitHubPages from './page/GitHubPages';
+import Footer from './components/App/Footer';
+import Forum from './page/Forum';
 
 let theme = createMuiTheme({
   palette: {
-    type: "dark",
+    type: 'dark',
     primary: {
-      main: "#bb87fa",
-      contrastText: "#000"
+      main: '#bb87fa',
+      contrastText: '#000',
     },
     secondary: {
-      main: "#1ddac6",
-      contrastText: "#fff"
+      main: '#1ddac6',
+      contrastText: '#fff',
     },
     error: {
-      light: "##ef9a9a",
-      main: "#ce667a",
-      dark: "#af0025",
-      contrastText: "#7e7e7e"
+      light: '##ef9a9a',
+      main: '#ce667a',
+      dark: '#af0025',
+      contrastText: '#7e7e7e',
     },
     background: {
-      default: "#1d1d1d",
-      paper: "#2c2c2c"
-    }
+      default: '#1d1d1d',
+      paper: '#2c2c2c',
+    },
   },
   typography: {
     subtitle1: {
-      fontStyle: "italic"
+      fontStyle: 'italic',
     },
     fontFamily: [
-      "-apple-system",
-      "BlinkMacSystemFont",
-      "Segoe UI",
-      "Roboto",
-      "Oxygen",
-      "Ubuntu",
-      "Cantarell",
-      "Open Sans",
-      "Helvetica Neue",
-      "sans-serif"
-    ].join(",")
+      '-apple-system',
+      'BlinkMacSystemFont',
+      'Segoe UI',
+      'Roboto',
+      'Oxygen',
+      'Ubuntu',
+      'Cantarell',
+      'Open Sans',
+      'Helvetica Neue',
+      'sans-serif',
+    ].join(','),
   },
   spacing: 8,
   overrides: {
     MuiButton: {
       text: {
-        borderRadius: 2
-      }
-    }
-  }
+        borderRadius: 2,
+      },
+    },
+  },
 });
 theme = responsiveFontSizes(theme);
 
@@ -70,7 +70,7 @@ export default function App() {
     <ThemeProvider theme={theme}>
       <CssBaseline />
       <Box pb={34}>
-        <Router basename="">
+        <Router basename={process.env.PUBLIC_URL}>
           <Switch>
             <Route path="/randomWord">
               <RandomSentence />