From 3d7dc4d03c4ab03f6a8e2fbe6d589f0128067bd9 Mon Sep 17 00:00:00 2001 From: _Bastler Date: Sun, 11 Dec 2022 10:29:49 +0100 Subject: [PATCH] fix bottom bar, migrate placeholder --- ngsw-config.json | 2 +- package-lock.json | 181 +++++++++------------ package.json | 2 +- src/app/pages/entry/edit/edit.page.html | 19 ++- src/app/pages/login/login.page.html | 8 +- src/app/pages/search/search.page.html | 11 +- src/app/pages/settings/settings.page.html | 23 +-- src/app/pages/view/edit/edit.page.html | 12 +- src/app/ui/comment/comment.ui.html | 6 +- src/app/ui/commentform/commentform.ui.html | 3 +- src/app/ui/entries/entries.ui.html | 29 ++-- src/app/ui/entries/entries.ui.scss | 4 +- src/app/ui/main/main.ui.html | 10 +- src/app/ui/tags/tagspicker.ui.html | 11 +- src/app/ui/tags/tagspicker.ui.ts | 5 +- src/styles.scss | 11 ++ 16 files changed, 167 insertions(+), 170 deletions(-) diff --git a/ngsw-config.json b/ngsw-config.json index bf259d6..5ff1913 100644 --- a/ngsw-config.json +++ b/ngsw-config.json @@ -2,7 +2,7 @@ "$schema": "./node_modules/@angular/service-worker/config/schema.json", "index": "/index.html", "appData": { - "version": "1.5.4" + "version": "1.5.5" }, "assetGroups": [ { diff --git a/package-lock.json b/package-lock.json index b3ff9ac..d930d39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bstlboard", - "version": "1.5.4", + "version": "1.5.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bstlboard", - "version": "1.5.4", + "version": "1.5.5", "license": "AGPL3", "dependencies": { "@angular-material-components/datetime-picker": "^9.0.0", @@ -3726,14 +3726,11 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@socket.io/base64-arraybuffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", - "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==", - "dev": true, - "engines": { - "node": ">= 0.6.0" - } + "node_modules/@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==", + "dev": true }, "node_modules/@tootallnate/once": { "version": "2.0.0", @@ -3763,12 +3760,6 @@ "@types/node": "*" } }, - "node_modules/@types/component-emitter": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", - "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==", - "dev": true - }, "node_modules/@types/connect": { "version": "3.4.35", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", @@ -3795,10 +3786,13 @@ "dev": true }, "node_modules/@types/cors": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", - "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==", - "dev": true + "version": "2.8.13", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", + "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==", + "dev": true, + "dependencies": { + "@types/node": "*" + } }, "node_modules/@types/eslint": { "version": "8.4.1", @@ -4183,9 +4177,9 @@ } }, "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -5224,12 +5218,6 @@ "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", "dev": true }, - "node_modules/component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, "node_modules/compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -6061,9 +6049,9 @@ } }, "node_modules/engine.io": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz", - "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz", + "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==", "dev": true, "dependencies": { "@types/cookie": "^0.4.1", @@ -6082,13 +6070,10 @@ } }, "node_modules/engine.io-parser": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz", - "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", + "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==", "dev": true, - "dependencies": { - "@socket.io/base64-arraybuffer": "~1.0.2" - }, "engines": { "node": ">=10.0.0" } @@ -11607,9 +11592,9 @@ } }, "node_modules/resolve-url-loader/node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -12210,36 +12195,35 @@ } }, "node_modules/socket.io": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz", - "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz", + "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==", "dev": true, "dependencies": { "accepts": "~1.3.4", "base64id": "~2.0.0", "debug": "~4.3.2", - "engine.io": "~6.1.0", - "socket.io-adapter": "~2.3.3", - "socket.io-parser": "~4.0.4" + "engine.io": "~6.2.1", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.1" }, "engines": { "node": ">=10.0.0" } }, "node_modules/socket.io-adapter": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz", - "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==", "dev": true }, "node_modules/socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", + "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", "dev": true, "dependencies": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", + "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" }, "engines": { @@ -16573,10 +16557,10 @@ "jsonc-parser": "3.2.0" } }, - "@socket.io/base64-arraybuffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", - "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==", + "@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==", "dev": true }, "@tootallnate/once": { @@ -16604,12 +16588,6 @@ "@types/node": "*" } }, - "@types/component-emitter": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz", - "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==", - "dev": true - }, "@types/connect": { "version": "3.4.35", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", @@ -16636,10 +16614,13 @@ "dev": true }, "@types/cors": { - "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", - "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==", - "dev": true + "version": "2.8.13", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", + "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==", + "dev": true, + "requires": { + "@types/node": "*" + } }, "@types/eslint": { "version": "8.4.1", @@ -17010,9 +16991,9 @@ }, "dependencies": { "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -17796,12 +17777,6 @@ "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", "dev": true }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", @@ -18449,9 +18424,9 @@ } }, "engine.io": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz", - "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz", + "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==", "dev": true, "requires": { "@types/cookie": "^0.4.1", @@ -18467,13 +18442,10 @@ } }, "engine.io-parser": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz", - "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==", - "dev": true, - "requires": { - "@socket.io/base64-arraybuffer": "~1.0.2" - } + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", + "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==", + "dev": true }, "enhanced-resolve": { "version": "5.12.0", @@ -22615,9 +22587,9 @@ }, "dependencies": { "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -23074,33 +23046,32 @@ "dev": true }, "socket.io": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz", - "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz", + "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==", "dev": true, "requires": { "accepts": "~1.3.4", "base64id": "~2.0.0", "debug": "~4.3.2", - "engine.io": "~6.1.0", - "socket.io-adapter": "~2.3.3", - "socket.io-parser": "~4.0.4" + "engine.io": "~6.2.1", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.1" } }, "socket.io-adapter": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz", - "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==", "dev": true }, "socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", + "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", "dev": true, "requires": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", + "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1" } }, diff --git a/package.json b/package.json index fea3a1d..8d431dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bstlboard", - "version": "1.5.4", + "version": "1.5.5", "license": "AGPL3", "scripts": { "ng": "ng", diff --git a/src/app/pages/entry/edit/edit.page.html b/src/app/pages/entry/edit/edit.page.html index 6afa12d..2e6ae5e 100644 --- a/src/app/pages/entry/edit/edit.page.html +++ b/src/app/pages/entry/edit/edit.page.html @@ -1,11 +1,13 @@
-
+

{{ (entry.id ? 'submission.edit' : 'submission.info') | i18n}}

- + {{'submission.entryType' | i18n}} + {{'entryType.' + entryType + '.icon' | i18n}} {{'entryType.' + entryType | i18n}} @@ -16,23 +18,24 @@ - + {{'submission.url' | i18n}} + {{'submission.url.error' | i18n}} - + {{'submission.title' | i18n}} + {{'submission.title.error' | i18n}} - + {{'submission.text' | i18n}} + {{'submission.text.error' | i18n}} diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 7f48371..ce6d865 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -24,15 +24,15 @@ {{'login.invalid' | i18n}} - + {{'username' | i18n}} + {{'username.missing' | i18n}} - + {{'password' | i18n}} + {{'password.invalid.hint' | i18n}} diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 08eae8c..6b2286e 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -5,8 +5,8 @@ - + {{'search.types' | i18n}} + {{'search.types.' + searchType + '.icon' | i18n}} {{'search.types.' + @@ -24,8 +24,8 @@ - + {{'search.byDate' | i18n}} + {{'search.byDate.' + byDate + '.icon' | i18n}} {{'search.byDate.' + byDate | i18n}} @@ -41,7 +41,8 @@ - + {{'search.asc' | i18n}} + {{'search.asc.' + asc + '.icon' | i18n}} {{'search.asc.' + asc | i18n}} diff --git a/src/app/pages/settings/settings.page.html b/src/app/pages/settings/settings.page.html index 060b88f..8836df0 100644 --- a/src/app/pages/settings/settings.page.html +++ b/src/app/pages/settings/settings.page.html @@ -4,14 +4,15 @@ {{user.username}} - + {{'settings.email' | i18n}} + {{'settings.email.error' | i18n}} - + {{'settings.about' | i18n}} + {{'settings.about.error' | i18n}} @@ -24,8 +25,8 @@ mat-icon-button (click)="resetGravity()"> cancel - + {{'settings.gravity' | i18n}} + {{'settings.gravity.hint' | i18n}} @@ -39,8 +40,8 @@ mat-icon-button (click)="resetEntryDelay()"> cancel - + {{'settings.entryDelay' | i18n}} + {{'settings.entryDelay.hint' | i18n}} @@ -54,8 +55,8 @@ matPrefix mat-icon-button (click)="resetCommentDelay()"> cancel - + {{'settings.commentDelay' | i18n}} + {{'settings.commentDelay.hint' | i18n}} @@ -70,8 +71,8 @@ mat-icon-button (click)="resetPageSize()"> cancel - + {{'settings.pageSize' | i18n}} + {{'settings.pageSize.hint' | i18n}} diff --git a/src/app/pages/view/edit/edit.page.html b/src/app/pages/view/edit/edit.page.html index 54003f9..524b978 100644 --- a/src/app/pages/view/edit/edit.page.html +++ b/src/app/pages/view/edit/edit.page.html @@ -6,7 +6,8 @@

{{ (view.id ? 'views.edit' : 'views.create') | i18n}}

- + {{'views.name' | i18n}} +
{{'views.name.error.' + error.key | i18n}}
@@ -15,7 +16,8 @@ - + {{'views.sorting' | i18n}} + {{'sorting.' + sorting + '.icon' | i18n}} {{'sorting.' + sorting | i18n}} @@ -32,7 +34,8 @@ - + {{'views.entryType' | i18n}} + {{'entryType.' + entryType + '.icon' | i18n}} {{'entryType.' + @@ -51,7 +54,8 @@ - + {{'views.index' | i18n}} +
{{'views.index.error.' + error.key | i18n}}
diff --git a/src/app/ui/comment/comment.ui.html b/src/app/ui/comment/comment.ui.html index 2a55678..842ba4c 100644 --- a/src/app/ui/comment/comment.ui.html +++ b/src/app/ui/comment/comment.ui.html @@ -60,7 +60,7 @@ | {{'moderation.comment.delete' | i18n}} - +
@@ -68,8 +68,8 @@ - + {{'comment.text' | i18n}} + {{'comment.text.error' | i18n}} diff --git a/src/app/ui/commentform/commentform.ui.html b/src/app/ui/commentform/commentform.ui.html index 607deb8..9ffacbd 100644 --- a/src/app/ui/commentform/commentform.ui.html +++ b/src/app/ui/commentform/commentform.ui.html @@ -1,7 +1,8 @@ - + {{'comment.text' | i18n}} + {{'comment.text.error' | i18n}} diff --git a/src/app/ui/entries/entries.ui.html b/src/app/ui/entries/entries.ui.html index 4f1f83f..af00ece 100644 --- a/src/app/ui/entries/entries.ui.html +++ b/src/app/ui/entries/entries.ui.html @@ -35,27 +35,28 @@ -
+
filter_alt -
- + + - + + {{'entries.filter.date' | i18n}} + (dateChange)="setFilter('date', $event.value && $event.value.toISOString() || undefined)"> - - + {{'entries.filter.entryType' | i18n}} + @@ -75,16 +76,16 @@ + [change]="boundExcludedTagsPickerChange" appearance="outline"> - + + {{'entries.filter.gravity' | i18n}} + (change)="setFilter('gravity', $event.target && $event.target.value || undefined)"> -
+
* { + &>* { margin-top: 5px; margin-bottom: 5px; margin-left: 15px; @@ -56,4 +56,4 @@ ui-tagspicker { @media screen and (min-width: 992px) { max-width: 50%; } -} +} \ No newline at end of file diff --git a/src/app/ui/main/main.ui.html b/src/app/ui/main/main.ui.html index e98421f..a56eb41 100644 --- a/src/app/ui/main/main.ui.html +++ b/src/app/ui/main/main.ui.html @@ -45,8 +45,8 @@ - + @@ -65,8 +65,9 @@ + {{'search' | i18n}} + (focus)="searchFocus = true" (blur)="searchFocus = false"> @@ -86,7 +87,8 @@ style="font-size: 0.7em;"> {{'page.privacy-policy' | i18n}} - v{{version}} {{'updateSw' | i18n}} + v{{version}} {{'updateSw' | i18n}} diff --git a/src/app/ui/tags/tagspicker.ui.html b/src/app/ui/tags/tagspicker.ui.html index 3f14bbd..6fd6944 100644 --- a/src/app/ui/tags/tagspicker.ui.html +++ b/src/app/ui/tags/tagspicker.ui.html @@ -1,4 +1,5 @@ - + + {{placeholder}} tag{{tag}} @@ -6,10 +7,10 @@ cancel - - {{tags && tags.length || 0}}/{{max}} + + {{tags && tags.length || 0}}/{{max}} diff --git a/src/app/ui/tags/tagspicker.ui.ts b/src/app/ui/tags/tagspicker.ui.ts index c7bffc6..1fb8c88 100644 --- a/src/app/ui/tags/tagspicker.ui.ts +++ b/src/app/ui/tags/tagspicker.ui.ts @@ -10,13 +10,14 @@ import { TagsService } from 'src/app/services/tags.service'; @Component({ selector: 'ui-tagspicker', templateUrl: './tagspicker.ui.html', - styleUrls: [ './tagspicker.ui.scss' ] + styleUrls: ['./tagspicker.ui.scss'] }) export class UiTagsPicker implements OnInit { @Input() change: Function; @Input() model: any; @Input() placeholder: string; + @Input() appearance: string; @Input() max: number = 0; tags: string[] = []; searchTags: Observable; @@ -24,7 +25,7 @@ export class UiTagsPicker implements OnInit { @ViewChild('tagsInput') tagsInput: ElementRef; searchFormControl = new FormControl(); - readonly separatorKeysCodes = [ ENTER, COMMA, SPACE ] as const; + readonly separatorKeysCodes = [ENTER, COMMA, SPACE] as const; constructor(private tagsService: TagsService) { } diff --git a/src/styles.scss b/src/styles.scss index 1cb69b2..3ad104a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -150,6 +150,7 @@ qrcode canvas { max-width: 400px !important; } + .flex { display: flex !important; @@ -173,6 +174,16 @@ qrcode canvas { } } + +@media (max-width: 576px) { + mat-paginator { + .mat-mdc-paginator-range-actions { + flex-wrap: wrap; + } + } +} + + .scroll-container { overflow: auto; }