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.

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

Update Admin Panel to work via iframes #799

Merged
merged 61 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
d238b5b
wrap admin panel in iframe
WillNilges Jan 4, 2025
3a867d2
slightly better
WillNilges Jan 4, 2025
8577796
Extract object info and query it with the meshdb API
WillNilges Jan 4, 2025
dc55709
Move script to its own file
WillNilges Jan 4, 2025
7db0687
Now if only I could get my admin map to behave
WillNilges Jan 4, 2025
3fb5d51
Aha, I have to listen for messages
WillNilges Jan 4, 2025
4eb5e15
Victory
WillNilges Jan 4, 2025
d545a8b
Allow map to change location of admin panel
WillNilges Jan 4, 2025
1099bf4
Refactor style sheets
WillNilges Jan 4, 2025
c0c8983
Restore map.js
WillNilges Jan 4, 2025
f20e2a6
make it not crash
WillNilges Jan 5, 2025
98baeba
Update environment variables
WillNilges Jan 5, 2025
d016323
Checkpoint: Subway refactor. This works!?
WillNilges Jan 10, 2025
35a1c3e
another checkpoint
WillNilges Jan 10, 2025
e64d4c7
another checkpoint: going to refactor iframe_panel to admin_panel_iframe
WillNilges Jan 10, 2025
b007f38
Capture back button requests
WillNilges Jan 10, 2025
3be7d48
Delete dead code
WillNilges Jan 10, 2025
357fa37
getting the map to be resizable through css
WillNilges Jan 11, 2025
35d1a44
computers are fucking dumb;
WillNilges Jan 11, 2025
b6cd4b4
some cleanup
WillNilges Jan 11, 2025
9fd0a2c
debugging weird flow control stuff
WillNilges Jan 11, 2025
93bf978
OK I think we have feature pairity
WillNilges Jan 11, 2025
eedd693
Pick up where we left off (protect against refreshes)
WillNilges Jan 11, 2025
8b21202
Pass URL through to the Admin Panel iFrame
WillNilges Jan 12, 2025
3e21134
Ope my code sucks
WillNilges Jan 12, 2025
3c6cc25
I have no idea what is going on
WillNilges Jan 12, 2025
e79ad04
Fix admin panel using relative URLs
WillNilges Jan 12, 2025
2fde80d
refactoring checkpoint
WillNilges Jan 12, 2025
d2f516e
Refactoring checkpoint 2
WillNilges Jan 12, 2025
52db0e0
Strip 'panel' out of get_admin_url
WillNilges Jan 12, 2025
27b0919
Skip iframe in search tests
WillNilges Jan 12, 2025
75c25a3
same for list
WillNilges Jan 12, 2025
5409788
same for change
WillNilges Jan 12, 2025
4358d7c
Lint
WillNilges Jan 12, 2025
149637e
Delete a bunch of stuff
WillNilges Jan 12, 2025
3564bf2
checkpoint: delete more things
WillNilges Jan 12, 2025
6d37aa9
fix layout issues
WillNilges Jan 12, 2025
69ace4c
Swap /admin and /admin/panel
WillNilges Jan 13, 2025
63dded2
Revert "same for change"
WillNilges Jan 13, 2025
f52d1cb
Revert "same for list"
WillNilges Jan 13, 2025
8d37570
Revert "Skip iframe in search tests"
WillNilges Jan 13, 2025
dee6453
Add simple test
WillNilges Jan 14, 2025
eb9e896
Add a slightly more complex test
WillNilges Jan 14, 2025
2a65892
Acutally, just add one test. See comment as to why
WillNilges Jan 14, 2025
da6abd4
whoops
WillNilges Jan 14, 2025
33c38bb
Add a way to get to /admin/panel and update map button logic
WillNilges Jan 14, 2025
c46f4dd
Swap /admin out from under users
WillNilges Jan 15, 2025
307222d
Fix URL if user goes to /admin/panel, I should probs make the URL a v…
WillNilges Jan 15, 2025
820893a
Refactor
WillNilges Jan 16, 2025
7ec13d0
andrew comments 1: Restore password reset, remove state override, fix…
WillNilges Jan 17, 2025
f42e5d7
andrew comments 2: Path
WillNilges Jan 17, 2025
2058a85
lint
WillNilges Jan 18, 2025
09cba15
Redirect top to login on logout
WillNilges Jan 18, 2025
57e5908
Move iframe escape logic to onAdminPanelLoad
WillNilges Jan 21, 2025
f3b67a6
Make clicking an los work
WillNilges Jan 21, 2025
764eec1
Fixes, disable map if on mobile
WillNilges Jan 21, 2025
78a2221
Remove override that was breaking mobile
WillNilges Jan 24, 2025
c4825dc
Update src/meshweb/static/admin/iframe_check.js
WillNilges Jan 27, 2025
c0dcf94
Update src/meshweb/static/admin/map.js
WillNilges Jan 27, 2025
6051f88
Fix variable and delete log lines
WillNilges Jan 27, 2025
d5eb255
Merge branch 'main' into wdn/map-iframe-2
WillNilges Feb 4, 2025
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
5 changes: 4 additions & 1 deletion src/meshapi/admin/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
AdminPasswordResetDoneView,
AdminPasswordResetView,
)
from meshdb.views import admin_iframe_view, minimal_example_view

