Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HtmlBlock card and Travis build fixes #93

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ src/langs/*.js
# Dependency directories
node_modules/
jspm_packages/
package-lock.json

# Typescript v1 declaration files
typings/
Expand Down
17,090 changes: 17,090 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"webextension-polyfill": "^0.5.0"
},
"devDependencies": {
"@babel/parser": "^7.7.5",
"@vue/cli": "^3.12.0",
"@vue/cli-plugin-babel": "^3.12.0",
"@vue/cli-plugin-eslint": "^3.12.0",
Expand All @@ -37,7 +38,7 @@
"copy-webpack-plugin": "^5.0.4",
"cross-env": "^6.0.3",
"glob": "^7.1.4",
"node-sass": "^4.12.0",
"node-sass": "^4.13.0",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"prerender-spa-plugin": "^3.4.0",
"sass-loader": "^7.3.1",
Expand All @@ -48,6 +49,9 @@
"vuetify-loader": "^1.2.2",
"zip-a-folder": "0.0.9"
},
"resolutions": {
"@babel/parser": "7.7.5"
},
"browserslist": [
"Firefox >= 54",
"Chrome >= 54"
Expand Down
12 changes: 12 additions & 0 deletions src/cards/HtmlBlock/index.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<template>
<div id="html-block">
<div v-if="html.length" v-html="html" :style="{ height: height, padding: padding }"></div>
<v-card-text v-else>
<div class="text-xs-center">
<h2 v-t="'HtmlBlock.empty'" class="subheading"/>
</div>
</v-card-text>
</div>
</template>
<script src="./main.js"></script>
<style lang="scss" rel='stylesheet/scss' src="./style.scss" scoped></style>
13 changes: 13 additions & 0 deletions src/cards/HtmlBlock/langs/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"title": "Html block",
"description": "Show custom HTML block in card",
"empty": "Please set HTML in settings",
"loading": "Loading...",
"settings": {
"cardName": "Card title",
"html": "HTML code. <script> tags will be ignored. If you need to run JS you can use JS-playground service and copy embedded result code there as <iframe> tag.",
"padding": "block padding",
"height": "Block height",
"autoHeight": "Automatic block height"
}
}
13 changes: 13 additions & 0 deletions src/cards/HtmlBlock/langs/uk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"title": "HTML block",
"description": "Відображення довільного HTML коду",
"empty": "Вкажіть HTML у налаштуваннях",
"loading": "Завантаження...",
"settings": {
"cardName": "Назва картки",
"html": "HTML код. Теги <script> ігноруються. Якщо вам потрібне виконання JS - скористайтеся сервісом JS-playground та скопіюйте встроюваний (embedded) код результата виконнання у вигляді <iframe>.",
"padding": "Відступ блока",
"height": "Висота",
"autoHeight": "Автоматична висота блока"
}
}
33 changes: 33 additions & 0 deletions src/cards/HtmlBlock/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// @vue/component
export default {
name: 'HtmlBlock',
props: {
settings: {
type: Object,
required: true,
},
},
data() {
return {
padding: '5px',
height: 'auto',
html: '',
};
},
created() {
this.$emit('update:cardtitle', this.settings.cardName);

if (this.settings.html) {
this.html = this.settings.html;
}

this.padding = `${this.settings.padding}px`;
if (this.settings.autoHeight) {
this.height = 'auto';
} else {
this.height = `${this.settings.height}px`;
}
},
methods: {
},
};
10 changes: 10 additions & 0 deletions src/cards/HtmlBlock/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"settings": {
"cardName": "HTML Block",
"html": "",
"autoHeight": true,
"padding": 5,
"height": 0
},
"allowMultiple": true
}
15 changes: 15 additions & 0 deletions src/cards/HtmlBlock/settings.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// @vue/component
export default {
name: 'HtmlBlock',
data() {
return {
settings: {
cardName: 'HTML Block',
html: '',
autoHeight: true,
height: 0,
padding: 0,
},
};
},
};
29 changes: 29 additions & 0 deletions src/cards/HtmlBlock/settings.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<template>
<v-card-text>
<h4 v-t="'HtmlBlock.settings.cardName'" class="subheading"/>
<v-text-field
v-model="settings.cardName"/>
<h4 v-t="'HtmlBlock.settings.html'" class="subheading"/>
<v-textarea
v-model="settings.html"
:rows="5"
auto-grow
box
/>
<h4 v-t="'HtmlBlock.settings.padding'" class="subheading"/>
<v-text-field
v-model="settings.padding"
type="number"
:min="0"
:max="200" />
<h4 v-t="'HtmlBlock.settings.height'" class="subheading"/>
<v-checkbox v-model="settings.autoHeight" :label="$t('HtmlBlock.settings.autoHeight')"></v-checkbox>
<v-text-field
v-if="!settings.autoHeight"
v-model="settings.height"
type="number"
:min="0"
:max="1000" />
</v-card-text>
</template>
<script src="./settings.js"></script>
3 changes: 3 additions & 0 deletions src/cards/HtmlBlock/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#html-block {
overflow-y: auto;
}
8 changes: 4 additions & 4 deletions src/cards/Translate/langs/uk.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "переводити",
"auto": "автоматичний",
"title": "Перекладач",
"auto": "Автовизначення",
"from_ph": "Введіть текст",
"to_ph": "переклад",
"copied": "скопійований"
"to_ph": "Переклад",
"copied": "Скопійовано"
}
4 changes: 2 additions & 2 deletions src/i18n/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"Сподіваюсь у тебе все добре",
"Хтось думає про тебе ;)",
"Привіт!",
"Спробуй посміїатись, це працює!",
"Спробуй посміхатись, це працює!",
"Ви знали, що ви супер?",
"А чому б нам не підняти мотивацію?",
"Давай друже!",
Expand All @@ -61,7 +61,7 @@
"header": "Заголовок",
"browse": "Переглянути",
"theme": "Тема",
"analytics_desc": "Просто щоб бачити, як си використовуєте картки",
"analytics_desc": "Просто щоб бачити, як ви використовуєте картки",
"custom_css": "Власний CSS",
"custom_css_desc": "Вставте URL адресу вашого CSS файла, наприклад https://example.com/style.css",
"custom_css_warning": "Увага! CSS налаштуваання для досвідчених користувачів, залиште порожнім для теми за замовчуванням",
Expand Down
23 changes: 14 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,15 @@
esutils "^2.0.2"
js-tokens "^4.0.0"

"@babel/parser@^7.0.0", "@babel/parser@^7.1.6", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
version "7.6.4"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
"@babel/[email protected]", "@babel/parser@^7.0.0", "@babel/parser@^7.1.6", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
version "7.7.5"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==

"@babel/parser@^7.7.5":
version "7.8.8"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4"
integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==

"@babel/plugin-proposal-async-generator-functions@^7.2.0":
version "7.2.0"
Expand Down Expand Up @@ -7504,10 +7509,10 @@ node-releases@^1.1.36:
dependencies:
semver "^6.3.0"

node-sass@^4.12.0:
version "4.12.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
node-sass@^4.13.0:
version "4.13.1"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
Expand All @@ -7516,7 +7521,7 @@ node-sass@^4.12.0:
get-stdin "^4.0.1"
glob "^7.0.3"
in-publish "^2.0.0"
lodash "^4.17.11"
lodash "^4.17.15"
meow "^3.7.0"
mkdirp "^0.5.1"
nan "^2.13.2"
Expand Down