diff --git a/.vscode/tasks.json b/.vscode/tasks.json index af8dfb2..01d037b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,7 +3,7 @@ "tasks": [ { "type": "shell", - "command":"tsc\nsass src/style:out/style\nrollup -c", + "command":"npm run build", "group": { "kind": "build", "isDefault": true @@ -12,7 +12,7 @@ }, { "type": "shell", - "command":"tsc\nsass src/style:out/style\nrollup -c\nnode ./out/server/index.js\ndel ./out/* -Recurse", + "command":"npm run build\nnode ./out/server/index.js\ndel ./out/* -Recurse", "group": { "kind": "build", "isDefault": true diff --git a/package-lock.json b/package-lock.json index 455e4c3..01020d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,14 @@ { "name": "monofile", - "version": "1.3.0-beta", + "version": "1.4.0-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "monofile", - "version": "1.3.0-beta", + "version": "1.4.0-dev", "license": "Unlicense", "dependencies": { - "@fontsource/fira-code": "^5.0.8", - "@fontsource/inconsolata": "^5.0.8", - "@fontsource/source-sans-pro": "^5.0.8", "@types/body-parser": "^1.19.2", "@types/express": "^4.17.14", "@types/multer": "^1.4.7", @@ -37,7 +34,7 @@ "svelte": "^3.55.1" }, "engines": { - "node": ">=v18" + "node": ">=v16.11" } }, "node_modules/@discordjs/builders": { @@ -90,21 +87,6 @@ "node": ">=16.9.0" } }, - "node_modules/@fontsource/fira-code": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-5.0.8.tgz", - "integrity": "sha512-kp/tJUVnjaZeLHENMBFTTSgP2B7+/rIboeofuMfoGB40s2U0DKXNqQcOqIF5PtDhJ5QTG1LcviYXMnc1yG6oYQ==" - }, - "node_modules/@fontsource/inconsolata": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@fontsource/inconsolata/-/inconsolata-5.0.8.tgz", - "integrity": "sha512-KpBU6q1yCovfycaFprVEauh8U5RsWty3konFfUukyRRxZBK4Sf73XmGQc8iJ4CPrOP4dplGfdX2kjbRgdymajA==" - }, - "node_modules/@fontsource/source-sans-pro": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@fontsource/source-sans-pro/-/source-sans-pro-5.0.8.tgz", - "integrity": "sha512-5U2UvIYRkCMozZ388gCE73PEpa2MFgN/0t9O4a1FF7bGT/MIneQWSL1XpWZ8iMVYdh6ntxRf3iFA6slCIuFgkg==" - }, "node_modules/@rollup/plugin-node-resolve": { "version": "15.0.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.1.tgz", @@ -1750,21 +1732,6 @@ "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.1.0.tgz", "integrity": "sha512-e7d+PaTLVQav6rOc2tojh2y6FE8S7REkqLldq1XF4soCx74XB/DIjbVbVLtBemf0nLW77ntz0v+o5DytKwFNLQ==" }, - "@fontsource/fira-code": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-5.0.8.tgz", - "integrity": "sha512-kp/tJUVnjaZeLHENMBFTTSgP2B7+/rIboeofuMfoGB40s2U0DKXNqQcOqIF5PtDhJ5QTG1LcviYXMnc1yG6oYQ==" - }, - "@fontsource/inconsolata": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@fontsource/inconsolata/-/inconsolata-5.0.8.tgz", - "integrity": "sha512-KpBU6q1yCovfycaFprVEauh8U5RsWty3konFfUukyRRxZBK4Sf73XmGQc8iJ4CPrOP4dplGfdX2kjbRgdymajA==" - }, - "@fontsource/source-sans-pro": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@fontsource/source-sans-pro/-/source-sans-pro-5.0.8.tgz", - "integrity": "sha512-5U2UvIYRkCMozZ388gCE73PEpa2MFgN/0t9O4a1FF7bGT/MIneQWSL1XpWZ8iMVYdh6ntxRf3iFA6slCIuFgkg==" - }, "@rollup/plugin-node-resolve": { "version": "15.0.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.1.tgz", diff --git a/package.json b/package.json index 5356eb1..03f1c4a 100644 --- a/package.json +++ b/package.json @@ -5,10 +5,11 @@ "main": "index.js", "scripts": { "start": "node ./out/server/index.js", + "build": "tsc\nsass src/style:out/style\nrollup -c", "test": "echo \"Error: no test specified\" && exit 1" }, "keywords": [], - "author": "Etcetera (https://cetera.uk)", + "author": "Etcetera (https://cetera.uk)", "license": "Unlicense", "engines": { "node": ">=v16.11" diff --git a/src/style/app/uploads.scss b/src/style/app/uploads.scss index 73268e9..9e8827a 100644 --- a/src/style/app/uploads.scss +++ b/src/style/app/uploads.scss @@ -23,6 +23,20 @@ font-size: 14px; } + h1 > button { + background-color: #0000 !important; + padding: 0; + margin-top: 5px; + + img { + color: #666666; + } + + &:hover { + img { color: #DDD; } + } + } + a { color:#999; } diff --git a/src/svelte/elem/UploadWindow.svelte b/src/svelte/elem/UploadWindow.svelte index c32dd9f..032b927 100644 --- a/src/svelte/elem/UploadWindow.svelte +++ b/src/svelte/elem/UploadWindow.svelte @@ -1,22 +1,22 @@
- {$serverStats.version ? `v${$serverStats.version}` : "•••"} — Discord based file sharing + {$serverStats.version ? `v${$serverStats.version}` : "•••"} — Discord based file sharing
- +{upload[1].uploadStatus.error ?? "Uploading..."}
++ {upload[1].uploadStatus.error ?? + "Uploading..."} +
{/if} {#if upload[1].uploadStatus.fileId} - + {#if !upload[1].viewingUrl} - - + {#if uploadInProgress == false} - - {#if ($serverStats.accounts||{}).requiredForUpload ? !!$account.username : true} - -Please log in to upload files.
- - ++ Please log in to upload files. +
+ {/if} - {/if} - +
- Hosting {$serverStats.files || "•••"} files
- —
- Maximum filesize is {(($serverStats.maxDiscordFileSize || 0)*($serverStats.maxDiscordFiles || 0))/1048576 || "•••"}MiB
+ Hosting {$serverStats.files || "•••"}
+ files — Maximum filesize is
+ {(($serverStats.maxDiscordFileSize || 0) *
+ ($serverStats.maxDiscordFiles || 0)) /
+ 1048576 || "•••"}MiB
- Made with {Math.floor(Math.random()*10)==0 ? "🐟" : "❤"} by Etcetera — source + Made with {Math.floor(Math.random() * 10) == 0 ? "🐟" : "❤"} by + Etcetera + — + source
-