ViUR3

.editorconfig

@@ -17,3 +17,21 @@ indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
+
+[{*.pyw,*.py}]
+# Codestyle
+ij_python_align_multiline_imports = true
+ij_python_blank_lines_after_imports = 1
+ij_python_blank_lines_after_local_imports = 0
+ij_python_from_import_new_line_after_left_parenthesis = false
+ij_python_from_import_new_line_before_right_parenthesis = false
+ij_python_from_import_parentheses_force_if_multiline = false
+ij_python_from_import_trailing_comma_if_multiline = false
+ij_python_from_import_wrapping = 1
+# Optimize Imports
+ij_python_optimize_imports_always_split_from_imports = false
+ij_python_optimize_imports_case_insensitive_order = false
+ij_python_optimize_imports_join_from_imports_with_same_source = true
+ij_python_optimize_imports_sort_by_type_first = true
+ij_python_optimize_imports_sort_imports = true
+ij_python_optimize_imports_sort_names_in_from_imports = true

.gitattributes

@@ -0,0 +1 @@
+*.html linguist-language=Jinja2

.gitignore

@@ -5,22 +5,8 @@
 
 .idea
 
+deploy/pyodide
 deploy/vi
-
 node_modules
 
-/login
-/acc
-/acc.txt
-
-/appengine-db
-/database
-/storage
-
-Thumbs.db
-[Dd]esktop.ini
-$RECYCLE.BIN/
-.DS_Store
-._*
-.Trashes
-.Trash-*
+storage

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "vi"]
-	path = vi
-	url = git@github.com:viur-framework/vi.git
-[submodule "deploy/server"]
-	path = deploy/server
-	url = git@github.com:viur-framework/server.git
-[submodule "sources/less/ignite"]
-	path = sources/less/ignite
-	url = git@github.com:viur-framework/ignite.git

Pipfile

@@ -0,0 +1,18 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+#[[source]]
+#url = "https://test.pypi.org/simple/"
+#verify_ssl = true
+#name = "testpypi"
+
+[packages]
+viur-core = "*"
+
+[dev-packages]
+viur-cli = "*"
+
+[requires]
+python_version = "3.9"

deploy/.gcloudignore

@@ -0,0 +1,26 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Python pycache:
+__pycache__/
+# Ignored by the build system
+/setup.cfg
+
+node_modules/
+/viur/docs/
+/viur/CHANGELOG.md
+/viur/LICENSE
+/viur/README.md
+/viur/.readthedocs.yml

deploy/app.yaml

@@ -1,37 +1,48 @@
-#application: ignite-docs
-#version: 1
-runtime: python27
-api_version: 1
-threadsafe: False
+runtime: python39
+
+# (1) Under some circumstances, you need to set a higher instance_class,
+#     like F2 or F4. Unfortunately, this will increase App Engine cost,
+#     see https://cloud.google.com/appengine/pricing.
+instance_class: F1
+default_expiration: "30s"
+
+# (2) To get more memory and concurrent requests, a separate gunicorn is run.
+entrypoint: gunicorn -b :$PORT -w 1 --threads 2 --disable-redirect-access-to-syslog main:app
+
+# (3) Limited scaling is default, to keep frontend instance hours low.
+#     Please change these values on your demands.
+automatic_scaling:
+  max_concurrent_requests: 2
+  max_instances: 1
+  max_idle_instances: 1
 
 handlers:
+# (4) For a local Pyodide installation, activate below and run get-pyodide.py from project root.
+#     Leave the comments to use the CDN-version of Pyodide, which also runs very well.
+#- url: /pyodide/(.*\.(wasm|data))$
+#  static_files: pyodide/\1
+#  upload: pyodide/.*\.(wasm|data)$
+#  mime_type: application/wasm
+#- url: /pyodide
+#  static_dir: pyodide
+
+# (5) Activate this when vi_plugins should be used
+#- url: /vi_plugins/s
+#  static_dir: vi_plugins
+
 - url: /vi/s
   static_dir: vi
 - url: /static
   static_dir: static
-  application_readable: true
 - url: /resources
