Skip to content

Commit

Permalink
Merge pull request #15 from ThinkR-open/deploy-with-shinylive
Browse files Browse the repository at this point in the history
Deploy with shinylive
  • Loading branch information
ArthurData authored Jan 16, 2025
2 parents bea331d + d972c5a commit a705f9a
Show file tree
Hide file tree
Showing 75 changed files with 93,476 additions and 706 deletions.
5 changes: 3 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ repos:
rev: v4.6.0
hooks:
- id: trailing-whitespace
exclude: ^site/
- id: end-of-file-fixer
exclude: ^signature/css/signature.css.map
exclude: ^signature/css/signature.css.map|^site/
- id: check-yaml
- id: check-added-large-files
exclude: ^signature/assets/current_banner.png
exclude: ^signature/assets/current_banner.png|^site/

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.1
Expand Down
12 changes: 0 additions & 12 deletions index.html

This file was deleted.

1,422 changes: 821 additions & 601 deletions poetry.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ packages = [{include = "signature"}]
[tool.poetry.dependencies]
python = "^3.12"
wheel = "^0.43.0"
shiny = "1.0.0"
shiny = "^1.2.1"
pre-commit = "^3.7.1"
pytest = "^8.2.2"
asyncio = "^3.4.3"
Expand All @@ -19,8 +19,9 @@ jinja2 = "^3.1.4"
rsconnect-python = "^1.24.0"
pytest-github-report = "^0.0.1"
poethepoet = "^0.27.0"
htmltools = "^0.5.3"
htmltools = "^0.6.0"
pytest-playwright = "^0.5.1"
shinylive = "^0.7.3"


