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

Update Admin Map to work via iframes #72

Open
wants to merge 9 commits into
base: meshdb-admin
Choose a base branch
from
Open

Update Admin Map to work via iframes #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
515d68e
update routing
WillNilges Jan 4, 2025
8801cf2
Victory
WillNilges Jan 4, 2025
7cd89af
fix icons not loading
WillNilges Jan 4, 2025
68c38ff
pass message back to parent
WillNilges Jan 4, 2025
bc09ef0
Delete comments
WillNilges Jan 5, 2025
4f98027
Checkpoint: subway refactor. This works!?
WillNilges Jan 10, 2025
887e03a
need a diff
WillNilges Jan 11, 2025
e1ba943
debugging weird flow control stuff
WillNilges Jan 11, 2025
795ab9a
Ok I think we have feature pairity
WillNilges Jan 11, 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
17 changes: 8 additions & 9 deletions src/Map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ import {Provider} from "react-redux";
import React, {Component} from "react";
import MapView from "./components/MapView";


import rootReducer from "./reducers";
import { MESHDB_URL } from "./actions";

const store = createStore(rootReducer);

class Map extends Component {
state = {
match: {params: {nodeId: "238-240"}},
match: {params: {nodeId: ""}},
}

constructor(props) {
super(props);
window.addEventListener("setMapNode", (e) => {
this.updateSelected.bind(this)(e.selectedNodes, false)
}
)
window.addEventListener("message", ({ data, source }) => {
this.updateSelected.bind(this)(data.selectedNodes, false);
console.log(`[map] Got message from Admin Panel: ${data}. State is now: ${JSON.stringify(this.state)}`);
});
}

updateSelected(selectedNodes, triggerEvent = true){
Expand All @@ -29,9 +29,8 @@ class Map extends Component {
this.setState({match: undefined});
}
if (triggerEvent) {
const selectedEvent = new Event("nodeSelectedOnMap");//, {detail: {selectedNodes: selectedNodes}});
selectedEvent.selectedNodes = selectedNodes;
window.dispatchEvent(selectedEvent);
console.log(`[map] Posting update: ${selectedNodes}`);
window.parent.postMessage({selectedNodes: selectedNodes}, MESHDB_URL);
}
}

Expand Down
11 changes: 7 additions & 4 deletions src/actions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
export const MESHDB_URL = process.env.REACT_APP_MESHDB_URL;

export function fetchNodes(dispatch) {
fetch("https://db.nycmesh.net/api/v1/mapdata/nodes/?format=json")
fetch(`${MESHDB_URL}/api/v1/mapdata/nodes/?format=json`)
.then(res => res.json())
.then(json => {
console.log("Fetched Nodes");
dispatch({ type: "FETCH_NODES_SUCCESS", nodes: json });
})
.catch(err => console.log(err));
}

export function fetchLinks(dispatch) {
fetch("https://db.nycmesh.net/api/v1/mapdata/links/?format=json")
fetch(`${MESHDB_URL}/api/v1/mapdata/links/?format=json`)
.then(res => res.json())
.then(json => {
dispatch({ type: "FETCH_LINKS_SUCCESS", links: json });
Expand All @@ -17,7 +20,7 @@ export function fetchLinks(dispatch) {
}

export function fetchSectors(dispatch) {
fetch("https://db.nycmesh.net/api/v1/mapdata/sectors/?format=json")
fetch(`${MESHDB_URL}/api/v1/mapdata/sectors/?format=json`)
.then(res => res.json())
.then(json => {
dispatch({ type: "FETCH_SECTORS_SUCCESS", sectors: json });
Expand All @@ -26,7 +29,7 @@ export function fetchSectors(dispatch) {
}

export function fetchKiosks(dispatch) {
fetch("https://db.nycmesh.net/api/v1/mapdata/kiosks/?format=json")
fetch(`${MESHDB_URL}/api/v1/mapdata/kiosks/?format=json`)
.then(res => res.json())
.then(json => {
dispatch({ type: "FETCH_KIOSKS_SUCCESS", kiosks: json });
Expand Down
30 changes: 15 additions & 15 deletions src/components/MapView/NodeMarker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class NodeMarker extends PureComponent {
if (type === "supernode")
return {
icon: {
url: "/static/admin/map/img/map/supernode.svg",
url: "/img/map/supernode.svg",
anchor: { x: 14, y: 14 }
},
zIndex: 100
Expand All @@ -88,7 +88,7 @@ class NodeMarker extends PureComponent {
if (type === "pop")
return {
icon: {
url: "/static/admin/map/img/map/pop.svg",
url: "/img/map/pop.svg",
anchor: { x: 14, y: 14 }
},
zIndex: 100
Expand All @@ -97,7 +97,7 @@ class NodeMarker extends PureComponent {
if (type === "ap")
return {
icon: {
url: "/static/admin/map/img/map/ap.svg",
url: "/img/map/ap.svg",
anchor: { x: 10, y: 10 }
},
zIndex: 90
Expand All @@ -106,16 +106,16 @@ class NodeMarker extends PureComponent {
if (type === "hub")
return {
icon: {
url: "/static/admin/map/img/map/hub.svg",
url: "/img/map/hub.svg",
anchor: { x: 10, y: 10 }
},
zIndex: 93
};

if (type === "omni") {
const url = filters.backbone
? "/static/admin/map/img/map/omni.svg"
: "/static/admin/map/img/map/active.svg";
? "/img/map/omni.svg"
: "/img/map/active.svg";
const zIndex = filters.backbone ? 92 : 91;
return {
icon: {
Expand All @@ -128,8 +128,8 @@ class NodeMarker extends PureComponent {

if (type === "remote") {
const url = filters.backbone
? "/static/admin/map/img/map/remote.svg"
: "/static/admin/map/img/map/active.svg";
? "/img/map/remote.svg"
: "/img/map/active.svg";
const anchor = filters.backbone ? { x: 5, y: 5 } : { x: 7, y: 7 };

return {
Expand All @@ -143,8 +143,8 @@ class NodeMarker extends PureComponent {

if (type === "kiosk") {
const url = filters.backbone
? "/static/admin/map/img/map/remote.svg"
: "/static/admin/map/img/map/active.svg";
? "/img/map/remote.svg"
: "/img/map/active.svg";
const anchor = filters.backbone ? { x: 5, y: 5 } : { x: 7, y: 7 };

return {
Expand All @@ -159,7 +159,7 @@ class NodeMarker extends PureComponent {
if (type === "active")
return {
icon: {
url: "/static/admin/map/img/map/active.svg",
url: "/img/map/active.svg",
anchor: { x: 7, y: 7 }
},
zIndex: 91
Expand All @@ -168,7 +168,7 @@ class NodeMarker extends PureComponent {
if (type === "potential-supernode")
return {
icon: {
url: "/static/admin/map/img/map/potential-supernode.svg",
url: "/img/map/potential-supernode.svg",
anchor: { x: 14, y: 14 }
},
zIndex: 83
Expand All @@ -177,7 +177,7 @@ class NodeMarker extends PureComponent {
if (type === "potential-hub")
return {
icon: {
url: "/static/admin/map/img/map/potential-hub.svg",
url: "/img/map/potential-hub.svg",
anchor: { x: 10, y: 10 }
},
zIndex: 82
Expand All @@ -186,15 +186,15 @@ class NodeMarker extends PureComponent {
if (type === "potential")
return {
icon: {
url: "/static/admin/map/img/map/potential.svg",
url: "/img/map/potential.svg",
anchor: { x: 7, y: 7 }
},
zIndex: 81
};

return {
icon: {
url: "/static/admin/map/img/map/dead.svg",
url: "/img/map/dead.svg",
anchor: { x: 5, y: 5 }
},
zIndex: 80
Expand Down