From b1b7fc5827f19f7e34d76403c729a619e7601ddf Mon Sep 17 00:00:00 2001
From: BinarySandia04 <aranseraroig@gmail.com>
Date: Wed, 16 Oct 2024 13:32:28 +0200
Subject: [PATCH] The dnd plugin now uses more api

---
 plugins/dnd-5e/client/data.js                   |  6 +++---
 plugins/dnd-5e/client/main.js                   | 17 ++++++++---------
 .../dnd-5e/client/views/CreateItemPrompt.vue    | 13 +++++++------
 plugins/dnd-5e/client/views/Database.vue        | 13 ++++++++-----
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/plugins/dnd-5e/client/data.js b/plugins/dnd-5e/client/data.js
index 560c8d8d..1b4b7c76 100644
--- a/plugins/dnd-5e/client/data.js
+++ b/plugins/dnd-5e/client/data.js
@@ -6,11 +6,11 @@ import { GetCampaign } from "@/services/Dragonroll";
 
 let data = reactive({});
 
-let Api = Global('dnd-5e')['api'];
+let Api = Global('dnd-5e').Api;
 let dndModule = Global('dnd-5e')['dndModule'];
 
 function InitData(){
-    Api = Global('dnd-5e')['api'];
+    Api = Global('dnd-5e').Api;
     dndModule = Global('dnd-5e')['dndModule'];
 
     data.value = {
@@ -30,7 +30,7 @@ function FetchData(){
 }
 
 let GetConcepts = () => data.value.concepts;
-let GetConcept = (id) => Server().get('/concept/get?campaign=' + GetCampaign()._id + "&id=" + id)
+let GetConcept = (id) => dndModule.router.get('/item/get', {id})
 
 
 export {
diff --git a/plugins/dnd-5e/client/main.js b/plugins/dnd-5e/client/main.js
index 0bfb1434..72de6e30 100644
--- a/plugins/dnd-5e/client/main.js
+++ b/plugins/dnd-5e/client/main.js
@@ -4,7 +4,7 @@ import { Global } from '@/services/PluginGlobals';
 var dndModule;
 
 function Main(Api){
-    Global('dnd-5e')['api'] = Api;
+    Global('dnd-5e')['Api'] = Api;
     
     console.log("Module registered!");
     dndModule = Api.createModule('dnd-5e');
@@ -24,9 +24,13 @@ function Main(Api){
     let databaseWindow = Api.registerWindow('database', Api.createView('Database'));
     let actorsWindow = Api.registerWindow('actors', Api.createView('Actors'));
 
-    Api.registerWindow('character_sheet', Api.createView('CharacterSheet'));
-    Api.registerWindow('item_sheet', Api.createView('ItemSheet'));
-    Api.registerWindow('create_item_prompt', Api.createView('CreateItemPrompt'));
+    Global('dnd-5e').Data = {
+        windows: {
+            character_sheet: Api.registerWindow('character_sheet', Api.createView('CharacterSheet')),
+            item_sheet: Api.registerWindow('item_sheet', Api.createView('ItemSheet')),
+            create_item_prompt: Api.registerWindow('create_item_prompt', Api.createView('CreateItemPrompt'))
+        }
+    }
 
     dndModule.setButtons({
         right: [
@@ -58,11 +62,6 @@ function Main(Api){
         FetchConcepts();
     });
 
-
-    // Api.windows.registerWindow('character_sheet', Api.createView('CharacterSheet'));
-    // Api.windows.registerWindow('item_sheet', Api.createView('ItemSheet'));
-    // Api.windows.registerWindow('create_item_prompt', Api.createView('CreateItemPrompt'));
-
     dndModule.onInit = () => {
         InitData();
         FetchData();
diff --git a/plugins/dnd-5e/client/views/CreateItemPrompt.vue b/plugins/dnd-5e/client/views/CreateItemPrompt.vue
index 834d47d1..463fa091 100644
--- a/plugins/dnd-5e/client/views/CreateItemPrompt.vue
+++ b/plugins/dnd-5e/client/views/CreateItemPrompt.vue
@@ -1,10 +1,9 @@
 <script setup>
 import WindowHandle from '@/views/partials/WindowHandle.vue';
-
 import { onMounted, ref } from 'vue';
 import { SetupHandle, SetSize, ResetPosition } from '@/services/Windows';
-import { ClearWindow, CreateWindow } from '@/services/Windows';
-import { GetCampaignModuleName } from '../../../../client/src/services/Campaign';
+import { Global } from '@/services/PluginGlobals';
+
 const props = defineProps(['data']);
 const data = props.data;
 
@@ -12,6 +11,8 @@ const handle = ref(null);
 let id = data.id;
 
 const radioContainer = ref(null);
+const Api = Global('dnd-5e').Api;
+const PluginData = Global('dnd-5e').Data;
 
 onMounted(() => {
     SetupHandle(id, handle);
@@ -24,15 +25,15 @@ function ConfirmSelection(){
     if(!selected) return;
     let value = selected.value;
 
-    CreateWindow(`${GetCampaignModuleName()}/item_sheet`, {
+    Api.createWindow(PluginData.windows.item_sheet, {
         id: 'item_sheet',
         title: 'Edit Item',
         item_type: value,
         item_create: true,
-        close: () => ClearWindow('item_sheet')
+        close: () => Api.clearWindow('item_sheet')
     });
 
-    ClearWindow(id);
+    Api.clearWindow(id);
 }
 
 </script>
diff --git a/plugins/dnd-5e/client/views/Database.vue b/plugins/dnd-5e/client/views/Database.vue
index 6885d8ef..d3bcc3a3 100644
--- a/plugins/dnd-5e/client/views/Database.vue
+++ b/plugins/dnd-5e/client/views/Database.vue
@@ -2,11 +2,11 @@
 import WindowHandle from '@/views/partials/WindowHandle.vue';
 
 import { onMounted, ref, shallowRef, watch } from 'vue';
-import { ClearWindow, CreateWindow, ResetPosition, SetMinSize, SetResizable, SetSize, SetupHandle } from '@/services/Windows';
+import { ResetPosition, SetMinSize, SetResizable, SetSize, SetupHandle } from '@/services/Windows';
 import ConceptList from '@/views/partials/ConceptList.vue';
 import Tabs from '@/views/partials/Tabs.vue';
-import { GetCampaignModuleName } from '@/services/Campaign';
 import FixedBottomButtons from '@/views/partials/FixedBottomButtons.vue';
+import { Global } from '@/services/PluginGlobals';
 
 import { FetchConcepts, GetConcepts } from './../data.js'
 
@@ -15,6 +15,9 @@ const handle = ref(null);
 const props = defineProps(['data']);
 const data = props.data;
 
+const Api = Global('dnd-5e').Api;
+const PluginData = Global('dnd-5e').Data;
+
 let id = data.id;
 const elements = shallowRef([]);
 
@@ -32,15 +35,15 @@ onMounted(() => {
     FetchConcepts();
 });
 function OpenCreateItemPrompt(){
-    CreateWindow(`${GetCampaignModuleName()}/create_item_prompt`, {id: 'create_item_prompt', title: 'Create Item', close: () => ClearWindow('create_item_prompt')})
+    Api.createWindow(PluginData.windows.create_item_prompt, {id: 'create_item_prompt', title: 'Create Item', close: () => Api.clearWindow('create_item_prompt')})
 }
 
 function OpenConcept(element){
-    CreateWindow(`${GetCampaignModuleName()}/item_sheet`, {
+    Api.createWindow(PluginData.windows.item_sheet, {
         id: 'item_sheet_' + element._id,
         title: 'Edit Item',
         item_id: element._id,
-        close: () => ClearWindow('item_sheet_' + element._id)
+        close: () => Api.clearWindow('item_sheet_' + element._id)
     });
 }