Skip to content

Commit 01dad38

Browse files
ct-anjali-patelct-anjali-patel
authored
Stage v2.0.0 (#37)
* all packages upgrades done, & vuetify updates done, only vue-router pending continue.., eslint & build checked * all vue-router changes done & checked, also authentication files delete & remove auth * all bugfixes changes done,eslint & build checked
1 parent 032abfb commit 01dad38

70 files changed

Lines changed: 2254 additions & 6487 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
VITE_API_URL="/"
2-
VITE_APP_VERSION=v1.5.0
2+
VITE_APP_VERSION=v2.0.0

‎eslint.config.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,12 @@ export default [
4141
}
4242
]
4343
}
44+
},
45+
{
46+
name: 'custom/vue-rules',
47+
files: ['src/pages/**/*.vue'],
48+
rules: {
49+
'vue/multi-word-component-names': 'off'
50+
}
4451
}
4552
];

‎package-lock.json‎

Lines changed: 1261 additions & 5573 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "berry-free-vuetify-vuejs-admin-template",
3-
"version": "1.5.0",
3+
"version": "2.0.0",
44
"private": true,
55
"author": "CodedThemes",
66
"type": "module",
@@ -15,43 +15,41 @@
1515
},
1616
"dependencies": {
1717
"@mdi/js": "^7.4.47",
18-
"@tsconfig/node24": "^24.0.3",
19-
"@typescript-eslint/parser": "8.47.0",
20-
"apexcharts": "5.3.6",
21-
"axios": "1.13.2",
18+
"@tsconfig/node24": "24.0.4",
19+
"@typescript-eslint/parser": "8.56.1",
20+
"apexcharts": "5.8.1",
21+
"axios": "1.13.6",
2222
"axios-mock-adapter": "2.1.0",
2323
"chance": "1.1.13",
2424
"date-fns": "4.1.0",
25-
"lodash": "4.17.21",
25+
"lodash": "4.17.23",
2626
"pinia": "3.0.4",
2727
"vee-validate": "4.15.1",
28-
"vite-plugin-vuetify": "2.1.2",
29-
"vue": "3.5.24",
30-
"vue-eslint-parser": "^10.2.0",
31-
"vue-router": "4.6.3",
28+
"vite-plugin-vuetify": "2.1.3",
29+
"vue": "3.5.29",
30+
"vue-eslint-parser": "10.4.0",
31+
"vue-router": "5.0.3",
3232
"vue-tabler-icons": "2.21.0",
3333
"vue3-apexcharts": "1.10.0",
3434
"vue3-perfect-scrollbar": "2.0.0",
35-
"vuetify": "3.10.11",
36-
"webpack-plugin-vuetify": "3.1.2"
35+
"vuetify": "4.0.2"
3736
},
3837
"devDependencies": {
39-
"@eslint/js": "9.39.1",
38+
"@eslint/js": "10.0.1",
4039
"@types/chance": "1.1.7",
41-
"@types/node": "24.10.1",
42-
"@vitejs/plugin-vue": "6.0.2",
40+
"@types/node": "25.3.3",
41+
"@vitejs/plugin-vue": "6.0.4",
4342
"@vue/eslint-config-prettier": "10.2.0",
44-
"@vue/tsconfig": "0.8.1",
45-
"eslint": "9.39.1",
46-
"eslint-plugin-vue": "10.5.1",
47-
"globals": "16.5.0",
48-
"prettier": "3.6.2",
49-
"sass": "1.94.1",
50-
"sass-loader": "16.0.6",
43+
"@vue/tsconfig": "0.9.0",
44+
"eslint": "10.0.2",
45+
"eslint-plugin-vue": "10.8.0",
46+
"globals": "17.4.0",
47+
"prettier": "3.8.1",
48+
"sass": "1.97.3",
49+
"sass-loader": "16.0.7",
5150
"typescript": "5.9.3",
52-
"typescript-eslint": "8.47.0",
53-
"vite": "7.2.2",
54-
"vue-cli-plugin-vuetify": "2.5.8",
55-
"vue-tsc": "3.1.4"
51+
"typescript-eslint": "8.56.1",
52+
"vite": "7.3.1",
53+
"vue-tsc": "3.2.5"
5654
}
57-
}
55+
}

