From 7fd2b56bfe09bdb5cd1de7225b84f036d9143b90 Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Fri, 8 Apr 2022 18:19:34 -0500 Subject: [PATCH 1/5] remove old files and old code references --- pyscriptjs/src/App.svelte | 46 ---------- pyscriptjs/src/ComponentDetailsNav.svelte | 89 ------------------ pyscriptjs/src/ComponentsNav.svelte | 89 ------------------ pyscriptjs/src/Header.svelte | 106 ---------------------- pyscriptjs/src/Main.svelte | 34 ------- pyscriptjs/src/SideNav.svelte | 82 ----------------- pyscriptjs/src/interpreter.ts | 5 +- pyscriptjs/src/main.ts | 5 - 8 files changed, 1 insertion(+), 455 deletions(-) delete mode 100644 pyscriptjs/src/ComponentDetailsNav.svelte delete mode 100644 pyscriptjs/src/ComponentsNav.svelte delete mode 100644 pyscriptjs/src/Header.svelte delete mode 100644 pyscriptjs/src/Main.svelte delete mode 100644 pyscriptjs/src/SideNav.svelte diff --git a/pyscriptjs/src/App.svelte b/pyscriptjs/src/App.svelte index fa4290d..9d20cee 100644 --- a/pyscriptjs/src/App.svelte +++ b/pyscriptjs/src/App.svelte @@ -1,15 +1,8 @@ - - - \ No newline at end of file diff --git a/pyscriptjs/src/ComponentDetailsNav.svelte b/pyscriptjs/src/ComponentDetailsNav.svelte deleted file mode 100644 index c5945c0..0000000 --- a/pyscriptjs/src/ComponentDetailsNav.svelte +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pyscriptjs/src/ComponentsNav.svelte b/pyscriptjs/src/ComponentsNav.svelte deleted file mode 100644 index 69c7363..0000000 --- a/pyscriptjs/src/ComponentsNav.svelte +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pyscriptjs/src/Header.svelte b/pyscriptjs/src/Header.svelte deleted file mode 100644 index 380dff9..0000000 --- a/pyscriptjs/src/Header.svelte +++ /dev/null @@ -1,106 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pyscriptjs/src/Main.svelte b/pyscriptjs/src/Main.svelte deleted file mode 100644 index 7bacfb7..0000000 --- a/pyscriptjs/src/Main.svelte +++ /dev/null @@ -1,34 +0,0 @@ - - -
-
- -
- -
-

PyScript

-

Copyright © 2022

- - -
-
\ No newline at end of file diff --git a/pyscriptjs/src/SideNav.svelte b/pyscriptjs/src/SideNav.svelte deleted file mode 100644 index 856ebff..0000000 --- a/pyscriptjs/src/SideNav.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pyscriptjs/src/interpreter.ts b/pyscriptjs/src/interpreter.ts index 03448bf..9db0452 100644 --- a/pyscriptjs/src/interpreter.ts +++ b/pyscriptjs/src/interpreter.ts @@ -1,7 +1,6 @@ // @ts-nocheck // @ts-ignore let pyodideReadyPromise; - let pyodide; let additional_definitions = ` @@ -43,9 +42,6 @@ class PyScript: def run_until_complete(f): p = loop.run_until_complete(f) -pyscript = PyScript() - - class Element: def __init__(self, element_id, element=None): @@ -97,6 +93,7 @@ class Element: return Element(clone.id, clone) +pyscript = PyScript() ` let loadInterpreter = async function(): any { diff --git a/pyscriptjs/src/main.ts b/pyscriptjs/src/main.ts index d8360cb..c0853da 100644 --- a/pyscriptjs/src/main.ts +++ b/pyscriptjs/src/main.ts @@ -1,10 +1,5 @@ import App from "./App.svelte"; -import {EditorState, EditorView , basicSetup} from "@codemirror/basic-setup" -import { python } from "@codemirror/lang-python" -import { keymap } from "@codemirror/view"; -import { defaultKeymap } from "@codemirror/commands"; -import { oneDarkTheme } from "@codemirror/theme-one-dark"; import { PyScript } from "./components/pyscript"; import { PyRepl } from "./components/pyrepl"; import { PyEnv } from "./components/pyenv" From 02fead9cb96007d58839b724c62c5d4eb1819283 Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Fri, 8 Apr 2022 18:42:01 -0500 Subject: [PATCH 2/5] move builds to build folder and examples to examples folder --- pyscriptjs/{public => examples}/bokeh.html | 5 ++--- pyscriptjs/rollup.config.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) rename pyscriptjs/{public => examples}/bokeh.html (91%) diff --git a/pyscriptjs/public/bokeh.html b/pyscriptjs/examples/bokeh.html similarity index 91% rename from pyscriptjs/public/bokeh.html rename to pyscriptjs/examples/bokeh.html index 92e7526..0bd192f 100644 --- a/pyscriptjs/public/bokeh.html +++ b/pyscriptjs/examples/bokeh.html @@ -10,9 +10,9 @@ - + - + @@ -22,7 +22,6 @@

Bokeh Example

