From c9a933926ba9de55f3503a0c5f324a7f54a7661a Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Thu, 25 Jan 2024 01:02:27 +0100
Subject: [PATCH] stash

---
 deploy/nginx-ws-proxy.conf    | 27 +++++++++++
 web/public/js/worker.js       | 50 ---------------------
 web/src/views/admin/Debug.vue | 84 ++++++++++++++++++++++-------------
 web/vue.config.js             | 39 ----------------
 4 files changed, 81 insertions(+), 119 deletions(-)
 create mode 100644 deploy/nginx-ws-proxy.conf
 delete mode 100644 web/public/js/worker.js

diff --git a/deploy/nginx-ws-proxy.conf b/deploy/nginx-ws-proxy.conf
new file mode 100644
index 0000000..7b55d7c
--- /dev/null
+++ b/deploy/nginx-ws-proxy.conf
@@ -0,0 +1,27 @@
+http {
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+
+    upstream websocket {
+        server staging.c3lf.de:443;
+    }
+
+    server {
+        listen 8082;
+        access_log /home/jedi/Projects/c3lf-system-3/deploy/foo.log;
+        location / {
+            proxy_pass https://websocket;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $connection_upgrade;
+            proxy_set_header Origin "https://staging.c3lf.de/";
+            proxy_set_header Host $host;
+        }
+    }
+}
+
+events {}
+
+pid /home/jedi/Projects/c3lf-system-3/deploy/nginx.pid;
\ No newline at end of file
diff --git a/web/public/js/worker.js b/web/public/js/worker.js
deleted file mode 100644
index 19f4203..0000000
--- a/web/public/js/worker.js
+++ /dev/null
@@ -1,50 +0,0 @@
-let state = 0;
-let ports = [];
-let notify_socket;
-
-function tryConnect(){
-    if(self.WebSocket === undefined){
-        console.log("no websocket support");
-        return;
-    }
-    if (!notify_socket || notify_socket.readyState !== WebSocket.OPEN) {
-        const scheme = location.protocol === "https:" ? "wss" : "ws";
-        notify_socket = new WebSocket(scheme + '://' + location.host + '/ws/2/notify/');
-        notify_socket.onopen = (e) => {
-            console.log("open", JSON.stringify(e));
-        };
-        notify_socket.onclose = (e) => {
-            console.log("close", JSON.stringify(e));
-            setTimeout(() => {
-                tryConnect();
-            }, 1000);
-        };
-        notify_socket.onerror = (e) => {
-            console.log("error", JSON.stringify(e));
-            setTimeout(() => {
-                tryConnect();
-            }, 1000);
-        };
-        notify_socket.onmessage = (e) => {
-            let data = JSON.parse(e.data);
-            console.log("message", data);
-            //this.loadEventItems()
-            //this.loadTickets()
-        }
-    }
-}
-
-onconnect = function (e) {
-    const port = e.ports[0];
-    ports.push(port);
-    port.onmessage = function (e) {
-        state = state + 1;
-        for (let i = 0; i < ports.length; i++) {
-            ports[i].postMessage({d: e.data, s: state, n: ports.length});
-        }
-    }
-    port.start();
-    console.log("worker connected", JSON.stringify(e));
-    tryConnect();
-}
-
diff --git a/web/src/views/admin/Debug.vue b/web/src/views/admin/Debug.vue
index 1acde81..683525c 100644
--- a/web/src/views/admin/Debug.vue
+++ b/web/src/views/admin/Debug.vue
@@ -1,39 +1,50 @@
 <template>
     <div>
