diff --git a/.woodpecker.yml b/.woodpecker.yml index fd433b4..009cfd0 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,7 +1,11 @@ steps: - build: + lint: image: docker.io/node:16 commands: - git clone --recurse-submodules -j8 https://codeberg.org/dragongoose/safetwitch - npm i + - npm run lint + build: + image: docker.io/node:16 + commands: - npm run build \ No newline at end of file diff --git a/README.md b/README.md index 6ef989b..10bfa63 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # SafeTwitch + +Translation status + SafeTwitch is a privacy respecting frontend for [twitch.tv](https://twitch.tv/) @@ -121,16 +124,16 @@ You can translate here: https://translate.codeberg.org/projects/safetwitch/front If you host a SafeTwitch instance and would like it to be listed in the readme, please make an issue or a pull request to add it in. ### Clearnet -| URL | Country | Info | -|---------------------------|---------|---------| -| [safetwitch.drgns.space \(Official\)](https://safetwitch.drgns.space/) | 🇺🇸 | Homelab | -| [safetwitch.projectsegfau.lt](https://safetwitch.projectsegfau.lt/) | 🇺🇸 🇮🇳 🇫🇷 | #2 | -| [stream.whateveritworks.org](https://stream.whateveritworks.org) | 🇩🇪 | Hosted on Hetzner/Dedicated Server with Encryption at rest | -| [safetwitch.datura.network](https://safetwitch.datura.network) | 🇩🇪 | #9 | -| [ttv.vern.cc](https://ttv.vern.cc) | 🇺🇸 | #12 | -| [safetwitch.frontendfriendly.xyz](https://safetwitch.frontendfriendly.xyz/) | 🇺🇸 | #16 | -| [ttv.femboys.world](https://ttv.femboys.world) | 🇺🇸 | #29 | -| [ttv.asylum.rest](https://ttv.asylum.rest) | 🇺🇸 | #29 | +### Clearnet +| URL | Country | Info | Cloudflare | +|---------------------------|---------|---------|------------| +| [safetwitch.drgns.space \(Official\)](https://safetwitch.drgns.space/) | 🇺🇸 | Homelab | ❌ | +| [safetwitch.projectsegfau.lt](https://safetwitch.projectsegfau.lt/) | 🇺🇸 🇮🇳 🇫🇷 | #2 | ❌ | +| [stream.whateveritworks.org](https://stream.whateveritworks.org) | 🇩🇪 | Hosted on Hetzner/Dedicated Server with Encryption at rest | ✅ | +| [safetwitch.datura.network](https://safetwitch.datura.network) | 🇩🇪 | #9 | ❌ | +| [ttv.vern.cc](https://ttv.vern.cc) | 🇺🇸 | #12 | ❌ | +| [safetwitch.frontendfriendly.xyz](https://safetwitch.frontendfriendly.xyz/) | 🇺🇸 | #16 | ❌ | +| [ttv.femboy.band](https://ttv.femboy.band) | 🇺🇸 | #29 | ✅ | ### Onion | URL | Country | Info | diff --git a/index.html b/index.html index bd0cd02..808d76d 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ SafeTwitch - +
diff --git a/package-lock.json b/package-lock.json index ad335a3..9b37c64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "test", - "version": "2.2.1", + "version": "2.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "test", - "version": "2.2.1", + "version": "2.3.1", "dependencies": { "@intlify/unplugin-vue-i18n": "^0.11.0", "@tailwindcss/forms": "^0.5.3", @@ -42,6 +42,7 @@ "postcss": "^8.4.21", "prettier": "^2.8.4", "tailwindcss": "^3.2.7", + "tailwindcss-themer": "^3.1.0", "typescript": "~4.8.4", "vite": "^4.1.4", "vue-cli-plugin-i18n": "~2.3.2", @@ -1769,6 +1770,19 @@ "node": ">= 6" } }, + "node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1786,6 +1800,16 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dev": true, + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "node_modules/commander": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", @@ -3454,6 +3478,12 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/just-unique": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/just-unique/-/just-unique-4.2.0.tgz", + "integrity": "sha512-cxQGGUiit6CGUpuuiezY8N4m1wgF4o7127rXEXDFcxeDUFfdV7gSkwA26Fe2wWBiNQq2SZOgN4gSmMxB/StA8Q==", + "dev": true + }, "node_modules/karma-safaritechpreview-launcher": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz", @@ -3567,6 +3597,12 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.mergewith": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", + "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", + "dev": true + }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -4758,6 +4794,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/simple-swizzle/node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "dev": true + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -4968,6 +5019,21 @@ "postcss": "^8.0.9" } }, + "node_modules/tailwindcss-themer": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tailwindcss-themer/-/tailwindcss-themer-3.1.0.tgz", + "integrity": "sha512-IfgxpCxWm5rRK3Q7aTvVyhQ/7tyyn8EJl5tFak5tS+/n8oXT7OGfv8praYepR7+IsM92waAuBDZng1HgnstrYA==", + "dev": true, + "dependencies": { + "color": "^4.1.0", + "just-unique": "^4.2.0", + "lodash.merge": "^4.6.2", + "lodash.mergewith": "^4.6.2" + }, + "peerDependencies": { + "tailwindcss": "^3.1.0" + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -6860,6 +6926,16 @@ } } }, + "color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "dev": true, + "requires": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + } + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -6874,6 +6950,16 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dev": true, + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "commander": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", @@ -8094,6 +8180,12 @@ "graceful-fs": "^4.1.6" } }, + "just-unique": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/just-unique/-/just-unique-4.2.0.tgz", + "integrity": "sha512-cxQGGUiit6CGUpuuiezY8N4m1wgF4o7127rXEXDFcxeDUFfdV7gSkwA26Fe2wWBiNQq2SZOgN4gSmMxB/StA8Q==", + "dev": true + }, "karma-safaritechpreview-launcher": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz", @@ -8186,6 +8278,12 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.mergewith": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", + "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", + "dev": true + }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -8998,6 +9096,23 @@ "object-inspect": "^1.9.0" } }, + "simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dev": true, + "requires": { + "is-arrayish": "^0.3.1" + }, + "dependencies": { + "is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "dev": true + } + } + }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -9155,6 +9270,18 @@ "resolve": "^1.22.1" } }, + "tailwindcss-themer": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tailwindcss-themer/-/tailwindcss-themer-3.1.0.tgz", + "integrity": "sha512-IfgxpCxWm5rRK3Q7aTvVyhQ/7tyyn8EJl5tFak5tS+/n8oXT7OGfv8praYepR7+IsM92waAuBDZng1HgnstrYA==", + "dev": true, + "requires": { + "color": "^4.1.0", + "just-unique": "^4.2.0", + "lodash.merge": "^4.6.2", + "lodash.mergewith": "^4.6.2" + } + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", diff --git a/package.json b/package.json index 51c2ffd..02a5315 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "test", - "version": "2.3.0", + "version": "2.3.1", "private": true, "scripts": { "build": "run-p type-check build-only", @@ -47,6 +47,7 @@ "postcss": "^8.4.21", "prettier": "^2.8.4", "tailwindcss": "^3.2.7", + "tailwindcss-themer": "^3.1.0", "typescript": "~4.8.4", "vite": "^4.1.4", "vue-cli-plugin-i18n": "~2.3.2", diff --git a/src/App.vue b/src/App.vue index 38276a0..75ece0c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,13 +7,15 @@ import DevWarning from './components/DevWarning.vue' const dev = import.meta.env.DEV -