diff --git a/.env.production b/.env.production index c3478f7..d8f81e3 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -VITE_ORY_URL=https://twig.tchlabs.net/kratos -VITE_AUTH_URL=https://twig.tchlabs.net/auth -VITE_API_URL=https://twig.tchlabs.net/api -VITE_AUTOFILL_URL=https://twig.tchlabs.net/autofill \ No newline at end of file +VITE_ORY_URL=https://twigslot.com/kratos +VITE_AUTH_URL=https://twigslot.com/auth +VITE_API_URL=https://twigslot.com/api +VITE_AUTOFILL_URL=https://twigslot.com/autofill diff --git a/kubernetes/nginx-service.yaml b/kubernetes/nginx-service.yaml index 06e69c3..44efc32 100644 --- a/kubernetes/nginx-service.yaml +++ b/kubernetes/nginx-service.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: nginx-container - image: tch1001/twig_client:latest + image: tch1001/twig_client:v3.1.1 ports: - containerPort: 80 --- @@ -28,4 +28,6 @@ spec: ports: - protocol: TCP port: 80 - targetPort: 80 \ No newline at end of file + targetPort: 80 + nodePort: 30002 + type: LoadBalancer \ No newline at end of file diff --git a/kubernetes/traefik-ingress-client.yaml b/kubernetes/traefik-ingress-client.yaml index 4e49dfc..598652c 100644 --- a/kubernetes/traefik-ingress-client.yaml +++ b/kubernetes/traefik-ingress-client.yaml @@ -7,7 +7,7 @@ spec: entryPoints: - websecure routes: - - match: Host(`twig.tchlabs.net`) + - match: Host(`twigslot.com`) kind: Rule services: - name: nginx-service @@ -15,4 +15,4 @@ spec: tls: certResolver: myresolver domains: - - main: twig.tchlabs.net \ No newline at end of file + - main: twigslot.com \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 7caf6f3..9bea57c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -110,6 +110,19 @@ body { float: left; } +.deco-panel { + background-color: yellowgreen; + position: fixed; + bottom: 0; + right: 0; +} +.graph-logs-panel { + background-color: yellow; + position: fixed; + bottom: 0; + left: 0; +} + .info-panel-outer { position: relative; clear: left; diff --git a/src/components/DataPanel.vue b/src/components/DataPanel.vue index 6dc7514..51f153a 100644 --- a/src/components/DataPanel.vue +++ b/src/components/DataPanel.vue @@ -11,18 +11,16 @@
- + + {{ retrieval_status }}
-
+
- -
-
-
@@ -62,6 +60,7 @@ import graphData from "../graphData"; const project_id: any = ref(""); const retrieval_status = ref("") +const hide_description = ref(true); export default defineComponent({ name: "DataPanel", setup() { }, @@ -72,7 +71,8 @@ export default defineComponent({ }, data() { return { - retrieval_status + retrieval_status, + hide_description } }, methods: { @@ -119,6 +119,7 @@ export default defineComponent({ request_url_post.substring(0, requestLengthLimit) + (request_url_post.length > requestLengthLimit ? "..." : ""); retrieval_status.value = "Saving..." + this.$emit('add_log', 'DataPanel', 'saving data panel...') axios.post(request_url_pre + request_url_post).then((response) => { console.log(response.data); graphData.nodes.value[`node${response.data.uid}`] = response.data; @@ -126,6 +127,7 @@ export default defineComponent({ this.$emit("updatedDataPanel"); } retrieval_status.value = "Saved!" + this.$emit('add_log', 'DataPanel', 'saved') setTimeout(() => { retrieval_status.value = "" }, 1000) diff --git a/src/components/DecoPanel.vue b/src/components/DecoPanel.vue index 4cf2400..cb2c693 100644 --- a/src/components/DecoPanel.vue +++ b/src/components/DecoPanel.vue @@ -1,3 +1,4 @@ +<<<<<<< HEAD