wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Merge pull request 'test' (!10) from test into dev 

Reviewed-on: verdnatura/hedera-web#10
This commit is contained in:
Juan Ferrer 2022-11-28 09:52:02 +00:00
parent 11da415eb2 ebb6055be5
commit 875629fc17
16 changed files with 221 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (22.48.0) stable; urgency=low hedera-web (22.48.1) stable; urgency=low
* Initial Release. * Initial Release.

6
forms/account/address-list/style.scss
View File

@ -1,4 +1,6 @@
.address-list .htk-list .side { hedera-address-list {
padding-right: 16px; .htk-list .side {
padding-right: 16px;
}
} }

2
forms/account/address-list/ui.xml
View File

@ -23,7 +23,7 @@
tip="_AddAddress" tip="_AddAddress"
on-click="this.onAddAddressClick()"/> on-click="this.onAddAddressClick()"/>
</div> </div>
<div id="form" class="address-list"> <div id="form" class="hedera-address-list">
<div class="box vn-w-sm"> <div class="box vn-w-sm">
<htk-radio-group <htk-radio-group
id="default-address" id="default-address"

2
forms/account/address/ui.xml
View File

@ -32,7 +32,7 @@
tip="_Accept" tip="_Accept"
on-click="iter.performOperations()"/> on-click="iter.performOperations()"/>
</div> </div>
<div id="form" class="address"> <div id="form" class="hedera-address">
<div class="form box vn-w-sm vn-pa-lg"> <div class="form box vn-w-sm vn-pa-lg">
<h5 class="vn-mb-md"> <h5 class="vn-mb-md">
<t>AddEditAddress</t> <t>AddEditAddress</t>

2
forms/ecomerce/catalog/style.scss
View File

