chore(clean): Fixed formatting, enforce prettier rules + new version.
This commit is contained in:
parent
7d3e47494f
commit
e2d499d053
18
.eslintrc.js
18
.eslintrc.js
|
@ -17,11 +17,11 @@ module.exports = {
|
||||||
project: resolve(__dirname, './tsconfig.json'),
|
project: resolve(__dirname, './tsconfig.json'),
|
||||||
tsconfigRootDir: __dirname,
|
tsconfigRootDir: __dirname,
|
||||||
ecmaVersion: 2019, // Allows for the parsing of modern ECMAScript features
|
ecmaVersion: 2019, // Allows for the parsing of modern ECMAScript features
|
||||||
sourceType: 'module' // Allows for the use of imports
|
sourceType: 'module', // Allows for the use of imports
|
||||||
},
|
},
|
||||||
|
|
||||||
env: {
|
env: {
|
||||||
browser: true
|
browser: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
// Rules order is important, please avoid shuffling them
|
// Rules order is important, please avoid shuffling them
|
||||||
|
@ -44,7 +44,7 @@ module.exports = {
|
||||||
|
|
||||||
// https://github.com/prettier/eslint-config-prettier#installation
|
// https://github.com/prettier/eslint-config-prettier#installation
|
||||||
// usage with Prettier, provided by 'eslint-config-prettier'.
|
// usage with Prettier, provided by 'eslint-config-prettier'.
|
||||||
'prettier', //'plugin:prettier/recommended'
|
'plugin:prettier/recommended',
|
||||||
],
|
],
|
||||||
|
|
||||||
plugins: [
|
plugins: [
|
||||||
|
@ -54,10 +54,6 @@ module.exports = {
|
||||||
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file
|
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file
|
||||||
// required to lint *.vue files
|
// required to lint *.vue files
|
||||||
'vue',
|
'vue',
|
||||||
|
|
||||||
// https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
|
|
||||||
// Prettier has not been included as plugin to avoid performance impact
|
|
||||||
// add it as an extension for your IDE
|
|
||||||
],
|
],
|
||||||
|
|
||||||
// add your custom rules here
|
// add your custom rules here
|
||||||
|
@ -66,10 +62,8 @@ module.exports = {
|
||||||
|
|
||||||
// TypeScript
|
// TypeScript
|
||||||
quotes: ['warn', 'single', { avoidEscape: true }],
|
quotes: ['warn', 'single', { avoidEscape: true }],
|
||||||
'@typescript-eslint/explicit-function-return-type': 'off',
|
|
||||||
'@typescript-eslint/explicit-module-boundary-types': 'off',
|
|
||||||
|
|
||||||
// allow debugger during development only
|
// allow debugger during development only
|
||||||
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
|
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
|
|
82
package.json
82
package.json
|
@ -1,41 +1,45 @@
|
||||||
{
|
{
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "1.0.0-alpha.2",
|
"version": "1.0.0-alpha.3",
|
||||||
"name": "@flaschengeist/users",
|
"name": "@flaschengeist/users",
|
||||||
"author": "Ferdinand Thiessen <rpm@fthiessen.de>",
|
"author": "Ferdinand Thiessen <rpm@fthiessen.de>",
|
||||||
"homepage": "https://flaschengeist.dev/Flaschengeist",
|
"homepage": "https://flaschengeist.dev/Flaschengeist",
|
||||||
"description": "Flaschengeist users plugin",
|
"description": "Flaschengeist users plugin",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://flaschengeist.dev/Flaschengeist/flaschengeist/issues"
|
"url": "https://flaschengeist.dev/Flaschengeist/flaschengeist/issues"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://flaschengeist.dev/Flaschengeist/flaschengeist-users"
|
"url": "https://flaschengeist.dev/Flaschengeist/flaschengeist-users"
|
||||||
},
|
},
|
||||||
"main": "src/index.ts",
|
"main": "src/index.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"pretty": "prettier --config ./package.json --write '{,!(node_modules)/**/}*.{ts,vue}'",
|
"format": "prettier --config ./package.json --write '{,!(node_modules|.*)/**/}*.{js,ts,vue}'",
|
||||||
"lint": "eslint --ext .js,.ts,.vue ./src"
|
"lint": "eslint --ext .js,.ts,.vue ./src"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@flaschengeist/types": "^1.0.0-alpha.9",
|
"@flaschengeist/api": "^1.0.0-alpha.7",
|
||||||
"@quasar/app": "^3.2.3",
|
"@flaschengeist/types": "^1.0.0-alpha.10",
|
||||||
"@typescript-eslint/eslint-plugin": "^5.4.0",
|
"@quasar/app": "^3.2.4",
|
||||||
"@typescript-eslint/parser": "^5.4.0",
|
"@typescript-eslint/eslint-plugin": "^5.5.0",
|
||||||
"eslint": "^8.3.0",
|
"@typescript-eslint/parser": "^5.5.0",
|
||||||
"eslint-config-prettier": "^8.3.0",
|
"axios": "^0.24.0",
|
||||||
"eslint-plugin-vue": "^8.1.1",
|
"eslint": "^8.4.0",
|
||||||
"prettier": "^2.5.0",
|
"eslint-config-prettier": "^8.3.0",
|
||||||
"quasar": "^2.3.3",
|
"eslint-plugin-prettier": "^4.0.0",
|
||||||
"typescript": "^4.5.2"
|
"eslint-plugin-vue": "^8.1.1",
|
||||||
},
|
"pinia": "^2.0.6",
|
||||||
"peerDependencies": {
|
"prettier": "^2.5.1",
|
||||||
"@flaschengeist/api": "^1.0.0-alpha.6"
|
"quasar": "^2.3.3",
|
||||||
},
|
"typescript": "^4.5.2"
|
||||||
"prettier": {
|
},
|
||||||
"singleQuote": true,
|
"peerDependencies": {
|
||||||
"semi": true,
|
"@flaschengeist/api": "^1.0.0-alpha.7"
|
||||||
"printWidth": 100,
|
},
|
||||||
"arrowParens": "always"
|
"prettier": {
|
||||||
}
|
"singleQuote": true,
|
||||||
|
"semi": true,
|
||||||
|
"printWidth": 100,
|
||||||
|
"arrowParens": "always"
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ export default defineComponent({
|
||||||
const emptyUser = {
|
const emptyUser = {
|
||||||
userid: '',
|
userid: '',
|
||||||
display_name: '',
|
display_name: '',
|
||||||
|
deleted: false,
|
||||||
firstname: '',
|
firstname: '',
|
||||||
lastname: '',
|
lastname: '',
|
||||||
mail: '',
|
mail: '',
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
map-options
|
map-options
|
||||||
clearable
|
clearable
|
||||||
@new-value="createRole"
|
@new-value="createRole"
|
||||||
@update:modelValue="updateRole"
|
@update:model-value="updateRole"
|
||||||
@clear="removeRole"
|
@clear="removeRole"
|
||||||
/>
|
/>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
@ -30,7 +30,7 @@
|
||||||
:options="permissions"
|
:options="permissions"
|
||||||
color="primary"
|
color="primary"
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
@update:modelValue="updatePermissions"
|
@update:model-value="updatePermissions"
|
||||||
/>
|
/>
|
||||||
</q-scroll-area>
|
</q-scroll-area>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|
|
@ -54,7 +54,7 @@ import { useMainStore, useSessionStore } from '@flaschengeist/api';
|
||||||
import { date } from 'quasar';
|
import { date } from 'quasar';
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'Session',
|
name: 'UserSession',
|
||||||
props: {
|
props: {
|
||||||
modelValue: {
|
modelValue: {
|
||||||
required: true,
|
required: true,
|
|
@ -8,7 +8,7 @@
|
||||||
<MainUserSettings :user="currentUser" @update:user="updateUser" />
|
<MainUserSettings :user="currentUser" @update:user="updateUser" />
|
||||||
</q-card>
|
</q-card>
|
||||||
<div class="col-12 text-left text-h6">Aktive Sessions:</div>
|
<div class="col-12 text-left text-h6">Aktive Sessions:</div>
|
||||||
<Session
|
<user-session
|
||||||
v-for="(session, index) in sessions"
|
v-for="(session, index) in sessions"
|
||||||
:key="'session' + index"
|
:key="'session' + index"
|
||||||
v-model="sessions[index]"
|
v-model="sessions[index]"
|
||||||
|
@ -22,12 +22,12 @@
|
||||||
import { useMainStore, useUserStore, useSessionStore } from '@flaschengeist/api';
|
import { useMainStore, useUserStore, useSessionStore } from '@flaschengeist/api';
|
||||||
import MainUserSettings from '../components/settings/MainUserSettings.vue';
|
import MainUserSettings from '../components/settings/MainUserSettings.vue';
|
||||||
import { defineComponent, onBeforeMount, ref } from 'vue';
|
import { defineComponent, onBeforeMount, ref } from 'vue';
|
||||||
import Session from '../components/settings/Session.vue';
|
import UserSession from '../components/settings/UserSession.vue';
|
||||||
import { Notify } from 'quasar';
|
import { Notify } from 'quasar';
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: 'UserSettings',
|
name: 'UserSettings',
|
||||||
components: { Session, MainUserSettings },
|
components: { MainUserSettings, UserSession },
|
||||||
setup() {
|
setup() {
|
||||||
const mainStore = useMainStore();
|
const mainStore = useMainStore();
|
||||||
const sessionStore = useSessionStore();
|
const sessionStore = useSessionStore();
|
||||||
|
|
Loading…
Reference in New Issue