urlpatterns = [
path("password_reset/", AdminPasswordResetView.as_view(), name="admin_password_reset"),
path("password_reset/done/", AdminPasswordResetDoneView.as_view(), name="password_reset_done"),
path("password_reset/<uidb64>/<token>/", AdminPasswordResetConfirmView.as_view(), name="password_reset_confirm"),
path("password_reset/done/", AdminPasswordResetCompleteView.as_view(), name="password_reset_complete"),
path("", admin.site.urls),
path("panel/", admin.site.urls),
path("", admin_iframe_view),
path("minimal_example/", minimal_example_view),
]
3 changes: 3 additions & 0 deletions src/meshdb/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@

USE_X_FORWARDED_HOST = True

X_FRAME_OPTIONS = "SAMEORIGIN"

SECURE_HSTS_SECONDS = 31536000
SECURE_HSTS_PRELOAD = False
SECURE_HSTS_INCLUDE_SUBDOMAINS = False
Expand Down Expand Up @@ -167,6 +169,7 @@

CORS_ALLOWED_ORIGINS += [
"http://127.0.0.1:3000",
"http://127.0.0.1:3001",
"http://localhost:3000",
"http://127.0.0.1:80",
"http://localhost:80",
Expand Down
3 changes: 0 additions & 3 deletions src/meshdb/templates/admin/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@
{% block footer %}<div id="footer"></div>{% endblock %}
</div>
</div>
{% block map_sidebar %}
{% include "admin/map_sidebar.html" %}
{% endblock %}
</div>

</div>
Expand Down
61 changes: 61 additions & 0 deletions src/meshdb/templates/admin/iframed.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{% load static %}

{% load env_extras %}

<!DOCTYPE html>
<html>
<head>
<script>let MAP_BASE_URL = "{% get_env_var 'ADMIN_MAP_BASE_URL' %}";</script>
<link rel="stylesheet" href="{% static '/admin/iframed.css'%}"/>

<link rel="stylesheet" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}">
{% block dark-mode-vars %}
<link rel="stylesheet" href="{% static "admin/css/dark_mode.css" %}">
<script src="{% static "admin/js/theme.js" %}" defer></script>
{% endblock %}
<link rel="stylesheet" href="{% static "/admin/admin_ext.css" %}">

</head>
<body>
<div id="page_container">
<div id="admin_panel_div" class="frameGrow">
<iframe src="panel" id="admin_panel_iframe" class="frameGrow"></iframe>
</div>

<div class="floating-button">
<a href="#" class="button" style="display: inline-block" id="show_map_button">
<img src="{% static '/admin/map/img/map.png' %}" height="16px" title="Show Map">
</a>
</div>

