From 14fb2ffa8b353562cec7e0917db7e2a23ec73ada Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 12 May 2023 20:05:18 -0700 Subject: [PATCH] Revert "add (back) pwa install button to help menu" This reverts commit 298960f4dd5c54815e8e999d1e41ce4219904cb9. --- locales/en-US.yml | 2 +- locales/ja-JP.yml | 1 - package.json | 2 +- packages/client/package.json | 1 - .../src/components/MkTutorialDialog.vue | 15 +----- packages/client/src/scripts/helpMenu.ts | 9 ---- .../src/ui/_common_/navbar-for-mobile.vue | 2 - packages/client/src/ui/_common_/navbar.vue | 2 - pnpm-lock.yaml | 53 ------------------- 9 files changed, 3 insertions(+), 84 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 40e203ea7..9cb58e6ef 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1085,7 +1085,7 @@ apps: "Apps" sendModMail: "Send Moderation Notice" preventAiLearning: "Prevent AI bot scraping" preventAiLearningDescription: "Request third-party AI language models not to study content you upload, such as posts and images." -pwa: "Install PWA" + _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing\ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 445d839b3..4fc2f42d7 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -975,7 +975,6 @@ customKaTeXMacroDescription: "数式入力を楽にするためのマクロを enableCustomKaTeXMacro: "カスタムKaTeXマクロを有効にする" preventAiLearning: "AIによる学習を防止" preventAiLearningDescription: "投稿したノート、添付した画像などのコンテンツを学習の対象にしないようAIに要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されます。" -pwa: "PWAをインストール" _sensitiveMediaDetection: description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てられます。サーバーの負荷が少し増えます。" diff --git a/package.json b/package.json index 686b9ea93..bbc63e27b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "14.0.0-dev9", + "version": "14.0.0-dev8", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/package.json b/packages/client/package.json index 173585503..69346651d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -9,7 +9,6 @@ }, "devDependencies": { "@discordapp/twemoji": "14.0.2", - "@khmyznikov/pwa-install": "^0.2.0", "@phosphor-icons/web": "^2.0.3", "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue index 2d5dc4519..89e213012 100644 --- a/packages/client/src/components/MkTutorialDialog.vue +++ b/packages/client/src/components/MkTutorialDialog.vue @@ -190,14 +190,7 @@ primary show-only-to-register /> - - {{ i18n.ts.pwa }} - + @@ -219,7 +212,6 @@ import { defaultStore } from "@/store"; import { i18n } from "@/i18n"; import { $i } from "@/account"; import { instance } from "@/instance"; -import "@khmyznikov/pwa-install"; const isLocalTimelineAvailable = !instance.disableLocalTimeline || @@ -277,11 +269,6 @@ const reduceAnimation = computed( ) ); -function installPwa(ev: MouseEvent) { - const pwaInstall = document.getElementsByTagName("pwa-install")[0]; - pwaInstall.showDialog(); -} - function close(res) { tutorial.value = -1; dialog.close(); diff --git a/packages/client/src/scripts/helpMenu.ts b/packages/client/src/scripts/helpMenu.ts index c630d5a1b..81e0a08ec 100644 --- a/packages/client/src/scripts/helpMenu.ts +++ b/packages/client/src/scripts/helpMenu.ts @@ -4,7 +4,6 @@ import { host } from "@/config"; import * as os from "@/os"; import XTutorial from "../components/MkTutorialDialog.vue"; import { i18n } from "@/i18n"; -import "@khmyznikov/pwa-install"; export function openHelpMenu_(ev: MouseEvent) { os.popupMenu( @@ -25,14 +24,6 @@ export function openHelpMenu_(ev: MouseEvent) { icon: "ph-lightbulb ph-bold ph-lg", to: "/about-calckey", }, - { - type: "button", - text: i18n.ts.pwa, - icon: "ph-export ph-bold ph-lg", - action: () => { - document.getElementsByTagName("pwa-install")[0].showDialog(); - } - }, { type: "button", text: i18n.ts.apps, diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue index 9ea373025..39abb7c26 100644 --- a/packages/client/src/ui/_common_/navbar-for-mobile.vue +++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue @@ -105,7 +105,6 @@ {{ i18n.ts.note }} - -