Merge pull request #200 from Shrutihindocha/main

fixes for dev environment
dbca-wa · Dec 20, 2023 · 3859ba6 · 3859ba6
2 parents 3f3afe7 + bb018aa
commit 3859ba6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/vscode/launch.json → .vscode/launch.json b/vscode/launch.json → .vscode/launch.json
@@ -11,7 +11,7 @@
             "program": "${workspaceFolder}/manage.py",
             "args": [
                 "runserver",
-                "0.0.0.0:9002"
+                "0.0.0.0:9001"
             ],
             "django": true
 

diff --git a/boranga/context_processors.py b/boranga/context_processors.py
@@ -13,6 +13,7 @@ def config(request):
         'template_title': settings.TEMPLATE_TITLE,
         'build_tag': settings.BUILD_TAG,
         "KMI_SERVER_URL": KMI_SERVER_URL,
+        'app_build_url': settings.DEV_APP_BUILD_URL,
     }
     #print( config )
     return config

diff --git a/boranga/frontend/boranga/vue.config.js b/boranga/frontend/boranga/vue.config.js
@@ -42,6 +42,11 @@ module.exports = defineConfig({
                 //index: true,
                 writeToDisk: true,
             },
+            headers: {
+                'Access-Control-Allow-Origin': '*',
+                'Access-Control-Allow-Headers':
+                'Origin, X-Requested-With, Content-Type, Accept',
+            },
             client: {
                 webSocketURL: 'ws://0.0.0.0:' + port + '/ws',
             },

diff --git a/boranga/templates/boranga/base.html b/boranga/templates/boranga/base.html
@@ -35,8 +35,13 @@
                     }
             </script>
             <script type="text/javascript" src="{% static 'boranga_vue/js/chunk-vendors.js' %}?v={{build_tag}}"></script>
-            <script type="text/javascript" src="{% static 'boranga_vue/js/app.js' %}?v={{build_tag}}"></script>
-
+            {% if app_build_url %}
+
+                <script type="module" type="text/javascript" src="{{ app_build_url }}"></script>
+            {% else %}
+                <script type="text/javascript" src="{% static 'boranga_vue/js/app.js' %}?v={{build_tag}}"></script>
+            {% endif %}
+            <div id="app">Template not loaded</div>
         {% endblock %}
 
         {% block menu_items2_right %}