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

fix(webapp): Fix component file name #763

Merged
merged 4 commits into from
Aug 2, 2023
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
17 changes: 15 additions & 2 deletions www/webapp/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,27 @@ module.exports = {
env: {
browser: true,
node: true, // Can be removed after migration to vite.
es2022: true,
es2024: true,
},
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
},
extends: [
'plugin:vue/essential',
// 'plugin:vue/strongly-recommended',
// 'plugin:vue/recommended',
'plugin:vuetify/base',
'eslint:recommended'
'plugin:import/recommended',
'eslint:recommended',
],
settings: {
'import/resolver': {
alias: {
map: [['@', './src']],
},
},
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
Expand All @@ -26,6 +38,7 @@ module.exports = {
'vue/no-deprecated-filter': 'warn', // Preparation for vue3
'vue/no-deprecated-v-on-number-modifiers': 'warn', // Preparation for vue3
'vue/no-deprecated-html-element-is': 'warn', // Preparation for vue3
'vue/match-component-file-name': ['error', {'extensions': ['vue'], 'shouldMatchCase': true}],
},
ignorePatterns: ['**/src/modules/**/*'],
}
6 changes: 4 additions & 2 deletions www/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "eslint --ignore-path .gitignore --no-fix src/",
"lint:fix": "eslint --ignore-path .gitignore --fix src/"
"lint": "eslint --ignore-path .gitignore --no-fix src/**/*.{vue,js,json}",
"lint:fix": "eslint --ignore-path .gitignore --fix src/**/*.{vue,js,json}"
},
"dependencies": {
"@fontsource/roboto": "^5.0.3",
Expand All @@ -26,6 +26,8 @@
"@vue/cli-plugin-router": "^5.0.8",
"@vue/cli-service": "^5.0.8",
"eslint": "^8.31.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-vue": "^9.8.0",
"eslint-plugin-vuetify": "^1.1.0",
"sass": "~1.32.13",
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/components/ActivateAccountActionHandler.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

<script>
import axios from 'axios';
import GenericActionHandler from "./GenericActionHandler"
import GenericActionHandler from "./GenericActionHandler.vue"

const HTTP = axios.create({
baseURL: '/api/v1/',
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/components/CreateTOTPActionHandler.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import GenericActionHandler from "./GenericActionHandler"
import GenericActionHandler from "./GenericActionHandler.vue"

export default {
name: 'CreateTOTPActionHandler',
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/components/DonateDirectDebitForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
import axios from 'axios';
import {email_pattern} from '@/validation';
import {digestError} from '@/utils';
import ErrorAlert from '@/components/ErrorAlert';
import ErrorAlert from '@/components/ErrorAlert.vue';
import {mdiAccount, mdiBank, mdiCash100, mdiEmail, mdiMessageTextOutline} from "@mdi/js";

const HTTP = axios.create({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { ipAddress } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

export default {
name: 'RecordA',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

// from https://stackoverflow.com/a/17871737/6867099, without the '%' and '.' parts
const ip6Address = helpers.regex('ip6Address', /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { integer, between } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const MAX8 = 255;
const int8 = between(0, MAX8);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import RecordDNSKEY from './DNSKEY.vue';
import RecordDNSKEY from './RecordDNSKEY.vue';

export default {
name: 'RecordCDNSKEY',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import RecordDS from './DS.vue';
import RecordDS from './RecordDS.vue';

export default {
name: 'RecordCDS',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z0-9_-]+\.)+[a-zA-Z]{2,}))[.]?$/);
const trailingDot = helpers.regex('trailingDot', /[.]$/);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers, integer, between } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const base64 = helpers.regex('base64', /^[0-9a-zA-Z+/][0-9a-zA-Z+/\s]*(=\s*){0,3}$/);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { and, helpers, integer, between } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const hex = helpers.regex('hex', /^([0-9a-fA-F]\s*)*[0-9a-fA-F]$/);
const trim = and(helpers.regex('trimBegin', /^[^\s]/), helpers.regex('trimEnd', /[^\s]$/));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import RecordSVCB from './SVCB.vue';
import RecordSVCB from './RecordSVCB.vue';

export default {
name: 'RecordHTTPS',
Expand Down
38 changes: 19 additions & 19 deletions www/webapp/src/components/Field/RecordList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@

<script>
import RecordItem from './RecordItem.vue';
import RecordA from './Record/A.vue';
import RecordAAAA from './Record/AAAA.vue';
import RecordCAA from './Record/CAA.vue';
import RecordCDNSKEY from './Record/CDNSKEY.vue';
import RecordCDS from './Record/CDS.vue';
import RecordCNAME from './Record/CNAME.vue';
import RecordDNSKEY from './Record/DNSKEY.vue';
import RecordDS from './Record/DS.vue';
import RecordHTTPS from './Record/HTTPS.vue';
import RecordMX from './Record/MX.vue';
import RecordNS from './Record/NS.vue';
import RecordOPENPGPKEY from './Record/OPENPGPKEY.vue';
import RecordPTR from './Record/PTR.vue';
import RecordSMIMEA from './Record/SMIMEA.vue';
import RecordSRV from './Record/SRV.vue';
import RecordSVCB from './Record/SVCB.vue';
import RecordTLSA from './Record/TLSA.vue';
import RecordTXT from './Record/TXT.vue';
import RecordSubnet from './Record/Subnet.vue';
import RecordA from './RecordA.vue';
import RecordAAAA from './RecordAAAA.vue';
import RecordCAA from './RecordCAA.vue';
import RecordCDNSKEY from './RecordCDNSKEY.vue';
import RecordCDS from './RecordCDS.vue';
import RecordCNAME from './RecordCNAME.vue';
import RecordDNSKEY from './RecordDNSKEY.vue';
import RecordDS from './RecordDS.vue';
import RecordHTTPS from './RecordHTTPS.vue';
import RecordMX from './RecordMX.vue';
import RecordNS from './RecordNS.vue';
import RecordOPENPGPKEY from './RecordOPENPGPKEY.vue';
import RecordPTR from './RecordPTR.vue';
import RecordSMIMEA from './RecordSMIMEA.vue';
import RecordSRV from './RecordSRV.vue';
import RecordSVCB from './RecordSVCB.vue';
import RecordTLSA from './RecordTLSA.vue';
import RecordTXT from './RecordTXT.vue';
import RecordSubnet from './RecordSubnet.vue';
import {mdiClose, mdiPlus} from "@mdi/js";

export default {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers, integer, between } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const hostname = helpers.regex('hostname', /^((([a-zA-Z0-9-]+\.?)+)|\.)$/);
const trailingDot = helpers.regex('trailingDot', /[.]$/);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const hostname = helpers.regex('hostname', /^((([a-zA-Z0-9-]+\.?)+)|\.)$/);
const trailingDot = helpers.regex('trailingDot', /[.]$/);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const base64 = helpers.regex('base64', /^[0-9a-zA-Z+/][0-9a-zA-Z+/\s]*(=\s*){0,3}$/);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import RecordCNAME from './CNAME.vue';
import RecordCNAME from './RecordCNAME.vue';

export default {
name: 'RecordPTR',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import RecordTLSA from './TLSA.vue';
import RecordTLSA from './RecordTLSA.vue';

export default {
name: 'RecordSMIMEA',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers, integer, between } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

// Allow for root label only, see RFC 2052
const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))?[.]?$/);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers, integer, between } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

// Allow for root label only
const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))?[.]?$/);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers, or } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

