Skip to content

Commit 783fc0e

Browse files
refactor(multi): refactored pages as per master-vue-free-internal
1 parent bd05405 commit 783fc0e

27 files changed

+1449
-922
lines changed

typescript-version/.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"editor.formatOnSave": true,
3+
"files.insertFinalNewline": true,
34
"javascript.updateImportsOnFileMove.enabled": "always",
45
"[javascript]": {
56
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
@@ -110,4 +111,4 @@
110111
}
111112
]
112113
}
113-
}
114+
}

typescript-version/auto-imports.d.ts

Lines changed: 625 additions & 0 deletions
Large diffs are not rendered by default.

typescript-version/package.json

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,60 +22,61 @@
2222
"axios-mock-adapter": "^1.21.4",
2323
"chart.js": "^4.1.2",
2424
"jwt-decode": "^3.1.2",
25-
"pinia": "^2.0.36",
25+
"pinia": "^2.1.3",
2626
"prismjs": "^1.29.0",
2727
"roboto-fontface": "^0.10.0",
2828
"sass": "^1.59.3",
2929
"unplugin-vue-define-options": "^1.3.5",
30-
"vue": "^3.3.2",
30+
"vue": "^3.3.4",
3131
"vue-chartjs": "^5.2.0",
3232
"vue-flatpickr-component": "11.0.3",
3333
"vue-i18n": "^9.2.2",
3434
"vue-prism-component": "^2.0.0",
35-
"vue-router": "^4.2.0",
35+
"vue-router": "^4.2.1",
3636
"vue3-apexcharts": "^1.4.1",
3737
"vue3-perfect-scrollbar": "^1.6.0",
38-
"vuetify": "3.2.1",
38+
"vuetify": "3.3.1",
3939
"webfontloader": "^1.6.28"
4040
},
4141
"devDependencies": {
42-
"@antfu/eslint-config-vue": "^0.38.6",
43-
"@fullcalendar/core": "^6.1.7",
44-
"@fullcalendar/daygrid": "^6.1.7",
45-
"@fullcalendar/interaction": "^6.1.7",
46-
"@fullcalendar/list": "^6.1.7",
47-
"@fullcalendar/timegrid": "^6.1.7",
48-
"@fullcalendar/vue3": "^6.1.7",
42+
"@antfu/eslint-config-vue": "^0.39.1",
43+
"@fullcalendar/core": "^6.1.8",
44+
"@fullcalendar/daygrid": "^6.1.8",
45+
"@fullcalendar/interaction": "^6.1.8",
46+
"@fullcalendar/list": "^6.1.8",
47+
"@fullcalendar/timegrid": "^6.1.8",
48+
"@fullcalendar/vue3": "^6.1.8",
4949
"@iconify-json/mdi": "^1.1.52",
5050
"@iconify/tools": "^2.2.0",
51+
"@iconify/utils": "^2.1.5",
5152
"@iconify/vue": "4.1.1",
5253
"@intlify/unplugin-vue-i18n": "^0.10.0",
53-
"@types/node": "^20.1.4",
54+
"@types/node": "^20.2.3",
5455
"@types/webfontloader": "^1.6.34",
55-
"@typescript-eslint/eslint-plugin": "^5.59.5",
56-
"@typescript-eslint/parser": "^5.59.5",
56+
"@typescript-eslint/eslint-plugin": "^5.59.6",
57+
"@typescript-eslint/parser": "^5.59.6",
5758
"@vitejs/plugin-vue": "^4.2.3",
5859
"@vitejs/plugin-vue-jsx": "^3.0.0",
59-
"eslint": "^8.40.0",
60+
"eslint": "^8.41.0",
6061
"eslint-config-airbnb-base": "^15.0.0",
6162
"eslint-import-resolver-typescript": "^3.5.1",
6263
"eslint-plugin-import": "^2.26.0",
6364
"eslint-plugin-promise": "^6.0.1",
6465
"eslint-plugin-regex": "^1.10.0",
6566
"eslint-plugin-sonarjs": "^0.19.0",
6667
"eslint-plugin-unicorn": "^47.0.0",
67-
"eslint-plugin-vue": "^9.12.0",
68+
"eslint-plugin-vue": "^9.13.0",
6869
"postcss-html": "^1.5.0",
6970
"stylelint": "14.15.0",
7071
"stylelint-config-idiomatic-order": "9.0.0",
7172
"stylelint-config-standard-scss": "6.1.0",
7273
"stylelint-use-logical-spec": "4.1.0",
73-
"type-fest": "^3.10.0",
74+
"type-fest": "^3.11.0",
7475
"typescript": "^5.0.4",
75-
"unplugin-auto-import": "^0.15.1",
76+
"unplugin-auto-import": "^0.16.1",
7677
"unplugin-vue-components": "^0.24.1",
77-
"vite": "^4.3.5",
78-
"vite-plugin-pages": "^0.29.0",
78+
"vite": "^4.3.8",
79+
"vite-plugin-pages": "^0.30.1",
7980
"vite-plugin-vue-layouts": "^0.8.0",
8081
"vite-plugin-vuetify": "1.0.2",
8182
"vue-shepherd": "^3.0.0",
@@ -85,4 +86,4 @@
8586
"resolutions": {
8687
"postcss": "8"
8788
}
88-
}
89+
}

typescript-version/src/@core/scss/base/_components.scss

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use "mixins";
2-
@use "vuetify/lib/styles/tools/_elevation" as mixins_elevation;
32
@use "@layouts/styles/placeholders";
3+
@use "@layouts/styles/mixins" as layoutMixins;
44
@use "@configured-variables" as variables;
55

