Update bookshelf texture image path, update glob

This commit is contained in:
advplyr 2023-04-25 18:28:47 -05:00
parent 97e8d4f5c0
commit 29d1f75f5c
4 changed files with 13 additions and 25 deletions

View file

@ -5,7 +5,7 @@
@import './absicons.css';
:root {
--bookshelf-texture-img: url(/textures/wood_default.jpg);
--bookshelf-texture-img: url(~static/textures/wood_default.jpg);
--bookshelf-divider-bg: linear-gradient(180deg, rgba(149, 119, 90, 1) 0%, rgba(103, 70, 37, 1) 17%, rgba(103, 70, 37, 1) 88%, rgba(71, 48, 25, 1) 100%);
}

26
package-lock.json generated
View file

@ -11,7 +11,7 @@
"dependencies": {
"axios": "^0.27.2",
"express": "^4.17.1",
"glob": "^10.2.1",
"glob": "^10.2.2",
"graceful-fs": "^4.2.10",
"htmlparser2": "^8.0.1",
"node-tone": "^1.0.1",
@ -659,11 +659,6 @@
"node": ">= 0.6"
}
},
"node_modules/fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
},
"node_modules/fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@ -697,12 +692,11 @@
}
},
"node_modules/glob": {
"version": "10.2.1",
"resolved": "https://registry.npmjs.org/glob/-/glob-10.2.1.tgz",
"integrity": "sha512-ngom3wq2UhjdbmRE/krgkD8BQyi1KZ5l+D2dVm4+Yj+jJIBp74/ZGunL6gNGc/CYuQmvUBiavWEXIotRiv5R6A==",
"version": "10.2.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-10.2.2.tgz",
"integrity": "sha512-Xsa0BcxIC6th9UwNjZkhrMtNo/MnyRL8jGCP+uEwhA5oFOCY1f2s1/oNKY47xQ0Bg5nkjsfAEIej1VeH62bDDQ==",
"dependencies": {
"foreground-child": "^3.1.0",
"fs.realpath": "^1.0.0",
"jackspeak": "^2.0.3",
"minimatch": "^9.0.0",
"minipass": "^5.0.0",
@ -2114,11 +2108,6 @@
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
},
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
},
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
@ -2142,12 +2131,11 @@
}
},
"glob": {
"version": "10.2.1",
"resolved": "https://registry.npmjs.org/glob/-/glob-10.2.1.tgz",
"integrity": "sha512-ngom3wq2UhjdbmRE/krgkD8BQyi1KZ5l+D2dVm4+Yj+jJIBp74/ZGunL6gNGc/CYuQmvUBiavWEXIotRiv5R6A==",
"version": "10.2.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-10.2.2.tgz",
"integrity": "sha512-Xsa0BcxIC6th9UwNjZkhrMtNo/MnyRL8jGCP+uEwhA5oFOCY1f2s1/oNKY47xQ0Bg5nkjsfAEIej1VeH62bDDQ==",
"requires": {
"foreground-child": "^3.1.0",
"fs.realpath": "^1.0.0",
"jackspeak": "^2.0.3",
"minimatch": "^9.0.0",
"minipass": "^5.0.0",

View file

@ -32,7 +32,7 @@
"dependencies": {
"axios": "^0.27.2",
"express": "^4.17.1",
"glob": "^10.2.1",
"glob": "^10.2.2",
"graceful-fs": "^4.2.10",
"htmlparser2": "^8.0.1",
"node-tone": "^1.0.1",

View file

@ -150,7 +150,7 @@ class Server {
router.use(this.auth.cors)
router.use(fileUpload())
router.use(express.urlencoded({ extended: true, limit: "5mb" }));
router.use(express.urlencoded({ extended: true, limit: "5mb" }))
router.use(express.json({ limit: "5mb" }))
// Static path to generated nuxt
@ -328,7 +328,7 @@ class Server {
}
// Apply the current RouterBasePath to all `<base>` tags in the client html files
async applyClientBasePath () {
async applyClientBasePath() {
const basePath = `/${global.RouterBasePath}/`
.replace('///', '') // convert base path `"/""` to `""`
.replace('//', '/') // Ensure there are single `/` at the front and end
@ -341,7 +341,7 @@ class Server {
const currentBasePath = indexHtml.match(/routerBasePath:"([^"]*)"/)[1]
if (currentBasePath === basePath) {
Logger.info(`[Server] Client base path already set to ${basePath}`)
return;
return
}
// Matches e.g `href="/_nuxt/..."` or `src='/...'` or `"url":"http://localhost:3333/...`
@ -380,7 +380,7 @@ class Server {
await fs.writeFile(jsPath, js)
}
Logger.info(`[Server] Client base path set to "${basePath}"`);
Logger.info(`[Server] Client base path set to "${basePath}"`)
}
// First time login rate limit is hit