ViUR3#15
Open
timmytiefkuehl wants to merge 2 commits intomainfrom
Open
Conversation
sveneberth
reviewed
Aug 12, 2022
|
|
||
| deploy/pyodide | ||
| deploy/vi | ||
|
|
Author
There was a problem hiding this comment.
This is standard gitignore file in viur base. The VI is served by the viur-cli.
sveneberth
requested changes
Aug 12, 2022
| [submodule "deploy/server"] | ||
| path = deploy/server | ||
| url = git@github.com:viur-framework/server.git | ||
| [submodule "sources/less/ignite"] |
Member
There was a problem hiding this comment.
Why is ignite no longer a submdule?
| #name = "testpypi" | ||
|
|
||
| [packages] | ||
| viur-core = "*" |
Member
There was a problem hiding this comment.
Can we please use a specific version?
Comment on lines
+22
to
+26
| /viur/docs/ | ||
| /viur/CHANGELOG.md | ||
| /viur/LICENSE | ||
| /viur/README.md | ||
| /viur/.readthedocs.yml |
Member
There was a problem hiding this comment.
These shouldn't be necessary, if we load the core from pip
Comment on lines
-1
to
-65
| /** | ||
| * Remove leading indent | ||
| * Inspired by https://github.com/jamiebuilds/min-indent | ||
| */ | ||
| function minIndent(str: string): number { | ||
| const match = str.match(/^[ \t]*(?=\S)/gm); | ||
|
|
||
| if (!match) { | ||
| return 0; | ||
| } | ||
|
|
||
| return match.reduce((r, a) => Math.min(r, a.length), Infinity); | ||
| } | ||
|
|
||
| /** | ||
| * Remove leading indent | ||
| * Inspired by https://github.com/sindresorhus/strip-indent | ||
| */ | ||
| function unIndent(str: string): string { | ||
| const indent: number = minIndent(str); | ||
|
|
||
| if (indent === 0) { | ||
| return str; | ||
| } | ||
|
|
||
| const regex = new RegExp(`^[ \\t]{${indent}}`, 'gm'); | ||
| return str.replace(regex, ''); | ||
| } | ||
|
|
||
| function escapeHtml(html: string): string { | ||
| const div = document.createElement('div'); | ||
| div.appendChild(document.createTextNode(html)); | ||
| return div.innerHTML; | ||
| } | ||
|
|
||
| document.addEventListener('DOMContentLoaded', () => { | ||
| const menu: Element = document.querySelector('.js-menu')!; | ||
| const menuBtn: Element = document.querySelector('.js-menu-btn')!; | ||
|
|
||
| menuBtn.addEventListener('click', () => { | ||
| menu.classList.toggle('is-active'); | ||
| menuBtn.classList.toggle('burger--to-cross'); | ||
| }); | ||
|
|
||
| document.querySelectorAll<HTMLElement>('.js-code-me').forEach((block: HTMLElement) => { | ||
| block.innerHTML = unIndent(block.innerHTML).trim(); | ||
| hljs.highlightBlock(block); | ||
| // @ts-ignore | ||
| hljs.lineNumbersBlock(block); | ||
| }); | ||
|
|
||
| document.querySelectorAll<HTMLElement>('.js-code-child').forEach((item: HTMLElement) => { | ||
| const escapedHtml = escapeHtml(unIndent(item.innerHTML).trim()); | ||
|
|
||
| const codeNode: HTMLElement = document.createElement('code'); | ||
| codeNode.classList.add('hljs', 'language-html', 'syntaxhighlighter'); | ||
| codeNode.innerHTML = escapedHtml; | ||
|
|
||
| item.parentElement!.insertBefore(codeNode, item.nextSibling); | ||
|
|
||
| hljs.highlightBlock(codeNode); | ||
| // @ts-ignore | ||
| hljs.lineNumbersBlock(codeNode); | ||
| }); | ||
| }); |
Member
There was a problem hiding this comment.
Why did you remove the source file?
| .pipe(gulp.dest(destpaths.embedsvg)); | ||
| }); | ||
|
|
||
| gulp.task('eslint', () => |
Member
There was a problem hiding this comment.
Why did you remove this task, the linting config and the husky hook?
| @@ -0,0 +1,361 @@ | |||
| import logging | |||
Member
There was a problem hiding this comment.
Not sure, why we should need allbones.py here...
Comment on lines
+23
to
+37
| {{ url("s/bar", "0.9") }} | ||
| {{ url("s/box", "0.9") }} | ||
| {{ url("s/buttons", "0.9") }} | ||
| {{ url("s/components", "0.9") }} | ||
| {{ url("s/forms", "0.9") }} | ||
| {{ url("s/gettingstarted", "0.9") }} | ||
| {{ url("s/guidelines", "0.9") }} | ||
| {{ url("s/messages", "0.9") }} | ||
| {{ url("s/mixins", "0.9") }} | ||
| {{ url("s/popout", "0.9") }} | ||
| {{ url("s/popup", "0.9") }} | ||
| {{ url("s/states", "0.9") }} | ||
| {{ url("s/tables", "0.9") }} | ||
| {{ url("s/types", "0.9") }} | ||
| {{ url("s/variables", "0.9") }} |
Member
There was a problem hiding this comment.
Suggested change
| {{ url("s/bar", "0.9") }} | |
| {{ url("s/box", "0.9") }} | |
| {{ url("s/buttons", "0.9") }} | |
| {{ url("s/components", "0.9") }} | |
| {{ url("s/forms", "0.9") }} | |
| {{ url("s/gettingstarted", "0.9") }} | |
| {{ url("s/guidelines", "0.9") }} | |
| {{ url("s/messages", "0.9") }} | |
| {{ url("s/mixins", "0.9") }} | |
| {{ url("s/popout", "0.9") }} | |
| {{ url("s/popup", "0.9") }} | |
| {{ url("s/states", "0.9") }} | |
| {{ url("s/tables", "0.9") }} | |
| {{ url("s/types", "0.9") }} | |
| {{ url("s/variables", "0.9") }} | |
| {% for menu in getMenu() -%} | |
| {% for site, name in menu.items() if site != "start" -%} | |
| {{ url("s/%s" % site, "0.9") }} | |
| {% endfor %} | |
| {% endfor %} |
Comment on lines
+72
to
+77
| // Burger Menu Mobile | ||
| $('.js_burger').click(function() { | ||
| $('.mainmenu').toggleClass("is-open"); | ||
| $('.burger').toggleClass(""); | ||
| $('html').toggleClass("no-scroll"); | ||
| }); |
Member
There was a problem hiding this comment.
This project doesn't uses jQuery and there's is no .js_burger element.
Comment on lines
+1
to
+18
| from viur.core.render import admin, html, json, vi, xml | ||
|
|
||
| @html.utils.jinjaGlobalFilter | ||
| def isList(render, val): | ||
| return isinstance(val, list) | ||
|
|
||
| @html.utils.jinjaGlobalFilter | ||
| def isDict(render, val): | ||
| return isinstance(val, dict) | ||
|
|
||
| # -*- coding: utf-8 -*- | ||
| import render.html | ||
| from server.render import admin, json, vi | ||
| import os | ||
| from collections import OrderedDict | ||
|
|
||
| from viur.core import conf, request, utils | ||
| from viur.core.render.html import default as defaultRender | ||
| from viur.core.render.html.utils import jinjaGlobalFunction | ||
|
|
Member
There was a problem hiding this comment.
Can please clean up the order of imports and methods...
Comment on lines
-39
to
-58
| def requestPreprocessor(path): | ||
| def isWhitelisted(): | ||
| reqPath = request.current.get().request.path | ||
| for testUrl in conf["viur.noSSLCheckUrls"]: | ||
| if testUrl.endswith("*"): | ||
| if reqPath.startswith(testUrl[:-1]): | ||
| return True | ||
| else: | ||
| if testUrl == reqPath: | ||
| return True | ||
| return False | ||
|
|
||
| url = request.current.get().request.url | ||
| if "://ignite.viur.is" in url and not isWhitelisted(): | ||
| raise errors.Redirect(url.replace("://ignite.viur.is", "://ignite.viur.dev"), status=301) | ||
|
|
||
| return path | ||
|
|
||
|
|
||
| conf["viur.requestPreprocessor"] = requestPreprocessor |
Member
There was a problem hiding this comment.
Can you please keep the requestPreprocessor?
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Whole project running on ViUR3 now.