From 259aa0bf63b642689f182e5a9763598d79f0e13c Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Fri, 25 Nov 2022 22:45:46 +0100 Subject: [PATCH] resolve bugs | upgrade to jsste@1.3.3 --- dashboard/src/App/index.js | 3 --- dashboard/src/App/routes.js | 4 ++-- dashboard/src/pages/Log/index.js | 2 +- package-lock.json | 17 ++++++++++------- package.json | 2 +- src/websrv/index.js | 2 +- yarn.lock | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dashboard/src/App/index.js b/dashboard/src/App/index.js index b25f074..8e1bcf9 100644 --- a/dashboard/src/App/index.js +++ b/dashboard/src/App/index.js @@ -4,9 +4,6 @@ import Routes from "./routes"; import Navbar from "./navbar"; import "bootstrap/dist/css/bootstrap.min.css"; import "./App.css"; -import Dashboard from "../Dashboard"; -import Log from "../Log"; -import Settings from "../Settings"; function App() { return ( diff --git a/dashboard/src/App/routes.js b/dashboard/src/App/routes.js index e7f6055..01c4642 100644 --- a/dashboard/src/App/routes.js +++ b/dashboard/src/App/routes.js @@ -2,8 +2,8 @@ import { Container, Row, Col, Navbar, Nav } from "react-bootstrap"; import { Routes as RRoutes, Route, Link, BrowserRouter, Layout } from "react-router-dom"; import "bootstrap/dist/css/bootstrap.min.css"; import "./App.css"; -import Dashboard from "../components/Dashboard"; -import Log from "../components/Log"; +import Dashboard from "../pages/Dashboard"; +import Log from "../pages/Log"; import Settings from "../Settings"; function Routes() { diff --git a/dashboard/src/pages/Log/index.js b/dashboard/src/pages/Log/index.js index 2ed6ebf..8e6dd5e 100644 --- a/dashboard/src/pages/Log/index.js +++ b/dashboard/src/pages/Log/index.js @@ -2,7 +2,7 @@ import { Stack, Card, Alert, Spinner } from "react-bootstrap"; import { useEffect, useState } from "react"; import SyntaxHighlighter from "react-syntax-highlighter"; import { github as CodeStyle } from "react-syntax-highlighter/dist/esm/styles/hljs"; -import axiosInstance from "../lib/axiosInstance"; +import axiosInstance from "../../lib/axiosInstance"; import "bootstrap/dist/css/bootstrap.min.css"; import "prismjs/themes/prism.css"; diff --git a/package-lock.json b/package-lock.json index 11cbfea..776ff79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "cors": "^2.8.5", "cron": "^1.8.2", "express": "^4.17.3", - "jsste": "^1.2.3", + "jsste": "^1.3.3", "moment": "^2.29.1", "open": "^8.4.0", "socket.io": "^4.5.1" @@ -949,9 +949,12 @@ } }, "node_modules/jsste": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jsste/-/jsste-1.2.3.tgz", - "integrity": "sha512-n6DLmM7o4IsRv3FP0IqRTryzmN5M1Sa5HCSxh01fms2r18GGE2A81FvQVTIPDv+km2kj5DePeWckEeh1a/N0LQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/jsste/-/jsste-1.3.3.tgz", + "integrity": "sha512-INSZSJtjUL5Be7Z7bPWjrn/Zdoe7H+CwJ6ez6Oy/0p8huAwg8JotJ+nnPiwhcBiaYcPsvkWQAcFk1feK94ENaQ==", + "bin": { + "jsste": "src/cli.js" + }, "engines": { "node": ">= 0.10.0" } @@ -2488,9 +2491,9 @@ } }, "jsste": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/jsste/-/jsste-1.2.3.tgz", - "integrity": "sha512-n6DLmM7o4IsRv3FP0IqRTryzmN5M1Sa5HCSxh01fms2r18GGE2A81FvQVTIPDv+km2kj5DePeWckEeh1a/N0LQ==" + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/jsste/-/jsste-1.3.3.tgz", + "integrity": "sha512-INSZSJtjUL5Be7Z7bPWjrn/Zdoe7H+CwJ6ez6Oy/0p8huAwg8JotJ+nnPiwhcBiaYcPsvkWQAcFk1feK94ENaQ==" }, "locate-path": { "version": "6.0.0", diff --git a/package.json b/package.json index e7c1a10..4f9fa68 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "cors": "^2.8.5", "cron": "^1.8.2", "express": "^4.17.3", - "jsste": "^1.2.3", + "jsste": "^1.3.3", "moment": "^2.29.1", "open": "^8.4.0", "socket.io": "^4.5.1" diff --git a/src/websrv/index.js b/src/websrv/index.js index d39e5c2..b4ea1bf 100644 --- a/src/websrv/index.js +++ b/src/websrv/index.js @@ -19,7 +19,7 @@ module.exports = function (conf) { State.JSSTEState().statusMSG = statusMSG; }); - const internalRouter = require("./routes/internalRouter"); + const internalRouter = require("./routes/internalRouter");32 app.dashboardExist = (cb) => { let result = fs.existsSync(path.join(__dirname, "../../dashboard/")); diff --git a/yarn.lock b/yarn.lock index ff4fa7f..1d31383 100644 --- a/yarn.lock +++ b/yarn.lock @@ -601,10 +601,10 @@ dependencies: "argparse" "^2.0.1" -"jsste@^1.2.3": - "integrity" "sha512-n6DLmM7o4IsRv3FP0IqRTryzmN5M1Sa5HCSxh01fms2r18GGE2A81FvQVTIPDv+km2kj5DePeWckEeh1a/N0LQ==" - "resolved" "https://registry.npmjs.org/jsste/-/jsste-1.2.3.tgz" - "version" "1.2.3" +"jsste@^1.3.3": + "integrity" "sha512-INSZSJtjUL5Be7Z7bPWjrn/Zdoe7H+CwJ6ez6Oy/0p8huAwg8JotJ+nnPiwhcBiaYcPsvkWQAcFk1feK94ENaQ==" + "resolved" "https://registry.npmjs.org/jsste/-/jsste-1.3.3.tgz" + "version" "1.3.3" "locate-path@^6.0.0": "integrity" "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="