[build-system]
Expand Down
Binary file removed signature/assets/current_banner.png
Binary file not shown.
Binary file removed signature/assets/icons/github.png
Binary file not shown.
Binary file removed signature/assets/icons/linkedin.png
Binary file not shown.
Binary file removed signature/assets/icons/twitch.png
Binary file not shown.
Binary file removed signature/assets/icons/twitter.png
Binary file not shown.
Binary file removed signature/assets/icons/youtube.png
Binary file not shown.
77 changes: 2 additions & 75 deletions signature/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,75 +1,2 @@
anyio==4.4.0 ; python_version >= "3.12" and python_version < "4.0"
appdirs==1.4.4 ; python_version >= "3.12" and python_version < "4.0"
asgiref==3.8.1 ; python_version >= "3.12" and python_version < "4.0"
asyncio==3.4.3 ; python_version >= "3.12" and python_version < "4.0"
certifi==2024.7.4 ; python_version >= "3.12" and python_version < "4.0"
cfgv==3.4.0 ; python_version >= "3.12" and python_version < "4.0"
chardet==5.2.0 ; python_version >= "3.12" and python_version < "4.0"
charset-normalizer==3.3.2 ; python_version >= "3.12" and python_version < "4.0"
click==8.1.7 ; python_version >= "3.12" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.12" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows")
dataproperty==1.0.1 ; python_version >= "3.12" and python_version < "4.0"
distlib==0.3.8 ; python_version >= "3.12" and python_version < "4.0"
faicons==0.2.2 ; python_version >= "3.12" and python_version < "4.0"
filelock==3.15.4 ; python_version >= "3.12" and python_version < "4.0"
greenlet==3.0.3 ; python_version >= "3.12" and python_version < "4.0"
h11==0.14.0 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Emscripten"
htmltools==0.5.3 ; python_version >= "3.12" and python_version < "4.0"
identify==2.6.0 ; python_version >= "3.12" and python_version < "4.0"
idna==3.7 ; python_version >= "3.12" and python_version < "4.0"
iniconfig==2.0.0 ; python_version >= "3.12" and python_version < "4.0"
jinja2==3.1.4 ; python_version >= "3.12" and python_version < "4.0"
linkify-it-py==2.0.3 ; python_version >= "3.12" and python_version < "4.0"
markdown-it-py==3.0.0 ; python_version >= "3.12" and python_version < "4.0"
markupsafe==2.1.5 ; python_version >= "3.12" and python_version < "4.0"
mbstrdecoder==1.1.3 ; python_version >= "3.12" and python_version < "4.0"
mdit-py-plugins==0.4.1 ; python_version >= "3.12" and python_version < "4.0"
mdurl==0.1.2 ; python_version >= "3.12" and python_version < "4.0"
nodeenv==1.9.1 ; python_version >= "3.12" and python_version < "4.0"
packaging==24.1 ; python_version >= "3.12" and python_version < "4.0"
pastel==0.2.1 ; python_version >= "3.12" and python_version < "4.0"
pathlib==1.0.1 ; python_version >= "3.12" and python_version < "4.0"
pathvalidate==3.2.0 ; python_version >= "3.12" and python_version < "4.0"
pip==24.1.2 ; python_version >= "3.12" and python_version < "4.0"
platformdirs==4.2.2 ; python_version >= "3.12" and python_version < "4.0"
playwright==1.45.1 ; python_version >= "3.12" and python_version < "4.0"
pluggy==1.5.0 ; python_version >= "3.12" and python_version < "4.0"
poethepoet==0.27.0 ; python_version >= "3.12" and python_version < "4.0"
pre-commit==3.7.1 ; python_version >= "3.12" and python_version < "4.0"
prompt-toolkit==3.0.36 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Emscripten"
pyee==11.1.0 ; python_version >= "3.12" and python_version < "4.0"
pyjwt==2.8.0 ; python_version >= "3.12" and python_version < "4.0"
pytablewriter==1.2.0 ; python_version >= "3.12" and python_version < "4.0"
pytest-base-url==2.1.0 ; python_version >= "3.12" and python_version < "4.0"
pytest-github-report==0.0.1 ; python_version >= "3.12" and python_version < "4.0"
pytest-playwright==0.5.1 ; python_version >= "3.12" and python_version < "4.0"
pytest==8.3.3 ; python_version >= "3.12" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.12" and python_version < "4.0"
python-multipart==0.0.9 ; python_version >= "3.12" and python_version < "4.0"
python-slugify==8.0.4 ; python_version >= "3.12" and python_version < "4.0"
pytz==2024.1 ; python_version >= "3.12" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.12" and python_version < "4.0"
questionary==2.0.1 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Emscripten"
requests==2.32.3 ; python_version >= "3.12" and python_version < "4.0"
rsconnect-python==1.24.0 ; python_version >= "3.12" and python_version < "4.0"
semver==2.13.0 ; python_version >= "3.12" and python_version < "4.0"
setuptools==72.1.0 ; python_version >= "3.12" and python_version < "4.0"
shiny==1.0.0 ; python_version >= "3.12" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.12" and python_version < "4.0"
sniffio==1.3.1 ; python_version >= "3.12" and python_version < "4.0"
starlette==0.37.2 ; python_version >= "3.12" and python_version < "4.0"
tabledata==1.3.3 ; python_version >= "3.12" and python_version < "4.0"
tcolorpy==0.1.6 ; python_version >= "3.12" and python_version < "4.0"
text-unidecode==1.3 ; python_version >= "3.12" and python_version < "4.0"
tomli==2.0.1 ; python_version >= "3.12" and python_version < "4.0"
typepy==1.3.2 ; python_version >= "3.12" and python_version < "4.0"
typepy[datetime]==1.3.2 ; python_version >= "3.12" and python_version < "4.0"
typing-extensions==4.12.2 ; python_version >= "3.12" and python_version < "4.0"
uc-micro-py==1.0.3 ; python_version >= "3.12" and python_version < "4.0"
urllib3==2.2.2 ; python_version >= "3.12" and python_version < "4.0"
uvicorn==0.30.1 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Emscripten"
virtualenv==20.26.3 ; python_version >= "3.12" and python_version < "4.0"
watchfiles==0.22.0 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Emscripten"
wcwidth==0.2.13 ; python_version >= "3.12" and python_version < "4.0" and platform_system != "Emscripten"
websockets==12.0 ; python_version >= "3.12" and python_version < "4.0"
wheel==0.43.0 ; python_version >= "3.12" and python_version < "4.0"
faicons==0.2.2
jinja2==3.1.4
18 changes: 8 additions & 10 deletions signature/template/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
<tr>
<td>
<a href="https://thinkr.fr" dir="ltr" target="_blank">
<img
src="https://raw.githubusercontent.com/ThinkR-open/signature/main/inst/app/www/templates/thinkr/assets/logo.jpg"
<img src="https://raw.githubusercontent.com/ThinkR-open/signature/refs/heads/main/assets/logo.jpg"
alt="" border="0" />
</a>
</td>
Expand Down Expand Up @@ -109,7 +108,7 @@
<div>
<a href="https://github.com/ThinkR-open" dir="ltr" target="_blank">
<img
src="https://raw.githubusercontent.com/ThinkR-open/signature.py/main/signature/assets/icons/github.png"
src="https://raw.githubusercontent.com/ThinkR-open/signature/refs/heads/main/assets/icons/github.png"
alt="" width="23" height="23" border="0" style="display: block">
</a>
</div>
Expand All @@ -119,7 +118,7 @@
<div>
<a href="https://twitter.com/thinkR_fr" dir="ltr" target="_blank">
<img
src="https://raw.githubusercontent.com/ThinkR-open/signature.py/main/signature/assets/icons/twitter.png"
src="https://raw.githubusercontent.com/ThinkR-open/signature/refs/heads/main/assets/icons/twitter.png"
alt="" width="23" height="23" border="0" style="display: block">
</a>
</div>
Expand All @@ -129,7 +128,7 @@
<div>
<a href="https://fr.linkedin.com/company/thinkr-sas" dir="ltr" target="_blank">
<img
src="https://raw.githubusercontent.com/ThinkR-open/signature.py/main/signature/assets/icons/linkedin.png"
src="https://raw.githubusercontent.com/ThinkR-open/signature/refs/heads/main/assets/icons/linkedin.png"
alt="" width="23" height="23" border="0" style="display: block">
</a>
</div>
Expand All @@ -140,7 +139,7 @@
<a href="https://www.youtube.com/channel/UCE3OyQLmrQ5tnKc9qDIZbtw" dir="ltr"
target="_blank">
<img
src="https://raw.githubusercontent.com/ThinkR-open/signature.py/main/signature/assets/icons/youtube.png"
src="https://raw.githubusercontent.com/ThinkR-open/signature/refs/heads/main/assets/icons/youtube.png"
alt="" width="23" height="23" border="0" style="display: block">
</a>
</div>
Expand All @@ -150,7 +149,7 @@
<div>
<a href="https://www.twitch.tv/thinkr_fr" dir="ltr" target="_blank">
<img
src="https://raw.githubusercontent.com/ThinkR-open/signature.py/main/signature/assets/icons/twitch.png"
src="https://raw.githubusercontent.com/ThinkR-open/signature/refs/heads/main/assets/icons/twitch.png"
alt="" width="20" height="20" border="0" style="display: block">
</a>
</div>
Expand All @@ -169,9 +168,8 @@
<tbody>
<tr>
<td>
<a href="https://thinkr-open.github.io/signature.py/" dir="ltr" target="_blank">
<img
src="https://raw.githubusercontent.com/ThinkR-open/signature.py/main/signature/assets/current_banner.png"
<a href="https://thinkr-open.github.io/signature/" dir="ltr" target="_blank">
<img src="https://raw.githubusercontent.com/ThinkR-open/signature/refs/heads/main/assets/banner/current.png"
alt="ThinkR banner" border="0" height="150" width="520"
style="max-width:520px;width:520px;height:150px" />
</td>
Expand Down
4 changes: 0 additions & 4 deletions signature/tests/pytest-unit/test_accordion_panels.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ def test_accordion_panels(panel_index, expected_title):
def test_accordion_panels_content(panel_index, input_index, input_name):
panels = mod_form.accordion_panels()
panel = panels[panel_index]._args[0]
assert isinstance(panel, list)
assert (
panel[input_index].children[1].name == "input"
), f"Expected input but got {panel[input_index].children[1].name}"
assert (
panel[input_index].children[1].attrs.get("id") == input_name
), f"Expected {input_name} but got {panel[input_index].children[1].attrs.get('id')}"
1 change: 1 addition & 0 deletions site/app.json

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions site/edit/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!doctype html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<title>Redirect to editable app</title>
<meta
http-equiv="refresh"
content="0;URL='../index.html?_shinylive-mode=editor-terminal-viewer'"
/>
</head>
<body></body>
</html>
28 changes: 28 additions & 0 deletions site/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Shiny App</title>
<script
src="./shinylive/load-shinylive-sw.js"
type="module"
></script>
<script type="module">
import { runExportedApp } from "./shinylive/shinylive.js";
runExportedApp({
id: "root",
appEngine: "python",
relPath: "",
});
</script>
<link rel="stylesheet" href="./shinylive/style-resets.css" />
<link rel="stylesheet" href="./shinylive/shinylive.css" />

</head>
<body>

<div style="height: 100vh; width: 100vw" id="root"></div>

</body>
</html>
Loading

0 comments on commit a705f9a

Please sign in to comment.