@ -17,7 +17,7 @@
} }
} }
.title ._subtitle { .title ._subtitle {
font-size: .7rem; font-size: .85rem;
color: #bbb; color: #bbb;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;

29
forms/news/new/index.js
View File

@ -5,6 +5,7 @@ const tinymce = require('tinymce/tinymce');
require('tinymce/icons/default'); require('tinymce/icons/default');
require('tinymce/themes/silver'); require('tinymce/themes/silver');
require('tinymce/skins/ui/oxide/skin.css'); require('tinymce/skins/ui/oxide/skin.css');
require('tinymce/models/dom');
require('tinymce/plugins/advlist'); require('tinymce/plugins/advlist');
require('tinymce/plugins/code'); require('tinymce/plugins/code');
require('tinymce/plugins/emoticons'); require('tinymce/plugins/emoticons');
@ -48,19 +49,21 @@ export default new Class({
tinymce.init({ tinymce.init({
target: this.$.htmlEditor target: this.$.htmlEditor
,plugins: [ ,plugins:
"advlist autolink lists link image charmap print preview hr" ' advlist autolink lists link image charmap preview'
,"anchor pagebreak searchreplace wordcount visualblocks" +' anchor pagebreak searchreplace wordcount visualblocks'
,"visualchars code fullscreen insertdatetime media nonbreaking" +' visualchars code fullscreen insertdatetime media nonbreaking'
,"save table directionality emoticons template paste" +' save table directionality emoticons template'
]
,toolbar1: ,toolbar1:
" print preview | link image media emoticons blockquote" ' print preview paste'
+" | insertfile undo redo | bold italic" +'|link image media emoticons blockquote hr'
+" | alignleft aligncenter alignright alignjustify" +'|insertfile undo redo'
+" | bullist numlist outdent indent" +'|bold italic'
+" | styleselect | fontselect fontsizeselect" +'|alignleft aligncenter alignright alignjustify'
+" | forecolor backcolor" +'|bullist numlist outdent indent'
+'|styleselect'
+'|fontselect fontsizeselect'
+'|forecolor backcolor '
,image_advtab: true ,image_advtab: true
,init_instance_callback: this._onEditorInit.bind(this) ,init_instance_callback: this._onEditorInit.bind(this)
,skin: false ,skin: false
@ -75,7 +78,7 @@ export default new Class({
_onEditorInit(editor) { _onEditorInit(editor) {
this.editor = editor; this.editor = editor;
editor.getDoc().body.style.fontSize = '1em'; editor.getDoc().body.style.fontSize = '1rem';
this.setEditorText(); this.setEditorText();
}, },

56
forms/news/new/style.scss
View File

@ -1,26 +1,32 @@
.new .box { .hedera-new {
position: relative; .box {
} position: relative;
.new .htk-image { }
height: 100px; .htk-image {
overflow: hidden; height: 100px;
border-bottom: 1px solid #ddd; overflow: hidden;
} border-bottom: 1px solid #ddd;
.new .htk-image > button { }
display: block; .htk-image > button {
} display: block;
.new .htk-image > img { }
margin-top: -40%; .htk-image > img {
width: 100%; margin-top: -40%;
height: initial; width: 100%;
} height: initial;
.new .tag-priority { }
display: flex; .tag-priority {
gap: 16px; display: flex;
} gap: 16px;
.new .tag-priority > *{ }
flex: 1; .tag-priority > *{
} flex: 1;
.new textarea { }
min-height: 500px; textarea {
min-height: 500px;
}
.tox-tinymce {
border: 1px solid #ddd;
border-radius: 0;
}
} }

2
forms/news/new/ui.xml
View File

@ -27,7 +27,7 @@
tip="_Accept" tip="_Accept"
on-click="this.onAcceptClick()"/> on-click="this.onAcceptClick()"/>
</div> </div>
<div id="form" class="new"> <div id="form" class="hedera-new">
<div class="box form vn-w-sm"> <div class="box form vn-w-sm">
<htk-image <htk-image
form="iter" form="iter"

10
forms/news/news/style.scss
View File

@ -1,6 +1,8 @@
.news .item .photo { .hedera-news {
height: 80px; .item .photo {
width: 80px; height: 80px;
border-radius: 10px; width: 80px;
border-radius: 10px;
}
} }

2
forms/news/news/ui.xml
View File

@ -8,7 +8,7 @@
tip="_AddNew" tip="_AddNew"
on-click="hash.setAll({form: 'news/new', new: null})"/> on-click="hash.setAll({form: 'news/new', new: null})"/>
</div> </div>
<div id="form" class="news"> <div id="form" class="hedera-news">
<htk-repeater form-id="iter" class="box htk-list vn-w-sm"> <htk-repeater form-id="iter" class="box htk-list vn-w-sm">
<db-model property="model" id="news-model" updatable="true"> <db-model property="model" id="news-model" updatable="true">
<custom> <custom>

29
js/hedera/login.scss
View File

@ -12,14 +12,14 @@
text-decoration: underline; text-decoration: underline;
} }
input { input {
margin: .3em; margin: 4px;
} }
input[type=text], input[type=text],
input[type=password] { input[type=password] {
margin: 0; margin: 0;
padding: 0 5px; padding: 0 5px;
width: 100%; width: 100%;
height: 2.6em; height: 36px;
border-radius: 0; border-radius: 0;
border-top: none; border-top: none;
border-left: none; border-left: none;
@ -31,7 +31,7 @@
margin: 0; margin: 0;
width: initial; width: initial;
height: initial; height: initial;
margin-right: .5em; margin-right: 7px;
} }
input[type=submit], input[type=submit],
input[type=button], input[type=button],
@ -75,9 +75,9 @@ $login-margin-between: 55px;
.version-code { .version-code {
color: red; color: red;
text-align: right; text-align: right;
margin: .2em auto; margin: 3px auto;
font-weight: bold; font-weight: bold;
height: 1.4em; height: 20px;
display: none; display: none;
} }
} }
@ -128,15 +128,22 @@ $login-margin-between: 55px;
position: relative; position: relative;
} }
.wrapper { .wrapper {
width: 0; }
overflow: visible; ._submit {
position: absolute; position: relative;
top: 0;
right: 0;
} }
.htk-spinner { .htk-spinner {
margin: .3em 1em; width: 24px;
height: 24px;
position: absolute; position: absolute;
top: 50%;
margin-top: -12px;
right: 24px;
& > .spinner {
border-top-color: white;
border-left-color: white;
}
} }
} }
} }

