diff --git a/backend/.plano.py b/backend/.plano.py index d5bc29e..5124d5e 100644 --- a/backend/.plano.py +++ b/backend/.plano.py @@ -1,3 +1,22 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + from plano import * image_tag = "quay.io/skupper/hello-world-backend" @@ -10,13 +29,11 @@ def build(no_cache=False): @command def run_(): - build() - run(f"podman run --net host {image_tag} python python/main.py --host localhost --port 8081") + run(f"podman run --net host {image_tag} --host localhost --port 8081") @command def debug(): - build() - run(f"podman run --net host -it {image_tag} /bin/bash") + run(f"podman run -it --net host --entrypoint /bin/sh {image_tag}") @command def push(): diff --git a/backend/Containerfile b/backend/Containerfile index 83e16c9..3aee09b 100644 --- a/backend/Containerfile +++ b/backend/Containerfile @@ -17,17 +17,21 @@ # under the License. # -FROM registry.fedoraproject.org/fedora-minimal +FROM python:alpine AS build -EXPOSE 8080 +RUN addgroup -S fritz && adduser -S fritz -G fritz +USER fritz -RUN microdnf -y install python-pip && microdnf clean all -RUN pip install starlette uvicorn +RUN pip install --user --no-cache-dir starlette uvicorn -USER 1001 +COPY --chown=fritz:fritz python /home/fritz/python -COPY python /app/python +FROM python:alpine AS run -WORKDIR /app +RUN addgroup -S fritz && adduser -S fritz -G fritz +USER fritz -CMD ["python", "python/main.py"] +COPY --chown=fritz:fritz --from=build /home/fritz /home/fritz + +WORKDIR /home/fritz +ENTRYPOINT ["python", "python/main.py"] diff --git a/frontend/.plano.py b/frontend/.plano.py index 0195ac4..f8b38a4 100644 --- a/frontend/.plano.py +++ b/frontend/.plano.py @@ -1,4 +1,24 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + from plano import * +from plano.github import * image_tag = "quay.io/skupper/hello-world-frontend" @@ -10,8 +30,7 @@ def build(no_cache=False): @command def run_(): - build() - run(f"podman run --net host {image_tag} python python/main.py --host localhost --port 8080 --backend http://localhost:8081") + run(f"podman run --net host {image_tag} --host localhost --port 8080 --backend http://localhost:8081") @command def test(): @@ -35,11 +54,14 @@ def test(): @command def debug(): - build() - run(f"podman run --net host -it {image_tag} /bin/bash") + run(f"podman run -it --net host --entrypoint /bin/sh {image_tag}") @command def push(): run("podman login quay.io") build() run(f"podman push {image_tag}") + +@command +def update_gesso(): + update_external_from_github("static/gesso", "ssorj", "gesso") diff --git a/frontend/Containerfile b/frontend/Containerfile index 56a58c0..d788139 100644 --- a/frontend/Containerfile +++ b/frontend/Containerfile @@ -17,18 +17,22 @@ # under the License. # -FROM registry.fedoraproject.org/fedora-minimal +FROM python:alpine AS build -EXPOSE 8080 +RUN addgroup -S fritz && adduser -S fritz -G fritz +USER fritz -RUN microdnf -y install python-pip && microdnf clean all -RUN pip install httpx starlette sse_starlette uvicorn +RUN pip install --user --no-cache-dir httpx starlette sse_starlette uvicorn -USER 1001 +COPY --chown=fritz:fritz python /home/fritz/python +COPY --chown=fritz:fritz static /home/fritz/static -COPY python /app/python -COPY static /app/static +FROM python:alpine AS run -WORKDIR /app +RUN addgroup -S fritz && adduser -S fritz -G fritz +USER fritz -CMD ["python", "python/main.py"] +COPY --chown=fritz:fritz --from=build /home/fritz /home/fritz + +WORKDIR /home/fritz +ENTRYPOINT ["python", "python/main.py"] diff --git a/frontend/static/gesso/LICENSE.txt b/frontend/static/gesso/LICENSE.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/frontend/static/gesso/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/frontend/static/gesso/README.md b/frontend/static/gesso/README.md new file mode 100644 index 0000000..5c33ed4 --- /dev/null +++ b/frontend/static/gesso/README.md @@ -0,0 +1 @@ +# Gesso diff --git a/frontend/static/gesso/gesso.js b/frontend/static/gesso/gesso.js index bec78ff..d0faad3 100644 --- a/frontend/static/gesso/gesso.js +++ b/frontend/static/gesso/gesso.js @@ -297,7 +297,6 @@ export class Page { const doc = parser.parseFromString(html, "text/html"); this.body = doc.activeElement; - this.router.routes[this.path] = this; } @@ -317,9 +316,8 @@ export class Page { if (key !== this.router.previousContentKey) { this.updateContent(); + this.router.previousContentKey = key; } - - this.router.previousContentKey = key; } getContentKey() {