From 8fdc28edcc8918756dc9bf8804dec22d2c7398e9 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 20 Apr 2022 08:04:53 +0800 Subject: [PATCH] Moved the static folder so it can be shared with the SPA. --- .../examples/toga/freedom/fake-briefcase.sh | 4 ++-- pyscriptjs/examples/toga/server/demo.py | 2 +- .../toga/{server => }/static/logo-32.png | Bin .../{server => }/static/pyscript/pyscript.css | 0 .../{server => }/static/pyscript/pyscript.js | 0 .../static/pyscript/pyscript.js.map | 0 .../toga/{server => }/static/toga.css | 0 .../toga/{server => }/static/wheels/README.md | 0 .../wheels/freedom-0.0.1-py3-none-any.whl | Bin .../toga_core-0.3.0.dev33-py3-none-any.whl | Bin 490370 -> 490370 bytes .../toga_flask-0.3.0.dev33-py3-none-any.whl | Bin 4235 -> 4235 bytes .../toga_web-0.3.0.dev33-py3-none-any.whl | Bin 12126 -> 12092 bytes .../wheels/travertino-0.1.3-py3-none-any.whl | Bin 15112 -> 15112 bytes 13 files changed, 3 insertions(+), 3 deletions(-) rename pyscriptjs/examples/toga/{server => }/static/logo-32.png (100%) rename pyscriptjs/examples/toga/{server => }/static/pyscript/pyscript.css (100%) rename pyscriptjs/examples/toga/{server => }/static/pyscript/pyscript.js (100%) rename pyscriptjs/examples/toga/{server => }/static/pyscript/pyscript.js.map (100%) rename pyscriptjs/examples/toga/{server => }/static/toga.css (100%) rename pyscriptjs/examples/toga/{server => }/static/wheels/README.md (100%) rename pyscriptjs/examples/toga/{server => }/static/wheels/freedom-0.0.1-py3-none-any.whl (100%) rename pyscriptjs/examples/toga/{server => }/static/wheels/toga_core-0.3.0.dev33-py3-none-any.whl (99%) rename pyscriptjs/examples/toga/{server => }/static/wheels/toga_flask-0.3.0.dev33-py3-none-any.whl (84%) rename pyscriptjs/examples/toga/{server => }/static/wheels/toga_web-0.3.0.dev33-py3-none-any.whl (59%) rename pyscriptjs/examples/toga/{server => }/static/wheels/travertino-0.1.3-py3-none-any.whl (95%) diff --git a/pyscriptjs/examples/toga/freedom/fake-briefcase.sh b/pyscriptjs/examples/toga/freedom/fake-briefcase.sh index 3e143a2..df64f98 100755 --- a/pyscriptjs/examples/toga/freedom/fake-briefcase.sh +++ b/pyscriptjs/examples/toga/freedom/fake-briefcase.sh @@ -1,7 +1,7 @@ #!/bin/sh -mkdir -p ../server/static/wheels +mkdir -p ../static/wheels cd src unzip ../base-wheel.zip -zip ../../server/static/wheels/freedom-0.0.1-py3-none-any.whl -r freedom* +zip ../../static/wheels/freedom-0.0.1-py3-none-any.whl -r freedom* rm -rf freedom-0.0.1.dist-info diff --git a/pyscriptjs/examples/toga/server/demo.py b/pyscriptjs/examples/toga/server/demo.py index 780fd11..abd9065 100644 --- a/pyscriptjs/examples/toga/server/demo.py +++ b/pyscriptjs/examples/toga/server/demo.py @@ -4,7 +4,7 @@ from toga_flask import TogaApp from freedom import app as freedom -app = Flask(__name__) +app = Flask(__name__, static_folder='../static') app.add_url_rule('/', view_func=TogaApp.as_view("foo", app_module=freedom)) diff --git a/pyscriptjs/examples/toga/server/static/logo-32.png b/pyscriptjs/examples/toga/static/logo-32.png similarity index 100% rename from pyscriptjs/examples/toga/server/static/logo-32.png rename to pyscriptjs/examples/toga/static/logo-32.png diff --git a/pyscriptjs/examples/toga/server/static/pyscript/pyscript.css b/pyscriptjs/examples/toga/static/pyscript/pyscript.css similarity index 100% rename from pyscriptjs/examples/toga/server/static/pyscript/pyscript.css rename to pyscriptjs/examples/toga/static/pyscript/pyscript.css diff --git a/pyscriptjs/examples/toga/server/static/pyscript/pyscript.js b/pyscriptjs/examples/toga/static/pyscript/pyscript.js similarity index 100% rename from pyscriptjs/examples/toga/server/static/pyscript/pyscript.js rename to pyscriptjs/examples/toga/static/pyscript/pyscript.js diff --git a/pyscriptjs/examples/toga/server/static/pyscript/pyscript.js.map b/pyscriptjs/examples/toga/static/pyscript/pyscript.js.map similarity index 100% rename from pyscriptjs/examples/toga/server/static/pyscript/pyscript.js.map rename to pyscriptjs/examples/toga/static/pyscript/pyscript.js.map diff --git a/pyscriptjs/examples/toga/server/static/toga.css b/pyscriptjs/examples/toga/static/toga.css similarity index 100% rename from pyscriptjs/examples/toga/server/static/toga.css rename to pyscriptjs/examples/toga/static/toga.css diff --git a/pyscriptjs/examples/toga/server/static/wheels/README.md b/pyscriptjs/examples/toga/static/wheels/README.md similarity index 100% rename from pyscriptjs/examples/toga/server/static/wheels/README.md rename to pyscriptjs/examples/toga/static/wheels/README.md diff --git a/pyscriptjs/examples/toga/server/static/wheels/freedom-0.0.1-py3-none-any.whl b/pyscriptjs/examples/toga/static/wheels/freedom-0.0.1-py3-none-any.whl similarity index 100% rename from pyscriptjs/examples/toga/server/static/wheels/freedom-0.0.1-py3-none-any.whl rename to pyscriptjs/examples/toga/static/wheels/freedom-0.0.1-py3-none-any.whl diff --git a/pyscriptjs/examples/toga/server/static/wheels/toga_core-0.3.0.dev33-py3-none-any.whl b/pyscriptjs/examples/toga/static/wheels/toga_core-0.3.0.dev33-py3-none-any.whl similarity index 99% rename from pyscriptjs/examples/toga/server/static/wheels/toga_core-0.3.0.dev33-py3-none-any.whl rename to pyscriptjs/examples/toga/static/wheels/toga_core-0.3.0.dev33-py3-none-any.whl index 38cc23d79e21a2ec49b66fc0b53dcea257849a14..42392f01be1fe07fcdcae07f3e7146d207c977e3 100644 GIT binary patch delta 116 zcmZqrF5C27wxNZwg{g(Pg{6hHg>4J_ry%AehAG>>2C>I6gIQr=>^z(x*7VeP_Bmh% sO9Hz;L@t57R1z$7u96+Bak_F9doWm}vWh(b%s5lU9sy>kSF=Y00LvjIMgRZ+ delta 116 zcmZqrF5C27wxNZwg{g(Pg{6hHg>4J_ryyqb{gbzU4PuXD2D8G#*m*cXtm&!o>~p{j smIQWxh+G1DsU%qFTqQeL<8m~p0xJp#;7uV#-10D^TXBme*a diff --git a/pyscriptjs/examples/toga/server/static/wheels/toga_flask-0.3.0.dev33-py3-none-any.whl b/pyscriptjs/examples/toga/static/wheels/toga_flask-0.3.0.dev33-py3-none-any.whl similarity index 84% rename from pyscriptjs/examples/toga/server/static/wheels/toga_flask-0.3.0.dev33-py3-none-any.whl rename to pyscriptjs/examples/toga/static/wheels/toga_flask-0.3.0.dev33-py3-none-any.whl index ff5e10b3ac01c6177f7b8198c3a6d64c6660c9b8..227b6203bca91303effcd419617b22e4a3d31c1a 100644 GIT binary patch delta 90 zcmeBH>{i@R!o-}!FlBQ&Q#>=6ag+5LD~K_96Zc#&9mEp`mRQZB0#-Wt5??S_LW4g9 SOxN=Vg6YfrkziV1AO-*+q8v#8 delta 90 zcmeBH>{i@R!oEU}tL1*~-PCB9&=ga&^I Sn6Bp!1k;!KBf+%3KnwuHSRgR~ diff --git a/pyscriptjs/examples/toga/server/static/wheels/toga_web-0.3.0.dev33-py3-none-any.whl b/pyscriptjs/examples/toga/static/wheels/toga_web-0.3.0.dev33-py3-none-any.whl similarity index 59% rename from pyscriptjs/examples/toga/server/static/wheels/toga_web-0.3.0.dev33-py3-none-any.whl rename to pyscriptjs/examples/toga/static/wheels/toga_web-0.3.0.dev33-py3-none-any.whl index 935042954865bde4da0a41f605df0cde8c337075..a104682a802927d7561b0e36c95e003d19653225 100644 GIT binary patch delta 3304 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 Sr}YC)>m4UWn8x?d<-Y;O%NxxA delta 3360 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 RG@q3>n2xau2Gg6Y!T?TD9i;#O delta 90 zcmeAu>nPh`q|MB+fAVHi?KoyIW15~8D~K`qu<>*-9cvN*me^pjiv=u@Yv~K7_geaa SX+A4&FdbtR45l|(g#iHYQ6Yl>