Skip to content

WebHost: Remove styleController.js and replace functionality with HTML/CSS. #4852

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

Merged
merged 2 commits into from
Apr 9, 2025
Merged

WebHost: Remove styleController.js and replace functionality with HTML/CSS. #4852

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
3be3142
ensure footer stays at bottom of page without JS
Apr 9, 2025
3323bb4
Remove some other usages.
Apr 9, 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
1 change: 0 additions & 1 deletion WebHostLib/static/assets/gameInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ window.addEventListener('load', () => {
showdown.setOption('strikethrough', true);
showdown.setOption('literalMidWordUnderscores', true);
gameInfo.innerHTML += (new showdown.Converter()).makeHtml(results);
adjustHeaderWidth();

// Reset the id of all header divs to something nicer
for (const header of document.querySelectorAll('h1, h2, h3, h4, h5, h6')) {
Expand Down
2 changes: 0 additions & 2 deletions WebHostLib/static/assets/hostGame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ window.addEventListener('load', () => {
document.getElementById('file-input').addEventListener('change', () => {
document.getElementById('host-game-form').submit();
});

adjustFooterHeight();
});
47 changes: 0 additions & 47 deletions WebHostLib/static/assets/styleController.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion WebHostLib/static/assets/tutorial.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ window.addEventListener('load', () => {
showdown.setOption('literalMidWordUnderscores', true);
showdown.setOption('disableForced4SpacesIndentedSublists', true);
tutorialWrapper.innerHTML += (new showdown.Converter()).makeHtml(results);
adjustHeaderWidth();

const title = document.querySelector('h1')
if (title) {
Expand Down
7 changes: 7 additions & 0 deletions WebHostLib/static/styles/globalStyles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ html{

body{
margin: 0;
display: flex;
flex-direction: column;
min-height: calc(100vh - 110px);
}

main {
flex-grow: 1;
}

a{
Expand Down
2 changes: 1 addition & 1 deletion WebHostLib/templates/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends 'pageWrapper.html' %}
{% import "macros.html" as macros %}
{% set show_footer = True %}

{% block head %}
<title>Page Not Found (404)</title>
Expand All @@ -13,5 +14,4 @@ <h1>This page is out of logic!</h1>
The page you're looking for doesn&apos;t exist.<br />
<a href="/">Click here to return to safety.</a>
</div>
{% include 'islandFooter.html' %}
{% endblock %}
3 changes: 1 addition & 2 deletions WebHostLib/templates/hostGame.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% extends 'pageWrapper.html' %}
{% set show_footer = True %}

{% block head %}
<title>Upload Multidata</title>
Expand Down Expand Up @@ -27,6 +28,4 @@ <h1>Host Game</h1>
</div>
</div>
</div>

{% include 'islandFooter.html' %}
{% endblock %}
2 changes: 1 addition & 1 deletion WebHostLib/templates/landing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% extends 'pageWrapper.html' %}
{% set show_footer = True %}

{% block head %}
<title>Archipelago</title>
Expand Down Expand Up @@ -57,5 +58,4 @@ <h4>multiworld multi-game randomizer</h4>
</div>
</div>
</div>
{% include 'islandFooter.html' %}
{% endblock %}
29 changes: 16 additions & 13 deletions WebHostLib/templates/pageWrapper.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,29 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/tooltip.css") }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/cookieNotice.css") }}" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/globalStyles.css") }}" />
<script type="application/ecmascript" src="{{ url_for('static', filename="assets/styleController.js") }}"></script>
<script type="application/ecmascript" src="{{ url_for('static', filename="assets/cookieNotice.js") }}"></script>
{% block head %}
<title>Archipelago</title>
{% endblock %}
</head>
<body>
<main>
{% with messages = get_flashed_messages() %}
{% if messages %}
<div>
{% for message in messages | unique %}
<div class="user-message">{{ message }}</div>
{% endfor %}
</div>
{% endif %}
{% endwith %}

{% with messages = get_flashed_messages() %}
{% if messages %}
<div>
{% for message in messages | unique %}
<div class="user-message">{{ message }}</div>
{% endfor %}
</div>
{% endif %}
{% endwith %}

{% block body %}
{% endblock %}
{% block body %}
{% endblock %}
</main>

{% if show_footer %}
{% include "islandFooter.html" %}
{% endif %}
</body>
</html>
2 changes: 1 addition & 1 deletion WebHostLib/templates/seedError.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends 'pageWrapper.html' %}
{% import "macros.html" as macros %}
{% set show_footer = True %}

{% block head %}
<title>Generation failed, please retry.</title>
Expand All @@ -15,5 +16,4 @@ <h2>please retry</h2>
{{ seed_error }}
</div>
</div>
{% include 'islandFooter.html' %}
{% endblock %}
3 changes: 1 addition & 2 deletions WebHostLib/templates/startPlaying.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% extends 'pageWrapper.html' %}
{% set show_footer = True %}

{% block head %}
<title>Start Playing</title>
Expand Down Expand Up @@ -26,6 +27,4 @@ <h1>Start Playing</h1>
</p>
</div>
</div>

{% include 'islandFooter.html' %}
{% endblock %}
2 changes: 1 addition & 1 deletion WebHostLib/templates/viewSeed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends 'pageWrapper.html' %}
{% import "macros.html" as macros %}
{% set show_footer = True %}

{% block head %}
<title>View Seed {{ seed.id|suuid }}</title>
Expand Down Expand Up @@ -50,5 +51,4 @@ <h1>Seed Info</h1>
</table>
</div>
</div>
{% include 'islandFooter.html' %}
{% endblock %}
2 changes: 1 addition & 1 deletion WebHostLib/templates/waitSeed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends 'pageWrapper.html' %}
{% import "macros.html" as macros %}
{% set show_footer = True %}

{% block head %}
<title>Generation in Progress</title>
Expand All @@ -15,5 +16,4 @@ <h1>Generation in Progress</h1>
Waiting for game to generate, this page auto-refreshes to check.
</div>
</div>
{% include 'islandFooter.html' %}
{% endblock %}