src/views/authentication/authForms/AuthLogin.vue renamed to src/components/authentication/authForms/AuthLogin.vue

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
<script setup lang="ts">
22
import { ref } from 'vue';
33
import Google from '@/assets/images/auth/social-google.svg';
4-
import { useAuthStore } from '@/stores/auth';
5-
import { Form } from 'vee-validate';
64
75
const checkbox = ref(false);
8-
const valid = ref(false);
96
const show1 = ref(false);
10-
//const logform = ref();
11-
const password = ref('admin123');
12-
const username = ref('[email protected]');
137
const passwordRules = ref([
148
(v: string) => !!v || 'Password is required',
159
(v: string) => (v && v.length <= 10) || 'Password must be less than 10 characters'
1610
]);
1711
const emailRules = ref([(v: string) => !!v || 'E-mail is required', (v: string) => /.+@.+\..+/.test(v) || 'E-mail must be valid']);
18-
19-
/* eslint-disable @typescript-eslint/no-explicit-any */
20-
function validate(values: any, { setErrors }: any) {
21-
const authStore = useAuthStore();
22-
return authStore.login(username.value, password.value).catch((error) => setErrors({ apiError: error }));
23-
}
2412
</script>
2513

2614
<template>
@@ -35,32 +23,17 @@ function validate(values: any, { setErrors }: any) {
3523
<v-divider class="custom-devider" />
3624
</v-col>
3725
</v-row>
38-
<h5 class="text-h5 text-center my-4 mb-8">Sign in with Email address</h5>
39-
<Form @submit="validate" class="mt-7 loginForm" v-slot="{ errors, isSubmitting }">
26+
<h5 class="text-center my-4 mb-8">Sign in with Email address</h5>
27+
<form @submit.prevent class="mt-7 loginForm">
28+
<v-text-field :rules="emailRules" label="Email Address / Username" class="mt-4 mb-8" required hide-details="auto"></v-text-field>
4029
<v-text-field
41-
v-model="username"
42-
:rules="emailRules"
43-
label="Email Address / Username"
44-
class="mt-4 mb-8"
45-
required
46-
density="comfortable"
47-
hide-details="auto"
48-
variant="outlined"
49-
color="primary"
50-
></v-text-field>
51-
<v-text-field
52-
v-model="password"
5330
:rules="passwordRules"
5431
label="Password"
5532
required
56-
density="comfortable"
57-
variant="outlined"
58-
color="primary"
5933
hide-details="auto"
60-
:append-icon="show1 ? '$eye' : '$eyeOff'"
34+
:append-inner-icon="show1 ? '$eye' : '$eyeOff'"
6135
:type="show1 ? 'text' : 'password'"
6236
@click:append="show1 = !show1"
63-
class="pwdInput"
6437
></v-text-field>
6538

6639
<div class="d-sm-flex align-center mt-2 mb-7 mb-sm-0">
@@ -77,13 +50,8 @@ function validate(values: any, { setErrors }: any) {
7750
<a href="javascript:void(0)" class="text-primary text-decoration-none">Forgot password?</a>
7851
</div>
7952
</div>
80-
<v-btn color="secondary" :loading="isSubmitting" block class="mt-2" variant="flat" size="large" :disabled="valid" type="submit">
81-
Sign In</v-btn
82-
>
83-
<div v-if="errors.apiError" class="mt-2">
84-
<v-alert color="error">{{ errors.apiError }}</v-alert>
85-
</div>
86-
</Form>
53+
<v-btn color="secondary" block class="mt-2" variant="flat" size="large" :disabled="false" type="submit"> Sign In</v-btn>
54+
</form>
8755
<div class="mt-5 text-right">
8856
<v-divider />
8957
<v-btn variant="plain" to="/register" class="mt-2 text-capitalize mr-n2">Don't Have an account?</v-btn>
@@ -106,15 +74,6 @@ function validate(values: any, { setErrors }: any) {
10674
border-color: rgba(0, 0, 0, 0.08);
10775
margin: 20px 15px;
10876
}
109-
.pwdInput {
110-
position: relative;
111-
.v-input__append {
112-
position: absolute;
113-
right: 10px;
114-
top: 50%;
115-
transform: translateY(-50%);
116-
}
117-
}
11877
.loginForm {
11978
.v-text-field .v-field--active input {
12079
font-weight: 500;

src/views/authentication/authForms/AuthRegister.vue renamed to src/components/authentication/authForms/AuthRegister.vue

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,14 @@ function validate() {
3131
<v-divider class="custom-devider" />
3232
</v-col>
3333
</v-row>
34-
<h5 class="text-h5 text-center my-4 mb-8">Sign up with Email address</h5>
34+
<h5 class="text-center my-4 mb-8">Sign up with Email address</h5>
3535
<v-form ref="Regform" lazy-validation action="/dashboards/analytical" class="mt-7 loginForm">
3636
<v-row>
3737
<v-col cols="12" sm="6">
38-
<v-text-field
39-
v-model="firstname"
40-
density="comfortable"
41-
hide-details="auto"
42-
variant="outlined"
43-
color="primary"
44-
label="Firstname"
45-
></v-text-field>
38+
<v-text-field v-model="firstname" hide-details="auto" label="Firstname"></v-text-field>
4639
</v-col>
4740
<v-col cols="12" sm="6">
48-
<v-text-field
49-
v-model="lastname"
50-
density="comfortable"
51-
hide-details="auto"
52-
variant="outlined"
53-
color="primary"
54-
label="Lastname"
55-
></v-text-field>
41+
<v-text-field v-model="lastname" hide-details="auto" label="Lastname"></v-text-field>
5642
</v-col>
5743
</v-row>
5844
<v-text-field
@@ -61,24 +47,17 @@ function validate() {
6147
label="Email Address / Username"
6248
class="mt-4 mb-4"
6349
required
64-
density="comfortable"
6550
hide-details="auto"
66-
variant="outlined"
67-
color="primary"
6851
></v-text-field>
6952
<v-text-field
7053
v-model="password"
7154
:rules="passwordRules"
7255
label="Password"
7356
required
74-
density="comfortable"
75-
variant="outlined"
76-
color="primary"
7757
hide-details="auto"
78-
:append-icon="show1 ? '$eye' : '$eyeOff'"
58+
:append-inner-icon="show1 ? '$eye' : '$eyeOff'"
7959
:type="show1 ? 'text' : 'password'"
8060
@click:append="show1 = !show1"
81-
class="pwdInput"
8261
></v-text-field>
8362

8463
<div class="d-sm-inline-flex align-center mt-2 mb-7 mb-sm-0 font-weight-bold">
@@ -117,13 +96,4 @@ function validate() {
11796
border-color: rgba(0, 0, 0, 0.08);
11897
margin: 20px 15px;
11998
}
120-
.pwdInput {
121-
position: relative;
122-
.v-input__append {
123-
position: absolute;
124-
right: 10px;
125-
top: 50%;
126-
transform: translateY(-50%);
127-
}
128-
}
12999
</style>

src/views/dashboards/default/components/PopularStocks.vue renamed to src/components/dashboard/default/PopularStocks.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ const revenues = ref([
8787
<v-card variant="outlined">
8888
<v-card-text>
8989
<div class="d-flex align-center">
90-
<h4 class="text-h4 mt-1">Popular Stocks</h4>
90+
<h4 class="mt-1">Popular Stocks</h4>
9191
<div class="ml-auto">
9292
<v-menu transition="slide-y-transition">
9393
<template v-slot:activator="{ props }">
@@ -112,20 +112,20 @@ const revenues = ref([
112112
</div>
113113
</div>
114114

115-
<v-card class="bg-lightsecondary mt-5">
115+
<v-card elevation="0" class="bg-lightsecondary mt-5">
116116
<div class="pa-5">
117117
<div class="d-flex align-start justify-space-between">
118118
<div>
119-
<h6 class="text-secondary text-h5">Bajaj Finery</h6>
120-
<span class="text-subtitle-2 text-medium-emphasis font-weight-bold">10% Profit</span>
119+
<h5 class="text-secondary">Bajaj Finery</h5>
120+
<h6 class="text-medium-emphasis font-weight-bold">10% Profit</h6>
121121
</div>
122-
<h4 class="text-h4">$1839.00</h4>
122+
<h4>$1839.00</h4>
123123
</div>
124124
</div>
125125
<apexchart type="area" height="95" :options="chartOptions1" :series="lineChart1.series"> </apexchart>
126126
</v-card>
127127
<div class="mt-4">
128-
<perfect-scrollbar v-bind:style="{ height: '270px' }">
128+
<perfect-scrollbar v-bind:style="{ height: '270px' }" :options="{ suppressScrollX: true }">
129129
<v-list lines="two" class="py-0">
130130
<v-list-item v-for="(revenue, i) in revenues" :key="i" :value="revenue" color="secondary" rounded="sm">
131131
<template v-slot:append>
@@ -142,14 +142,14 @@ const revenues = ref([
142142
</template>
143143
<div class="d-inline-flex align-center justify-space-between w-100">
144144
<div>
145-
<h6 class="text-subtitle-1 text-medium-emphasis font-weight-bold">
145+
<h5 class="text-medium-emphasis font-weight-bold">
146146
{{ revenue.name }}
147-
</h6>
148-
<span v-if="revenue.price > 145" class="text-success text-subtitle-2">{{ revenue.profit }}% Profit</span>
149-
<span v-else class="text-error text-subtitle-2">{{ revenue.profit }}% Profit</span>
147+
</h5>
148+
<span v-if="revenue.price > 145" class="text-success text-body-small">{{ revenue.profit }}% Profit</span>
149+
<span v-else class="text-error text-body-small">{{ revenue.profit }}% Profit</span>
150150
</div>
151151

152-
<div class="ml-auto text-subtitle-1 text-medium-emphasis font-weight-bold">${{ revenue.price }}</div>
152+
<h5 class="ml-auto text-medium-emphasis font-weight-bold">${{ revenue.price }}</h5>
153153
</div>
154154
</v-list-item>
155155
</v-list>

src/views/dashboards/default/components/TotalEarning.vue renamed to src/components/dashboard/default/TotalEarning.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ const items = shallowRef([
3737
</v-menu>
3838
</div>
3939
</div>
40-
<h2 class="text-h1 font-weight-medium">
40+
<h1 class="font-weight-medium">
4141
$500.00 <a href="#"><CircleArrowUpRightIcon stroke-width="1.5" width="28" class="text-white" /> </a>
42-
</h2>
43-
<span class="text-subtitle-1 text-medium-emphasis text-white">Total Earning</span>
42+
</h1>
43+
<span class="text-body-large text-medium-emphasis text-white">Total Earning</span>
4444
</v-card-text>
4545
</v-card>
4646
</template>

src/views/dashboards/default/components/TotalGrowth.vue renamed to src/components/dashboard/default/TotalGrowth.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ const lineChart1 = {
103103
<v-card-text>
104104
<v-row>
105105
<v-col cols="12" sm="9">
106-
<span class="text-subtitle-2 text-disabled font-weight-bold">Total Growth</span>
107-
<h3 class="text-h3 mt-1">$2,324.00</h3>
106+
<h6 class="text-disabled font-weight-bold">Total Growth</h6>
107+
<h3 class="mt-1">$2,324.00</h3>
108108
</v-col>
109109
<v-col cols="12" sm="3">
110110
<v-select

src/views/dashboards/default/components/TotalIncome.vue renamed to src/components/dashboard/default/TotalIncome.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<TableIcon stroke-width="1.5" width="25" />
99
</v-btn>
1010
<div>
11-
<h4 class="text-h4 font-weight-medium">$203k</h4>
12-
<span class="text-subtitle-2 text-medium-emphasis text-white">Total Income</span>
11+
<h4 class="font-weight-medium">$203k</h4>
12+
<span class="text-body-small text-medium-emphasis text-white">Total Income</span>
1313
</div>
1414
</div>
1515
</v-card-text>
@@ -22,8 +22,8 @@
2222
<BuildingStoreIcon stroke-width="1.5" width="25" class="text-warning" />
2323
</v-btn>
2424
<div>
25-
<h4 class="text-h4 font-weight-medium">$203k</h4>
26-
<span class="text-subtitle-2 text-disabled font-weight-medium">Total Income</span>
25+
<h4 class="font-weight-medium">$203k</h4>
26+
<span class="text-body-small text-disabled font-weight-medium">Total Income</span>
2727
</div>
2828
</div>
2929
</v-card-text>

0 commit comments

Comments
 (0)