<div id="map_controls">
<!-- This handle is always visible, unless you're resizing, in which case
goes big and invisible to block the iframes from stealing focus -->
<div class="handle" id="handle">
<span class="vert-align-helper"></span>
<img class="handlebar" id="handlebar" src="{% static '/admin/map/img/handlebar.svg' %}" height="60px"/>
</div>
<!-- Only shows up during resizes -->
<div class="handle hiddenDuringResize" id="substituteHandle">
<span class="vert-align-helper"></span>
<img class="handlebar" id="substituteHandlebar" src="{% static '/admin/map/img/handlebar.svg' %}" height="60px"/>
</div>
<div class="floating-button">
<a href="#" class="button" style="display: inline-block" id="map_hide_button">
<img src="{% static '/admin/map/img/cross.png' %}" height="24px" title="Hide Map">
</a>
</div>
<div class="floating-button-below">
<a href="#" class="button" style="display: inline-block" id="map_recenter_button">
<img src="{% static '/admin/map/img/recenter.png' %}" height="24px" title="Recenter map">
</a>
</div>
</div>

<div id="map_panel_div">
<iframe src="{% get_env_var 'ADMIN_MAP_BASE_URL' %}" id="map_panel"></iframe>
</div>
</div>
<script src="{% static '/admin/map.js' %}"></script>
</body>
</html>
55 changes: 55 additions & 0 deletions src/meshdb/templates/admin/minimal_example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Embedded Page</title>
</head>
<body>
<h2>Embedded</h2>
<textarea cols="30" rows="10" disabled id="output">waiting</textarea>
<input type="text" id="field" />
<button id="send">Send</button>
<script>
// set up references to DOM nodes
const output = document.getElementById("output");
const button = document.getElementById("send");
const field = document.getElementById("field");

// create a variable for the parent window. We will assign it once we get the first message.
let parent = null;

// add an event listener to send messages when the button is clicked
button.addEventListener("click", () => {
// don't do anything if there is no parent reference yet
if (parent === null) {
return;
}

// otherwise get the field text, and send it to the parent
const text = field.value;
parent.postMessage(text);
});

// add an event listener to run when a message is received
window.addEventListener("message", ({ data, source }) => {
console.log("Got message.");
// if we don't have a reference to the parent window yet, set it now
if (parent === null) {
parent = source;
}

// now we can do whatever we want with the message data.
// in this case, displaying it, and then sending it back
// wrapped in an object
output.textContent = JSON.stringify(data);
const response = {
success: true,
request: { data },
};
parent.postMessage(response);
});
</script>
</body>
</html>

11 changes: 11 additions & 0 deletions src/meshdb/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from django.shortcuts import render
from django.contrib.admin.views.decorators import staff_member_required

@staff_member_required
def admin_iframe_view(request):
return render(request, 'admin/iframed.html')


@staff_member_required
def minimal_example_view(request):
return render(request, 'admin/minimal_example.html')
29 changes: 28 additions & 1 deletion src/meshweb/static/admin/admin_ext.css
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,33 @@
margin-left: -4px; /* IDK why this is needed CSS is voodoo */
}

/* Invisible full-screen div */
.fullscreenInvis {
position: fixed; /* Makes the div stay in place even when scrolling */
top: 0; /* Position the top of the div at the top of the screen */
left: 0; /* Position the left of the div at the left edge of the screen */
width: 100vw; /* Full width of the viewport */
height: 100vh; /* Full height of the viewport */
background: transparent; /* No visible background */
pointer-events: none; /* Makes it non-interactive */
z-index: 9999; /* Ensure it appears on top of other elements if needed */
}


/* Hidden state */
.hiddenDuringResize {
display: none; /* Completely hides the element */
}

.bigBar {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: transparent;
}

.floating-button {
z-index: 100;
position: absolute;
Expand Down Expand Up @@ -187,4 +214,4 @@ fieldset h2 {

.hidden {
display: none;
}
}
19 changes: 19 additions & 0 deletions src/meshweb/static/admin/iframed.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
iframe {
height: 100%;
width: 100%;
border: none;
z-index: 1;
}

.frameGrow {
flex-grow: 1;
border: none;
margin: 0;
padding: 0;
}

#page_container {
display: flex;
flex-direction: row;
height: 100%;
}
Loading
Loading