diff --git a/backend/models/configItemsModel.js b/backend/models/configItemsModel.js
index 3f4ce03..b3f2410 100644
--- a/backend/models/configItemsModel.js
+++ b/backend/models/configItemsModel.js
@@ -118,6 +118,7 @@ export const deleteConfigItemById = async (id, result) => {
try {
let sql = `DELETE FROM changedb WHERE primaryID = ?`;
const results = await ownConn.query(sql, [id])
+ results.insertId = results.insertId.toString();
result(null, results);
}
catch (err) {
diff --git a/clientsideConfig.js b/clientsideConfig.js
index 21e5a89..0e0664f 100644
--- a/clientsideConfig.js
+++ b/clientsideConfig.js
@@ -1,7 +1,7 @@
const clientsideConfig = {
// later for the server
- url: 'tueitapp.tueit.de',
- // url: 'localhost',
+ //url: 'tueitapp.tueit.de',
+ url: 'localhost',
port: 3000,
};
diff --git a/components/server/Asset.vue b/components/server/Asset.vue
index ab3abd4..594291d 100644
--- a/components/server/Asset.vue
+++ b/components/server/Asset.vue
@@ -76,7 +76,7 @@
@@ -115,7 +118,6 @@ export default {
},
methods: {
toggleActionbar() {
- console.log('Actionbar toggled');
this.isExpanded = !this.isExpanded;
},
},
diff --git a/plugins/vuex.js b/plugins/vuex.js
index fc284e8..17033f3 100644
--- a/plugins/vuex.js
+++ b/plugins/vuex.js
@@ -4,6 +4,7 @@ const store = createStore({
state() {
return {
assetEditable: false,
+ deleteAsset: false,
onAssetlist: true,
onCustomerAssetlist: false,
onAsset: false,
@@ -46,6 +47,12 @@ const store = createStore({
state.chosenAssetId = -1
state.assetEditable = false
},
+ doDeleteAsset(state) {
+ state.deleteAsset = true
+ },
+ undoDeleteAsset(state) {
+ state.deleteAsset = false
+ }
},
});
diff --git a/server/api/deleteConfigItem/[id].ts b/server/api/deleteConfigItem/[id].ts
new file mode 100644
index 0000000..d95df14
--- /dev/null
+++ b/server/api/deleteConfigItem/[id].ts
@@ -0,0 +1,22 @@
+import { errorMsg } from "../../middleware/configItems";
+import { OutgoingMessage } from 'http';
+
+export default defineEventHandler(async (event) => {
+
+ const headers: Record[1]> = {
+ 'Access-Control-Allow-Origin': 'https://tueitapp.tueit.de',
+ 'Access-Control-Allow-Headers': 'authorization, content-type',
+ 'Access-Control-Allow-Methods': 'OPTIONS,GET,HEAD,PUT,PATCH,POST,DELETE',
+ };
+ setResponseHeaders(event, headers)
+
+ if (!(errorMsg === '')) {
+ throw createError({
+ statusCode: 400,
+ statusMessage: errorMsg,
+ })
+ }
+
+ setResponseStatus(event, 200)
+ return
+})
diff --git a/server/api/login.ts b/server/api/login.ts
index d35b662..facceda 100644
--- a/server/api/login.ts
+++ b/server/api/login.ts
@@ -11,8 +11,6 @@ export default defineEventHandler(async (event) => {
};
setResponseHeaders(event, headers)
- console.log(event)
-
if (!loginSuccessful) {
throw createError({
statusCode: 400,
diff --git a/server/api/updateConfigItem.ts b/server/api/updateConfigItem.ts
index 65ef5dc..bf12cff 100644
--- a/server/api/updateConfigItem.ts
+++ b/server/api/updateConfigItem.ts
@@ -3,15 +3,6 @@ import { OutgoingMessage } from 'http';
export default defineEventHandler(async (event) => {
-// const headers: Record[1]> = {
-// 'Access-Control-Allow-Origin': 'https://tueitapp.tueit.de',
-// 'Access-Control-Allow-Headers': 'authorization, content-type',
-// 'Access-Control-Allow-Methods': 'GET,HEAD,PUT,PATCH,POST,DELETE,OPTIONS',
-// };
-// setResponseHeaders(event, headers)
-
- console.log(event)
-
if (!(errorMsg === '')) {
throw createError({
statusCode: 400,
diff --git a/server/middleware/configItems.ts b/server/middleware/configItems.ts
index cd80f02..728c0d5 100644
--- a/server/middleware/configItems.ts
+++ b/server/middleware/configItems.ts
@@ -107,6 +107,38 @@ export default defineEventHandler(async (event) => {
}
}
}
+
+ if (event.path.startsWith("/api/deleteConfigItem")) {
+ let itemId = null;
+ const path = event._path;
+ const pathSegments = path.split('/');
+ itemId = pathSegments[pathSegments.length - 1];
+
+ // delete the config item in the backend
+ try {
+ let res = await axiosInstance.delete(`https://${serversideConfig.url}:${serversideConfig.port}/configItems/${itemId}`);
+ } catch (err) {
+ if (axios.isAxiosError(err)) {
+ const axiosError = err as AxiosError;
+
+ if (axiosError.response) {
+ // Axios error
+ console.error(axiosError.response.data.message);
+ errorMsg = axiosError.response.data.message;
+ } else if (axiosError.request) {
+ console.log(err)
+ // If error was caused by the request
+ console.error(axiosError.request);
+ } else {
+ // Other errors
+ console.error('Error', axiosError.message);
+ }
+ } else {
+ // No AxiosError
+ console.error('Error', err);
+ }
+ }
+ }
})
export { configItems, configItem, errorMsg };
\ No newline at end of file