Add license to each file

laffra · laffra · commit 143be0f8eca8 · 2023-11-12T17:15:43.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+dist/*
+ltk.egg-info/*
+pyscript_ltk.egg-info/*
diff --git a/README.md b/README.md
@@ -112,3 +112,30 @@ LTK is covered under the Apache License:
  - The license does not require derived works to adopt the Apache license. Though this is encouraged for consistency.
 
 
+
+## Upload new version to PyPi
+
+First build the package into a source distribution and a Python wheel:
+```console
+python3 -m pip install --user --upgrade setuptools wheel twine build
+python3 -m build
+```
+
+Then verify whether the build works for pypi:
+```console
+twine check dist/*
+```
+
+Then upload to the pypi test environment:
+```console
+twine upload --repository pypitest dist/*
+```
+
+Finally, if the pypi test upload appears to work fine, run:
+```console
+twine upload dist/*
+```
+
+# License
+
+_Microlog_ is released under version 1 of the [Server Side Public License (SSPL)](LICENSE).
diff --git a/examples/__init__.py b/examples/__init__.py
@@ -1,3 +1,5 @@
+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE 
+
 from examples import custom
 from examples import table
 from examples import tictactoe
diff --git a/examples/custom.py b/examples/custom.py
@@ -1,3 +1,5 @@
+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE 
+
 import ltk
 
 # Create a new widget, based on VBox
diff --git a/examples/table.py b/examples/table.py
@@ -1,3 +1,5 @@
+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE 
+
 import ltk
 
 # Create an HTML table to display country temperature data
diff --git a/examples/tictactoe.py b/examples/tictactoe.py
@@ -1,3 +1,5 @@
+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE 
+
 import ltk
 
 # Tic Tac Toe Game
@@ -55,4 +57,6 @@ def create():
             for row in range(3)
         ),
         ltk.H4("Tip: Click inside the squares."),
-    ).attr("name", "Tic Tac Toe")
+    ).attr("name", "Tic Tac Toe")
+
+ltk.inject(__file__, "tictactoe.css")
diff --git a/index.html b/index.html
@@ -1,22 +1,20 @@
+<!-- LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE -->
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>LTK</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
-    <!-- Import PyScript CSS and JS -->
+    <!-- Import PyScript -->
     <link rel="stylesheet" href="https://pyscript.net/releases/2023.11.1/core.css" />
     <script defer type="module" src="https://pyscript.net/releases/2023.11.1/core.js"></script>
 
-    <!-- Import LTK and jQuery -->
-    <link rel="stylesheet" href="ltk/ltk.css" />
+    <!-- Import jQuery -->
     <script src="https://code.jquery.com/jquery-3.6.0.js"></script>
     <script src="https://code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
     <link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/base/jquery-ui.css">
-
-    <!-- Import custom CSS for our examples -->
-    <link rel="stylesheet" href="examples/tictactoe.css" />
 </head>
 <body>
     <h1>The PyScript LTK Kitchen Sink</h1>
@@ -28,8 +26,11 @@ <h1>The PyScript LTK Kitchen Sink</h1>
             "ltk/__init__.py",
             "ltk/jquery.py",
             "ltk/widgets.py",
+            "ltk/ltk.js",
+            "ltk/ltk.css",
             "examples/__init__.py",
             "examples/tictactoe.py",
+            "examples/tictactoe.css",
             "examples/custom.py",
             "examples/table.py",
         ]
diff --git a/ltk/__init__.py b/ltk/__init__.py
@@ -1,3 +1,5 @@
+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE 
+
 from ltk.jquery import find
 from ltk.jquery import create
 from ltk.jquery import find_list
@@ -14,13 +16,15 @@
 from ltk.jquery import set_url_parameter
 from ltk.jquery import push_state
 from ltk.jquery import to_js
+from ltk.jquery import inject
 
 
 from ltk.jquery import jQuery
 from ltk.jquery import console
 from ltk.jquery import window
 from ltk.jquery import document
 from ltk.jquery import body
+from ltk.jquery import head
 from ltk.jquery import parse_int
 from ltk.jquery import parse_float
 from ltk.jquery import local_storage
@@ -52,3 +56,5 @@
 from ltk.widgets import H2
 from ltk.widgets import H3
 from ltk.widgets import H4
+
+inject(__file__, "ltk.js", "ltk.css")
diff --git a/ltk/jquery.py b/ltk/jquery.py
@@ -1,14 +1,19 @@
+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE 
+
 import js # type: ignore
 import json
+import os
 import pyodide # type: ignore
 import traceback
 
+
 timers = {}
 
 jQuery = js.jQuery
 console = js.console
 window = jQuery(js.window)
 document = jQuery(js.document)
+head = jQuery("head")
 body = jQuery("body")
 parse_int = js.parseInt
 parse_float = js.parseFloat
@@ -81,3 +86,15 @@ def set_url_parameter(key, value):
 
 def push_state(url):
     js.history.pushState(None, "", url)
+
+def inject(modulepath, *files):
+    types = {
+        ".js": "<script>",
+        ".css": "<style>",
+    }
+    for file in files:
+        _, extension = os.path.splitext(file)
+        tag = types[extension]
+        path = os.path.join(os.path.dirname(modulepath), file)
+        create(tag).text(open(path).read()).appendTo(head)
+        print("injected", tag, path)
diff --git a/ltk/ltk.css b/ltk/ltk.css
@@ -1,3 +1,5 @@
+/* LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE  */
+
 .ltk-vbox {
     display: flex;
     flex-direction: column;
diff --git a/ltk/ltk.js b/ltk/ltk.js
@@ -0,0 +1,46 @@
+/* LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE  */
+
+function table() {
+    return $("<table>").addClass("ltk-table");
+}
+
+function tableTitle(table, column, title) {
+    var header = table.find("tr");
+    if (!header.length) {
+        header = $("<tr>")
+            .addClass("ltk-table-header")
+            .appendTo(table);
+    }
+    for (var n=header.find(".ltk-table-title").length; n<=column; n++) {
+        $("<th>")
+            .addClass("ltk-table-title")
+            .appendTo(header);
+    }
+    header.find(".ltk-table-title").eq(column).text(title)
+}
+
+function tableCell(table, column, row) {
+    for (var n=table.find(".ltk-table-row").length; n<=row; n++) {
+        $("<tr>")
+            .addClass("ltk-table-row")
+            .addClass(`ltk-row-${n}`)
+            .appendTo(table);
+    }
+    const rowElement = table.find(".ltk-table-row").eq(row)
+    for (var n=rowElement.find(".ltk-table-cell").length; n<=column; n++) {
+        $("<td>")
+            .addClass("ltk-table-cell")
+            .addClass(`ltk-row-${row}`)
+            .addClass(`ltk-col-${n}`)
+            .appendTo(rowElement);
+    }
+    return rowElement.find(".ltk-table-cell").eq(column)
+}
+
+function tableGet(table, column, row) {
+    return tableCell(table, column, row).text()
+}
+
+function tableSet(table, column, row, value) {
+    tableCell(table, column, row).text(value)
+}
diff --git a/ltk/widgets.py b/ltk/widgets.py
@@ -1,6 +1,7 @@
+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE 
+
 import inspect
 import js # type: ignore
-import pyodide # type: ignore
 
 from ltk.jquery import jQuery
 from ltk.jquery import proxy
@@ -175,6 +176,22 @@ class Table(Widget):
     classes = [ "ltk-table" ]
     tag = "table"
     
+    def __init__(self, *rows):
+        self.element = (
+            js.table()
+                .addClass(" ".join(self.classes))
+                .append(*self.flatten(rows))
+        )
+
+    def title(self, column, title):
+        js.tableTitle(self.element, column, title)
+    
+    def get(self, column, row):
+        return js.tableGet(self.element, column, row)
+
+    def set(self, column, row, value):
+        js.tableSet(self.element, column, row, value)
+    
 
 class TableRow(Widget):
     classes = [ "ltk-tr" ]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+dist/*`
	`2`	`+ltk.egg-info/*`
	`3`	`+pyscript_ltk.egg-info/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE`
	`2`	`+`
`1`	`3`	`from examples import custom`
`2`	`4`	`from examples import table`
`3`	`5`	`from examples import tictactoe`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE`
	`2`	`+`
`1`	`3`	`import ltk`
`2`	`4`
`3`	`5`	`# Create a new widget, based on VBox`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/* LTK - Copyrights Reserved 2023 - chrislaffra.com - See LICENSE */`
	`2`	`+`
`1`	`3`	`.ltk-vbox {`
`2`	`4`	`display: flex;`
`3`	`5`	`flex-direction: column;`