Skip to content

Commit

Permalink
Fix/tabs page (#661)
Browse files Browse the repository at this point in the history
* fix: remove hardcoded icon-class from app-sidebar

* feat: add button, that allows to revert color changes made from ui

* feat: add button, that allows to revert color changes made from ui (#659)

* fix: reworked tabs page

* feat: pwa (#668)

* feat: pwa
* update lock

* Feat: stylelint support (#666)

* feat: add button, that allows to revert color changes made from ui

* feat: added stylelint suport

* remove stylelint log

* update yarn.lock

* add color rules to stylelint config

* direct CI to another hosting

* add server ip to known hosts

* merge master into branch

* update services imports

* remove unused files

* try to fix import vuestic-ui in es5

* update imports from vuestic-ui

* fix vue-config.remove unused dependencies

* fix ie11

* remove unused dependencies

* update dev dependencies

* update main dependencies

* remove unsupported browser from browserlist

* update node package for circleci

* Fix/navbar poblems (#685)

* add iconset iconst to app

* remove vuestic-ui iconset imports

* add va-navbar component from vuestic-ui to app

* update navbar styles

* merge app-navbar and va-navbar

* replace navbar actions to separate file

* refactor app-navbar for remove bootstrap classes

* remove global position-relative class

* fix navigation styles

* remove unused styles

* remove unused app-topbar components

* fix z-index app-navbar

* remove header-selector component

* replace app-navbar-action component

* fix name of shift-color function in app-navbar

* fix alignmens icons in app-navbar-actions

* remove unused topbar-link components

* fix import color-function to app-navbar

* add tamplate indentation eslint rule

* replace color-shift-hsl function to services.update themes values
  • Loading branch information
ssemenkoff authored and asvae committed Nov 29, 2019
1 parent 8423f0f commit 3c3ef49
Show file tree
Hide file tree
Showing 99 changed files with 10,725 additions and 7,937 deletions.
2 changes: 1 addition & 1 deletion .browserslistrc
@@ -1,3 +1,3 @@
> 1%
last 2 versions
not ie <= 8
ie 11
17 changes: 10 additions & 7 deletions .circleci/config.yml
Expand Up @@ -16,7 +16,7 @@ aliases:

docker: &docker
docker:
- image: circleci/node:10.12.0
- image: circleci/node:10.13.0

defaults: &defaults
<<: *docker
Expand Down Expand Up @@ -47,15 +47,18 @@ jobs:
- run: *install_dependencies
- save_cache: *save_cache
- run: yarn build
- add_ssh_keys:
fingerprints:
- "f8:c0:94:79:68:a2:5e:33:9f:78:bc:ad:ed:86:c6:3c"
- run:
name: Add $SERVER_IP to known_hosts
command: ssh-keyscan -H $SERVER_IP >> ~/.ssh/known_hosts
- run:
name: Deploy to hosting
# DEPLOY_PATH here is for staging only
# This doesn't really work. Has to be done manually for now. ssh-keyscan -t rsa -H -F "[$SERVER_IP]:$SERVER_PORT"
command: |
tar -czf dist.tar.gz ~/repo/dist -C ~/repo/dist .
sudo apt install sshpass
sshpass -p $SERVER_PASSWORD scp -P $SERVER_PORT ~/repo/dist.tar.gz $SERVER_USERNAME@$SERVER_IP:~/tmp
sshpass -p $SERVER_PASSWORD ssh -p $SERVER_PORT $SERVER_USERNAME@$SERVER_IP /bin/bash << EOF
scp ~/repo/dist.tar.gz $SERVER_USER@$SERVER_IP:~/tmp
ssh $SERVER_USER@$SERVER_IP /bin/bash << EOF
rm -rf $DEPLOY_PATH/*
tar -xzf ~/tmp/dist.tar.gz -C $DEPLOY_PATH
rm -f ~/tmp/dist.tar.gz
Expand Down Expand Up @@ -98,7 +101,7 @@ workflows:
- deploy-staging:
requires:
- test
context: vuestic-staging
context: vuestic-admin-staging
filters:
branches:
only: develop
Expand Down
14 changes: 12 additions & 2 deletions .eslintrc.js
Expand Up @@ -3,17 +3,27 @@ module.exports = {
env: {
node: true,
},
'extends': [
'plugin:vue/essential',
extends: [
'@vue/standard',
'plugin:vue/essential',
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'comma-dangle': ['error', 'always-multiline'],
'curly': 'error',
'vue/html-indent': ['error', 2, {
'attribute': 1,
'baseIndent': 1,
'closeBracket': 0,
'alignAttributesVertically': false,
'ignores': []
}]
},
parserOptions: {
parser: 'babel-eslint',
},
globals: {
'workbox': 'readonly',
},
}
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -10,6 +10,7 @@ node_modules
npm-debug.log*
yarn-debug.log*
yarn-error.log*
stylelintOutput.log*
inspect.js

# Editor directories and files
Expand Down
11 changes: 11 additions & 0 deletions .stylelintrc
@@ -0,0 +1,11 @@
{
"extends": ["stylelint-config-standard", "stylelint-config-recommended-scss"],
"rules": {
"no-empty-source": null,
"font-family-no-missing-generic-family-keyword": null,
"block-no-empty": null,
"no-descending-specificity": null,
"color-hex-length": "long",
"color-hex-case": "lower"
}
}
7 changes: 5 additions & 2 deletions babel.config.js
@@ -1,5 +1,8 @@
module.exports = {
presets: [
presets: [[
'@vue/app',
],
{
'useBuiltIns': 'entry',
},
]],
}

0 comments on commit 3c3ef49

Please sign in to comment.