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

Pin PyScript #16

Merged
merged 6 commits into from
Dec 10, 2024
Merged

Pin PyScript #16

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7c36b2
Pin PyScript
rmartin16 Oct 11, 2024
3826339
Hide error content, and add Briefcase splash screen.
freakboy3742 Oct 12, 2024
f0b1a2b
Update to PyScript 2024.11.1, and add Briefcase target_version
mhsmith Dec 9, 2024
b0e8a7e
Make the splash image throb.
freakboy3742 Dec 9, 2024
79bee07
Add a templated pyscript.toml.
freakboy3742 Dec 9, 2024
5021abb
Remove stderr CSS
mhsmith Dec 10, 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
3 changes: 2 additions & 1 deletion cookiecutter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
],
"_extensions": [
"briefcase.integrations.cookiecutter.PythonVersionExtension"
]
],
"_jinja2_env_vars": {"lstrip_blocks": true, "trim_blocks": true}
}
3 changes: 3 additions & 0 deletions {{ cookiecutter.format }}/briefcase.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Generated using Python {{ cookiecutter.python_version }}
[briefcase]
target_version = "0.3.21"

[paths]
app_path = "app"
app_requirements_path = "requirements.txt"
Expand Down
25 changes: 19 additions & 6 deletions {{ cookiecutter.format }}/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@

<link rel="icon" type="image/png" href="/static/logo-32.png"/>

<script defer src="https://pyscript.net/latest/pyscript.js"></script>
<link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
<script type="module">
// Hide the splash screen when the page is ready.
import { hooks } from "https://pyscript.net/releases/2024.11.1/core.js";
hooks.main.onReady.add(() => {
document.getElementById("briefcase-splash").classList.add("hidden");
});
</script>

<link rel="stylesheet" href="https://pyscript.net/releases/2024.11.1/core.css">
<script type="module" src="https://pyscript.net/releases/2024.11.1/core.js"></script>

{% if cookiecutter.style_framework == "Bootstrap v4.6" %}
<link rel="stylesheet"
Expand All @@ -24,6 +32,10 @@
<link rel="stylesheet" href="/static/css/briefcase.css">
</head>
<body id="app-placeholder">
<div id="briefcase-splash">
<img src="static/logo-32.png" alt="Splash screen logo">
<p>Loading...</p>
</div>
{% if cookiecutter.style_framework == "Bootstrap v4.6" %}
<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"
integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
Expand All @@ -32,10 +44,11 @@
integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct"
crossorigin="anonymous"></script>
{% endif %}
<py-config src="/pyscript.toml"></py-config>
<py-script>
<script type="py" async="false" config="pyscript.toml">
import runpy
result = runpy.run_module("{{ cookiecutter.module_name }}", run_name="__main__", alter_sys=True)
</py-script>
result = runpy.run_module(
"{{ cookiecutter.module_name }}", run_name="__main__", alter_sys=True
)
</script>
</body>
</html>
1 change: 1 addition & 0 deletions {{ cookiecutter.format }}/www/pyscript.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
plugins = ["!error"]
52 changes: 42 additions & 10 deletions {{ cookiecutter.format }}/www/static/css/briefcase.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,47 @@

/* Unset the overly generic pyscript .label style */
#app-placeholder .label {
margin-top: inherit;
color: inherit;
text-align: inherit;
width: inherit;
display: inherit;
color: inherit;
font-size: inherit;
margin-top: inherit;
/* Prevent stderr appearing on the page. It will still be visible in the console. */
div.py-error {
display: none;
}

/* Splash screen */
div#briefcase-splash {
background-color:#999;
position:fixed;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width:100%;
height:100%;
top:0px;
left:0px;
z-index:1000;
}
div#briefcase-splash p {
text-align: center;
color: white;
font-size: large;
font-family: sans-serif;
}
div#briefcase-splash.hidden {
visibility: hidden;
opacity: 0;
transition: visibility 0s 0.2s, opacity 0.2s linear;
}
div#briefcase-splash img {
animation: throbber 1.5s infinite;
}
@keyframes throbber {
0% {
transform: scale(1.2);
}
70% {
transform: scale(1.0);
}
100% {
transform: scale(1.2);
}
}

/*******************************************************************
Expand Down
Loading