- import json diff --git a/pyscriptjs/rollup.config.js b/pyscriptjs/rollup.config.js index ac60b22..d95a17d 100644 --- a/pyscriptjs/rollup.config.js +++ b/pyscriptjs/rollup.config.js @@ -40,7 +40,7 @@ export default { sourcemap: true, format: "iife", name: "app", - file: "public/build/pyscript.js", + file: "build/pyscript.js", }, plugins: [ svelte({ From 00d4277437f03f499e4fb683f2c3795851c195c8 Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Sat, 9 Apr 2022 15:44:15 -0500 Subject: [PATCH 3/5] move examples from public to their own examples folder --- pyscriptjs/examples/bokeh.html | 4 +- .../bokeh_interactive.html | 4 +- pyscriptjs/examples/handtrack/say_hello.html | 122 ++++++++++++++++++ pyscriptjs/{public => examples}/index.html | 0 .../{public => examples}/mario/css/game.css | 0 .../{public => examples}/mario/js/bcoin.js | 0 .../{public => examples}/mario/js/block.js | 0 .../{public => examples}/mario/js/coin.js | 0 .../{public => examples}/mario/js/entity.js | 0 .../{public => examples}/mario/js/fireball.js | 0 .../mario/js/fireflower.js | 0 .../{public => examples}/mario/js/flag.js | 0 .../{public => examples}/mario/js/floor.js | 0 .../{public => examples}/mario/js/game.js | 0 .../{public => examples}/mario/js/goomba.js | 0 .../{public => examples}/mario/js/input.js | 0 .../{public => examples}/mario/js/koopa.js | 0 .../mario/js/levels/11.js | 0 .../mario/js/levels/11tunnel.js | 0 .../mario/js/levels/level.js | 0 .../{public => examples}/mario/js/mushroom.js | 0 .../{public => examples}/mario/js/outline.txt | 0 .../{public => examples}/mario/js/pipe.js | 0 .../{public => examples}/mario/js/player.js | 0 .../{public => examples}/mario/js/prop.js | 0 .../mario/js/resources.js | 0 .../{public => examples}/mario/js/rubble.js | 0 .../{public => examples}/mario/js/sprite.js | 0 .../{public => examples}/mario/js/star.js | 0 .../{public => examples}/mario/js/util.js | 0 .../mario/play_mario.html | 6 +- .../mario/sounds/aboveground_bgm.ogg | Bin .../mario/sounds/breakblock.wav | Bin .../mario/sounds/bump.wav | Bin .../mario/sounds/coin.wav | Bin .../mario/sounds/fireball.wav | Bin .../mario/sounds/flagpole.wav | Bin .../mario/sounds/itemAppear.wav | Bin .../mario/sounds/jump-small.wav | Bin .../mario/sounds/jump-super.wav | Bin .../mario/sounds/kick.wav | Bin .../mario/sounds/mariodie.wav | Bin .../mario/sounds/pipe.wav | Bin .../mario/sounds/powerup.wav | Bin .../mario/sounds/stage_clear.wav | Bin .../mario/sounds/stomp.wav | Bin .../mario/sounds/underground_bgm.ogg | Bin .../mario/sprites/1-1 reference.png | Bin .../mario/sprites/enemy.png | Bin .../mario/sprites/enemyr.png | Bin .../mario/sprites/items.png | Bin .../mario/sprites/player.png | Bin .../mario/sprites/playerl.png | Bin .../mario/sprites/tiles.png | Bin pyscriptjs/{public => examples}/panel.html | 4 +- .../{public => examples}/panel_kmeans.html | 4 +- pyscriptjs/{public => examples}/repl.html | 4 +- pyscriptjs/{public => examples}/repl2.html | 4 +- .../{public => examples}/simple_script.html | 4 +- .../{public => examples}/simple_script2.html | 4 +- pyscriptjs/examples/todo.html | 83 ++++++++++++ pyscriptjs/public/favicon.png | Bin 3127 -> 0 bytes 62 files changed, 224 insertions(+), 19 deletions(-) rename pyscriptjs/{public => examples}/bokeh_interactive.html (96%) create mode 100644 pyscriptjs/examples/handtrack/say_hello.html rename pyscriptjs/{public => examples}/index.html (100%) rename pyscriptjs/{public => examples}/mario/css/game.css (100%) rename pyscriptjs/{public => examples}/mario/js/bcoin.js (100%) rename pyscriptjs/{public => examples}/mario/js/block.js (100%) rename pyscriptjs/{public => examples}/mario/js/coin.js (100%) rename pyscriptjs/{public => examples}/mario/js/entity.js (100%) rename pyscriptjs/{public => examples}/mario/js/fireball.js (100%) rename pyscriptjs/{public => examples}/mario/js/fireflower.js (100%) rename pyscriptjs/{public => examples}/mario/js/flag.js (100%) rename pyscriptjs/{public => examples}/mario/js/floor.js (100%) rename pyscriptjs/{public => examples}/mario/js/game.js (100%) rename pyscriptjs/{public => examples}/mario/js/goomba.js (100%) rename pyscriptjs/{public => examples}/mario/js/input.js (100%) rename pyscriptjs/{public => examples}/mario/js/koopa.js (100%) rename pyscriptjs/{public => examples}/mario/js/levels/11.js (100%) rename pyscriptjs/{public => examples}/mario/js/levels/11tunnel.js (100%) rename pyscriptjs/{public => examples}/mario/js/levels/level.js (100%) rename pyscriptjs/{public => examples}/mario/js/mushroom.js (100%) rename pyscriptjs/{public => examples}/mario/js/outline.txt (100%) rename pyscriptjs/{public => examples}/mario/js/pipe.js (100%) rename pyscriptjs/{public => examples}/mario/js/player.js (100%) rename pyscriptjs/{public => examples}/mario/js/prop.js (100%) rename pyscriptjs/{public => examples}/mario/js/resources.js (100%) rename pyscriptjs/{public => examples}/mario/js/rubble.js (100%) rename pyscriptjs/{public => examples}/mario/js/sprite.js (100%) rename pyscriptjs/{public => examples}/mario/js/star.js (100%) rename pyscriptjs/{public => examples}/mario/js/util.js (100%) rename pyscriptjs/{public => examples}/mario/play_mario.html (96%) rename pyscriptjs/{public => examples}/mario/sounds/aboveground_bgm.ogg (100%) rename pyscriptjs/{public => examples}/mario/sounds/breakblock.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/bump.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/coin.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/fireball.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/flagpole.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/itemAppear.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/jump-small.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/jump-super.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/kick.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/mariodie.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/pipe.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/powerup.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/stage_clear.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/stomp.wav (100%) rename pyscriptjs/{public => examples}/mario/sounds/underground_bgm.ogg (100%) rename pyscriptjs/{public => examples}/mario/sprites/1-1 reference.png (100%) rename pyscriptjs/{public => examples}/mario/sprites/enemy.png (100%) rename pyscriptjs/{public => examples}/mario/sprites/enemyr.png (100%) rename pyscriptjs/{public => examples}/mario/sprites/items.png (100%) rename pyscriptjs/{public => examples}/mario/sprites/player.png (100%) rename pyscriptjs/{public => examples}/mario/sprites/playerl.png (100%) rename pyscriptjs/{public => examples}/mario/sprites/tiles.png (100%) rename pyscriptjs/{public => examples}/panel.html (91%) rename pyscriptjs/{public => examples}/panel_kmeans.html (98%) rename pyscriptjs/{public => examples}/repl.html (76%) rename pyscriptjs/{public => examples}/repl2.html (82%) rename pyscriptjs/{public => examples}/simple_script.html (80%) rename pyscriptjs/{public => examples}/simple_script2.html (90%) create mode 100644 pyscriptjs/examples/todo.html delete mode 100644 pyscriptjs/public/favicon.png diff --git a/pyscriptjs/examples/bokeh.html b/pyscriptjs/examples/bokeh.html index 0bd192f..1265580 100644 --- a/pyscriptjs/examples/bokeh.html +++ b/pyscriptjs/examples/bokeh.html @@ -10,9 +10,9 @@ - + - + diff --git a/pyscriptjs/public/bokeh_interactive.html b/pyscriptjs/examples/bokeh_interactive.html similarity index 96% rename from pyscriptjs/public/bokeh_interactive.html rename to pyscriptjs/examples/bokeh_interactive.html index 1cb1b8b..0d3ed33 100644 --- a/pyscriptjs/public/bokeh_interactive.html +++ b/pyscriptjs/examples/bokeh_interactive.html @@ -10,9 +10,9 @@ - + - + diff --git a/pyscriptjs/examples/handtrack/say_hello.html b/pyscriptjs/examples/handtrack/say_hello.html new file mode 100644 index 0000000..6883eba --- /dev/null +++ b/pyscriptjs/examples/handtrack/say_hello.html @@ -0,0 +1,122 @@ + + + + + + + Svelte app + + + + + + + + + +from js import handTrack, setTimeout, requestAnimationFrame +from pyodide import create_once_callable +import asyncio + +context = canvas.element.getContext("2d") + +isVideo = False +model = None + +modelParams = { + "flipHorizontal": True, # flip e.g for video + "maxNumBoxes": 20, # maximum number of boxes to detect + "iouThreshold": 0.5, # ioU threshold for non-max suppression + "scoreThreshold": 0.6, # confidence threshold for predictions. +} + +def toggle_video(evt): + global isVideo + if (not isVideo): + update_note.write("Starting video") + pyscript.run_until_complete(start_video()) + else: + update_note.write("Stopping video") + handTrack.stopVideo(video.element) + isVideo = False + update_note.write("Video stopped") + +async def start_video(): + global isVideo + update_note.write("Inside sstart video") + status = await handTrack.startVideo(video.element) + console.log("video started", status) + if status: + update_note.write("Video started. Now tracking") + isVideo = True + console.log( "Calling RUN DETECTION") + y = await run_detection() + else: + update_note.write( "Please enable video") + +def sync_run_detection(evt): + pyscript.run_until_complete(run_detection()) + +async def run_detection(): + console.log("in RUN DETECTION: "); + global model + global isVideo + + console.log("...1") + + predictions = await model.detect(video.element) + console.log("done...1") + console.log("Predictions: ", predictions); + model.renderPredictions(predictions, canvas.element, context, video.element); + console.log("is Video?", isVideo) + if (isVideo): + console.log("requestingAnimation!") + await requestAnimationFrame(create_once_callable(sync_run_detection)); + console.log("...2") + +def run_detection_image(img): + console.log("in RUN DETECTION IMAGE", predictions); + global model + def detect(predition): + console.log("Predictions: ", predictions); + model.renderPredictions(predictions, canvas, context, img); + console.log("...3") + model.detect(img).then(detect) + console.log("...4") + +def handle_model(lmodel): + global model + model = lmodel + update_note.write("Loaded Model!") + +async def start(): + console.log("creating x") + console.log("calling x") + model = await handTrack.load(modelParams)#.then(handle_model) + console.log("loaded model!") + console.log(model) + handle_model(model) + print(dir(x)) + print(x) + +pyscript.run_until_complete(start()) + +#}); + + + +
+ + +
loading model ..
+
+
+ + +
+ + diff --git a/pyscriptjs/public/index.html b/pyscriptjs/examples/index.html similarity index 100% rename from pyscriptjs/public/index.html rename to pyscriptjs/examples/index.html diff --git a/pyscriptjs/public/mario/css/game.css b/pyscriptjs/examples/mario/css/game.css similarity index 100% rename from pyscriptjs/public/mario/css/game.css rename to pyscriptjs/examples/mario/css/game.css diff --git a/pyscriptjs/public/mario/js/bcoin.js b/pyscriptjs/examples/mario/js/bcoin.js similarity index 100% rename from pyscriptjs/public/mario/js/bcoin.js rename to pyscriptjs/examples/mario/js/bcoin.js diff --git a/pyscriptjs/public/mario/js/block.js b/pyscriptjs/examples/mario/js/block.js similarity index 100% rename from pyscriptjs/public/mario/js/block.js rename to pyscriptjs/examples/mario/js/block.js diff --git a/pyscriptjs/public/mario/js/coin.js b/pyscriptjs/examples/mario/js/coin.js similarity index 100% rename from pyscriptjs/public/mario/js/coin.js rename to pyscriptjs/examples/mario/js/coin.js diff --git a/pyscriptjs/public/mario/js/entity.js b/pyscriptjs/examples/mario/js/entity.js similarity index 100% rename from pyscriptjs/public/mario/js/entity.js rename to pyscriptjs/examples/mario/js/entity.js diff --git a/pyscriptjs/public/mario/js/fireball.js b/pyscriptjs/examples/mario/js/fireball.js similarity index 100% rename from pyscriptjs/public/mario/js/fireball.js rename to pyscriptjs/examples/mario/js/fireball.js diff --git a/pyscriptjs/public/mario/js/fireflower.js b/pyscriptjs/examples/mario/js/fireflower.js similarity index 100% rename from pyscriptjs/public/mario/js/fireflower.js rename to pyscriptjs/examples/mario/js/fireflower.js diff --git a/pyscriptjs/public/mario/js/flag.js b/pyscriptjs/examples/mario/js/flag.js similarity index 100% rename from pyscriptjs/public/mario/js/flag.js rename to pyscriptjs/examples/mario/js/flag.js diff --git a/pyscriptjs/public/mario/js/floor.js b/pyscriptjs/examples/mario/js/floor.js similarity index 100% rename from pyscriptjs/public/mario/js/floor.js rename to pyscriptjs/examples/mario/js/floor.js diff --git a/pyscriptjs/public/mario/js/game.js b/pyscriptjs/examples/mario/js/game.js similarity index 100% rename from pyscriptjs/public/mario/js/game.js rename to pyscriptjs/examples/mario/js/game.js diff --git a/pyscriptjs/public/mario/js/goomba.js b/pyscriptjs/examples/mario/js/goomba.js similarity index 100% rename from pyscriptjs/public/mario/js/goomba.js rename to pyscriptjs/examples/mario/js/goomba.js diff --git a/pyscriptjs/public/mario/js/input.js b/pyscriptjs/examples/mario/js/input.js similarity index 100% rename from pyscriptjs/public/mario/js/input.js rename to pyscriptjs/examples/mario/js/input.js diff --git a/pyscriptjs/public/mario/js/koopa.js b/pyscriptjs/examples/mario/js/koopa.js similarity index 100% rename from pyscriptjs/public/mario/js/koopa.js rename to pyscriptjs/examples/mario/js/koopa.js diff --git a/pyscriptjs/public/mario/js/levels/11.js b/pyscriptjs/examples/mario/js/levels/11.js similarity index 100% rename from pyscriptjs/public/mario/js/levels/11.js rename to pyscriptjs/examples/mario/js/levels/11.js diff --git a/pyscriptjs/public/mario/js/levels/11tunnel.js b/pyscriptjs/examples/mario/js/levels/11tunnel.js similarity index 100% rename from pyscriptjs/public/mario/js/levels/11tunnel.js rename to pyscriptjs/examples/mario/js/levels/11tunnel.js diff --git a/pyscriptjs/public/mario/js/levels/level.js b/pyscriptjs/examples/mario/js/levels/level.js similarity index 100% rename from pyscriptjs/public/mario/js/levels/level.js rename to pyscriptjs/examples/mario/js/levels/level.js diff --git a/pyscriptjs/public/mario/js/mushroom.js b/pyscriptjs/examples/mario/js/mushroom.js similarity index 100% rename from pyscriptjs/public/mario/js/mushroom.js rename to pyscriptjs/examples/mario/js/mushroom.js diff --git a/pyscriptjs/public/mario/js/outline.txt b/pyscriptjs/examples/mario/js/outline.txt similarity index 100% rename from pyscriptjs/public/mario/js/outline.txt rename to pyscriptjs/examples/mario/js/outline.txt diff --git a/pyscriptjs/public/mario/js/pipe.js b/pyscriptjs/examples/mario/js/pipe.js similarity index 100% rename from pyscriptjs/public/mario/js/pipe.js rename to pyscriptjs/examples/mario/js/pipe.js diff --git a/pyscriptjs/public/mario/js/player.js b/pyscriptjs/examples/mario/js/player.js similarity index 100% rename from pyscriptjs/public/mario/js/player.js rename to pyscriptjs/examples/mario/js/player.js diff --git a/pyscriptjs/public/mario/js/prop.js b/pyscriptjs/examples/mario/js/prop.js similarity index 100% rename from pyscriptjs/public/mario/js/prop.js rename to pyscriptjs/examples/mario/js/prop.js diff --git a/pyscriptjs/public/mario/js/resources.js b/pyscriptjs/examples/mario/js/resources.js similarity index 100% rename from pyscriptjs/public/mario/js/resources.js rename to pyscriptjs/examples/mario/js/resources.js diff --git a/pyscriptjs/public/mario/js/rubble.js b/pyscriptjs/examples/mario/js/rubble.js similarity index 100% rename from pyscriptjs/public/mario/js/rubble.js rename to pyscriptjs/examples/mario/js/rubble.js diff --git a/pyscriptjs/public/mario/js/sprite.js b/pyscriptjs/examples/mario/js/sprite.js similarity index 100% rename from pyscriptjs/public/mario/js/sprite.js rename to pyscriptjs/examples/mario/js/sprite.js diff --git a/pyscriptjs/public/mario/js/star.js b/pyscriptjs/examples/mario/js/star.js similarity index 100% rename from pyscriptjs/public/mario/js/star.js rename to pyscriptjs/examples/mario/js/star.js diff --git a/pyscriptjs/public/mario/js/util.js b/pyscriptjs/examples/mario/js/util.js similarity index 100% rename from pyscriptjs/public/mario/js/util.js rename to pyscriptjs/examples/mario/js/util.js diff --git a/pyscriptjs/public/mario/play_mario.html b/pyscriptjs/examples/mario/play_mario.html similarity index 96% rename from pyscriptjs/public/mario/play_mario.html rename to pyscriptjs/examples/mario/play_mario.html index 709c0a7..ad39198 100644 --- a/pyscriptjs/public/mario/play_mario.html +++ b/pyscriptjs/examples/mario/play_mario.html @@ -7,9 +7,9 @@ Svelte app - + - + @@ -140,5 +140,5 @@ pyscript.run_until_complete(start()) - + diff --git a/pyscriptjs/public/mario/sounds/aboveground_bgm.ogg b/pyscriptjs/examples/mario/sounds/aboveground_bgm.ogg similarity index 100% rename from pyscriptjs/public/mario/sounds/aboveground_bgm.ogg rename to pyscriptjs/examples/mario/sounds/aboveground_bgm.ogg diff --git a/pyscriptjs/public/mario/sounds/breakblock.wav b/pyscriptjs/examples/mario/sounds/breakblock.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/breakblock.wav rename to pyscriptjs/examples/mario/sounds/breakblock.wav diff --git a/pyscriptjs/public/mario/sounds/bump.wav b/pyscriptjs/examples/mario/sounds/bump.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/bump.wav rename to pyscriptjs/examples/mario/sounds/bump.wav diff --git a/pyscriptjs/public/mario/sounds/coin.wav b/pyscriptjs/examples/mario/sounds/coin.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/coin.wav rename to pyscriptjs/examples/mario/sounds/coin.wav diff --git a/pyscriptjs/public/mario/sounds/fireball.wav b/pyscriptjs/examples/mario/sounds/fireball.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/fireball.wav rename to pyscriptjs/examples/mario/sounds/fireball.wav diff --git a/pyscriptjs/public/mario/sounds/flagpole.wav b/pyscriptjs/examples/mario/sounds/flagpole.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/flagpole.wav rename to pyscriptjs/examples/mario/sounds/flagpole.wav diff --git a/pyscriptjs/public/mario/sounds/itemAppear.wav b/pyscriptjs/examples/mario/sounds/itemAppear.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/itemAppear.wav rename to pyscriptjs/examples/mario/sounds/itemAppear.wav diff --git a/pyscriptjs/public/mario/sounds/jump-small.wav b/pyscriptjs/examples/mario/sounds/jump-small.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/jump-small.wav rename to pyscriptjs/examples/mario/sounds/jump-small.wav diff --git a/pyscriptjs/public/mario/sounds/jump-super.wav b/pyscriptjs/examples/mario/sounds/jump-super.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/jump-super.wav rename to pyscriptjs/examples/mario/sounds/jump-super.wav diff --git a/pyscriptjs/public/mario/sounds/kick.wav b/pyscriptjs/examples/mario/sounds/kick.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/kick.wav rename to pyscriptjs/examples/mario/sounds/kick.wav diff --git a/pyscriptjs/public/mario/sounds/mariodie.wav b/pyscriptjs/examples/mario/sounds/mariodie.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/mariodie.wav rename to pyscriptjs/examples/mario/sounds/mariodie.wav diff --git a/pyscriptjs/public/mario/sounds/pipe.wav b/pyscriptjs/examples/mario/sounds/pipe.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/pipe.wav rename to pyscriptjs/examples/mario/sounds/pipe.wav diff --git a/pyscriptjs/public/mario/sounds/powerup.wav b/pyscriptjs/examples/mario/sounds/powerup.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/powerup.wav rename to pyscriptjs/examples/mario/sounds/powerup.wav diff --git a/pyscriptjs/public/mario/sounds/stage_clear.wav b/pyscriptjs/examples/mario/sounds/stage_clear.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/stage_clear.wav rename to pyscriptjs/examples/mario/sounds/stage_clear.wav diff --git a/pyscriptjs/public/mario/sounds/stomp.wav b/pyscriptjs/examples/mario/sounds/stomp.wav similarity index 100% rename from pyscriptjs/public/mario/sounds/stomp.wav rename to pyscriptjs/examples/mario/sounds/stomp.wav diff --git a/pyscriptjs/public/mario/sounds/underground_bgm.ogg b/pyscriptjs/examples/mario/sounds/underground_bgm.ogg similarity index 100% rename from pyscriptjs/public/mario/sounds/underground_bgm.ogg rename to pyscriptjs/examples/mario/sounds/underground_bgm.ogg diff --git a/pyscriptjs/public/mario/sprites/1-1 reference.png b/pyscriptjs/examples/mario/sprites/1-1 reference.png similarity index 100% rename from pyscriptjs/public/mario/sprites/1-1 reference.png rename to pyscriptjs/examples/mario/sprites/1-1 reference.png diff --git a/pyscriptjs/public/mario/sprites/enemy.png b/pyscriptjs/examples/mario/sprites/enemy.png similarity index 100% rename from pyscriptjs/public/mario/sprites/enemy.png rename to pyscriptjs/examples/mario/sprites/enemy.png diff --git a/pyscriptjs/public/mario/sprites/enemyr.png b/pyscriptjs/examples/mario/sprites/enemyr.png similarity index 100% rename from pyscriptjs/public/mario/sprites/enemyr.png rename to pyscriptjs/examples/mario/sprites/enemyr.png diff --git a/pyscriptjs/public/mario/sprites/items.png b/pyscriptjs/examples/mario/sprites/items.png similarity index 100% rename from pyscriptjs/public/mario/sprites/items.png rename to pyscriptjs/examples/mario/sprites/items.png diff --git a/pyscriptjs/public/mario/sprites/player.png b/pyscriptjs/examples/mario/sprites/player.png similarity index 100% rename from pyscriptjs/public/mario/sprites/player.png rename to pyscriptjs/examples/mario/sprites/player.png diff --git a/pyscriptjs/public/mario/sprites/playerl.png b/pyscriptjs/examples/mario/sprites/playerl.png similarity index 100% rename from pyscriptjs/public/mario/sprites/playerl.png rename to pyscriptjs/examples/mario/sprites/playerl.png diff --git a/pyscriptjs/public/mario/sprites/tiles.png b/pyscriptjs/examples/mario/sprites/tiles.png similarity index 100% rename from pyscriptjs/public/mario/sprites/tiles.png rename to pyscriptjs/examples/mario/sprites/tiles.png diff --git a/pyscriptjs/public/panel.html b/pyscriptjs/examples/panel.html similarity index 91% rename from pyscriptjs/public/panel.html rename to pyscriptjs/examples/panel.html index 6319144..491dcb7 100644 --- a/pyscriptjs/public/panel.html +++ b/pyscriptjs/examples/panel.html @@ -8,8 +8,8 @@ - - + + diff --git a/pyscriptjs/public/panel_kmeans.html b/pyscriptjs/examples/panel_kmeans.html similarity index 98% rename from pyscriptjs/public/panel_kmeans.html rename to pyscriptjs/examples/panel_kmeans.html index ee8e902..69d4dfe 100644 --- a/pyscriptjs/public/panel_kmeans.html +++ b/pyscriptjs/examples/panel_kmeans.html @@ -38,8 +38,8 @@ - - + + diff --git a/pyscriptjs/public/repl.html b/pyscriptjs/examples/repl.html similarity index 76% rename from pyscriptjs/public/repl.html rename to pyscriptjs/examples/repl.html index 59d7113..5944e03 100644 --- a/pyscriptjs/public/repl.html +++ b/pyscriptjs/examples/repl.html @@ -7,9 +7,9 @@ Svelte app - + - + diff --git a/pyscriptjs/public/repl2.html b/pyscriptjs/examples/repl2.html similarity index 82% rename from pyscriptjs/public/repl2.html rename to pyscriptjs/examples/repl2.html index ff54ff9..3b150e3 100644 --- a/pyscriptjs/public/repl2.html +++ b/pyscriptjs/examples/repl2.html @@ -7,9 +7,9 @@ Svelte app - + - + diff --git a/pyscriptjs/public/simple_script.html b/pyscriptjs/examples/simple_script.html similarity index 80% rename from pyscriptjs/public/simple_script.html rename to pyscriptjs/examples/simple_script.html index ec5549c..467e183 100644 --- a/pyscriptjs/public/simple_script.html +++ b/pyscriptjs/examples/simple_script.html @@ -7,9 +7,9 @@ Svelte app - + - + diff --git a/pyscriptjs/public/simple_script2.html b/pyscriptjs/examples/simple_script2.html similarity index 90% rename from pyscriptjs/public/simple_script2.html rename to pyscriptjs/examples/simple_script2.html index 7e2c5de..d32860c 100644 --- a/pyscriptjs/public/simple_script2.html +++ b/pyscriptjs/examples/simple_script2.html @@ -7,9 +7,9 @@ Svelte app - + - + diff --git a/pyscriptjs/examples/todo.html b/pyscriptjs/examples/todo.html new file mode 100644 index 0000000..1690441 --- /dev/null +++ b/pyscriptjs/examples/todo.html @@ -0,0 +1,83 @@ + + + + + + + Todo App + + + + + + + + +from datetime import datetime as dt + +tasks = [] + +# define the task template that will be use to render new templates to the page +task_template = Element("task-template").select('.task', from_content=True) +task_list = Element("list-tasks-container") +new_task_content = Element("new-task-content") + +def add_task(*ags, **kws): + # create task + task_id = f"task-{len(tasks)}" + task = {"id": task_id, "content": new_task_content.element.value, "done": False, "created_at": dt.now()} + tasks.append(task) + + # add the task element to the page as new node in the list by cloning from a template + taskHtml = task_template.clone(task_id, to=task_list) + taskHtmlContent = taskHtml.select('p') + taskHtmlContent.element.innerText = task['content'] + taskHtmlCheck = taskHtml.select('input') + task_list.element.appendChild(taskHtml.element) + + def check_task(evt=None): + task['done'] = not task['done'] + if task['done']: + taskHtmlContent.element.classList.add("line-through") + else: + taskHtmlContent.element.classList.remove("line-through") + + new_task_content.clear() + taskHtmlCheck.element.onclick = check_task + +def add_task_event(e): + console.log("im in") + if (e.key == "Enter"): + add_task() + + + +
+
+ +
+

To Do List

+
+ +
+ + +
+ +
+
+ + + +
+
+ diff --git a/pyscriptjs/public/favicon.png b/pyscriptjs/public/favicon.png deleted file mode 100644 index 7e6f5eb5a2f1f1c882d265cf479de25caa925645..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3127 zcmV-749N3|P)i z7)}s4L53SJCkR}iVi00SFk;`MXX*#X*kkwKs@nFGS}c;=?XFjU|G$3t^5sjIVS2G+ zw)WGF83CpoGXhLGW(1gW%uV|X7>1P6VhCX=Ux)Lb!*DZ%@I3!{Gsf7d?gtIQ%nQiK z3%(LUSkBji;C5Rfgd6$VsF@H`Pk@xtY6t<>FNR-pD}=C~$?)9pdm3XZ36N5PNWYjb z$xd$yNQR9N!dfj-Vd@BwQo^FIIWPPmT&sZyQ$v81(sCBV=PGy{0wltEjB%~h157*t zvbe_!{=I_783x!0t1-r#-d{Y?ae$Q4N_Nd^Ui^@y(%)Gjou6y<3^XJdu{rmUf-Me?)zZ>9OR&6U5H*cK; z$gUlB{g0O4gN0sLSO|Of?hU(l?;h(jA3uH!Z{EBKuV23ouU@^Y6#%v+QG;>e*E}%?wlu-NT4DG zs)z)7WbLr)vGAu(ohrKc^em@OpO&f~6_>E61n_e0_V3@{U3^O;j{`^mNCJUj_>;7v zsMs6Hu3g7+@v+lSo;=yTYFqq}jZmQ-BK8K{C4kqi_i*jBaQE(Au0607V-zKeT;EPg zX(`vrn=L+e74+-Tqeok@_`tDa$G9I|$nTU5H*2V8@y()n*zqM?J1G!-1aX;CfDC9B zTnJ#j_%*n8Qb1)re*Bno7g0RG{Eb;IK14irJYJp$5Z6ac9~b_P?+5t~95~SRG$g?1 znFJ7p$xV&GZ18m~79TGRdfsc-BcX$9yXTR*n)mPD@1~O(_?cT$ZvFPucRmGlq&se0 zKrcUf^k}4hM*biEJOWKzz!qQe;CB_ZtSOO9Owg#lZAc=s65^rb{fZe(TYu_rk!wKkEf}RIt=#Om( zR8mN`DM<^xj~59euMMspBolVN zAPTr8sSDI104orIAdmL$uOXn*6hga1G+0WD0E?UtabxC#VC~vf3|10|phW;yQ3CY8 z2CM=)ErF;xq-YJ5G|um}>*1#E+O_Mu|Nr#qQ&G1P-NMq@f?@*XUcSbV?tX=)ilM-Q zBZP|!Bpv0V;#ojKcpc7$=eqO;#Uy~#?^kNI{vSZfLx&DEt~LTmaKWXcx=joubklI<*Aw z>LtMaQ7DR<1I2LkWvwyu#Rwn~;ezT}_g(@5l3h?W%-a86Y-t#O1PubP+z<%?V5D(U zy57A6{h+{?kOZp7&WKZR+=sznMJ}+Dnpo=C_0%R_x_t~J5T?E_{+))l5v1%52>)d-`iiZyx|5!%M2Fb2dU zW3~MwwpEH9Rhue+k$UIOoo($Ds!NbOyMR36fRHu;*15(YcA7siIZk#%JWz>P!qX1?IUojG&nKR>^gArBt2 zit(ETyZ=@V&7mv_Fi4bABcnwP+jzQuHcfU&BrAV91u-rFvEi7y-KnWsvHH=d2 zgAk(GKm_S8RcTJ>2N3~&Hbwp{Z3NF_Xeh}g4Eke)V&dY{W(3&b1j9t4yK_aYJisZZ{1rcU5- z;eD>K;ndPq&B-8yA_S0F!4ThA&{1{x)H<#?k9a#6Pc6L?V^s0``ynL&D;p(!Nmx`Y zFkHex{4p!Ggm^@DlehW}iHHVi}~u=$&N? z(NEBLQ#UxxAkdW>X9LnqUr#t4Lu0=9L8&o>JsqTtT5|%gb3QA~hr0pED71+iFFr)dZ=Q=E6ng{NE{Z~0)C?deO#?Aj zSDQ$z#TeC2T^|=}6GBo-&$;E{HL3!q3Z-szuf)O=G#zDjin4SSP%o%6+2IT#sLjQa ziyxFFz~LMjWY+_a5H!U6%a<=b7QVP^ z*90a62;bVq{?@)P6^DWd^Yilq4|YTV2Nw!Yu;a1lPI-sxR)rf@Fe5DhDP7FH zZZ%4S*1C30P;|O+jB!1;m|rXT90Sm5*RBbQN`PKu+hDD*S^yE(CdtSfg=z>u$cIj> z Date: Sun, 10 Apr 2022 10:32:35 -0500 Subject: [PATCH 4/5] add logo --- pyscriptjs/examples/favicon.png | Bin 0 -> 4295 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pyscriptjs/examples/favicon.png diff --git a/pyscriptjs/examples/favicon.png b/pyscriptjs/examples/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..0e2c5cc2f6e9467777e9535d1d321c249db30350 GIT binary patch literal 4295 zcmchZ_dnH-7suZ&axdBA8kL#K$cRGr$W_L5W$zS)8`)RJm1J{e#l2+4)g>y~BUxo$ zMKUtN&FWs)xVEp)Kk$LqWvkMsQfyk7BeQ$to}L1q8|SdC!%h*L-ZC-9lm{YBHY z@6;GPbWC&rpeB{&(3KGYn2jFk>B0RGhPom~271>ORIgu`RlKSI0I>Kxi(s2{8lUD2 z?E$-$?l`3;+dB#n6DNRsIc$qKUIMPqIk>dDV&a&scz8K+Fw4$oqs*|pxcP$1^&UD2 zadwH84l4hIr^;%>L&@vw2R{#*NjTEsAZmym&B-O1wp8Q^s3Kz2)y9QW&0w8hThJh0 z*ertx$5LO12V)liQ0P%15dqa&hjj0J01)6idR2m}XYM4r5iV&Bh@=6tVq7E^It&8n zy?VEo2k7Mosx3a;X9h9=z#A2&D+W}s0&81FnvB3WK79%bj2E55gMnl^Am_571W3CH zaIuU+$bi~AfC7TH*j0x1Dmt|7Cq+XLx`h!4O0mJPYr6pG99@}yKtu%u=w09*pcgTw zFOVN;o5ef(#?-^;fcC!3f$TdY*LdnPhXsSFl-YUF`3~Aa) zbzqwp-X55+0v^unIbNHD6xcBjhwde!R1UQ-&1NJB(2m%Y zO%h~D12{aC6j3w)NN?Lq)t06M2C_^306_C!euwf5sBt$K0Q3u@q^fn8&VJ@0w6ozp zpKor5f?Ut&YoC>9SLe_@vw%LwT*#lLBXGA}ZJeRDnqIJgGk1>T<7WjGR?;k&L)5A- z^o$FCeg}W^3kZWwFPPg^R4tD4Udp)GAQ+mH!XV}fQ+kOm5m}DoF&FFV^(z74bv@G@ zVd7L-KOWU&2km{#WUq)~!eK(Qp+ZK~dvp39pg`@0a$&)Q?gD>efD*eSI;+TwDERS$ z2KrM`8S&2FzyKgTA;k?%RA6&Y`sM176l>rTZzCw#!{@eWqimI`>~`MfMi8%1d%i0f zECEVHbFYD&o^y0~Kf_=QZH#U7$}g^of8=TeTSKCsD|B2EOD{M3crlb~uQTMHS`EhL z7D4i#=mpXIi%yr=xSi8s5^P^zE|@ZlUc@LGu^4&5CSkHA7A2Y^9FK6ulB*cx*WU}^ z_h^Dhc3K^V9b@+L;Om!#Iv%yIxOrnpkp!Y7gX^~P1Fc1d($|W*IRzEw1Ni(O;EFi4 z*LFt8f*`n@MJ%3MDKPiq0G3a$uSB+ZbU62s$0OQ9x#fUH$aM4tgY4n#5wE{Y%cSM# zt>Ck)FIb~{VD~NycnLfeDC4gakjpWC!}vWrr}wV>Peq{|k5}xkd@OCGcBI01)4p+K zs%2VbMr4vI?ppd=YK@{QSnj^HWPj^q75?Uy^%O?EwszF3BA{9Pl z?p)mJeDrMJjrIMDm|F!eV8wUc>beDzMftiFA8gp@j`>;9ugZA6GP!5}es9ebhChWP~q_6K?UHm{bP|I2I$iAU|)W) zx~;M;CQK#f6<79qt;J{&UAP>-*<#salk?ov=hzrCgVv(tBJ-NM`rGO+m-4JKcT}ct zhU@J=d|`Ggu=^Us3?Yq56L{GmzG-5mKlYn2^y|qlS=9_&2Cf*v`Y7w8^iTP^%XMb% z($eXy3#cXJH=*>{Z?pyRJ^#%~Uhf!VV(~{r6`YOFSgu?;#Gce%Oh8!d6RG9}{S{ZSQWkcENfEY|-a=Z~i7{tToq4 zhgf^H7=&*>9{KldI#uwVP-ELt#B{x3uvu4r>eJGvOgjeTRnGt)@2PifZSNsS#P#G0 zFg4#rEZS!RyPg|d>uV>))}gcb`O?gru&00Ee+vh{Onn)c$%(An2Cu?U(j#hZfdtuN zWPwIu3;AzSao%~S^M3N%Bj}*1$mb>Hue^trT;0rUzVR|s-^KGX9`6# zKFslQGPCvf(HCEu5+e+-TX~Tb)+==Zi&(EOjs7bXtQ?#SC)bl3XL?$Mb1olhAHz3^`))mD!)7#1QrPjK9PRn$fvlm*&}qpO zaf2aD03cNIw0u4Xfc^hU=wAQ`lm~zn7XVOu1prWAT%)=ADS-IGZ2bX%h5J9z0l7GS z0AT!Uq_1-~1h<|?%$&T=Vc_9M^(h6tWeDUr9gGQ+AEP-$D(bv`m53jcl+HhGdpfG< zu*Yzd;S*2`|-qEU2)k_T7&RM2t85Tw$7KGNLYcB+5;ehXDK!pc5 z#|*IjpU*hwSX20@Dz$pwF}_!FBK*nVbdrCa7*$fto^x+4xGk~QNMDUKg(`TL97iac zwkAy}-*{@9LQsWmX7$9-{WnTmQdv6UtDrUe)8u0x(enCmbm2L z>TM|gPm+J;(+%y5p{q?9Kr4mGvIW0lVWGh?g@41%0L-)NTJMMrnQek)?URTvpW6zB# zvbIcOd}qNL$u~^0|1PVRFK8IZ$;azbPKjs|T$iCEu&);#w+hyp4RDe29p3hXDjKiP zpDXq!2o%MG6Tuk!U0=JT3473evt`ZhE5ygs>6;6-BBC=EubnaqCx6}Nbmw*PoQqb` z0|f{)*jN`?j5?ZOjXr4W7FpcNAJBhgfVPWapWlWI^DaElki2lF+jYC)>)KH6L~srg z8#jCxJ#mWPF#HY2U7NSD4!AMgEv4&&EkHH{ElW#+o#j%x+;n!lnsKkWTrBuKJiKt`FKp0~Jah;{PN#E5P#BbJ53y zjvV@PoFp8v>LDNe>H2Wy5;o1E2At0Ds)_R1#h%&sn>SX2rToY<)FRi%-N``AnAb%M z9%kLN8-b~1sOF1`?f>-a1G){|;eWNXA#2wEL%#1l$XL1$-JO0AFJpC8#+v$QM9z-~ z3%S#VkW%Y5SeL;pPV6p^NULHxZR44`W~V%}pY*^r@l+zq=atkb|2ViFP%GS5CGJ=A zW@1qI!(;BA5zWy3{KL!R3mRy%svK}8L$zkTTd4z1E~U2HCVR(qOSOT*o(tiSuy=fp z2T4>N6T6HCK>J~ds>$)fTNah4kcC6S+2r{Z(5^b+X{5DM!CV*tc|$Q`yF=@h3ED+I z-GE;jeIg=vYZ7Z3CY>F3GccS;ps>3`Mfj&4a(06YXsz#@JGNZpRd!}_T|Bg?x{UD$aJ|;w3`t2Y4DST0(#67A?K4p6g zzL=0|yT*s<;QFlMQ32Emevc4~^onY@lEle8TtZ=YGDR~Lg1c*KKn_Q-O`flUW!h2t zNzuQdnUgD!TQaR@_;txz)%CXyK2e*`?26Hp+b4WPp$#W1przEnuX$(FjG7oyLS!G#Ms;U?n>iB8f^rBGFkxa z1yB$3=a9!rE4p-Nh7TtDP4$oC*upEfi`ZYybcN literal 0 HcmV?d00001 From bef7d439becbdaee592e1297a008774cb7ad9b45 Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Sun, 10 Apr 2022 14:28:12 -0500 Subject: [PATCH 5/5] update gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index b685b63..b73e485 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ __pycache__/ *.py[cod] *$py.class +.DS_Store # C extensions *.so @@ -117,6 +118,9 @@ venv.bak/ # Rope project settings .ropeproject +# VS Code Files +.vscode/ + # mkdocs documentation /site