-  static_dir: server/resources
-- url: /_tasks
-  script: ignite-docs.application
-- url: /admin/user/getAuthMethod
-  script: ignite-docs.application
-- url: /admin/.*
-  script: ignite-docs.application
-- url: /vi.*
-  script: ignite-docs.application
+  static_dir: viur/core/resources
 - url: /favicon.ico
   static_files: static/meta/favicon.ico
   upload: favicon.ico
-- url: /.*
-  script: ignite-docs.application
-
-libraries:
-- name: jinja2
-  version: latest
+- url: /robots.txt
+  static_files: static/meta/robots.txt
+  upload: robots.txt
 
 inbound_services:
 - warmup
 
-builtins:
-- deferred: on

deploy/cron.yaml

@@ -1,4 +1,4 @@
 cron:
 - description: Task trigger
-  url: /_tasks
+  url: /_tasks/cron
   schedule: every 4 hours

deploy/emails/user_password_recovery.email

@@ -1,4 +1,4 @@
-Subject: Reset Password
+Reset Password
 {% extends "viur_mail_default.html" %}
 
 {% block title %}
@@ -10,6 +10,12 @@ Subject: Reset Password
 		Hello user,
 		<br><br>
 
-		open this link to confirm the password reset process: <a href="{{ getHostUrl() }}/user/auth_userpassword/pwrecover?authtoken={{ skel.skey }}">{{ getHostUrl() }}/user/auth_userpassword/pwrecover?authtoken={{ skel.skey }}</a>
+		open this link to confirm the password reset process:
+		<a href="{{ getHostUrl() }}/user/auth_userpassword/pwrecover?recoveryKey={{ skel["recoveryKey"] }}">
+			{{ getHostUrl() }}/user/auth_userpassword/pwrecover?recoveryKey={{ skel["recoveryKey"] }}
+		</a>
+
+		or enter the following verification code manually:
+		<pre>{{ skel["recoveryKey"] }}</pre>
 	</div>
 {% endblock %}

deploy/emails/viur_mail_dummy.email

@@ -1,5 +1,4 @@
-
-Subject: ViMail Dummy
+ViMail Subject (always first line)
 {% extends "viur_mail_default.html" %}
 
 {% block title %}

deploy/html/editform/editform_bone_bone.html

@@ -0,0 +1,11 @@
+<input
+		class="switch-input ignt-input--boolean ignt-input--{{ boneName }}
+			{{ "is-required" if boneParams.required }}
+			{{ "is-readonly" if boneParams.readOnly }}
+			{{ "is-invalid" if boneErrors else "is-valid" }}"
+		name="{{ boneName }}"
+		value="{{ boneValue or "" }}"
+		{{ "required" if boneParams.required }}
+		{{ "readonly" if boneParams.readOnly }}
+		{% if boneErrors %} aria-invalid="true" {% endif %}
+>

deploy/html/editform/editform_bone_bool.html

@@ -0,0 +1,17 @@
+<div class="switch ignt-switch">
+	<input
+			class="switch-input ignt-input--boolean ignt-input--{{ boneName }}
+				{{ "is-required" if boneParams.required }}
+				{{ "is-readonly" if boneParams.readOnly }}
+			{{ "is-invalid" if boneErrors else "is-valid" }}"
+			id="ignt-id-{{ boneName }}"
+			type="checkbox"
+			name="{{ boneName }}"
+			value="True"
+			{{ "checked" if boneValue }}
+			{{ "required" if boneParams.required }}
+			{{ "readonly" if boneParams.readOnly }}
+			{% if boneErrors %} aria-invalid="true" {% endif %}
+	>
+	<label class="switch-label" for="ignt-id-{{ boneName }}"></label>
+</div>

deploy/html/editform/editform_bone_captcha.html

