Skip to content
Merged
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
27 changes: 27 additions & 0 deletions .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Code Layout

on: push

jobs:
code_style_python:
name: Python code convention check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: psf/black@stable
with:
options: "--check --verbose --diff"
src: "./server"

code_style_js:
name: JavaScript code convention check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- name: Check JS
run: |
cd web-app
yarn install
yarn run lint:all
3 changes: 3 additions & 0 deletions LICENSES/CLA-signed-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ C/ My company has custom contribution contract with Lutra Consulting Ltd. or I a

* PeterPetrik, 31st March 2023
* tomasMizera, 31st March 2023
* MarcelGeo, 19th April 2023
* harminius, 18th Aril 2023
* varmar05, 12th April 2023
* lavor, 26th April 2023
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
</p>

<p align="center">
<img src="https://img.shields.io/badge/License-Dual AGPL3 and MM Commercial licence-blue">
<img src="https://img.shields.io/badge/License-Dual AGPL3 and MM Commercial licence-blue"> <br />
[![Code Layout](https://github.com/MerginMaps/mergin/actions/workflows/code_style.yml/badge.svg)](https://github.com/MerginMaps/mergin/actions/workflows/code_style.yml)
</p>

## About
Expand Down
3 changes: 3 additions & 0 deletions web-app/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
presets: ['@vue/cli-plugin-babel/preset']
}
4 changes: 2 additions & 2 deletions web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"build:admin:dev": "yarn workspace @mergin/admin-app build:dev",
"clean:libs": "yarn workspace @mergin/lib clean && yarn workspace @mergin/admin-lib clean",
"clean:libs:noadmin": "yarn workspace @mergin/lib clean",
"lint": "yarn workspace @mergin/app lint",
"i18n:report": "yarn workspace @mergin/app 18n:report",
"types:libs": "yarn workspaces run build:types",
"types:lib": "yarn workspace @mergin/lib build:types",
"types:admin-lib": "yarn workspace @mergin/admin-lib build:types",
"watch:lib": "yarn workspace @mergin/lib build:lib:watch",
"watch:admin-lib": "yarn workspace @mergin/admin-lib build:lib:watch"
"watch:admin-lib": "yarn workspace @mergin/admin-lib build:lib:watch",
"lint:all": "yarn workspaces run lint"
},
"devDependencies": {
"@babel/core": "^7.17.9",
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/admin-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"build:lib:all:prod": "yarn build:lib:prod && yarn build:types",
"build:types": "echo 'Not defined script'",
"clean": "echo 'Nothing to clean.'",
"lint": "vue-cli-service lint --fix",
"lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts",
"i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'"
},
"dependencies": {
Expand Down
4 changes: 1 addition & 3 deletions web-app/packages/admin-lib/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
module.exports = {
root: true,
env: {
node: true
},
extends: [
'plugin:vue/essential',
'eslint:recommended',
'@vue/typescript/recommended',
'../../.eslintrc.js'
'@vue/typescript/recommended'
],
parser: 'vue-eslint-parser',
parserOptions: {
Expand Down
4 changes: 4 additions & 0 deletions web-app/packages/admin-lib/.eslintrc.lint.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: '.eslintrc.js'
}
2 changes: 1 addition & 1 deletion web-app/packages/admin-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"clean:lib": "rimraf ./dist",
"clean:types:temp": "rimraf ./**/*.vue.ts",
"clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp",
"lint": "vue-cli-service lint"
"lint": "eslint . --config .eslintrc.lint.js ../../.eslintrc.js --no-eslintrc --ext .js,.vue,.ts"
},
"dependencies": {
"@mergin/lib": "file:../lib",
Expand Down
2 changes: 1 addition & 1 deletion web-app/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"build:lib:all": "yarn build:lib && yarn build:types",
"build:lib:all:prod": "yarn build:lib:prod && yarn build:types",
"clean": "echo 'Nothing to clean.'",
"lint": "vue-cli-service lint --fix",
"lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts",
"i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'"
},
"dependencies": {
Expand Down
4 changes: 1 addition & 3 deletions web-app/packages/lib/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
module.exports = {
root: true,
env: {
node: true
},
extends: [
'plugin:vue/essential',
'eslint:recommended',
'@vue/typescript/recommended',
'../../.eslintrc.js'
'@vue/typescript/recommended'
],
parser: 'vue-eslint-parser',
parserOptions: {
Expand Down
4 changes: 4 additions & 0 deletions web-app/packages/lib/.eslintrc.lint.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: '.eslintrc.js'
}
2 changes: 1 addition & 1 deletion web-app/packages/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"clean:lib": "rimraf ./dist",
"clean:types:temp": "rimraf ./**/*.vue.ts",
"clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp",
"lint": "vue-cli-service lint"
"lint": "eslint . -c ./.eslintrc.lint.js ../../.eslintrc.js --no-eslintrc --ext .js,.vue,.ts"
},
"dependencies": {
"axios": "^0.26.1",
Expand Down