// from https://www.oreilly.com/library/view/regular-expressions-cookbook/9781449327453/ch08s16.html, adding subnet
const ip4AddressOrSubnet = helpers.regex('ip4Address', /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\/(3[0-2]|[12]?[0-9]))?$/);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { and, helpers, integer, between } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const hex = helpers.regex('hex', /^([0-9a-fA-F]\s*)*[0-9a-fA-F]$/);
const trim = and(helpers.regex('trimBegin', /^[^\s]/), helpers.regex('trimEnd', /[^\s]$/));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import { helpers } from 'vuelidate/lib/validators';
import RecordItem from '../RecordItem.vue';
import RecordItem from './RecordItem.vue';

const txtToken = helpers.regex('txtToken', /^".*"$/);

Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/components/ResetPasswordActionHandler.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</template>

<script>
import GenericActionHandler from "./GenericActionHandler"
import GenericActionHandler from "./GenericActionHandler.vue"

export default {
name: 'ResetPasswordActionHandler',
Expand Down
6 changes: 3 additions & 3 deletions www/webapp/src/views/ChangeEmail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@
</template>

<script>
import { HTTP, withWorking } from '@/utils';
import { HTTP, withWorking ,digestError} from '@/utils';
import {email_pattern} from '@/validation';
import {digestError} from '@/utils';
import ErrorAlert from "@/components/ErrorAlert";

import ErrorAlert from "@/components/ErrorAlert.vue";

export default {
name: 'ChangeEmail',
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/views/ConfirmationPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import CreateTOTPActionHandler from '@/components/CreateTOTPActionHandler.vue';
import ResetPasswordActionHandler from '@/components/ResetPasswordActionHandler.vue';
import {digestError} from '@/utils';
import ErrorAlert from '@/components/ErrorAlert';
import ErrorAlert from '@/components/ErrorAlert.vue';

const HTTP = axios.create({
baseURL: '/api/v1/',
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/views/Console/DomainSetupDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</template>

<script>
import DomainSetup from "@/views/DomainSetup";
import DomainSetup from "@/views/DomainSetup.vue";
import {mdiClose} from "@mdi/js";

export default {
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/views/Console/TOTPVerifyDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

<script>
import {digestError, HTTP, logout, withWorking} from '@/utils'
import ErrorAlert from "../../components/ErrorAlert";
import ErrorAlert from "@/components/ErrorAlert.vue";
import QrcodeVue from '../../modules/qrcode.vue/dist/qrcode.vue.esm'
import {mdiCheck, mdiClose, mdiNumeric1Circle, mdiNumeric2Circle} from "@mdi/js";

Expand Down
14 changes: 7 additions & 7 deletions www/webapp/src/views/CrudList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -342,16 +342,16 @@

<script>
import { HTTP, withWorking, digestError } from '@/utils';
import RRSetType from '@/components/Field/RRSetType';
import TimeAgo from '@/components/Field/TimeAgo';
import RRSetType from '@/components/Field/RRSetType.vue';
import TimeAgo from '@/components/Field/TimeAgo.vue';
import GenericCheckbox from '@/components/Field/GenericCheckbox.vue';
import GenericText from '@/components/Field/GenericText';
import GenericTextarea from '@/components/Field/GenericTextarea';
import GenericText from '@/components/Field/GenericText.vue';
import GenericTextarea from '@/components/Field/GenericTextarea.vue';
import RecordItem from '@/components/Field/RecordItem.vue';
import RecordList from '@/components/Field/RecordList';
import RecordList from '@/components/Field/RecordList.vue';
import GenericSwitchbox from '@/components/Field/GenericSwitchbox.vue';
import TTL from '@/components/Field/TTL';
import ErrorAlert from '@/components/ErrorAlert'
import TTL from '@/components/Field/TTL.vue';
import ErrorAlert from '@/components/ErrorAlert.vue'
import {useUserStore} from "@/store/user";
import {mdiClose, mdiContentSaveEdit, mdiDelete, mdiMagnify, mdiPlus} from "@mdi/js";

Expand Down
4 changes: 2 additions & 2 deletions www/webapp/src/views/CrudListDomain.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script>
import { HTTP, withWorking } from '@/utils';
import CrudList from './CrudList';
import DomainSetupDialog from '@/views/Console/DomainSetupDialog';
import CrudList from './CrudList.vue';
import DomainSetupDialog from '@/views/Console/DomainSetupDialog.vue';
import {mdiDownload, mdiInformation} from "@mdi/js";
import GenericText from "@/components/Field/GenericText.vue";
import GenericTextarea from "@/components/Field/GenericTextarea.vue";
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/views/CrudListRecord.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import CrudList from '@/views/CrudList';
import CrudList from '@/views/CrudList.vue';
import {HTTP, withWorking} from "@/utils"
import GenericText from "@/components/Field/GenericText.vue";
import RecordList from "@/components/Field/RecordList.vue";
Expand Down
4 changes: 2 additions & 2 deletions www/webapp/src/views/CrudListTOTP.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import CrudList from './CrudList';
import TOTPVerifyDialog from '@/views/Console/TOTPVerifyDialog';
import CrudList from './CrudList.vue';
import TOTPVerifyDialog from '@/views/Console/TOTPVerifyDialog.vue';
import GenericText from "@/components/Field/GenericText.vue";
import TimeAgo from "@/components/Field/TimeAgo.vue";

Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/views/CrudListToken.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import CrudList from './CrudList';
import CrudList from './CrudList.vue';
import {useUserStore} from "@/store/user";
import GenericText from "@/components/Field/GenericText.vue";
import GenericCheckbox from "@/components/Field/GenericCheckbox.vue";
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/views/DeleteAccount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<script>
import { HTTP, withWorking, digestError } from '@/utils';
import ErrorAlert from "../components/ErrorAlert";
import ErrorAlert from "@/components/ErrorAlert.vue";

export default {
name: 'DeleteAccount',
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/views/DomainSetupPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</template>

<script>
import DomainSetup from "@/views/DomainSetup";
import DomainSetup from "@/views/DomainSetup.vue";

export default {
name: 'DomainSetupPage',
Expand Down
Loading
Loading