Skip to content

Commit

Permalink
- added eslint presets (#489)
Browse files Browse the repository at this point in the history
- enabled eslint rule overrides
- app version = 4.3.3
- auto-fixed "id must come first"
- auto-fixed "one property per line"
- auto-fixed "property needs double quotes"
- auto-fixed "v-for must come first"
- auto-fixed "one space after {{ and before }}"
- auto-fixed "use self-closing HTML elements"
- auto-fixed "#activator"
- auto-fixed "key must come before other properties"
- etc
  • Loading branch information
severinbeauvais authored Apr 24, 2023
1 parent 63295cb commit 3134b5e
Show file tree
Hide file tree
Showing 70 changed files with 2,871 additions and 956 deletions.
14 changes: 7 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ module.exports = {
'plugin:@typescript-eslint/recommended',
'plugin:vue/base',
'plugin:vue/essential',
// 'plugin:vue/recommended',
// 'plugin:vue/strongly-recommended',
'plugin:vue/recommended',
'plugin:vue/strongly-recommended',
'plugin:vue/vue3-essential',
// 'plugin:vue/vue3-recommended',
// 'plugin:vue/vue3-strongly-recommended',
'plugin:vue/vue3-recommended',
'plugin:vue/vue3-strongly-recommended',
'plugin:vuetify/base',
'plugin:vuetify/recommended',
'@vue/standard',
Expand All @@ -22,10 +22,10 @@ module.exports = {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'max-len': ['warn', { code: 120, ignoreRegExpLiterals: true }],
// 'vue/attribute-hyphenation': 'off',
// 'vue/no-deprecated-filter': 'warn',
'vue/attribute-hyphenation': 'off',
'vue/no-deprecated-filter': 'warn',
'vue/no-deprecated-slot-scope-attribute': 'warn',
// 'vue/no-deprecated-v-on-native-modifier': 'warn',
'vue/no-deprecated-v-on-native-modifier': 'warn',
'vue/no-v-for-template-key-on-child': 'warn',
'vue/no-v-html': 'off',
'vue/v-on-event-hyphenation': 'off',
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-edit-ui",
"version": "4.3.2",
"version": "4.3.3",
"private": true,
"appName": "Edit UI",
"sbcName": "SBC Common Components",
Expand Down
35 changes: 26 additions & 9 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<template>
<v-app class="app-container" id="app">
<v-app
id="app"
class="app-container"
>
<!-- Dialogs -->
<ConfirmDialogShared
ref="confirm"
Expand Down Expand Up @@ -72,10 +75,19 @@

<!-- Initial Page Load Transition -->
<transition name="fade">
<div class="loading-container" v-show="!haveData && !isErrorDialog">
<div
v-show="!haveData && !isErrorDialog"
class="loading-container"
>
<div class="loading__content">
<v-progress-circular color="primary" size="50" indeterminate />
<div class="loading-msg">Loading</div>
<v-progress-circular
color="primary"
size="50"
indeterminate
/>
<div class="loading-msg">
Loading
</div>
</div>
</div>
</transition>
Expand All @@ -84,26 +96,31 @@

<!-- Alert banner -->
<v-alert
tile dense
v-if="bannerText"
tile
dense
type="warning"
v-if="bannerText">
<div v-html="bannerText" class="mb-0 text-center colour-dk-text"></div>
>
<div
class="mb-0 text-center colour-dk-text"
v-html="bannerText"
/>
</v-alert>

<div class="app-body">
<main v-if="!isErrorDialog">
<BreadcrumbShared :breadcrumbs="breadcrumbs" />
<EntityInfo />
<router-view
:appReady=appReady
:appReady="appReady"
:isSummaryMode="isSummaryMode"
@fetchError="fetchErrorDialog = true"
@haveData="haveData = true"
/>
</main>
</div>

<SbcFooter :aboutText=aboutText />
<SbcFooter :aboutText="aboutText" />
</v-app>
</template>

Expand Down
80 changes: 60 additions & 20 deletions src/components/Alteration/AlterationSummary.vue
Original file line number Diff line number Diff line change
@@ -1,23 +1,35 @@
<template>
<v-card flat id="alteration-summary">
<v-card
id="alteration-summary"
flat
>
<!-- Section Header -->
<div class="summary-header px-4 mb-2 rounded-t">
<v-row no-gutters>
<v-col cols="9">
<img class="my-n1 header-icon" src="@/assets/images/currency-usd-circle.svg">
<label class="summary-title">Alteration Notice Changes {{alterationFees}}</label>
<img
class="my-n1 header-icon"
src="@/assets/images/currency-usd-circle.svg"
>
<label class="summary-title">Alteration Notice Changes {{ alterationFees }}</label>
</v-col>

<!-- Actions -->
<v-col cols="3" class="mt-n2">
<v-col
cols="3"
class="mt-n2"
>
<div class="actions mr-4">
<v-btn
text color="primary"
id="btn-delete-alteration"
text
color="primary"
:disabled="isBusySaving"
@click="onDeleteClicked()"
>
<v-icon small>mdi-delete</v-icon>
<v-icon small>
mdi-delete
</v-icon>
<span>Delete</span>
</v-btn>
</div>
Expand All @@ -34,9 +46,16 @@
<label><strong>Company Name</strong></label>
</v-col>

<v-col cols="8" class="mt-n1">
<div class="company-name font-weight-bold text-uppercase">{{ companyName }}</div>
<div class="company-name mt-2">{{ getNameRequest.nrNumber }}</div>
<v-col
cols="8"
class="mt-n1"
>
<div class="company-name font-weight-bold text-uppercase">
{{ companyName }}
</div>
<div class="company-name mt-2">
{{ getNameRequest.nrNumber }}
</div>
</v-col>
</v-row>
</div>
Expand All @@ -56,9 +75,16 @@
&nbsp;
<span class="info-text">to a {{ GetCorpFullDescription(getEntityType) }}</span>

<p class="subtitle mt-2 pt-2">Benefit Company Articles</p>
<p class="subtitle mt-2 pt-2">
Benefit Company Articles
</p>
<div class="confirmed-msg">
<v-icon color="success" class="confirmed-icon">mdi-check</v-icon>
<v-icon
color="success"
class="confirmed-icon"
>
mdi-check
</v-icon>
<span class="info-text text-body-3 confirmed-icon ml-2">
The company has completed a set Benefit Company Articles containing a benefit provision, and a copy
of these articles has been added to the company's record book.
Expand Down Expand Up @@ -86,7 +112,10 @@
<label><strong>Share Structure</strong></label>
</v-col>
</v-row>
<ShareStructures class="mt-6" :is-edit-mode="false" />
<ShareStructures
class="mt-6"
:is-edit-mode="false"
/>
</div>
</template>

Expand Down Expand Up @@ -125,16 +154,26 @@
<v-container
id="effective-date-time"
class="alteration-date-time"
:class="{ 'invalid': alterationDateTimeInvalid }">
:class="{ 'invalid': alterationDateTimeInvalid }"
>
<v-row no-gutters>
<v-col cols="3" class="inner-col-1">
<v-col
cols="3"
class="inner-col-1"
>
<label><strong>Alteration Date<br>and Time</strong></label>
</v-col>

<v-col cols="9" class="inner-col-2">
<p id="effective-date-time-instructions" class="info-text">
<v-col
cols="9"
class="inner-col-2"
>
<p
id="effective-date-time-instructions"
class="info-text"
>
Select the date and time of alteration of your business. You may select a date and time up to 10 days in
the future (note: there is an <strong>additional fee {{futureEffectiveFeePrice}}</strong> to
the future (note: there is an <strong>additional fee {{ futureEffectiveFeePrice }}</strong> to
enter an alteration date and time in the future). Unless a business has special requirements, most
businesses select an immediate Alteration Date and Time.
</p>
Expand All @@ -146,12 +185,13 @@
/>

<v-card
v-if="isFutureEffective && isEffectiveDateTimeValid"
id="effective-date-text"
flat
class="px-16 pb-8 mt-n12"
id="effective-date-text"
v-if="isFutureEffective && isEffectiveDateTimeValid">
>
The alteration for this business will be effective as of:<br>
<strong>{{effectiveDateTimeString}}</strong>
<strong>{{ effectiveDateTimeString }}</strong>
</v-card>
</v-col>
</v-row>
Expand Down
9 changes: 7 additions & 2 deletions src/components/Alteration/Articles/Articles.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<template>
<v-card flat id="articles">
<v-card
id="articles"
flat
>
<div class="articles-header pa-5">
<v-icon color="appDkBlue">mdi-handshake</v-icon>
<v-icon color="appDkBlue">
mdi-handshake
</v-icon>
<label class="articles-title pl-2">Articles</label>
</div>

Expand Down
Loading

0 comments on commit 3134b5e

Please sign in to comment.