fix: resolve conflict

loingtan · Apr 13, 2024 · f33aba3 · f33aba3
1 parent 95df38e
commit f33aba3
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 51 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,32 +1,32 @@
-{
-    "version": "0.2.0",
-    "compounds": [
-      {
-        "name": "Main + renderer",
-        "configurations": ["Main", "Renderer"],
-        "stopAll": true
-      }
-    ],
-    "configurations": [
-      {
-        "name": "Renderer",
-        "port": 9222,
-        "request": "attach",
-        "type": "chrome",
-        "webRoot": "QuanLyDangKyMonHocVaThuPhiSV-Desktop"
-      },
-      {
-        "name": "Main",
-        "type": "node",
-        "request": "launch",
-        "cwd": "${workspaceFolder}",
-        "runtimeExecutable": "QuanLyDangKyMonHocVaThuPhiSV-Desktop/node_modules/.bin/electron",
-        "windows": {
-          "runtimeExecutable": "QuanLyDangKyMonHocVaThuPhiSV-Desktop/node_modules/.bin/electron.cmd"
-        },
-        "args": [".", "--remote-debugging-port=9222"],
-        "outputCapture": "std",
-        "console": "integratedTerminal"
-      }
-    ]
+{
+    "version": "0.2.0",
+    "compounds": [
+      {
+        "name": "Main + renderer",
+        "configurations": ["Main", "Renderer"],
+        "stopAll": true
+      }
+    ],
+    "configurations": [
+      {
+        "name": "Renderer",
+        "port": 9222,
+        "request": "attach",
+        "type": "chrome",
+        "webRoot": "QuanLyDangKyMonHocVaThuPhiSV-Desktop"
+      },
+      {
+        "name": "Main",
+        "type": "node",
+        "request": "launch",
+        "cwd": "${workspaceFolder}",
+        "runtimeExecutable": "QuanLyDangKyMonHocVaThuPhiSV-Desktop/node_modules/.bin/electron",
+        "windows": {
+          "runtimeExecutable": "QuanLyDangKyMonHocVaThuPhiSV-Desktop/node_modules/.bin/electron.cmd"
+        },
+        "args": [".", "--remote-debugging-port=9222"],
+        "outputCapture": "std",
+        "console": "integratedTerminal"
+      }
+    ]
   }
diff --git a/forge.env.d.ts b/forge.env.d.ts
@@ -1,3 +1,4 @@
+
 export {}; // Make this a module
 
 declare global {

diff --git a/src/preload.ts b/src/preload.ts
@@ -1,5 +1,3 @@
-// See the Electron documentation for details on how to use preload scripts:
-// https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
 import { contextBridge, ipcRenderer } from 'electron';
 contextBridge.exposeInMainWorld('electron', {
   store: {

diff --git a/src/renderer/store/store.ts b/src/renderer/store/store.ts
@@ -1,12 +1,12 @@
-import { defineStore } from 'pinia';
-import { computed, ref } from 'vue';
-export const useCounterStore = defineStore('counter', () => {
-  const count = ref(0);
-  const name = ref('Eduardo');
-  const doubleCount = computed(() => count.value * 2);
-  function increment() {
-    count.value++;
-  }
-
-  return { count, name, doubleCount, increment };
-});
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+export const useCounterStore = defineStore('counter', () => {
+  const count = ref(0);
+  const name = ref('Eduardo');
+  const doubleCount = computed(() => count.value * 2);
+  function increment() {
+    count.value++;
+  }
+
+  return { count, name, doubleCount, increment };
+});
diff --git a/src/renderer/views/Login.vue b/src/renderer/views/Login.vue
@@ -72,7 +72,6 @@ async function login(e) {
 
     console.log('Login successful', data);
     authError.value = false;
-
   } catch (error) {
     authError.value = true;
   }
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		export {}; // Make this a module

		declare global {
Expand Down