Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dashboard #89

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Fix dashboard #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion makerspaceleiden/prod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
SECURE_BROWSER_XSS_FILTER = True
SESSION_COOKIE_SECURE = True
CSRF_COOKIE_SECURE = True
X_FRAME_OPTIONS = "DENY"
X_FRAME_OPTIONS = "SAMEORIGIN"
SECURE_SSL_REDIRECT = os.getenv("SECURE_SSL_REDIRECT", "True") == "True"
SECURE_HSTS_PRELOAD = True
SECURE_CONTENT_TYPE_NOSNIFF = True
Expand Down
2 changes: 1 addition & 1 deletion nodered/templates/nodered_live_data_and_sensors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% block content %}

{% if node_red_available %}
<iframe id="iframe-nodered" src="{% url 'nodered_dashboard_proxy' %}/live_data_and_sensors" scrolling="no" width="100%" height="2000px" frameborder="0" style="background-color: white; overflow: hidden;"></iframe>
<iframe id="iframe-nodered" src="{% url 'nodered_dashboard_proxy' url='dashboard/live_data_and_sensors' %}" scrolling="no" width="100%" height="2000px" frameborder="0" style="background-color: white; overflow: hidden;"></iframe>
{% else %}
<div class="mt-3">Data not available.</div>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion nodered/templates/nodered_space_climate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% block content %}

{% if node_red_available %}
<iframe id="iframe-nodered" src="{% url 'nodered_dashboard_proxy' %}/space_climate" scrolling="no" width="100%" height="2000px" frameborder="0" style="background-color: white; overflow: hidden;"></iframe>
<iframe id="iframe-nodered" src="{% url 'nodered_dashboard_proxy' url='dashboard/space_climate' %}" scrolling="no" width="100%" height="2000px" frameborder="0" style="background-color: white; overflow: hidden;"></iframe>
{% else %}
<div class="mt-3">Data not available.</div>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions nodered/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
name="nodered_dashboard_proxy",
),
path(
"dashboard/nodered_live_data_and_sensors/",
"dashboard_intranet/nodered_live_data_and_sensors/",
views.NoderedLiveDataAndSensorsView,
name="nodered_live_data_and_sensors",
),
path(
"dashboard/nodered_space_climate/",
"dashboard_intranet/nodered_space_climate/",
views.NoderedSpaceClimateView,
name="nodered_space_climate",
),
Expand Down
1 change: 1 addition & 0 deletions rollout-prod.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ python manage.py makemigrations
python manage.py migrate

sudo apachectl restart
sudo systemctl restart crm-daphne.service
)
E=$?

Expand Down
Loading