-    <!--qr-code :text="qr_url" color="#000" bg-color="#fff" error-level="H" class="qr-code"></qr-code-->
-    <h3 class="text-center">Events</h3>
-    <!--p>{{ events }}</p-->
-    <ul>
-        <li v-for="event in events" :key="event.id">
-            {{ event.slug }}
-        </li>
-    </ul>
-    <h3 class="text-center">Items</h3>
-    <!--p>{{ loadedItems }}</p-->
-    <ul>
-        <li v-for="item in loadedItems" :key="item.id">
-            {{ item.description }}
-        </li>
-    </ul>
-    <h3 class="text-center">Boxes</h3>
-    <!--p>{{ loadedBoxes }}</p-->
-    <ul>
-        <li v-for="box in loadedBoxes" :key="box.id">
-            {{ box.name }}
-        </li>
-    </ul>
-    <h3 class="text-center">Issues</h3>
-    <!--p>{{ issues }}</p-->
-    <ul>
-        <li v-for="issue in tickets" :key="issue.id">
-            {{ issue.id }}
-        </li>
-    </ul>
+        <div>
+            <ul>
+                <li>
+                    <button class="btn btn-primary" @click="addTest('test')">+</button>
+                </li>
+                <li v-for="(t, index) in test" :key="index">
+                    {{ t }}
+                    <button class="btn btn-link" @click="removeTest(index)">-</button>
+                </li>
+            </ul>
+        </div>
+        <!--qr-code :text="qr_url" color="#000" bg-color="#fff" error-level="H" class="qr-code"></qr-code-->
+        <h3 class="text-center">Events</h3>
+        <!--p>{{ events }}</p-->
+        <ul>
+            <li v-for="event in events" :key="event.id">
+                {{ event.slug }}
+            </li>
+        </ul>
+        <h3 class="text-center">Items</h3>
+        <!--p>{{ loadedItems }}</p-->
+        <ul>
+            <li v-for="item in loadedItems" :key="item.id">
+                {{ item.description }}
+            </li>
+        </ul>
+        <h3 class="text-center">Boxes</h3>
+        <!--p>{{ loadedBoxes }}</p-->
+        <ul>
+            <li v-for="box in loadedBoxes" :key="box.id">
+                {{ box.name }}
+            </li>
+        </ul>
+        <h3 class="text-center">Issues</h3>
+        <!--p>{{ issues }}</p-->
+        <ul>
+            <li v-for="issue in tickets" :key="issue.id">
+                {{ issue.id }}
+            </li>
+        </ul>
     </div>
 </template>
 
 <script>
-import {mapActions, mapState} from 'vuex';
+import {mapActions, mapMutations, mapState} from 'vuex';
 import Table from '@/components/Table';
 
 export default {
@@ -41,6 +52,8 @@ export default {
     components: {Table},
     computed: {
         ...mapState(['events', 'loadedItems', 'loadedBoxes', 'tickets']),
+        ...mapState(['events', 'loadedItems', 'loadedBoxes']),//, 'mails', 'issues', 'systemEvents']),
+        ...mapState(['test']),
         qr_url() {
             return window.location.href;
         }
@@ -48,6 +61,17 @@ export default {
     methods: {
         ...mapActions(['changeEvent', 'loadTickets']),
 
+        ...mapActions(['changeEvent']),//, 'loadMails', 'loadIssues', 'loadSystemEvents']),
+        ...mapMutations(['setTest']),
+        addTest(test) {
+            const tests = [...this.test, test];
+            this.setTest(tests);
+        },
+        removeTest(index) {
+            const tests = [...this.test];
+            tests.splice(index, 1);
+            this.setTest(tests);
+        }
     },
     mounted() {
         this.loadTickets();
diff --git a/web/vue.config.js b/web/vue.config.js
index 89eed95..6a50fe3 100644
--- a/web/vue.config.js
+++ b/web/vue.config.js
@@ -7,45 +7,6 @@ module.exports = {
             "Access-Control-Allow-Headers": "*",
             "Access-Control-Allow-Methods": "*"
         },
-        //devMiddleware: {
-        //    //location /redirect_media/ {
-        //    //    internal;
-        //    //    alias /var/www/c3lf-sys3/userfiles/;
-        //    //}
-        //    //
-        //    //location /redirect_thumbnail/ {
-        //    //    internal;
-        //    //    alias /var/www/c3lf-sys3/userfiles/thumbnails/;
-        //    //}
-        //    modifyResponse: function (res) {
-        //        path = res.headers['x-accel-redirect'];
-        //        let re_path;
-        //        if (path && path.includes('/redirect_thumbnail/')) {
-        //            re_path = path.replace('/redirect_thumbnail/', '../userfiles/thumbnails/');
-        //        }else if (path && path.includes('/redirect_media/')) {
-        //            re_path = path.replace('/redirect_media/', '../userfiles/');
-        //        }
-        //        const body = require(re_path);
-        //        res.headers['content-type'] = 'image/jpeg';
-        //        res.headers['content-length'] = body.length;
-        //        res.body = body;
-        //        return res;
-        //    },
-        //},
-        /*setupMiddlewares: (middlewares, devServer) => {
-            devServer.app.use(basicAuth({
-                users: {
-                    'c3lf': 'findetalles'
-                },
-                challenge: true
-            }));
-
-            return middlewares;
-        },*/
-        /*watchOptions: {
-            poll: true,
-            ignored: /node_modules/,
-        },*/
         proxy: {
             '^/media/2': {
                 target: 'https://staging.c3lf.de/',