@@ -0,0 +1,25 @@
+<div class="hidden2formfield">
+	<script src="https://www.google.com/recaptcha/api.js?render={{ boneValue }}"></script>
+	<input type="hidden" class="recaptcha" name="g-recaptcha-response"
+		   data-sitekey="{{ boneValue }}"
+		   data-action="{{ boneParams["action"]|default("form") }}">
+</div>
+
+<script>
+	(function () {
+		function fetchToken(input) {
+			grecaptcha.ready(function () {
+				const {sitekey, action} = input.dataset;
+				grecaptcha.execute(sitekey, {action})
+					.then(token => {
+						input.value = token;
+						// A reCAPTCHA token expires after two minutes,
+						// refresh it 10 seconds before.
+						setTimeout(fetchToken, (2 * 60 - 10) * 1000, input);
+					});
+			});
+		}
+
+		document.querySelectorAll('.recaptcha').forEach(fetchToken);
+	})();
+</script>

deploy/html/editform/editform_bone_color.html

@@ -0,0 +1,14 @@
+<input
+		class="input ignt-input ignt-input--color ignt-input--{{ boneName }}
+			{{ "is-required" if boneParams.required }}
+			{{ "is-readonly" if boneParams.readOnly }}
+			{{ "is-invalid" if boneErrors else "is-valid" }}"
+		name="{{ boneName }}"
+		type="color"
+		title="{{ boneParams.tooltip or boneParams.descr or boneName }}"
+		id="ignt-id-{{ boneName }}"
+		value="{{ boneValue|default("", true) }}"
+		{{ "readonly" if boneParams.readOnly }}
+		{{ "required" if boneParams.required }}
+		{% if boneErrors %} aria-invalid="true" {% endif %}
+>

deploy/html/editform/editform_bone_date.html

