Преглед изворни кода

Update way out of date node stuff

Robert Marshall пре 2 година
родитељ
комит
de9c309b56

+ 1 - 1
Infrastructure/.drone.yml

@@ -30,7 +30,7 @@ steps:
     MailboxEndpoint:
       from_secret: MailboxEndpoint
   commands:
-  - curl -sL https://deb.nodesource.com/setup_12.x | bash -
+  - curl -sL https://deb.nodesource.com/setup_18.x | bash -
   - apt-get install -y nodejs
   - chmod +x ./build.sh
   - ./build.sh

+ 1 - 1
src/Website/gulpfile.js

@@ -1,5 +1,5 @@
 var gulp = require("gulp"),
-	sass = require("gulp-sass"),
+	sass = require("gulp-sass")(require('sass')),
 	cleanCss = require("gulp-clean-css");
 
 gulp.task("compile_scss", function () {

Разлика између датотеке није приказан због своје велике величине
+ 5934 - 1075
src/Website/package-lock.json


+ 6 - 5
src/Website/package.json

@@ -4,13 +4,14 @@
   "description": "",
   "main": "index.js",
   "devDependencies": {
-    "gulp": "^4.0.0",
-    "gulp-clean-css": "^4.0.0",
-    "gulp-less": "^4.0.1",
-    "gulp-sass": "^4.0.2"
+    "gulp": "^4.0.2",
+    "gulp-clean-css": "^4.3.0",
+    "gulp-less": "^5.0.0",
+    "gulp-sass": "^5.1.0"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.12.1"
+    "@fortawesome/fontawesome-free": "^5.12.1",
+    "sass": "^1.58.0"
   },
   "scripts": {
     "gulp": "gulp"

+ 0 - 14
src/Website/wwwroot/css/map.scss

@@ -1,14 +0,0 @@
-#map{
-	height: 80vh;
-	margin: 0 10px;
-
-	.leaflet-control{
-		opacity: 0;
-	}
-
-	&:hover{
-		.leaflet-control{
-			opacity: 1;
-		}
-	}
-}

+ 0 - 1
src/Website/wwwroot/css/style.scss

@@ -3,7 +3,6 @@
 $fa-font-path: "../webfonts";
 @import "../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
 @import "../../node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
-@import "map.css";
 
 * {
 	box-sizing: border-box;