From 0cedc9ed51c8932e829e50045ea8a0f567fe4e90 Mon Sep 17 00:00:00 2001 From: liyasthomas Date: Tue, 15 Jun 2021 06:34:21 +0530 Subject: [PATCH] chore: remove unused code --- README.md | 5 -- components/firebase/Feeds.vue | 62 --------------------- components/firebase/Inputform.vue | 59 -------------------- components/firebase/Login.vue | 2 - components/http/Notes.vue | 30 ---------- helpers/fb/feeds.ts | 91 ------------------------------- helpers/fb/index.ts | 2 - lang/bn-BD.json | 3 - lang/de-DE.json | 3 - lang/en-US.json | 3 - lang/es-ES.json | 3 - lang/fr-FR.json | 1 - lang/id-ID.json | 3 - lang/in-IN.json | 3 - lang/ko-KR.json | 3 - lang/ml-ML.json | 3 - lang/nb-NO.json | 3 - lang/nl-BE.json | 3 - lang/pt-BR.json | 3 - lang/pt-PT.json | 3 - lang/tr-TR.json | 3 - lang/vi-VN.json | 3 - lang/zh-CN.json | 3 - lang/zh-TW.json | 3 - pages/graphql.vue | 8 --- pages/index.vue | 10 ++-- pages/settings.vue | 15 ----- 27 files changed, 5 insertions(+), 328 deletions(-) delete mode 100644 components/firebase/Feeds.vue delete mode 100644 components/firebase/Inputform.vue delete mode 100644 components/http/Notes.vue delete mode 100644 helpers/fb/feeds.ts diff --git a/README.md b/README.md index 492070454..a750d0733 100644 --- a/README.md +++ b/README.md @@ -361,7 +361,6 @@ _Add-ons are developed and maintained under **[Official Hoppscotch Organization] - History - Collections - Environments -- Notes ✅ **Post-Request Tests β:** Write tests associated with a request that are executed after the request response. @@ -378,10 +377,6 @@ _Add-ons are developed and maintained under **[Official Hoppscotch Organization] -📝 **Notes** : Instantly jot down notes, tasks or whatever you feel like as they come to your mind. - -_Notes are only available for signed-in users_ - 🌱 **Environments** : Environment variables allow you to store and reuse values in your requests and scripts.
diff --git a/components/firebase/Feeds.vue b/components/firebase/Feeds.vue deleted file mode 100644 index 6d74513ad..000000000 --- a/components/firebase/Feeds.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - - diff --git a/components/firebase/Inputform.vue b/components/firebase/Inputform.vue deleted file mode 100644 index 865de7ae1..000000000 --- a/components/firebase/Inputform.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - diff --git a/components/firebase/Login.vue b/components/firebase/Login.vue index b75b9df33..a061db64a 100644 --- a/components/firebase/Login.vue +++ b/components/firebase/Login.vue @@ -71,7 +71,6 @@ export default { applySetting("syncHistory", true) applySetting("syncCollections", true) applySetting("syncEnvironments", true) - this.$router.push({ path: "/settings" }) toastObject.remove() }, }, @@ -144,7 +143,6 @@ export default { applySetting("syncHistory", true) applySetting("syncCollections", true) applySetting("syncEnvironments", true) - this.$router.push({ path: "/settings" }) toastObject.remove() }, }, diff --git a/components/http/Notes.vue b/components/http/Notes.vue deleted file mode 100644 index 874291615..000000000 --- a/components/http/Notes.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/helpers/fb/feeds.ts b/helpers/fb/feeds.ts deleted file mode 100644 index 3ce10e0ec..000000000 --- a/helpers/fb/feeds.ts +++ /dev/null @@ -1,91 +0,0 @@ -import firebase from "firebase" -import { BehaviorSubject } from "rxjs" -import { currentUser$ } from "./auth" - -type HoppFeed = firebase.firestore.DocumentData & { - id: string - label: string - message: string -} - -/** - * An observable subject which is defined as an array of feeds - * the current user has. - * - * Note: If this is null, then it means the user is not signed in - */ -export const currentFeeds$ = new BehaviorSubject(null) - -export function initFeeds() { - let snapshotStop: (() => void) | null = null - - currentUser$.subscribe((user) => { - if (!user && snapshotStop) { - // User has logged out, clean up snapshot listeners - snapshotStop() - snapshotStop = null - } else if (user) { - snapshotStop = firebase - .firestore() - .collection("users") - .doc(user.uid) - .collection("feeds") - .orderBy("createdOn", "desc") - .onSnapshot((feedsRef) => { - const feeds: HoppFeed[] = [] - - feedsRef.forEach((doc) => { - const feed = doc.data() - feed.id = doc.id - feeds.push(feed as HoppFeed) - }) - - currentFeeds$.next(feeds) - }) - } - }) -} - -export async function writeFeed(label: string, message: string) { - if (currentUser$.value == null) - throw new Error("Logged out user cannot write to feeds") - - const dt = { - createdOn: new Date(), - author: currentUser$.value.uid, - author_name: currentUser$.value.displayName, - author_image: currentUser$.value.photoURL, - message, - label, - } - - try { - await firebase - .firestore() - .collection("users") - .doc(currentUser$.value.uid) - .collection("feeds") - .add(dt) - } catch (e) { - console.error("error inserting", dt, e) - throw e - } -} - -export async function deleteFeed(id: string) { - if (currentUser$.value == null) - throw new Error("Logged out user cannot delete feed") - - try { - await firebase - .firestore() - .collection("users") - .doc(currentUser$.value.uid) - .collection("feeds") - .doc(id) - .delete() - } catch (e) { - console.error("error deleting", id, e) - throw e - } -} diff --git a/helpers/fb/index.ts b/helpers/fb/index.ts index 303d6ff5d..5d03f18b6 100644 --- a/helpers/fb/index.ts +++ b/helpers/fb/index.ts @@ -2,7 +2,6 @@ import firebase from "firebase" import { initAuth } from "./auth" import { initCollections } from "./collections" import { initEnvironments } from "./environments" -import { initFeeds } from "./feeds" import { initHistory } from "./history" import { initSettings } from "./settings" @@ -25,5 +24,4 @@ export function initializeFirebase() { initCollections() initHistory() initEnvironments() - initFeeds() } diff --git a/lang/bn-BD.json b/lang/bn-BD.json index a7692998e..486efec88 100644 --- a/lang/bn-BD.json +++ b/lang/bn-BD.json @@ -263,10 +263,7 @@ "syncCollections": "সংগ্রহ", "syncEnvironments": "এনভায়রনমেন্টসমূহ", "turn_on": "চালু করুন", - "login_first": "প্রথমে লগিন করুন", - "paste_a_note": "একটি মন্তব্য লিপিবদ্ধ করুন", "import_from_sync": "সিঙ্ক থেকে ইমপোর্ট করুন", - "notes": "মন্তব্য", "socketio": "সকেট ইনপুট/আউটপুট", "event_name": "ইভেন্টের নাম", "mqtt": "এম.কিউ.টি.টি", diff --git a/lang/de-DE.json b/lang/de-DE.json index 2a225c75b..ceb9bb16b 100644 --- a/lang/de-DE.json +++ b/lang/de-DE.json @@ -90,10 +90,7 @@ "syncEnvironments": "Environments", "turn_on": "Anschalten", "turn_off": "Ausschalten", - "login_first": "Logge dich zuerst ein", - "paste_a_note": "Füge eine Notiz hinzu", "import_from_sync": "Von Sync importieren", - "notes": "Notizen", "socketio": "Socket.IO", "event_name": "Event Name", "mqtt": "MQTT", diff --git a/lang/en-US.json b/lang/en-US.json index e8a81fe08..843ef6ab1 100644 --- a/lang/en-US.json +++ b/lang/en-US.json @@ -266,10 +266,7 @@ "syncEnvironments": "Environments", "turn_on": "Turn on", "turn_off": "Turn off", - "login_first": "Login first", - "paste_a_note": "Paste a note", "import_from_sync": "Import from Sync", - "notes": "Notes", "socketio": "Socket.IO", "event_name": "Event Name", "mqtt": "MQTT", diff --git a/lang/es-ES.json b/lang/es-ES.json index 06cb15e21..353c53b80 100644 --- a/lang/es-ES.json +++ b/lang/es-ES.json @@ -240,7 +240,6 @@ "syncCollections": "Colecciones", "syncEnvironments": "Entornos", "turn_on": "Encender", - "login_first": "Inicie sesión primero", "import_from_sync": "Importar desde Sync", "add_one_variable": "(añade al menos una variable)", "check_graphql_valid": "Compruebe la URL para ver si es un endpoint GraphQL válido", @@ -262,8 +261,6 @@ "scrollInto_use_toggle": "Auto scroll", "prettify_query": "Formatear query", "prettify_body": "Formatear cuerpo", - "paste_a_note": "Pegar una nota", - "notes": "Notas", "new_environment": "Nuevo entorno", "my_new_environment": "Mi nuevo entorno", "mqtt_unsubscribe": "Desuscribirse", diff --git a/lang/fr-FR.json b/lang/fr-FR.json index 06a2219a1..1549fc0ec 100644 --- a/lang/fr-FR.json +++ b/lang/fr-FR.json @@ -241,7 +241,6 @@ "syncCollections": "Collections", "syncEnvironments": "Environments", "turn_on": "Activer", - "login_first": "Se connecter d'abord", "paste_a_collection": "Coller une collection", "import_from_sync": "Importer depuis la synchronisation", "create_new_collection": "Créer une nouvelle collection", diff --git a/lang/id-ID.json b/lang/id-ID.json index 62728353d..2e5818f52 100644 --- a/lang/id-ID.json +++ b/lang/id-ID.json @@ -263,10 +263,7 @@ "syncEnvironments": "Lingkungan", "turn_on": "Nyalakan", "turn_off": "Matikan", - "login_first": "Masuk dahulu", - "paste_a_note": "Tempel catatan", "import_from_sync": "Impor dari Sinkronasi", - "notes": "Catatan", "socketio": "Socket.IO", "event_name": "Nama Kejadian", "mqtt": "MQTT", diff --git a/lang/in-IN.json b/lang/in-IN.json index a1d80fd4c..7968d9d99 100644 --- a/lang/in-IN.json +++ b/lang/in-IN.json @@ -266,10 +266,7 @@ "syncEnvironments": "वातावरण", "turn_on": "चालू करो", "turn_off": "बंद करें", - "login_first": "पहले प्रवेश करो", - "paste_a_note": "एक नोट चिपकाएं", "import_from_sync": "सिंक से आयात करें", - "notes": "टिप्पणियाँ", "socketio": "सॉकेट.आईओ", "event_name": "घटना नाम", "mqtt": "एमक्यूटीटी", diff --git a/lang/ko-KR.json b/lang/ko-KR.json index d4880cddb..006172b39 100644 --- a/lang/ko-KR.json +++ b/lang/ko-KR.json @@ -263,10 +263,7 @@ "syncCollections": "컬렉션", "syncEnvironments": "환경변수", "turn_on": "Turn on", - "login_first": "먼저 로그인해주세요.", - "paste_a_note": "노트 붙여넣기", "import_from_sync": "동기화에서 가져오기", - "notes": "노트", "socketio": "Socket.IO", "event_name": "이", "mqtt": "MQTT", diff --git a/lang/ml-ML.json b/lang/ml-ML.json index 922016a83..c4f352931 100644 --- a/lang/ml-ML.json +++ b/lang/ml-ML.json @@ -263,10 +263,7 @@ "syncCollections": "ശേഖരങ്ങൾ", "syncEnvironments": "പരിതസ്ഥിതികൾ", "turn_on": "ഓൺ ചെയ്യുക", - "login_first": "ആദ്യം പ്രവേശിക്കുക", - "paste_a_note": "ഒരു കുറിപ്പ് ഒട്ടിക്കുക", "import_from_sync": "Sync-ൽ നിന്ന് ഇറക്കുമതി ചെയ്യുക", - "notes": "കുറിപ്പുകൾ", "socketio": "Socket.IO", "event_name": "ഇവന്റിന്റെ പേര്", "mqtt": "MQTT", diff --git a/lang/nb-NO.json b/lang/nb-NO.json index 18f930a49..e03c63157 100644 --- a/lang/nb-NO.json +++ b/lang/nb-NO.json @@ -266,10 +266,7 @@ "syncEnvironments": "Miljøer", "turn_on": "Slå på", "turn_off": "Slå av", - "login_first": "Logg inn først", - "paste_a_note": "Lim inn et notat", "import_from_sync": "Importer fra synkronisering", - "notes": "Notater", "socketio": "Socket.IO", "event_name": "Hendelsesnavn", "mqtt": "MQTT", diff --git a/lang/nl-BE.json b/lang/nl-BE.json index ab3620783..ffb043bd7 100644 --- a/lang/nl-BE.json +++ b/lang/nl-BE.json @@ -263,10 +263,7 @@ "syncCollections": "Collecties", "syncEnvironments": "Omgevingen", "turn_on": "Inschakelen", - "login_first": "Meld u eerst aan", - "paste_a_note": "Notitie plakken", "import_from_sync": "Importeren van Sync", - "notes": "Notities", "socketio": "Socket.IO", "event_name": "Event-naam", "mqtt": "MQTT", diff --git a/lang/pt-BR.json b/lang/pt-BR.json index 4b273eb5e..eeb0d89a5 100644 --- a/lang/pt-BR.json +++ b/lang/pt-BR.json @@ -271,10 +271,7 @@ "scrollInto_use_toggle": "Auto rolagem", "sync": "Sincronizar", "turn_on": "Ligar", - "login_first": "Realize o login primeiro", - "paste_a_note": "Cole uma nota", "import_from_sync": "Importar de Sincronização", - "notes": "Notas", "socketio": "Socket.IO", "event_name": "Nome do Evento", "mqtt": "MQTT", diff --git a/lang/pt-PT.json b/lang/pt-PT.json index cf96b5760..a697109c9 100644 --- a/lang/pt-PT.json +++ b/lang/pt-PT.json @@ -260,10 +260,7 @@ "syncCollections": "Coleções", "syncEnvironments": "Ambientes", "turn_on": "Ativar", - "login_first": "Entre primeiro", - "paste_a_note": "Cole uma nota", "import_from_sync": "Importar from Sync", - "notes": "Notas", "socketio": "Socket.IO", "event_name": "Nome do evento", "mqtt": "MQTT", diff --git a/lang/tr-TR.json b/lang/tr-TR.json index c5a572a85..a47455d7a 100644 --- a/lang/tr-TR.json +++ b/lang/tr-TR.json @@ -261,10 +261,7 @@ "syncCollections": "Koleksiyonlar", "syncEnvironments": "Ortamlar", "turn_on": "Aç", - "login_first": "Önce Giriş Yap", - "paste_a_note": "Bir not yapıştır", "import_from_sync": "Senkronizasyondan İçeri Aktar", - "notes": "Notlar", "socketio": "Socket.IO", "event_name": "Olay Adı", "mqtt": "MQTT", diff --git a/lang/vi-VN.json b/lang/vi-VN.json index 9495c2261..faddc9fa4 100644 --- a/lang/vi-VN.json +++ b/lang/vi-VN.json @@ -263,10 +263,7 @@ "syncCollections": "Bộ sưu tập", "syncEnvironments": "Môi trường", "turn_on": "Bật", - "login_first": "Đăng nhập trước", - "paste_a_note": "Dán ghi chú", "import_from_sync": "Nhập từ đồng bồ", - "notes": "Ghi chú", "socketio": "Socket.IO", "event_name": "Tên Event", "mqtt": "MQTT", diff --git a/lang/zh-CN.json b/lang/zh-CN.json index ab259b555..652ca8592 100644 --- a/lang/zh-CN.json +++ b/lang/zh-CN.json @@ -268,10 +268,7 @@ "syncEnvironments": "环境", "turn_on": "点击开启", "turn_off": "点击关闭", - "login_first": "请先登录：", - "paste_a_note": "输入新便笺", "import_from_sync": "从云存储导入", - "notes": "便笺", "socketio": "Socket.IO", "event_name": "事件名称", "mqtt": "MQTT", diff --git a/lang/zh-TW.json b/lang/zh-TW.json index 640621768..c576ac5e3 100644 --- a/lang/zh-TW.json +++ b/lang/zh-TW.json @@ -258,10 +258,7 @@ "syncCollections": "收藏庫", "syncEnvironments": "環境", "turn_on": "打開", - "login_first": "請先登入", - "paste_a_note": "Paste a note", "import_from_sync": "Import from Sync", - "notes": "Notes", "socketio": "Socket.IO", "event_name": "Event Name", "mqtt": "MQTT", diff --git a/pages/graphql.vue b/pages/graphql.vue index bda374e92..452a4da8e 100644 --- a/pages/graphql.vue +++ b/pages/graphql.vue @@ -457,14 +457,6 @@ - - diff --git a/pages/index.vue b/pages/index.vue index 82806848a..b7e51d7eb 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -637,10 +637,6 @@ - - - - @@ -775,7 +771,11 @@ import runTestScriptWithVariables from "~/helpers/postwomanTesting" import parseTemplateString from "~/helpers/templating" import { tokenRequest, oauthRedirect } from "~/helpers/oauth" import { cancelRunningRequest, sendNetworkRequest } from "~/helpers/network" -import { hasPathParams, addPathParamsToVariables, getQueryParams } from "~/helpers/requestParams" +import { + hasPathParams, + addPathParamsToVariables, + getQueryParams, +} from "~/helpers/requestParams" import { parseUrlAndPath } from "~/helpers/utils/uri" import { httpValid } from "~/helpers/utils/valid" import { diff --git a/pages/settings.vue b/pages/settings.vue index e899a5ee0..210f5f7a3 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -57,13 +57,6 @@ {{ SYNC_HISTORY ? $t("enabled") : $t("disabled") }}

- -

- -

@@ -286,9 +279,6 @@ export default Vue.extend({ key: this.PROXY_KEY, } }, - isSyncDisabled(): boolean { - return this.SYNC_COLLECTIONS && this.SYNC_ENVIRONMENTS && this.SYNC_HISTORY - } }, watch: { proxySettings: { @@ -318,11 +308,6 @@ export default Vue.extend({ ) { this.applySetting(name, value) }, - initSettings() { - applySetting("syncHistory", true) - applySetting("syncCollections", true) - applySetting("syncEnvironments", true) - }, resetProxy({ target }: { target: HTMLElement }) { applySetting("PROXY_URL", `https://proxy.hoppscotch.io/`)