Merge pull request #20 from codedthemes/stage-v1.3.0

Stage v1.3.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "berry-free-vuetify-vuejs-admin-template",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": true,
   "author": "CodedThemes",
   "type": "module",
@@ -15,46 +15,44 @@
   },
   "dependencies": {
     "@mdi/js": "^7.4.47",
-    "@tiptap/starter-kit": "2.3.2",
-    "@tiptap/vue-3": "2.3.2",
-    "@tsconfig/node20": "20.1.4",
-    "@typescript-eslint/parser": "^7.8.0",
-    "apexcharts": "3.49.1",
-    "axios": "1.6.8",
-    "axios-mock-adapter": "^1.22.0",
-    "chance": "1.1.11",
-    "date-fns": "3.6.0",
+    "@tsconfig/node22": "^22.0.0",
+    "@typescript-eslint/parser": "^8.19.0",
+    "apexcharts": "4.3.0",
+    "axios": "1.7.9",
+    "axios-mock-adapter": "2.1.0",
+    "chance": "1.1.12",
+    "date-fns": "4.1.0",
     "lodash": "4.17.21",
-    "pinia": "2.1.7",
-    "remixicon": "4.2.0",
-    "vee-validate": "4.12.8",
-    "vite-plugin-vuetify": "2.0.3",
-    "vue": "3.4.27",
-    "vue-router": "4.3.2",
+    "pinia": "2.3.0",
+    "remixicon": "4.6.0",
+    "vee-validate": "4.15.0",
+    "vite-plugin-vuetify": "2.0.4",
+    "vue": "3.5.13",
+    "vue-router": "4.5.0",
     "vue-tabler-icons": "2.21.0",
-    "vue3-apexcharts": "1.5.2",
+    "vue3-apexcharts": "1.8.0",
     "vue3-perfect-scrollbar": "2.0.0",
     "vue3-print-nb": "0.1.4",
-    "vuetify": "3.6.5",
+    "vuetify": "3.7.6",
     "webpack-plugin-vuetify": "3.0.3",
-    "yup": "1.4.0"
+    "yup": "1.6.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.1.1",
+    "@eslint/js": "^9.17.0",
     "@types/chance": "1.1.6",
-    "@types/node": "20.12.11",
-    "@vitejs/plugin-vue": "5.0.4",
-    "@vue/eslint-config-prettier": "9.0.0",
-    "@vue/tsconfig": "0.5.1",
-    "eslint": "8.57.0",
-    "eslint-plugin-vue": "9.25.0",
-    "prettier": "3.2.5",
-    "sass": "1.77.1",
-    "sass-loader": "14.2.1",
-    "typescript": "5.4.5",
-    "typescript-eslint": "^7.8.0",
-    "vite": "5.2.11",
+    "@types/node": "22.10.4",
+    "@vitejs/plugin-vue": "5.2.1",
+    "@vue/eslint-config-prettier": "10.1.0",
+    "@vue/tsconfig": "0.7.0",
+    "eslint": "9.17.0",
+    "eslint-plugin-vue": "9.32.0",
+    "prettier": "3.4.2",
+    "sass": "1.79.6",
+    "sass-loader": "16.0.4",
+    "typescript": "5.7.2",
+    "typescript-eslint": "^8.19.0",
+    "vite": "6.0.7",
     "vue-cli-plugin-vuetify": "2.5.8",
-    "vue-tsc": "2.0.17"
+    "vue-tsc": "2.2.0"
   }
 }

src/components/apps/README.md