6
js/hedera/login.xml
View File

@ -27,10 +27,10 @@
</label> </label>
</div> </div>
<div class="enter"> <div class="enter">
<input id="submit" type="submit" value="_Login"/> <button id="submit" type="submit">
<div class="wrapper"> <t>Login</t>
<htk-spinner id="spinner"/> <htk-spinner id="spinner"/>
</div> </button>
</div> </div>
<div> <div>
<a class="button guest" href="#!form=cms/home&amp;guest=true"> <a class="button guest" href="#!form=cms/home&amp;guest=true">

4
js/htk/spinner/style.scss
View File

@ -1,7 +1,7 @@
.htk-spinner { .htk-spinner {
width: 1.8em; width: 25px;
height: 1.8em; height: 25px;
position: relative; position: relative;
display: inline-block; display: inline-block;

129
package-lock.json generated
View File

@ -1,19 +1,19 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "22.46.9", "version": "22.46.19",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "hedera-web", "name": "hedera-web",
"version": "22.46.9", "version": "22.46.19",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"js-yaml": "^3.12.1", "js-yaml": "^3.12.1",
"mootools": "^1.5.2", "mootools": "^1.5.2",
"promise-polyfill": "^8.2.3", "promise-polyfill": "^8.2.3",
"require-yaml": "0.0.1", "require-yaml": "0.0.1",
"tinymce": "^5.10.6" "tinymce": "^6.3.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-env": "^7.20.2", "@babel/preset-env": "^7.20.2",
@ -28,6 +28,7 @@
"glob": "^8.0.3", "glob": "^8.0.3",
"html-webpack-plugin": "^5.5.0", "html-webpack-plugin": "^5.5.0",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"mini-css-extract-plugin": "^2.7.0",
"node-sass": "^7.0.1", "node-sass": "^7.0.1",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
"sass-loader": "^12.6.0", "sass-loader": "^12.6.0",
@ -6329,6 +6330,72 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/mini-css-extract-plugin": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.0.tgz",
"integrity": "sha512-auqtVo8KhTScMsba7MbijqZTfibbXiBNlPAQbsVt7enQfcDYLdgG57eGxMqwVU3mfeWANY4F1wUg+rMF+ycZgw==",
"dev": true,
"dependencies": {
"schema-utils": "^4.0.0"
},
"engines": {
"node": ">= 12.13.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
},
"peerDependencies": {
"webpack": "^5.0.0"
}
},
"node_modules/mini-css-extract-plugin/node_modules/ajv": {
"version": "8.11.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
"integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
"dev": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
"require-from-string": "^2.0.2",
"uri-js": "^4.2.2"
},
"funding": {
"type": "github",
"url": "https://github.com/sponsors/epoberezkin"
}
},
"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
"dev": true,
"dependencies": {
"fast-deep-equal": "^3.1.3"
},
"peerDependencies": {
"ajv": "^8.8.2"
}
},
"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.9",
"ajv": "^8.8.0",
"ajv-formats": "^2.1.1",
"ajv-keywords": "^5.0.0"
},
"engines": {
"node": ">= 12.13.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
}
},
"node_modules/minimalistic-assert": { "node_modules/minimalistic-assert": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@ -8881,9 +8948,9 @@
"dev": true "dev": true
}, },
"node_modules/tinymce": { "node_modules/tinymce": {
"version": "5.10.6", "version": "6.3.0",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.6.tgz", "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.3.0.tgz",
"integrity": "sha512-bnF2LUoycDsoZZLQBNHbOijrmoJuEeR1rQdqgo4s77BedufpOVnDh00OZKbseHeTMCxhVH05wvOqxLsi6vpeZw==" "integrity": "sha512-UeOKdbDbBoAT2A8WQr/D4AqzqPloTY/B/zJXCGlPz5L4YOmwUCqXAFTxN1tkysRq994UIZZUJZezC7WmCDx5ag=="
}, },
"node_modules/to-fast-properties": { "node_modules/to-fast-properties": {
"version": "2.0.0", "version": "2.0.0",
@ -14574,6 +14641,50 @@
"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
"dev": true "dev": true
}, },
"mini-css-extract-plugin": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.0.tgz",
"integrity": "sha512-auqtVo8KhTScMsba7MbijqZTfibbXiBNlPAQbsVt7enQfcDYLdgG57eGxMqwVU3mfeWANY4F1wUg+rMF+ycZgw==",
"dev": true,
"requires": {
"schema-utils": "^4.0.0"
},
"dependencies": {
"ajv": {
"version": "8.11.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
"integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
"require-from-string": "^2.0.2",
"uri-js": "^4.2.2"
}
},
"ajv-keywords": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.3"
}
},
"schema-utils": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
"ajv": "^8.8.0",
"ajv-formats": "^2.1.1",
"ajv-keywords": "^5.0.0"
}
}
}
},
"minimalistic-assert": { "minimalistic-assert": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@ -16509,9 +16620,9 @@
"dev": true "dev": true
}, },
"tinymce": { "tinymce": {
"version": "5.10.6", "version": "6.3.0",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.6.tgz", "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.3.0.tgz",
"integrity": "sha512-bnF2LUoycDsoZZLQBNHbOijrmoJuEeR1rQdqgo4s77BedufpOVnDh00OZKbseHeTMCxhVH05wvOqxLsi6vpeZw==" "integrity": "sha512-UeOKdbDbBoAT2A8WQr/D4AqzqPloTY/B/zJXCGlPz5L4YOmwUCqXAFTxN1tkysRq994UIZZUJZezC7WmCDx5ag=="
}, },
"to-fast-properties": { "to-fast-properties": {
"version": "2.0.0", "version": "2.0.0",

5
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "22.48.0", "version": "22.48.1",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {
@ -20,6 +20,7 @@
"glob": "^8.0.3", "glob": "^8.0.3",
"html-webpack-plugin": "^5.5.0", "html-webpack-plugin": "^5.5.0",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"mini-css-extract-plugin": "^2.7.0",
"node-sass": "^7.0.1", "node-sass": "^7.0.1",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
"sass-loader": "^12.6.0", "sass-loader": "^12.6.0",
@ -36,7 +37,7 @@
"mootools": "^1.5.2", "mootools": "^1.5.2",
"promise-polyfill": "^8.2.3", "promise-polyfill": "^8.2.3",
"require-yaml": "0.0.1", "require-yaml": "0.0.1",
"tinymce": "^5.10.6" "tinymce": "^6.3.0"
}, },
"scripts": { "scripts": {
"front": "webpack serve --open", "front": "webpack serve --open",

14
webpack.config.js
View File

@ -1,6 +1,7 @@
const path = require('path'); const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const AssetsWebpackPlugin = require('assets-webpack-plugin'); const AssetsWebpackPlugin = require('assets-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const merge = require('webpack-merge').merge; const merge = require('webpack-merge').merge;
const wpConfig = require('./webpack.config.json'); const wpConfig = require('./webpack.config.json');
@ -27,9 +28,17 @@ const baseConfig = {
presets: ['@babel/preset-env'] presets: ['@babel/preset-env']
} }
} }
}, {
test: /tinymce\/.*\/skin\.css$/i,
use: [MiniCssExtractPlugin.loader, 'css-loader']
}, {
test: /tinymce\/.*\/content\.css$/i,
loader: 'css-loader',
options: {esModule: false}
}, { }, {
test: /\.css$/, test: /\.css$/,
use: [/*'style-loader', */'css-loader'], use: ['style-loader', 'css-loader'],
exclude: [/node_modules/]
}, { }, {
test: /\.yml$/, test: /\.yml$/,
use: ['json-loader', 'yaml-loader'] use: ['json-loader', 'yaml-loader']
@ -74,7 +83,8 @@ const baseConfig = {
_DEV_MODE: devMode, _DEV_MODE: devMode,
_DEV_SERVER_PORT: wpConfig.devServerPort, _DEV_SERVER_PORT: wpConfig.devServerPort,
_PUBLIC_PATH: JSON.stringify(publicPath) _PUBLIC_PATH: JSON.stringify(publicPath)
}) }),
new MiniCssExtractPlugin()
], ],
optimization: { optimization: {
runtimeChunk: true, runtimeChunk: true,