66
// 👉 Avatar group
@@ -65,6 +65,17 @@
6565
}
6666
}
6767

68+
// 👉 Datatable
69+
.v-data-table-footer__pagination {
70+
@include layoutMixins.rtl {
71+
.v-btn {
72+
.v-icon {
73+
transform: rotate(180deg);
74+
}
75+
}
76+
}
77+
}
78+
6879
// Dialog responsive width
6980
.v-dialog {
7081
// dialog custom close btn
@@ -148,8 +159,12 @@
148159
}
149160
}
150161

151-
// 👉 Textarea
162+
// 👉 Switch
163+
.v-switch .v-selection-control:not(.v-selection-control--dirty) .v-switch__thumb {
164+
color: #fff !important;
165+
}
152166

167+
// 👉 Textarea
153168
.v-textarea .v-field__input {
154169
/* stylelint-disable-next-line property-no-vendor-prefix */
155170
-webkit-mask-image: none !important;

typescript-version/src/@core/scss/base/_default-layout-w-vertical-nav.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@use "@configured-variables" as variables;
22
@use "@core/scss/base/placeholders" as *;
33
@use "@core/scss/template/placeholders" as *;
4-
@use "vuetify/lib/styles/tools/_elevation" as mixins_elevation;
54
@use "misc";
65
@use "@core/scss/base/mixins";
76

typescript-version/src/@core/scss/base/_mixins.scss

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
box-shadow: map.get(vuetify.$shadow-key-umbra, $z), map.get(vuetify.$shadow-key-penumbra, $z), map.get(vuetify.$shadow-key-ambient, $z) if($important, !important, null);
66
}
77

8+
// #region before-pseudo
89
// ℹ️ This mixin is inspired from vuetify for adding hover styles via before pseudo element
910
@mixin before-pseudo() {
1011
position: relative;
@@ -22,6 +23,8 @@
2223
}
2324
}
2425

26+
// #endregion before-pseudo
27+
2528
@mixin bordered-skin($component, $border-property: "border", $important: false) {
2629
#{$component} {
2730
// background-color: rgb(var(--v-theme-background));
@@ -30,30 +33,10 @@
3033
}
3134
}
3235

36+
// #region selected-states
3337
// ℹ️ Inspired from vuetify's active-states mixin
3438
// focus => 0.12 & selected => 0.08
3539
@mixin selected-states($selector) {
36-
// #{$selector} {
37-
// opacity: calc(#{map.get(vuetify.$states, "selected")} * var(--v-theme-overlay-multiplier));
38-
// }
39-
40-
// &:hover
41-
// #{$selector} {
42-
// opacity: calc(#{map.get(vuetify.$states, "selected") + map.get(vuetify.$states, "hover")} * var(--v-theme-overlay-multiplier));
43-
// }
44-
45-
// &:focus-visible
46-
// #{$selector} {
47-
// opacity: calc(#{map.get(vuetify.$states, "selected") + map.get(vuetify.$states, "focus")} * var(--v-theme-overlay-multiplier));
48-
// }
49-
50-
// @supports not selector(:focus-visible) {
51-
// &:focus {
52-
// #{$selector} {
53-
// opacity: calc(#{map.get(vuetify.$states, "selected") + map.get(vuetify.$states, "focus")} * var(--v-theme-overlay-multiplier));
54-
// }
55-
// }
56-
// }
5740
#{$selector} {
5841
opacity: calc(var(--v-selected-opacity) * var(--v-theme-overlay-multiplier));
5942
}
@@ -76,3 +59,5 @@
7659
}
7760
}
7861
}
62+
63+
// #endregion selected-states

typescript-version/src/@core/scss/base/_utilities.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ $card-spacer-content: 16px;
9595
.v-btn--icon.v-btn--density-default {
9696
block-size: calc(var(--v-btn-height) + -10px);
9797
color: rgba(var(--v-theme-on-surface), var(--v-medium-emphasis-opacity));
98-
inline-size: calc(var(--v-btn-height) + -10px);
98+
inline-size: calc(var(--v-btn-height) + -8px);
9999

100100
&.v-btn--active {
101101
color: #fff;
@@ -104,6 +104,17 @@ $card-spacer-content: 16px;
104104
.v-btn__overlay {
105105
opacity: 0;
106106
}
107+
108+
.v-ripple__container {
109+
display: none;
110+
}
111+
112+
.v-btn__content {
113+
.v-icon {
114+
block-size: 8px !important;
115+
inline-size: 8px !important;
116+
}
117+
}
107118
}
108119
}
109120

typescript-version/src/@core/scss/base/libs/vuetify/_overrides.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ h6,
196196
color: rgb(var(--v-border-color));
197197
}
198198

199-
// 👉 DataTable
200199
// 👉 DataTable
201200
.v-data-table {
202201
/* stylelint-disable-next-line no-descending-specificity */

typescript-version/src/@core/scss/base/placeholders/_nav.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use "vuetify/lib/styles/tools/_elevation" as mixins_elevation;
21
@use "@core/scss/base/mixins";
32

43
// ℹ️ This is common style that needs to be applied to both navs

typescript-version/src/@core/scss/template/libs/apex-chart.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "@styles/variables/_vuetify.scss" as vuetify;
2-
@use "vuetify/lib/styles/tools/_elevation" as mixins_elevation;
32
@use "@layouts/styles/mixins" as layoutsMixins;
43
@use "@core/scss/base/mixins";
54

0 commit comments

Comments
 (0)