@@ -0,0 +1,45 @@
+**Note:** *This README file is maintained to ensure the product structure aligns with the Pro version, making migration to Pro seamless when you choose to upgrade. This alignment aims to provide a smoother experience during the upgrade, especially regarding directory structure. You may notice these files and folders appearing throughout the project where they are part of the Pro version. While this might feel slightly inconvenient, it is intended to simplify your migration process and provide assistance. If these files are unnecessary for your use case, you can easily remove them.*
+
+Please continue reading below to explore the features of the Pro version:
+
+# Berry Admin Panel - Unlock Premium Features with the Pro Version
+
+Elevate your project with the Pro Version of the <b>Berry Admin Panel!</b> Built to cater to modern web applications, the Pro version is loaded with advanced features, intuitive design elements, and dynamic tools that ensure seamless functionality.
+
+This page (folder) is a sneak peek into the premium features available in <b>version 1.5.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
+
+## Included in the Pro Version:
+
+[🚀 Dashboards](https://berrydashboard.io/vue/dashboard/default) : Advanced dashboards with real-time insights and data visualizations for actionable metrics.
+
+[📦 Widgets](https://berrydashboard.io/vue/widget/statistics) : A curated library of pre-built widgets for enhanced functionality and faster development.
+
+[🔧 Components](https://berrydashboard.io/vue/components/buttons) : A rich collection of reusable and customizable UI components.
+
+[🚀 Advanced Components](https://berrydashboard.io/vue/advance/snackbar) : Customizable and dynamic Snackbar components for delivering seamless notifications and user feedback in your application.
+
+[📝 Forms](https://berrydashboard.io/vue/forms/formvalidation) : Dynamic and customizable forms with advanced validation features for a smooth user experience.
+
+[📊 Tables](https://berrydashboard.io/vue/tables/tbl-basic) :  Simple and clean tables for displaying structured data effectively.
+
+[📈 Charts](https://berrydashboard.io/vue/forms/charts/apexchart) : Beautifully designed charts powered by modern data visualization libraries.
+
+[🔒 Authentication](https://berrydashboard.io/vue/register1) : Secure pages for login, registration, and password recovery, ensuring robust user management.
+
+[🛒 E-commerce App](https://berrydashboard.io/vue/ecommerce/products) : A streamlined system for managing products and inventory in your e-commerce platform.
+
+[💬 Chat Messages](https://berrydashboard.io/vue/app/chats) : An integrated chat system to enhance communication within your application.
+
+[👤 Account Profile](https://berrydashboard.io/vue/app/user/account-profile/profile1) : A sleek and customizable account profile page for managing user details and settings.
+
+## Why Upgrade to the Pro Version?
+
+🚀 <b>Advanced Features</b> : Access premium components and tools designed for modern, high-end projects. <br/><br/>
+⚡ <b>Faster Development</b> : Pre-designed pages, widgets, and features help you save time and effort. <br/><br/>
+📱 <b>Fully Responsive Design</b> : Enjoy a flawless experience across desktops, tablets, and smartphones. <br/><br/>
+🛠 <b>Developer-Friendly</b> : Modular code, clear documentation, and well-structured components make customization a breeze. <br/><br/>
+🎨 <b>Customization-Ready</b> : Personalize every aspect of your project with ease to match your branding needs.
+
+## Get Started with the Pro Version!
+
+👉 [Explore the Pro version now](https://codedthemes.com/item/berry-vue-admin-dashboard/) - and supercharge your development experience!

src/components/forms/README.md

@@ -0,0 +1,45 @@
+**Note:** *This README file is maintained to ensure the product structure aligns with the Pro version, making migration to Pro seamless when you choose to upgrade. This alignment aims to provide a smoother experience during the upgrade, especially regarding directory structure. You may notice these files and folders appearing throughout the project where they are part of the Pro version. While this might feel slightly inconvenient, it is intended to simplify your migration process and provide assistance. If these files are unnecessary for your use case, you can easily remove them.*
+
+Please continue reading below to explore the features of the Pro version:
+
+# Berry Admin Panel - Unlock Premium Features with the Pro Version
+
+Elevate your project with the Pro Version of the <b>Berry Admin Panel!</b> Built to cater to modern web applications, the Pro version is loaded with advanced features, intuitive design elements, and dynamic tools that ensure seamless functionality.
+
+This page (folder) is a sneak peek into the premium features available in <b>version 1.5.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
+
+## Included in the Pro Version:
+
+[🚀 Dashboards](https://berrydashboard.io/vue/dashboard/default) : Advanced dashboards with real-time insights and data visualizations for actionable metrics.
+
+[📦 Widgets](https://berrydashboard.io/vue/widget/statistics) : A curated library of pre-built widgets for enhanced functionality and faster development.
+
+[🔧 Components](https://berrydashboard.io/vue/components/buttons) : A rich collection of reusable and customizable UI components.
+
+[🚀 Advanced Components](https://berrydashboard.io/vue/advance/snackbar) : Customizable and dynamic Snackbar components for delivering seamless notifications and user feedback in your application.
+
+[📝 Forms](https://berrydashboard.io/vue/forms/formvalidation) : Dynamic and customizable forms with advanced validation features for a smooth user experience.
+
+[📊 Tables](https://berrydashboard.io/vue/tables/tbl-basic) :  Simple and clean tables for displaying structured data effectively.
+
+[📈 Charts](https://berrydashboard.io/vue/forms/charts/apexchart) : Beautifully designed charts powered by modern data visualization libraries.
+
+[🔒 Authentication](https://berrydashboard.io/vue/register1) : Secure pages for login, registration, and password recovery, ensuring robust user management.
+
+[🛒 E-commerce App](https://berrydashboard.io/vue/ecommerce/products) : A streamlined system for managing products and inventory in your e-commerce platform.
+
+[💬 Chat Messages](https://berrydashboard.io/vue/app/chats) : An integrated chat system to enhance communication within your application.
+
+[👤 Account Profile](https://berrydashboard.io/vue/app/user/account-profile/profile1) : A sleek and customizable account profile page for managing user details and settings.
+
+## Why Upgrade to the Pro Version?
+
+🚀 <b>Advanced Features</b> : Access premium components and tools designed for modern, high-end projects. <br/><br/>
+⚡ <b>Faster Development</b> : Pre-designed pages, widgets, and features help you save time and effort. <br/><br/>
+📱 <b>Fully Responsive Design</b> : Enjoy a flawless experience across desktops, tablets, and smartphones. <br/><br/>
+🛠 <b>Developer-Friendly</b> : Modular code, clear documentation, and well-structured components make customization a breeze. <br/><br/>
+🎨 <b>Customization-Ready</b> : Personalize every aspect of your project with ease to match your branding needs.
+
+## Get Started with the Pro Version!
+
+👉 [Explore the Pro version now](https://codedthemes.com/item/berry-vue-admin-dashboard/) - and supercharge your development experience!

src/layouts/full/vertical-sidebar/VerticalSidebar.vue

@@ -52,7 +52,7 @@ const sidebarMenu = shallowRef(sidebarItems);
         <ExtraBox />
       </div>
       <div class="pa-4 text-center">
-        <v-chip color="inputBorder" size="small"> v1.2.0 </v-chip>
+        <v-chip color="inputBorder" size="small"> v1.3.0 </v-chip>
       </div>
     </perfect-scrollbar>
   </v-navigation-drawer>

src/layouts/full/vertical-sidebar/sidebarItem.ts

@@ -44,19 +44,19 @@ const sidebarItem: menu[] = [
       {
         title: 'Login',
         icon: CircleIcon,
-        to: '/auth/login'
+        to: '/login1'
       },
       {
         title: 'Register',
         icon: CircleIcon,
-        to: '/auth/register'
+        to: '/register'
       }
     ]
   },
   {
     title: 'Error 404',
     icon: BugIcon,
-    to: '/pages/error'
+    to: '/error'
   },
   { divider: true },
   { header: 'Utilities' },

src/plugins/mdi-icon.ts

@@ -1,9 +1,4 @@
-import {
-  mdiClose,
-  mdiHome,
-  mdiEyeOff,
-  mdiEye
-} from '@mdi/js';
+import { mdiClose, mdiHome, mdiEyeOff, mdiEye } from '@mdi/js';
 
 export const icons = {
   close: mdiClose,

src/router/AuthRoutes.ts → src/router/PublicRoutes.ts

@@ -1,26 +1,31 @@
-const AuthRoutes = {
-  path: '/auth',
+const PublicRoutes = {
+  path: '/',
   component: () => import('@/layouts/blank/BlankLayout.vue'),
   meta: {
     requiresAuth: false
   },
   children: [
+    {
+      name: 'Authentication',
+      path: '/login',
+      component: () => import('@/views/authentication/LoginPage.vue')
+    },
     {
       name: 'Login',
-      path: '/auth/login',
+      path: '/login1',
       component: () => import('@/views/authentication/auth/LoginPage.vue')
     },
     {
       name: 'Register',
-      path: '/auth/register',
+      path: '/register',
       component: () => import('@/views/authentication/auth/RegisterPage.vue')
     },
     {
       name: 'Error 404',
-      path: '/pages/error',
+      path: '/error',
       component: () => import('@/views/pages/maintenance/error/Error404Page.vue')
     }
   ]
 };
 
-export default AuthRoutes;
+export default PublicRoutes;

src/router/index.ts

@@ -1,6 +1,6 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import MainRoutes from './MainRoutes';
-import AuthRoutes from './AuthRoutes';
+import PublicRoutes from './PublicRoutes';
 import { useAuthStore } from '@/stores/auth';
 
 export const router = createRouter({
@@ -11,7 +11,7 @@ export const router = createRouter({
       component: () => import('@/views/pages/maintenance/error/Error404Page.vue')
     },
     MainRoutes,
-    AuthRoutes
+    PublicRoutes
   ]
 });
 
@@ -32,16 +32,26 @@ interface AuthStore {
 
 router.beforeEach(async (to, from, next) => {
   // redirect to login page if not logged in and trying to access a restricted page
-  const publicPages = ['/auth/login'];
-  const authRequired = !publicPages.includes(to.path);
+  const publicPages = ['/'];
   const auth: AuthStore = useAuthStore();
 
-  if (to.matched.some((record) => record.meta.requiresAuth)) {
-    if (authRequired && !auth.user) {
-      auth.returnUrl = to.fullPath;
-      return next('/auth/login');
-    } else next();
+  const isPublicPage = publicPages.includes(to.path);
+  const authRequired = !isPublicPage && to.matched.some((record) => record.meta.requiresAuth);
+
+  // User not logged in and trying to access a restricted page
+  if (authRequired && !auth.user) {
+    auth.returnUrl = to.fullPath; // Save the intended page
+    next('/login');
+  } else if (auth.user && to.path === '/login') {
+    // User logged in and trying to access the login page
+    next({
+      query: {
+        ...to.query,
+        redirect: auth.returnUrl !== '/' ? to.fullPath : undefined
+      }
+    });
   } else {
+    // All other scenarios, either public page or authorized access
     next();
   }
 });

src/scss/_override.scss

@@ -34,3 +34,31 @@ html {
     transform: rotate(270deg);
   }
 }
+
+// apexchart css
+.apexcharts-canvas {
+  .apexcharts-tooltip-rangebar {
+    padding: 0px 8px 5px;
+  }
+  .apexcharts-tooltip-title {
+    margin-bottom: 0;
+  }
+  .apexcharts-tooltip {
+    &.apexcharts-theme-light {
+      color: rgb(var(--v-theme-darkText));
+    }
+  }
+  .apexcharts-tooltip-series-group {
+    &.apexcharts-active,
+    &:last-child {
+      padding-bottom: 0;
+    }
+  }
+  .apexcharts-menu {
+    .apexcharts-menu-item {
+      &:hover {
+        background: rgb(var(--v-theme-gray100));
+      }
+    }
+  }
+}

src/scss/layout/_sidebar.scss

@@ -38,6 +38,10 @@
       font-size: 0.875rem;
     }
   }
+  .v-list-group__items .v-list-item {
+    margin-inline-start: calc(2px + var(--indent-padding) / 2);
+    padding-inline-start: 16px !important;
+  }
   .leftPadding {
     margin-left: 4px;
   }

src/stores/apps/README.md

@@ -0,0 +1,45 @@
+**Note:** *This README file is maintained to ensure the product structure aligns with the Pro version, making migration to Pro seamless when you choose to upgrade. This alignment aims to provide a smoother experience during the upgrade, especially regarding directory structure. You may notice these files and folders appearing throughout the project where they are part of the Pro version. While this might feel slightly inconvenient, it is intended to simplify your migration process and provide assistance. If these files are unnecessary for your use case, you can easily remove them.*
+
+Please continue reading below to explore the features of the Pro version:
+
+# Berry Admin Panel - Unlock Premium Features with the Pro Version
+
+Elevate your project with the Pro Version of the <b>Berry Admin Panel!</b> Built to cater to modern web applications, the Pro version is loaded with advanced features, intuitive design elements, and dynamic tools that ensure seamless functionality.
+
+This page (folder) is a sneak peek into the premium features available in <b>version 1.5.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
+
+## Included in the Pro Version:
+
+[🚀 Dashboards](https://berrydashboard.io/vue/dashboard/default) : Advanced dashboards with real-time insights and data visualizations for actionable metrics.
+
+[📦 Widgets](https://berrydashboard.io/vue/widget/statistics) : A curated library of pre-built widgets for enhanced functionality and faster development.
+
+[🔧 Components](https://berrydashboard.io/vue/components/buttons) : A rich collection of reusable and customizable UI components.
+
+[🚀 Advanced Components](https://berrydashboard.io/vue/advance/snackbar) : Customizable and dynamic Snackbar components for delivering seamless notifications and user feedback in your application.
+
+[📝 Forms](https://berrydashboard.io/vue/forms/formvalidation) : Dynamic and customizable forms with advanced validation features for a smooth user experience.
+
+[📊 Tables](https://berrydashboard.io/vue/tables/tbl-basic) :  Simple and clean tables for displaying structured data effectively.
+
+[📈 Charts](https://berrydashboard.io/vue/forms/charts/apexchart) : Beautifully designed charts powered by modern data visualization libraries.
+
+[🔒 Authentication](https://berrydashboard.io/vue/register1) : Secure pages for login, registration, and password recovery, ensuring robust user management.
+
+[🛒 E-commerce App](https://berrydashboard.io/vue/ecommerce/products) : A streamlined system for managing products and inventory in your e-commerce platform.
+
+[💬 Chat Messages](https://berrydashboard.io/vue/app/chats) : An integrated chat system to enhance communication within your application.
+
+[👤 Account Profile](https://berrydashboard.io/vue/app/user/account-profile/profile1) : A sleek and customizable account profile page for managing user details and settings.
+
+## Why Upgrade to the Pro Version?
+
+🚀 <b>Advanced Features</b> : Access premium components and tools designed for modern, high-end projects. <br/><br/>
+⚡ <b>Faster Development</b> : Pre-designed pages, widgets, and features help you save time and effort. <br/><br/>
+📱 <b>Fully Responsive Design</b> : Enjoy a flawless experience across desktops, tablets, and smartphones. <br/><br/>
+🛠 <b>Developer-Friendly</b> : Modular code, clear documentation, and well-structured components make customization a breeze. <br/><br/>
+🎨 <b>Customization-Ready</b> : Personalize every aspect of your project with ease to match your branding needs.
+
+## Get Started with the Pro Version!
+
+👉 [Explore the Pro version now](https://codedthemes.com/item/berry-vue-admin-dashboard/) - and supercharge your development experience!