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

Jump to bottom

Add an HTTP endpoint for rendering the entire world map #175

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Add an HTTP endpoint for rendering the entire world map #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17077b9
Add an HTTP endpoint for rendering the entire world map
hanzi Jan 7, 2024
f277eb8
Fix world map skipping connections if there are diving-related ones
hanzi Jan 7, 2024
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
8 changes: 7 additions & 1 deletion modules/web/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,10 +651,16 @@ def stream():

@server.route("/", methods=["GET"])
def http_index():
index_file = Path(__file__).parent / "http_example.html"
index_file = Path(__file__).parent / "index.html"
with open(index_file, "rb") as file:
return Response(file.read(), content_type="text/html; charset=utf-8")

@server.route("/world_map", methods=["GET"])
def http_world_map():
html_file = Path(__file__).parent / "world_map.html"
with open(html_file, "rb") as file:
return Response(file.read(), content_type="text/html; charset=utf-8")

@server.route("/swagger", methods=["GET"])
def http_get_swagger_json():
return Response(json.dumps(spec.to_dict(), indent=4), content_type="application/json; charset=utf-8")
Expand Down
60 changes: 30 additions & 30 deletions modules/web/http_example.html → modules/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h2>Current Encounter</h2>

<h2 id="mini_map_headline">Mini Map</h2>

<canvas id="mini_map"></canvas>
<a href="/world_map" id="mini_map_link"><canvas id="mini_map"></canvas></a>

<h2>Event Log</h2>

Expand Down Expand Up @@ -710,7 +710,7 @@ <h2>Current Encounter</h2>
--background-image: None;
/* Add other theme-related variables here */
}

html,
body {
margin: 0;
Expand All @@ -719,21 +719,21 @@ <h2>Current Encounter</h2>
background-color: var(--background-color);
color: var(--text-color);
}

#first_row>div,
#second_row>div {
padding: 1rem;
box-sizing: border-box;
}

#second_row h2 {
margin-top: 0;
}

.none {
color: #aaa;
}

#gba_video {
border-right: 1px #000 solid;
border-bottom: 1px #000 solid;
Expand All @@ -744,13 +744,13 @@ <h2>Current Encounter</h2>
width: 100%;
max-width: 480px;
}

@media screen and (max-width: 520px) {
#gba_video {
margin-right: 0;
}
}

#emulator_card,
#trainer_card,
#party_card,
Expand All @@ -760,79 +760,79 @@ <h2>Current Encounter</h2>
width: 100%;
max-width: 500px;
}

#emulator_card ul,
#trainer_card ul,
#party_card ol,
#map_card ul {
padding-left: 1rem;
}

.party-entry {
margin-bottom: .5rem;
}

.party-entry .hp-bar,
.party-entry .exp-bar {
width: 200px;
background-color: #ddd;
border: 1px #888 solid;
}

.party-entry .hp-bar {
height: 5px;
margin-top: 2px;
}

.party-entry .exp-bar {
height: 3px;
margin-top: 1px;
}

.party-entry .hp-bar div,
.party-entry .exp-bar div {
height: 100%;
background-color: #5ae;
}

.encounter-container {
border: 1px #ccc solid;
}

#encounter {
height: 275px;
padding: calc(1rem - 5px);
border: 5px transparent solid;
}

#encounter>*:first-child {
margin-top: 0;
}

#encounter>*:last-child {
margin-bottom: 0;
}

#encounter>ul {
margin: 0;
display: inline-block;
width: 300px;
vertical-align: top;
}

#encounter table {
display: inline-block;
vertical-align: top;
}

#encounter th,
#encounter td {
text-align: center;
width: 80px;
padding: .25rem .5rem;
background-color: rgba(0, 0, 0, 0.2);
}

@media screen and (max-width: 479px) {
#encounter table {
margin-top: .5rem;
Expand All @@ -842,14 +842,14 @@ <h2>Current Encounter</h2>
font-size: 70%;
}
}

#mini_map {
border: 1px #000 solid;
box-sizing: border-box;
margin: 1rem 0;
max-width: 100%;
}

@media screen and (min-width: 1400px) {
#mini_map_headline {
display: none;
Expand All @@ -863,17 +863,17 @@ <h2>Current Encounter</h2>
border-right: 0;
}
}

#log p {
margin: .5rem 0 0;
}

#log small {
font-size: 75%;
color: #888;
margin-right: 10px;
}

#screen_loading,
#screen_connection_lost {
position: fixed;
Expand All @@ -889,16 +889,16 @@ <h2>Current Encounter</h2>
color: #000;
font-size: 3rem;
}

#screen_loading {
background-color: rgba(255, 240, 80, 0.75);
}

#screen_connection_lost {
display: none;
background-color: rgba(255, 120, 120, 0.75);
}
</style>
</body>

</html>
</html>
Loading