From 9febbc08576c0357c590a9a830a6f522027618bd Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Tue, 14 Nov 2023 14:53:58 +0100
Subject: [PATCH] fix: static assets

---
 .../src/assets}/images/mood_uk.jpg            | Bin
 .../src/assets}/images/mood_vv.jpg            | Bin
 .../components/dashboard/NoCourseSession.vue  |   6 +--
 client/src/pages/onboarding/WizardBase.vue    |   6 ++-
 server/vbv_lernwelt/core/views.py             |  36 ++++++++++++------
 5 files changed, 32 insertions(+), 16 deletions(-)
 rename {server/vbv_lernwelt/static => client/src/assets}/images/mood_uk.jpg (100%)
 rename {server/vbv_lernwelt/static => client/src/assets}/images/mood_vv.jpg (100%)

diff --git a/server/vbv_lernwelt/static/images/mood_uk.jpg b/client/src/assets/images/mood_uk.jpg
similarity index 100%
rename from server/vbv_lernwelt/static/images/mood_uk.jpg
rename to client/src/assets/images/mood_uk.jpg
diff --git a/server/vbv_lernwelt/static/images/mood_vv.jpg b/client/src/assets/images/mood_vv.jpg
similarity index 100%
rename from server/vbv_lernwelt/static/images/mood_vv.jpg
rename to client/src/assets/images/mood_vv.jpg
diff --git a/client/src/components/dashboard/NoCourseSession.vue b/client/src/components/dashboard/NoCourseSession.vue
index 93b802c7..7936c17e 100644
--- a/client/src/components/dashboard/NoCourseSession.vue
+++ b/client/src/components/dashboard/NoCourseSession.vue
@@ -10,8 +10,8 @@ const user = useUserStore();
 
     <div class="grid grid-cols-1 gap-12 md:grid-cols-2">
       <div>
-        <img src="/static/images/mood_vv.jpg" alt="Versicherungsvermittler/-in" />
-        <h3 class="mb-4 mt-8">Versicherungsvermittler/-in</h3>
+        <img src="../../assets/images/mood_vv.jpg" alt="Versicherungsvermittler/-in" />
+        <h3 class="mb-4 mt-8">Versicherungsvermittler/-in!</h3>
         <p class="mb-4">
           Der Lehrgang und die Prüfung zum Erwerb des Verbandszertifikats als
           Versicherungs-vermittler/-in.
@@ -25,7 +25,7 @@ const user = useUserStore();
       </div>
 
       <div>
-        <img src="/static/images/mood_uk.jpg" alt="Überbetriebliche Kurse" />
+        <img src="../../assets/images/mood_uk.jpg" alt="Überbetriebliche Kurse" />
         <h3 class="mb-4 mt-8">Überbetriebliche Kurse</h3>
         <p class="mb-4">
           Die überbetrieblichen Kurse der kaufmännischen Ausbildungs- und
diff --git a/client/src/pages/onboarding/WizardBase.vue b/client/src/pages/onboarding/WizardBase.vue
index 3efdbcac..87dd85b0 100644
--- a/client/src/pages/onboarding/WizardBase.vue
+++ b/client/src/pages/onboarding/WizardBase.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import WizardSidePanel from "@/components/onboarding/WizardSidePanel.vue";
 import { computed } from "vue";
+import mood_uk from "@/assets/images/mood_uk.jpg";
+import mood_vv from "@/assets/images/mood_vv.jpg";
 
 const props = defineProps({
   courseType: {
@@ -19,11 +21,11 @@ type CourseMetaType = {
 const courseMeta: CourseMetaType = {
   uk: {
     name: "Überbetriebliche Kurse",
-    imageUrl: "/static/images/mood_uk.jpg",
+    imageUrl: mood_uk,
   },
   vv: {
     name: "Versicherungs&shy;vermittler/&#8209;in",
-    imageUrl: "/static/images/mood_vv.jpg",
+    imageUrl: mood_vv,
   },
 };
 
diff --git a/server/vbv_lernwelt/core/views.py b/server/vbv_lernwelt/core/views.py
index 8101e5cf..6cc324db 100644
--- a/server/vbv_lernwelt/core/views.py
+++ b/server/vbv_lernwelt/core/views.py
@@ -7,7 +7,12 @@ import structlog
 from django.conf import settings
 from django.contrib.auth import authenticate, login, logout
 from django.core.management import call_command
-from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
+from django.http import (
+    HttpResponse,
+    HttpResponseRedirect,
+    JsonResponse,
+    StreamingHttpResponse,
+)
 from django.shortcuts import render
 from django.template import loader
 from django.views.decorators.csrf import ensure_csrf_cookie
@@ -32,12 +37,21 @@ logger = structlog.get_logger(__name__)
 @ensure_csrf_cookie
 def vue_home(request, *args):
     if settings.IT_SERVE_VUE:
+        from gunicorn.util import is_hoppish
+
         try:
-            res = requests.get(f"{settings.IT_SERVE_VUE_URL}{request.get_full_path()}")
-            content = res.text
-            headers = res.headers
-            content_type = headers.get("content-type", "text/html")
-            return HttpResponse(content, content_type=content_type)
+            path = request.get_full_path()
+            res = requests.get(f"{settings.IT_SERVE_VUE_URL}{path}", stream=True)
+            response = StreamingHttpResponse(
+                streaming_content=(chunk for chunk in res.iter_content(4096)),
+                content_type=res.headers.get("Content-Type", "text/html"),
+                status=res.status_code,
+            )
+            for name, value in res.headers.items():
+                if not is_hoppish(name):
+                    response[name] = value
+
+            return response
         except Exception as e:
             return HttpResponse(
                 f"Can not connect to vue dev server at {settings.IT_SERVE_VUE_URL}: {e}"
@@ -147,13 +161,13 @@ def cypress_reset_view(request):
         options = {}
 
         create_assignment_completion = (
-            request.data.get("create_assignment_completion") == "true"
+                request.data.get("create_assignment_completion") == "true"
         )
         if create_assignment_completion:
             options["create_assignment_completion"] = create_assignment_completion
 
         create_assignment_evaluation = (
-            request.data.get("create_assignment_evaluation") == "true"
+                request.data.get("create_assignment_evaluation") == "true"
         )
         if create_assignment_evaluation:
             options["create_assignment_evaluation"] = create_assignment_evaluation
@@ -163,7 +177,7 @@ def cypress_reset_view(request):
             options["assignment_evaluation_scores"] = assignment_evaluation_scores
 
         options["create_feedback_responses"] = (
-            request.data.get("create_feedback_responses") == "true"
+                request.data.get("create_feedback_responses") == "true"
         )
 
         # edoniq test results
@@ -176,11 +190,11 @@ def cypress_reset_view(request):
             )
 
         options["create_course_completion_performance_criteria"] = (
-            request.data.get("create_course_completion_performance_criteria") == "true"
+                request.data.get("create_course_completion_performance_criteria") == "true"
         )
 
         options["create_attendance_days"] = (
-            request.data.get("create_attendance_days") == "true"
+                request.data.get("create_attendance_days") == "true"
         )
 
         call_command(