aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FrontEnd/package.json4
-rw-r--r--FrontEnd/src/app/index.sass6
-rw-r--r--FrontEnd/webpack.config.dev.js2
3 files changed, 8 insertions, 4 deletions
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index fbcc5fba..a94218ec 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -63,7 +63,7 @@
"@babel/preset-env": "^7.14.1",
"@babel/preset-react": "^7.13.13",
"@babel/preset-typescript": "^7.13.0",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
+ "@pmmmwh/react-refresh-webpack-plugin": "next",
"@types/lodash": "^4.14.168",
"@types/node": "^15.0.2",
"@types/react": "^17.0.5",
@@ -108,7 +108,7 @@
"webpack": "^5.36.2",
"webpack-chain": "^6.5.1",
"webpack-cli": "^4.6.0",
- "webpack-dev-server": "^3.11.2",
+ "webpack-dev-server": "next",
"workbox-webpack-plugin": "^6.1.5"
}
}
diff --git a/FrontEnd/src/app/index.sass b/FrontEnd/src/app/index.sass
index 6f6bafb3..329248b8 100644
--- a/FrontEnd/src/app/index.sass
+++ b/FrontEnd/src/app/index.sass
@@ -15,6 +15,10 @@
@import './views/admin/admin'
+:root
+ --primary-color: #007bff
+ --text-on-primary-color: #ffffff
+
small
line-height: 1.2
@@ -73,7 +77,7 @@ textarea
background: $gray-100
transition: all 0.3s
&:hover
- border-color: $primary
+ border-color: var(--primary)
.full-viewport-center-child
position: fixed
diff --git a/FrontEnd/webpack.config.dev.js b/FrontEnd/webpack.config.dev.js
index a10bdaa8..44438cf3 100644
--- a/FrontEnd/webpack.config.dev.js
+++ b/FrontEnd/webpack.config.dev.js
@@ -40,7 +40,7 @@ config.resolve.set("fallback", {
});
config.devServer
- .contentBase(path.resolve(__dirname, "public/"))
+ .set("static", path.resolve(__dirname, "public/"))
.port(3000)
.historyApiFallback(true)
.hot(true);