@@ -0,0 +1,21 @@
+<div
+	id="ignt-id-{{ boneName }}"
+	class="input-group">
+	{% if boneParams.date and boneParams.time %}
+		{# Current Webbrowsers dont support a datetime input yet so we'll split it up until they do #}
+		<input type="date" class="input ignt-input ignt-input--date" value="{% if boneValue %}{{ boneValue.strftime("%Y-%m-%d") }}{% endif %}"
+			   name="{{ boneName }}-date" {% if boneParams.readOnly %}disabled="disabled"{% endif %}>
+		<input type="time" class="input ignt-input ignt-input--time" value="{% if boneValue %}{{ boneValue.strftime("%H:%M:%S") }}{% endif %}"
+			   name="{{ boneName }}-time" {% if boneParams.readOnly %}disabled="disabled"{% endif %}>
+		<input type="hidden" value="{% if boneValue %}{{ boneValue.strftime("%Y-%M-%d") }}{% endif %}"
+			   name="{{ boneName }}" class="js-viur-bones-date-doubleinput">
+	{% elif boneParams.date %}
+		<input type="date" class="input ignt-input ignt-input--date" value="{% if boneValue %}{{ boneValue.strftime("%Y-%m-%d") }}{% endif %}"
+			   name="{{ boneName }}" {% if boneParams.readOnly %}disabled="disabled"{% endif %}>
+	{% elif boneParams.time %}
+		<input type="time" class="input ignt-input ignt-input--time" value="{% if boneValue %}{{ boneValue.strftime("%H:%M:%S") }}{% endif %}"
+			   name="{{ boneName }}-time" {% if boneParams.readOnly %}disabled="disabled"{% endif %}>
+	{% else %}
+		<!-- You messed up this datebone somehow -->
+	{% endif %}
+</div>

deploy/html/editform/editform_bone_hidden.html

@@ -0,0 +1,4 @@
+{%  if boneValue and (boneParams["type"] == "relational" or boneParams["type"].startswith("relational.")) %}
+	{% set boneValue = boneValue["dest"]["key"] %}
+{%  endif %}
+<input type="hidden" name="{{ boneName }}" value="{{ boneValue or "" }}">

deploy/html/editform/editform_bone_numeric.html

@@ -0,0 +1,28 @@
+{%- if boneParams.precision < 0 -%}
+    {# if precision is < 0, we only allow powers of 10 to be selected by forcing the last n digits to be allways
+    zero (ie. ..., 0, 10, 20, ... or ..., 0, 100, 200, ...). We ensure that the last digits of our min/max value
+    matches that alley by foring the last n digits to be 0. Otherwise we  might end up in shifted alleys
+    ( ..., -4, 6, 16, ... or the like) #}
+    {%- set min = (boneParams.min|string)[:-(boneParams.precision|abs)]+"0"*(boneParams.precision|abs) -%}
+    {%- set max = (boneParams.max|string)[:-(boneParams.precision|abs)]+"0"*(boneParams.precision|abs) -%}
+{%- else -%}
+    {% set min = boneParams.min -%}
+    {% set max = boneParams.max -%}
+{%- endif -%}
+
+<input
+		class="input ignt-input ignt-input-numeric ignt-input--{{ boneName }}
+			{{ "is-required" if boneParams.required }}
+			{{ "is-readonly" if boneParams.readOnly }}
+			{{ "is-invalid" if boneErrors else "is-valid" }}"
+		value="{{ boneValue|default("", true) }}"
+		name="{{ boneName }}"
+		type="number"
+		title="{{ boneParams.tooltip or boneParams.descr or boneName }}"
+		id="ignt-id-{{boneName}}"
+        {% if min %} min="{{ min }}" {% endif %}
+        {% if max %} max="{{ max }}" {% endif %}
+        {{ "readonly" if boneParams.readOnly }}
+        {{ "required" if boneParams.required }}
+        {% if boneErrors %} aria-invalid="true" {% endif %}
+>

deploy/html/editform/editform_bone_password.html

@@ -0,0 +1,14 @@
+<input
+		class="input ignt-input ignt-input--password ignt-ignt--{{ boneName }}
+			{{ "is-required" if boneParams.required }}
+			{{ "is-readonly" if boneParams.readOnly }}
+			{{ "is-invalid" if boneErrors else "is-valid" }}"
+		name="{{ boneName }}"
+		type="password"
+		title="{{ boneParams.tooltip or boneParams.descr or boneName }}"
+		id="ignt-id-{{ boneName }}"
+		value="{{ boneValue|default("", true) }}"
+		{{ "required" if boneParams.required }}
+		{{ "readonly" if boneParams.readOnly }}
+		{% if boneErrors %} aria-invalid="true" {% endif %}
+>

deploy/html/editform/editform_bone_record.html

@@ -0,0 +1,8 @@
+{{ renderEditForm(
+	skel={
+		"structure": boneParams.using,
+		"value": boneValue or {},
+		"errors": boneErrors
+	},
+	prefix=boneName
+) }}

deploy/html/editform/editform_bone_relational.html

@@ -0,0 +1,34 @@
+<select
+		id="ignt-id-{{ boneName }}"
+		name="{{ boneName }}"
+		class="select ignt-select ignt-select--{{ boneName }}
+			{{ "is-required" if boneParams.required }}
+			{{ "is-readonly" if boneParams.readOnly }}
+			{{ "is-invalid" if boneWasInvalid else "is-valid" }}"
+		{{'readonly' if boneParams.readOnly}}
+		{{'required' if boneParams.required}}
+    >
+{% set ns = namespace(cursor="") %}
+{% for i in range(0, 1000, 100) %}
+	{% if ns.cursor == "" %}
+		{% set skellist = getList(boneParams.module, limit=100) %}
+		{% set ns.cursor = skellist.getCursor() %}
+	{% elif ns.cursor != none %}
+		{% set skellist = getList(boneParams.module, cursor=ns.cursor, limit=100) %}
+		{% set ns.cursor = skellist.getCursor() %}
+	{% else %}
+		{% set skellist = [] %}
+	{% endif %}
+    {% for entry in skellist %}
+        {% if loop.first %}
+            <option value="" {{ "selected" if not boneValue }} {{ "disabled" if boneParams.required}} hidden>
+                -
+            </option>
+        {% endif %}
+        <option value="{{ entry["key"] }}" {{ "selected" if boneValue and entry["key"] == boneValue["dest"]["key"] }}>
+            {{ entry["name"] }}
+        </option>
+    {% endfor %}
+{% endfor %}
+
+    </select>