From 0421134c139363fe901827d1b4594cb9af8dc333 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Fri, 23 Feb 2024 16:23:41 +0300
Subject: [PATCH 01/11] delete editor tools from user settings

- added ability to delete not default tools from user settings
---
 src/application/services/useUserSettings.ts |  2 +-
 src/domain/user.service.ts                  |  9 +++++++++
 src/presentation/pages/Settings.vue         | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/application/services/useUserSettings.ts b/src/application/services/useUserSettings.ts
index 031ba39c..026ccad5 100644
--- a/src/application/services/useUserSettings.ts
+++ b/src/application/services/useUserSettings.ts
@@ -18,7 +18,7 @@ interface UseUserSettingsComposableState {
 /**
  * Methods for working with user settings
  */
-export function useUserSettings(): UseUserSettingsComposableState {
+export default function useUserSettings(): UseUserSettingsComposableState {
   /**
    * Add tool to the user settings
    *
diff --git a/src/domain/user.service.ts b/src/domain/user.service.ts
index 5bb6d064..4323f49a 100644
--- a/src/domain/user.service.ts
+++ b/src/domain/user.service.ts
@@ -64,4 +64,13 @@ export default class UserService {
   public async removeTool(id: string): Promise<void> {
     return await this.repository.removeTool(id);
   }
+
+  /**
+   * Deletes a tool from the user (marketplace mock)
+   *
+   * @param id - tool id
+   */
+  public deleteTool(id: string): void {
+    this.repository.deleteTool(id);
+  }
 }
diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index 700694f8..80548709 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -7,6 +7,11 @@
   >
     <li>
       {{ tool.title }}
+      <Button
+        v-if="tool.isDefault === false"
+        :text="t('editorTools.delete')"
+        @click="userDeleteTool(tool.id)"
+      />
     </li>
   </ul>
   <ThemeButton />
@@ -31,6 +36,7 @@ import Button from '../components/button/Button.vue';
 import { IconUnlink } from '@codexteam/icons';
 import { useRouter } from 'vue-router';
 import useAuth from '@/application/services/useAuth';
+import useUserSettings from '@/application/services/useUserSettings';
 import ThemeButton from '@/presentation/components/theme/ThemeButton.vue';
 import { useAppState } from '@/application/services/useAppState';
 import { useHead } from 'unhead';
@@ -39,6 +45,7 @@ const { userEditorTools } = useAppState();
 const { t } = useI18n();
 const router = useRouter();
 const { logout } = useAuth();
+const { deleteTool } = useUserSettings();
 
 /**
  * Changing the title in the browser
@@ -54,6 +61,15 @@ async function userLogout() {
     router.push({ path: '/' });
   });
 }
+
+/**
+ * Deletes tool from the user
+ *
+ * @param toolId - id of the tool
+ */
+async function userDeleteTool(toolId) {
+  await deleteTool(toolId);
+}
 </script>
 
 <style scoped lang="postcss">

From 0c7860086bcc4da28e6fab0c90a28dcf91536960 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Fri, 23 Feb 2024 17:21:35 +0300
Subject: [PATCH 02/11] type declaration fixed

---
 src/presentation/pages/Settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index 80548709..f74585ee 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -67,7 +67,7 @@ async function userLogout() {
  *
  * @param toolId - id of the tool
  */
-async function userDeleteTool(toolId) {
+async function userDeleteTool(toolId: string) {
   await deleteTool(toolId);
 }
 </script>

From ee6bc6541c8bd307f499fb1434812cb9550f3f22 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Fri, 23 Feb 2024 19:43:51 +0300
Subject: [PATCH 03/11] moved editorTools.delete to userSettings

- changed descriptions
- moved editorTools.delete to userSettings.delete
- deleted unwanted logs
---
 src/application/i18n/messages/en.json   | 3 ++-
 src/domain/user.repository.interface.ts | 2 +-
 src/domain/user.service.ts              | 4 ++--
 src/presentation/pages/Settings.vue     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/application/i18n/messages/en.json b/src/application/i18n/messages/en.json
index 3432eaef..392cae2d 100644
--- a/src/application/i18n/messages/en.json
+++ b/src/application/i18n/messages/en.json
@@ -13,7 +13,8 @@
   "userSettings": {
     "title": "User Settings",
     "changeTheme": "Change theme",
-    "userEditorTools": "User editor tools"
+    "userEditorTools": "User editor tools",
+    "delete": "delete"
   },
   "noteSettings": {
     "title": "Note Settings",
diff --git a/src/domain/user.repository.interface.ts b/src/domain/user.repository.interface.ts
index 026d1158..1bcf0928 100644
--- a/src/domain/user.repository.interface.ts
+++ b/src/domain/user.repository.interface.ts
@@ -31,7 +31,7 @@ export default interface UserRepositoryInterface {
   getUserEditorTools: () => EditorTool[];
 
   /**
-   * Adds a tool to the user (marketplace mock)
+   * Adds a tool to the user
    *
    * @param id - tool id
    */
diff --git a/src/domain/user.service.ts b/src/domain/user.service.ts
index 4323f49a..6f7f59cd 100644
--- a/src/domain/user.service.ts
+++ b/src/domain/user.service.ts
@@ -48,7 +48,7 @@ export default class UserService {
   }
 
   /**
-   * Adds a tool to the user (marketplace mock)
+   * Adds a tool to the user
    *
    * @param id - tool id
    */
@@ -66,7 +66,7 @@ export default class UserService {
   }
 
   /**
-   * Deletes a tool from the user (marketplace mock)
+   * Deletes a tool from the user
    *
    * @param id - tool id
    */
diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index f74585ee..7a247b0e 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -9,7 +9,7 @@
       {{ tool.title }}
       <Button
         v-if="tool.isDefault === false"
-        :text="t('editorTools.delete')"
+        :text="t('userSettings.delete')"
         @click="userDeleteTool(tool.id)"
       />
     </li>

From 5598b7513194f90fe7052abe19dde498e45762fb Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 16:04:56 +0300
Subject: [PATCH 04/11] changed method for removing editor tool

---
 src/presentation/components/marketplace/EditorToolElement.vue | 2 +-
 src/presentation/pages/Settings.vue                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/presentation/components/marketplace/EditorToolElement.vue b/src/presentation/components/marketplace/EditorToolElement.vue
index e2a9538c..6d69c853 100644
--- a/src/presentation/components/marketplace/EditorToolElement.vue
+++ b/src/presentation/components/marketplace/EditorToolElement.vue
@@ -20,7 +20,7 @@
 
 <script setup lang="ts">
 import { EditorToolWithUserBinding } from '@/domain/entities/EditorTool';
-import { useUserSettings } from '@/application/services/useUserSettings';
+import useUserSettings from '@/application/services/useUserSettings';
 import { useI18n } from 'vue-i18n';
 import { computed } from 'vue';
 import Button from '../button/Button.vue';
diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index 7a247b0e..b933eedb 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -45,7 +45,7 @@ const { userEditorTools } = useAppState();
 const { t } = useI18n();
 const router = useRouter();
 const { logout } = useAuth();
-const { deleteTool } = useUserSettings();
+const { removeTool } = useUserSettings();
 
 /**
  * Changing the title in the browser
@@ -68,7 +68,7 @@ async function userLogout() {
  * @param toolId - id of the tool
  */
 async function userDeleteTool(toolId: string) {
-  await deleteTool(toolId);
+  await removeTool(toolId);
 }
 </script>
 

From aad1cdfaf8ce1d828de06587b76f01c0cb102714 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 17:22:53 +0300
Subject: [PATCH 05/11] renamed function

---
 src/application/i18n/messages/en.json | 2 +-
 src/domain/user.service.ts            | 9 ---------
 src/presentation/pages/Settings.vue   | 4 ++--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/application/i18n/messages/en.json b/src/application/i18n/messages/en.json
index 392cae2d..515754f0 100644
--- a/src/application/i18n/messages/en.json
+++ b/src/application/i18n/messages/en.json
@@ -14,7 +14,7 @@
     "title": "User Settings",
     "changeTheme": "Change theme",
     "userEditorTools": "User editor tools",
-    "delete": "delete"
+    "deleteEditorTool": "Uninstall"
   },
   "noteSettings": {
     "title": "Note Settings",
diff --git a/src/domain/user.service.ts b/src/domain/user.service.ts
index 6f7f59cd..5dc3765d 100644
--- a/src/domain/user.service.ts
+++ b/src/domain/user.service.ts
@@ -64,13 +64,4 @@ export default class UserService {
   public async removeTool(id: string): Promise<void> {
     return await this.repository.removeTool(id);
   }
-
-  /**
-   * Deletes a tool from the user
-   *
-   * @param id - tool id
-   */
-  public deleteTool(id: string): void {
-    this.repository.deleteTool(id);
-  }
 }
diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index b933eedb..bd4c0b4e 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -10,7 +10,7 @@
       <Button
         v-if="tool.isDefault === false"
         :text="t('userSettings.delete')"
-        @click="userDeleteTool(tool.id)"
+        @click="userRemoveTool(tool.id)"
       />
     </li>
   </ul>
@@ -67,7 +67,7 @@ async function userLogout() {
  *
  * @param toolId - id of the tool
  */
-async function userDeleteTool(toolId: string) {
+async function userRemoveTool(toolId: string) {
   await removeTool(toolId);
 }
 </script>

From 2da5be4674ad80a77e7fc443b98af2a3eaec0948 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 17:33:29 +0300
Subject: [PATCH 06/11] changed button behaviour

---
 src/presentation/pages/Settings.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index bd4c0b4e..2525d8e3 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -5,14 +5,14 @@
     v-for="tool in userEditorTools"
     :key="tool.id"
   >
-    <li>
+    <div class="user__tool">
       {{ tool.title }}
       <Button
         v-if="tool.isDefault === false"
-        :text="t('userSettings.delete')"
+        :text="t('userSettings.deleteEditorTool')"
         @click="userRemoveTool(tool.id)"
       />
-    </li>
+    </div>
   </ul>
   <ThemeButton />
   <Button
@@ -78,4 +78,10 @@ async function userRemoveTool(toolId: string) {
 .marketplace {
   margin-top: var(--spacing-l);
 }
+
+.user__tool {
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-very-x);
+}
 </style>

From 1df052125abc5323b5159bc1d2e0ddabf8541b1b Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 17:58:35 +0300
Subject: [PATCH 07/11] changed dict

---
 src/application/i18n/messages/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/application/i18n/messages/en.json b/src/application/i18n/messages/en.json
index 515754f0..266fd91a 100644
--- a/src/application/i18n/messages/en.json
+++ b/src/application/i18n/messages/en.json
@@ -14,7 +14,7 @@
     "title": "User Settings",
     "changeTheme": "Change theme",
     "userEditorTools": "User editor tools",
-    "deleteEditorTool": "Uninstall"
+    "uninstallEditorTool": "Uninstall"
   },
   "noteSettings": {
     "title": "Note Settings",

From 1a866c018ac68097f25757d425b83ae4c2a4f2d2 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 18:06:30 +0300
Subject: [PATCH 08/11] added delete editorTool confirmation

---
 src/presentation/pages/Settings.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index 2525d8e3..c9165b46 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -9,8 +9,8 @@
       {{ tool.title }}
       <Button
         v-if="tool.isDefault === false"
-        :text="t('userSettings.deleteEditorTool')"
-        @click="userRemoveTool(tool.id)"
+        :text="t('userSettings.uninstallEditorTool')"
+        @click="uninstallClicked(tool.id)"
       />
     </div>
   </ul>
@@ -67,8 +67,10 @@ async function userLogout() {
  *
  * @param toolId - id of the tool
  */
-async function userRemoveTool(toolId: string) {
-  await removeTool(toolId);
+async function uninstallClicked(toolId: string) {
+  if (window.confirm('Do you really want to delete thid tool?')) {
+    await removeTool(toolId);
+  }
 }
 </script>
 

From 09f27bc87b5ba2ca44951e228c0ae44310ad2130 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 19:37:27 +0300
Subject: [PATCH 09/11] added confirmations to i18n

- added confirmations.uninstallEditorTool to i18n
- imports fixed
---
 src/application/i18n/messages/en.json                         | 3 +++
 src/application/services/useUserSettings.ts                   | 2 +-
 src/presentation/components/marketplace/EditorToolElement.vue | 2 +-
 src/presentation/pages/Settings.vue                           | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/application/i18n/messages/en.json b/src/application/i18n/messages/en.json
index 266fd91a..a8ce8f65 100644
--- a/src/application/i18n/messages/en.json
+++ b/src/application/i18n/messages/en.json
@@ -10,6 +10,9 @@
       "noteSettings": "Settings"
     }
   },
+  "confirmations": {
+    "uninstallEditorTool": "Do you really want to delete this tool?"
+  },
   "userSettings": {
     "title": "User Settings",
     "changeTheme": "Change theme",
diff --git a/src/application/services/useUserSettings.ts b/src/application/services/useUserSettings.ts
index 026ccad5..031ba39c 100644
--- a/src/application/services/useUserSettings.ts
+++ b/src/application/services/useUserSettings.ts
@@ -18,7 +18,7 @@ interface UseUserSettingsComposableState {
 /**
  * Methods for working with user settings
  */
-export default function useUserSettings(): UseUserSettingsComposableState {
+export function useUserSettings(): UseUserSettingsComposableState {
   /**
    * Add tool to the user settings
    *
diff --git a/src/presentation/components/marketplace/EditorToolElement.vue b/src/presentation/components/marketplace/EditorToolElement.vue
index 6d69c853..e2a9538c 100644
--- a/src/presentation/components/marketplace/EditorToolElement.vue
+++ b/src/presentation/components/marketplace/EditorToolElement.vue
@@ -20,7 +20,7 @@
 
 <script setup lang="ts">
 import { EditorToolWithUserBinding } from '@/domain/entities/EditorTool';
-import useUserSettings from '@/application/services/useUserSettings';
+import { useUserSettings } from '@/application/services/useUserSettings';
 import { useI18n } from 'vue-i18n';
 import { computed } from 'vue';
 import Button from '../button/Button.vue';
diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index c9165b46..00b9b4b9 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -36,7 +36,7 @@ import Button from '../components/button/Button.vue';
 import { IconUnlink } from '@codexteam/icons';
 import { useRouter } from 'vue-router';
 import useAuth from '@/application/services/useAuth';
-import useUserSettings from '@/application/services/useUserSettings';
+import { useUserSettings } from '@/application/services/useUserSettings';
 import ThemeButton from '@/presentation/components/theme/ThemeButton.vue';
 import { useAppState } from '@/application/services/useAppState';
 import { useHead } from 'unhead';
@@ -68,7 +68,7 @@ async function userLogout() {
  * @param toolId - id of the tool
  */
 async function uninstallClicked(toolId: string) {
-  if (window.confirm('Do you really want to delete thid tool?')) {
+  if (window.confirm(t('confirmations.uninstallEditorTool'))) {
     await removeTool(toolId);
   }
 }

From cd06aa1c15ad0595d40bef6bc97f020aca1ce9f7 Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 19:49:50 +0300
Subject: [PATCH 10/11] used css module

---
 src/presentation/pages/Settings.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index 00b9b4b9..4ad78e2e 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -5,14 +5,14 @@
     v-for="tool in userEditorTools"
     :key="tool.id"
   >
-    <div class="user__tool">
+    <li :class="$style.user__tool">
       {{ tool.title }}
       <Button
         v-if="tool.isDefault === false"
         :text="t('userSettings.uninstallEditorTool')"
         @click="uninstallClicked(tool.id)"
       />
-    </div>
+    </li>
   </ul>
   <ThemeButton />
   <Button
@@ -74,7 +74,7 @@ async function uninstallClicked(toolId: string) {
 }
 </script>
 
-<style scoped lang="postcss">
+<style scoped lang="postcss" module>
 @import '@/presentation/styles/typography.pcss';
 
 .marketplace {

From 155b7cdc4e219f8dfeada03deb5de546d6287e4e Mon Sep 17 00:00:00 2001
From: e11sy <Egoramurin@gmail.com>
Date: Sun, 25 Feb 2024 22:52:37 +0300
Subject: [PATCH 11/11] moved confirmation

- moved confirmation.uninstallEditorTool to userSettings.ToolUninstallConfirmation i18n
- dont using BEM with css modules
---
 src/application/i18n/messages/en.json | 6 ++----
 src/presentation/pages/Settings.vue   | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/application/i18n/messages/en.json b/src/application/i18n/messages/en.json
index a8ce8f65..ddabed61 100644
--- a/src/application/i18n/messages/en.json
+++ b/src/application/i18n/messages/en.json
@@ -10,14 +10,12 @@
       "noteSettings": "Settings"
     }
   },
-  "confirmations": {
-    "uninstallEditorTool": "Do you really want to delete this tool?"
-  },
   "userSettings": {
     "title": "User Settings",
     "changeTheme": "Change theme",
     "userEditorTools": "User editor tools",
-    "uninstallEditorTool": "Uninstall"
+    "uninstallEditorTool": "Uninstall",
+    "toolUninstallConfirmation": "Do you really want to delete this tool?"
   },
   "noteSettings": {
     "title": "Note Settings",
diff --git a/src/presentation/pages/Settings.vue b/src/presentation/pages/Settings.vue
index 4ad78e2e..c429d68f 100644
--- a/src/presentation/pages/Settings.vue
+++ b/src/presentation/pages/Settings.vue
@@ -5,7 +5,7 @@
     v-for="tool in userEditorTools"
     :key="tool.id"
   >
-    <li :class="$style.user__tool">
+    <li :class="$style.tool">
       {{ tool.title }}
       <Button
         v-if="tool.isDefault === false"
@@ -68,7 +68,7 @@ async function userLogout() {
  * @param toolId - id of the tool
  */
 async function uninstallClicked(toolId: string) {
-  if (window.confirm(t('confirmations.uninstallEditorTool'))) {
+  if (window.confirm(t('userSettings.toolUninstallConfirmation'))) {
     await removeTool(toolId);
   }
 }
@@ -81,7 +81,7 @@ async function uninstallClicked(toolId: string) {
   margin-top: var(--spacing-l);
 }
 
-.user__tool {
+.tool {
   display: flex;
   align-items: center;
   gap: var(--spacing-very-x);