Merge branch 'streamsync-cloud:dev' into dev

anant-writer · May 31, 2024 · 158de22 · 158de22
2 parents e4921e4 + 02ccf21
commit 158de22
Show file tree

Hide file tree

Showing 13 changed files with 191 additions and 205 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Apache License
+                             Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -175,18 +175,7 @@ Apache License
 
    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]
+   Copyright 2024 Writer, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/apps/product-description-generator/README.md → apps/pdg-tutorial/README.md b/apps/product-description-generator/README.md → apps/pdg-tutorial/README.md
diff --git a/apps/product-description-generator/main.py → apps/pdg-tutorial/main.py b/apps/product-description-generator/main.py → apps/pdg-tutorial/main.py
diff --git a/.../product-description-generator/prompts.py → apps/pdg-tutorial/prompts.py b/.../product-description-generator/prompts.py → apps/pdg-tutorial/prompts.py
diff --git a/...duct-description-generator/pyproject.toml → apps/pdg-tutorial/pyproject.toml b/...duct-description-generator/pyproject.toml → apps/pdg-tutorial/pyproject.toml
diff --git a/...ct-description-generator/static/README.md → apps/pdg-tutorial/static/README.md b/...ct-description-generator/static/README.md → apps/pdg-tutorial/static/README.md
diff --git a/...-description-generator/static/favicon.png → apps/pdg-tutorial/static/favicon.png b/...-description-generator/static/favicon.png → apps/pdg-tutorial/static/favicon.png
diff --git a/apps/product-description-generator/ui.json → apps/pdg-tutorial/ui.json b/apps/product-description-generator/ui.json → apps/pdg-tutorial/ui.json
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,14 +4,14 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "writer"
-version = "0.6.0rc4"
-description = "Writer Framework helps you create performant data apps, via Python code and its built-in visual UI editor."
-authors = ["Writer, Inc. <[email protected]>"]
+version = "0.6.0rc5"
+description = "An open-source, Python framework for building feature-rich apps that are fully integrated with the Writer platform."
+authors = ["Writer, Inc."]
 readme = "README.md"
 homepage = "https://www.writer.com"
 repository = "https://www.github.com/streamsync-cloud/streamsync"
-documentation = "https://www.streamsync.cloud/getting-started.html"
-keywords = ["data apps", "gui", "ui"]
+documentation = "https://developer.writer.com/framework"
+keywords = ["data apps", "gui", "ui", "framework", "writer framework"]
 classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -45,7 +45,7 @@ requests = "^2.31.0"
 uvicorn = ">= 0.20.0, < 1"
 watchdog = ">= 3.0.0, < 4"
 websockets = ">= 12, < 13"
-writer-sdk = "0.1.0a2"
+writer-sdk = "0.1.0a3"
 
 
 [tool.poetry.group.build]

diff --git a/src/ui/index.html b/src/ui/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="UTF-8" />
-		<link rel="icon" type="image/png" href="./static/favicon.png" />
+		<link rel="icon" type="image/png" href="./static/favicon.png?2" />
 		<link rel="preconnect" href="https://fonts.googleapis.com">
 		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 		<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">

diff --git a/tests/backend/testapp/ui.json b/tests/backend/testapp/ui.json
@@ -1,6 +1,6 @@
 {
     "metadata": {
-        "writer_version": "0.5.0"
+        "writer_version": "0.6.0rc4"
     },
     "components": {
         "root": {
@@ -2136,7 +2136,7 @@
             "id": "abaa1903-e58e-4a67-92ef-d7065f1a7fcf",
             "type": "header",
             "content": {
-                "text": "Food Selector"
+                "text": "FOOD SELECTOR"
             },
             "isCodeManaged": false,
             "position": 0,