From e9dac1ca2799970ecf9a7ff43cded36fc1819d09 Mon Sep 17 00:00:00 2001 From: Juless Date: Sun, 31 Oct 2021 18:30:16 +0000 Subject: [PATCH 001/122] Incomplete command "npm run serve" Missing run in npm run serve --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1a8a4d8..e7c35bdb 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ $ yarn install ``` bash # dev server with hot reload at http://localhost:3000 -$ npm serve +$ npm run serve ``` or From d2d9de7520af2f2783a50ede5b40f90719ae014e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Sun, 31 Oct 2021 20:50:56 +0100 Subject: [PATCH 002/122] fix: remove eslint and prettier warnings --- babel.config.js | 2 +- src/App.vue | 5 +- src/assets/icons/index.js | 20 ++--- src/components/AppBreadcrumb.vue | 2 +- src/components/AppHeader.vue | 1 - src/components/AppSidebar.vue | 4 +- src/components/AppSidebarNav.js | 50 ++++++----- src/components/DocsCallout.vue | 16 ++-- src/components/DocsExample.vue | 6 +- src/layouts/DefaultLayout.vue | 12 +-- src/router/index.js | 6 +- src/store/index.js | 2 +- src/views/Dashboard.vue | 32 +++++-- src/views/base/Accordion.vue | 14 +-- src/views/base/Cards.vue | 23 +++-- src/views/base/Carousels.vue | 110 ++++------------------- src/views/base/ListGroups.vue | 8 +- src/views/base/Navs.vue | 9 +- src/views/base/Popovers.vue | 12 +-- src/views/base/Tables.vue | 38 ++++---- src/views/base/Tooltips.vue | 8 +- src/views/buttons/ButtonGroups.vue | 38 ++++---- src/views/buttons/Buttons.vue | 10 +-- src/views/buttons/Dropdowns.vue | 2 +- src/views/forms/ChecksRadios.vue | 112 ++++++++++++------------ src/views/forms/FloatingLabels.vue | 36 ++++---- src/views/forms/FormControl.vue | 44 +++++----- src/views/forms/InputGroup.vue | 16 ++-- src/views/forms/Layout.vue | 32 +++---- src/views/forms/Range.vue | 6 +- src/views/forms/Validation.vue | 92 +++++++------------ src/views/icons/Brands.vue | 13 ++- src/views/icons/CoreUIIcons.vue | 13 ++- src/views/icons/Flags.vue | 13 ++- src/views/notifications/Modals.vue | 2 +- src/views/pages/Login.vue | 4 +- src/views/pages/Register.vue | 8 +- src/views/theme/ColorTheme.vue | 5 +- src/views/widgets/WidgetsStatsTypeA.vue | 6 +- src/views/widgets/WidgetsStatsTypeD.vue | 22 ++--- 40 files changed, 381 insertions(+), 473 deletions(-) diff --git a/babel.config.js b/babel.config.js index 716b0237..c1b783ea 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,3 +1,3 @@ module.exports = { - presets: ['@vue/cli-plugin-babel/preset'] + presets: ['@vue/cli-plugin-babel/preset'], } diff --git a/src/App.vue b/src/App.vue index c08c6ed9..7502212d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,6 @@ - diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 30cd7836..2c292085 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -22,9 +22,9 @@ import { cibCcStripe, cibCcPaypal, cibCcApplePay, - cibCcAmex -} from "@coreui/icons"; -import { cifUs, cifBr, cifIn, cifFr, cifEs, cifPl } from "@coreui/icons"; + cibCcAmex, +} from '@coreui/icons' +import { cifUs, cifBr, cifIn, cifFr, cifEs, cifPl } from '@coreui/icons' import { cilArrowBottom, cilArrowRight, @@ -76,8 +76,8 @@ import { cilUser, cilUserFemale, cilUserFollow, - cilXCircle -} from "@coreui/icons"; + cilXCircle, +} from '@coreui/icons' export const iconsSet = Object.assign( {}, @@ -132,7 +132,7 @@ export const iconsSet = Object.assign( cilUser, cilUserFemale, cilUserFollow, - cilXCircle + cilXCircle, }, { cifUs, @@ -140,7 +140,7 @@ export const iconsSet = Object.assign( cifIn, cifFr, cifEs, - cifPl + cifPl, }, { cibFacebook, @@ -166,6 +166,6 @@ export const iconsSet = Object.assign( cibCcStripe, cibCcPaypal, cibCcApplePay, - cibCcAmex - } -); + cibCcAmex, + }, +) diff --git a/src/components/AppBreadcrumb.vue b/src/components/AppBreadcrumb.vue index 5e0b2d20..53b29cdc 100644 --- a/src/components/AppBreadcrumb.vue +++ b/src/components/AppBreadcrumb.vue @@ -2,9 +2,9 @@ {{ item.name }} diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue index f4cfd638..e02b6f14 100644 --- a/src/components/AppHeader.vue +++ b/src/components/AppHeader.vue @@ -55,7 +55,6 @@ export default { AppHeaderDropdownAccnt, }, setup() { - return { logo, } diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue index 6d84edd1..2cb1703a 100644 --- a/src/components/AppSidebar.vue +++ b/src/components/AppSidebar.vue @@ -13,12 +13,12 @@ > diff --git a/src/components/AppSidebarNav.js b/src/components/AppSidebarNav.js index fcc2f7dc..25dfb803 100644 --- a/src/components/AppSidebarNav.js +++ b/src/components/AppSidebarNav.js @@ -1,39 +1,45 @@ import { defineComponent, h, onMounted, ref, resolveComponent } from 'vue' import { RouterLink, useRoute } from 'vue-router' -import { CBadge, CSidebarNav, CNavItem, CNavGroup, CNavTitle } from '@coreui/vue' +import { + CBadge, + CSidebarNav, + CNavItem, + CNavGroup, + CNavTitle, +} from '@coreui/vue' import nav from '@/_nav.js' const normalizePath = (path) => -decodeURI(path) - .replace(/#.*$/, '') - .replace(/(index)?\.(html)$/, '') + decodeURI(path) + .replace(/#.*$/, '') + .replace(/(index)?\.(html)$/, '') const isActiveLink = (route, link) => { -if (link === undefined) { - return false -} + if (link === undefined) { + return false + } -if (route.hash === link) { - return true -} + if (route.hash === link) { + return true + } -const currentPath = normalizePath(route.path) -const targetPath = normalizePath(link) + const currentPath = normalizePath(route.path) + const targetPath = normalizePath(link) -return currentPath === targetPath + return currentPath === targetPath } const isActiveItem = (route, item) => { -if (isActiveLink(route, item.to)) { - return true -} + if (isActiveLink(route, item.to)) { + return true + } -if (item.items) { - return item.items.some((child) => isActiveItem(route, child)) -} + if (item.items) { + return item.items.some((child) => isActiveItem(route, child)) + } -return false + return false } const AppSidebarNav = defineComponent({ @@ -56,7 +62,9 @@ const AppSidebarNav = defineComponent({ return h( CNavGroup, { - ...firstRender.value && { visible: item.items.some((child) => isActiveItem(route, child))} + ...(firstRender.value && { + visible: item.items.some((child) => isActiveItem(route, child)), + }), }, { togglerContent: () => [ diff --git a/src/components/DocsCallout.vue b/src/components/DocsCallout.vue index ff1adea9..59a495a5 100644 --- a/src/components/DocsCallout.vue +++ b/src/components/DocsCallout.vue @@ -1,16 +1,20 @@ diff --git a/src/router/index.js b/src/router/index.js index 66051c75..70c92526 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -274,17 +274,17 @@ const routes = [ { path: '500', name: 'Page500', - component: () => import('@/views/pages/Page500') + component: () => import('@/views/pages/Page500'), }, { path: 'login', name: 'Login', - component: () => import('@/views/pages/Login') + component: () => import('@/views/pages/Login'), }, { path: 'register', name: 'Register', - component: () => import('@/views/pages/Register') + component: () => import('@/views/pages/Register'), }, ], }, diff --git a/src/store/index.js b/src/store/index.js index b5f77ab4..57dcaeda 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -14,7 +14,7 @@ export default createStore({ }, updateSidebarVisible(state, payload) { state.sidebarVisible = payload.value - } + }, }, actions: {}, modules: {}, diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index a798e2fd..bbf62239 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -128,9 +128,15 @@
-
+
- {{item.title}} + {{ + item.title + }}
@@ -168,11 +174,15 @@
-
+
- {{item.title}} - {{item.value}}% + {{ item.title }} + {{ item.value }}%
@@ -181,13 +191,19 @@
-
+
Organic Search - {{item.value}} - ({{item.percent}}%) + {{ item.value }} + ({{ item.percent }}%)
diff --git a/src/views/base/Accordion.vue b/src/views/base/Accordion.vue index fd728258..8ec7a95e 100644 --- a/src/views/base/Accordion.vue +++ b/src/views/base/Accordion.vue @@ -14,7 +14,7 @@

- + Accordion Item #1 This is the first item's accordion body. It @@ -28,7 +28,7 @@ overflow. - + Accordion Item #2 This is the second item's accordion body. It @@ -42,7 +42,7 @@ overflow. - + Accordion Item #3 This is the third item's accordion body. It @@ -129,8 +129,8 @@ open when another item is opened.

- - + + Accordion Item #1 This is the first item's accordion body. It @@ -144,7 +144,7 @@ overflow. - + Accordion Item #2 This is the second item's accordion body. It @@ -158,7 +158,7 @@ overflow. - + Accordion Item #3 This is the third item's accordion body. It diff --git a/src/views/base/Cards.vue b/src/views/base/Cards.vue index 6d454925..96a2cc0e 100644 --- a/src/views/base/Cards.vue +++ b/src/views/base/Cards.vue @@ -571,7 +571,7 @@ Header @@ -612,7 +612,7 @@ :key="item" >

Use the CRow component and set - {xs|sm|md|lg|xl|xxl}="{ cols: * - }" + {xs|sm|md|lg|xl|xxl}="{ cols: * }" property to control how many grid columns (wrapped around your cards) you show per row. For example, here's - xs="{cols: 1}" laying out the cards - on one column, and - md="{cols: 1}" splitting four cards - to equal width across multiple rows, from the medium breakpoint up. + xs="{cols: 1}" laying out the cards on one + column, and md="{cols: 1}" splitting four + cards to equal width across multiple rows, from the medium + breakpoint up.

@@ -890,8 +887,8 @@

- Change it to md="{ cols: 3}" and - you'll see the fourth card wrap. + Change it to md="{ cols: 3}" and you'll + see the fourth card wrap.

diff --git a/src/views/base/Carousels.vue b/src/views/base/Carousels.vue index a84e6c35..ea3ae650 100644 --- a/src/views/base/Carousels.vue +++ b/src/views/base/Carousels.vue @@ -15,25 +15,13 @@ - slide 1 + slide 1 - slide 2 + slide 2 - slide 3 + slide 3 @@ -51,25 +39,13 @@ - slide 1 + slide 1 - slide 2 + slide 2 - slide 3 + slide 3 @@ -87,25 +63,13 @@ - slide 1 + slide 1 - slide 2 + slide 2 - slide 3 + slide 3 @@ -129,11 +93,7 @@ - slide 1 + slide 1
First slide label

@@ -142,11 +102,7 @@ - slide 2 + slide 2

First slide label

@@ -155,11 +111,7 @@ - slide 3 + slide 3

First slide label

@@ -183,25 +135,13 @@ - slide 1 + slide 1 - slide 2 + slide 2 - slide 3 + slide 3 @@ -223,25 +163,13 @@ - slide 1 + slide 1 - slide 2 + slide 2 - slide 3 + slide 3 @@ -263,6 +191,6 @@ export default { ReactImg, VueImg, } - } + }, } diff --git a/src/views/base/ListGroups.vue b/src/views/base/ListGroups.vue index 3722c5ce..442e8835 100644 --- a/src/views/base/ListGroups.vue +++ b/src/views/base/ListGroups.vue @@ -192,8 +192,8 @@ 'light', 'dark', ]" - :color="item" :key="item" + :color="item" >A simple {{ item }} list group item @@ -221,10 +221,10 @@ 'light', 'dark', ]" + :key="item" component="a" href="#" :color="item" - :key="item" >A simple {{ item }} list group item @@ -340,10 +340,10 @@ - + - + diff --git a/src/views/base/Navs.vue b/src/views/base/Navs.vue index 79bc08b2..5bb3026d 100644 --- a/src/views/base/Navs.vue +++ b/src/views/base/Navs.vue @@ -34,9 +34,8 @@

Classes are used throughout, so your markup can be super flexible. - Use{' '} - <ul>s like above, <ol> if the - order of your items is important, or roll your own with a + Use <ul>s like above, <ol> if + the order of your items is important, or roll your own with a <nav> element. Because the .nav uses display: flex, the nav links behave the same as nav items would, but without the extra markup. @@ -59,7 +58,7 @@

- Change the horizontal alignment of your nav with{' '} + Change the horizontal alignment of your nav with flexbox utilities @@ -207,7 +206,7 @@

Force your .nav's contents to extend the full available width one of two modifier classes. To proportionately fill - all available space with your{' '} .nav-items, use + all available space with your .nav-items, use layout="fill". Notice that all horizontal space is occupied, but not every nav item has the same width.

diff --git a/src/views/base/Popovers.vue b/src/views/base/Popovers.vue index e2b32e31..3a850f40 100644 --- a/src/views/base/Popovers.vue +++ b/src/views/base/Popovers.vue @@ -11,14 +11,14 @@ Click to toggle popover @@ -38,39 +38,39 @@

Popover on top Popover on right Popover on bottom Popover on left diff --git a/src/views/base/Tables.vue b/src/views/base/Tables.vue index c8b99b0c..841ea607 100644 --- a/src/views/base/Tables.vue +++ b/src/views/base/Tables.vue @@ -38,7 +38,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -153,7 +153,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -187,7 +187,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -218,7 +218,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -262,7 +262,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -293,7 +293,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -324,7 +324,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -364,7 +364,7 @@ 3 - + Larry the Bird @twitter @@ -397,7 +397,7 @@ 3 - + Larry the Bird @twitter @@ -443,7 +443,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -456,7 +456,7 @@ can be added to change colors:

- + # @@ -480,7 +480,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -523,7 +523,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -554,7 +554,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -599,7 +599,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -730,7 +730,7 @@ @mdo - + @@ -767,7 +767,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -845,7 +845,7 @@ 3 - Larry the Bird + Larry the Bird @twitter @@ -885,7 +885,7 @@ 3 - Larry the Bird + Larry the Bird @twitter diff --git a/src/views/base/Tooltips.vue b/src/views/base/Tooltips.vue index 40181ea9..b9184161 100644 --- a/src/views/base/Tooltips.vue +++ b/src/views/base/Tooltips.vue @@ -34,39 +34,39 @@

Tooltip on top Tooltip on right Tooltip on bottom Tooltip on left diff --git a/src/views/buttons/ButtonGroups.vue b/src/views/buttons/ButtonGroups.vue index d3e8a88b..491f32b9 100644 --- a/src/views/buttons/ButtonGroups.vue +++ b/src/views/buttons/ButtonGroups.vue @@ -86,21 +86,21 @@ aria-label="Basic checkbox toggle button group" > @@ -113,27 +113,27 @@ aria-label="Basic checkbox toggle button group" > @@ -384,30 +384,30 @@ aria-label="Vertical button group" > diff --git a/src/views/buttons/Buttons.vue b/src/views/buttons/Buttons.vue index 90e21d84..b754129a 100644 --- a/src/views/buttons/Buttons.vue +++ b/src/views/buttons/Buttons.vue @@ -294,10 +294,7 @@ ]" :key="color" > - + {{ color.charAt(0).toUpperCase() + color.slice(1) }} @@ -325,10 +322,7 @@ ]" :key="color" > - + {{ color.charAt(0).toUpperCase() + color.slice(1) }} diff --git a/src/views/buttons/Dropdowns.vue b/src/views/buttons/Dropdowns.vue index 659f82c9..58d44901 100644 --- a/src/views/buttons/Dropdowns.vue +++ b/src/views/buttons/Dropdowns.vue @@ -224,8 +224,8 @@
@@ -177,8 +177,8 @@ Password
@@ -199,27 +199,27 @@
Default file input example - +
Multiple files input example - +
Disabled file input example - +
Small file input example - +
Large file input example - +
@@ -234,9 +234,9 @@ Color picker diff --git a/src/views/forms/InputGroup.vue b/src/views/forms/InputGroup.vue index 6df0bc8a..d5370e1f 100644 --- a/src/views/forms/InputGroup.vue +++ b/src/views/forms/InputGroup.vue @@ -224,10 +224,10 @@ Button @@ -244,10 +244,10 @@ aria-describedby="button-addon2" /> Button @@ -467,42 +467,42 @@ Upload - + - + Upload Button Button diff --git a/src/views/forms/Layout.vue b/src/views/forms/Layout.vue index 47c852e1..4e508ab8 100644 --- a/src/views/forms/Layout.vue +++ b/src/views/forms/Layout.vue @@ -55,11 +55,11 @@ Email - + Password - + Address @@ -89,8 +89,8 @@ @@ -129,7 +129,7 @@ Email - + @@ -140,31 +140,31 @@ Password - +
Radios
@@ -209,9 +209,9 @@ @@ -222,8 +222,8 @@ @@ -237,9 +237,9 @@ @@ -327,8 +327,8 @@ @@ -377,8 +377,8 @@ @@ -435,8 +435,8 @@ diff --git a/src/views/forms/Range.vue b/src/views/forms/Range.vue index bc5a1999..57361b14 100644 --- a/src/views/forms/Range.vue +++ b/src/views/forms/Range.vue @@ -50,7 +50,7 @@

Example range - + @@ -70,11 +70,11 @@ Example range diff --git a/src/views/forms/Validation.vue b/src/views/forms/Validation.vue index 48b1fc2d..94bc5f67 100644 --- a/src/views/forms/Validation.vue +++ b/src/views/forms/Validation.vue @@ -9,7 +9,7 @@

For custom CoreUI form validation messages, you'll need to add the - noValidate boolean property to your + novalidate boolean property to your <CForm>. This disables the browser default feedback tooltips, but still provides access to the form validation APIs in JavaScript. Try to submit the form below; our JavaScript @@ -24,26 +24,18 @@ Email - + Looks good! Email - + Looks good! @@ -52,7 +44,7 @@ @ @@ -87,8 +79,8 @@ @@ -129,20 +121,12 @@ > Email - + Looks good! Email - + Looks good! @@ -153,7 +137,7 @@ @ @@ -188,8 +172,8 @@ @@ -227,37 +211,35 @@ - Email + Email Looks good! - Email + Email Looks good! - Username + Username @ - City + City @@ -280,7 +262,7 @@ > - City + City @@ -290,10 +272,10 @@ > - City + City @@ -303,8 +285,8 @@

@@ -362,17 +344,17 @@ >Example invalid feedback text @@ -392,8 +374,8 @@
@@ -428,26 +410,18 @@ Email - + Looks good! Email - + Looks good! @@ -458,7 +432,7 @@ @ diff --git a/src/views/icons/Brands.vue b/src/views/icons/Brands.vue index 1792a851..39e243e2 100644 --- a/src/views/icons/Brands.vue +++ b/src/views/icons/Brands.vue @@ -3,13 +3,11 @@ - - CoreUI Icons - Brand - + CoreUI Icons - Brand From f1322d42a073dcbb4093a09ab5cb525b07126213 Mon Sep 17 00:00:00 2001 From: mrholek Date: Mon, 12 Jun 2023 23:34:09 +0200 Subject: [PATCH 030/122] fix: resolve eslint warning --- src/views/base/Progress.vue | 1 + src/views/forms/Select.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/base/Progress.vue b/src/views/base/Progress.vue index 257cbbe1..200b2231 100644 --- a/src/views/base/Progress.vue +++ b/src/views/base/Progress.vue @@ -206,6 +206,7 @@ diff --git a/src/views/forms/Select.vue b/src/views/forms/Select.vue index d256949a..765cddfd 100644 --- a/src/views/forms/Select.vue +++ b/src/views/forms/Select.vue @@ -108,6 +108,7 @@ From b1b828def3b83260142461f0d3b8a31d600b412c Mon Sep 17 00:00:00 2001 From: mrholek Date: Mon, 12 Jun 2023 23:41:08 +0200 Subject: [PATCH 031/122] refactor: update views --- src/router/index.js | 4 +++- src/views/{ => dashboard}/Dashboard.vue | 10 +++++----- .../MainChartExample.vue => dashboard/MainChart.vue} | 0 3 files changed, 8 insertions(+), 6 deletions(-) rename src/views/{ => dashboard}/Dashboard.vue (98%) rename src/views/{charts/MainChartExample.vue => dashboard/MainChart.vue} (100%) diff --git a/src/router/index.js b/src/router/index.js index 0a195eac..ff424c75 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,7 +17,9 @@ const routes = [ // this generates a separate chunk (about.[hash].js) for this route // which is lazy-loaded when the route is visited. component: () => - import(/* webpackChunkName: "dashboard" */ '@/views/Dashboard.vue'), + import( + /* webpackChunkName: "dashboard" */ '@/views/dashboard/Dashboard.vue' + ), }, { path: '/theme', diff --git a/src/views/Dashboard.vue b/src/views/dashboard/Dashboard.vue similarity index 98% rename from src/views/Dashboard.vue rename to src/views/dashboard/Dashboard.vue index 3959c270..91421320 100644 --- a/src/views/Dashboard.vue +++ b/src/views/dashboard/Dashboard.vue @@ -28,7 +28,7 @@ - @@ -275,14 +275,14 @@ import avatar3 from '@/assets/images/avatars/3.jpg' import avatar4 from '@/assets/images/avatars/4.jpg' import avatar5 from '@/assets/images/avatars/5.jpg' import avatar6 from '@/assets/images/avatars/6.jpg' -import MainChartExample from './charts/MainChartExample' -import WidgetsStatsA from './widgets/WidgetsStatsTypeA.vue' -import WidgetsStatsD from './widgets/WidgetsStatsTypeD.vue' +import MainChart from './MainChart' +import WidgetsStatsA from './../widgets/WidgetsStatsTypeA.vue' +import WidgetsStatsD from './../widgets/WidgetsStatsTypeD.vue' export default { name: 'Dashboard', components: { - MainChartExample, + MainChart, WidgetsStatsA, WidgetsStatsD, }, diff --git a/src/views/charts/MainChartExample.vue b/src/views/dashboard/MainChart.vue similarity index 100% rename from src/views/charts/MainChartExample.vue rename to src/views/dashboard/MainChart.vue From bf6a0f745a70b7ffc70dece332622c653fbd02aa Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 13 Jun 2023 15:08:19 +0200 Subject: [PATCH 032/122] chore: update @coreui/vue to v4.9.0-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6db6c192..0fcfa430 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@coreui/icons": "^3.0.1", "@coreui/icons-vue": "2.0.0", "@coreui/utils": "^2.0.2", - "@coreui/vue": "^4.9.0-beta.0", + "@coreui/vue": "^4.9.0-beta.1", "@coreui/vue-chartjs": "2.1.0", "core-js": "^3.31.0", "vue": "^3.3.4", From 3b88337579ada11a98616406472d0327e76bf5c4 Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 13 Jun 2023 15:08:59 +0200 Subject: [PATCH 033/122] refactor: update color modes handling --- src/App.vue | 28 +++++++++++++++++++++++++ src/components/AppHeader.vue | 2 +- src/store/index.js | 1 + src/views/widgets/WidgetsStatsTypeA.vue | 17 +++++++++------ 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7502212d..84b32347 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,34 @@ + diff --git a/src/styles/examples.scss b/src/styles/examples.scss index 2390ba19..375fa9a5 100644 --- a/src/styles/examples.scss +++ b/src/styles/examples.scss @@ -1,5 +1,6 @@ /* stylelint-disable declaration-no-important, scss/selector-no-redundant-nesting-selector */ -$enable-deprecation-messages: false; /* stylelint-disable-line scss/dollar-variable-default */ + +$enable-deprecation-messages: false !default; @import "@coreui/coreui/scss/functions"; @import "@coreui/coreui/scss/variables"; @@ -53,6 +54,8 @@ $enable-deprecation-messages: false; /* stylelint-disable-line scss/dollar-varia } // Buttons + .col > .btn, + .col-auto > .btn, > .btn, > .btn-group { margin: .25rem .125rem; @@ -113,4 +116,4 @@ $enable-deprecation-messages: false; /* stylelint-disable-line scss/dollar-varia background-color: var(--#{$prefix}secondary-bg) !important; } } -} +} \ No newline at end of file From 129352d91de5ddf4c5c8b04171b42b0bf2eabbb9 Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 2 Jan 2024 18:55:22 +0100 Subject: [PATCH 078/122] refactor: update charts --- src/views/dashboard/MainChart.vue | 4 ++-- src/views/widgets/WidgetsStatsTypeA.vue | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/dashboard/MainChart.vue b/src/views/dashboard/MainChart.vue index de7c83d2..6df1c977 100644 --- a/src/views/dashboard/MainChart.vue +++ b/src/views/dashboard/MainChart.vue @@ -82,16 +82,16 @@ export default { }, }, y: { + beginAtZero: true, border: { color: getStyle('--cui-border-color-translucent'), }, grid: { color: getStyle('--cui-border-color-translucent'), }, + max: 250, ticks: { - beginAtZero: true, color: getStyle('--cui-body-color'), - max: 250, maxTicksLimit: 5, stepSize: Math.ceil(250 / 5), }, diff --git a/src/views/widgets/WidgetsStatsTypeA.vue b/src/views/widgets/WidgetsStatsTypeA.vue index 2d04467a..30677ff7 100644 --- a/src/views/widgets/WidgetsStatsTypeA.vue +++ b/src/views/widgets/WidgetsStatsTypeA.vue @@ -65,7 +65,6 @@ }, grid: { display: false, - drawBorder: false, }, ticks: { display: false, @@ -164,7 +163,6 @@ }, grid: { display: false, - drawBorder: false, }, ticks: { display: false, @@ -366,7 +364,6 @@ }, grid: { display: false, - drawBorder: false, drawTicks: false, }, ticks: { From 8a1dbee0b09696483fb6b16ea5f3559bbff87a20 Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 2 Jan 2024 18:57:05 +0100 Subject: [PATCH 079/122] refactor: update examples --- src/views/dashboard/Dashboard.vue | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue index 03b56757..fc95f213 100644 --- a/src/views/dashboard/Dashboard.vue +++ b/src/views/dashboard/Dashboard.vue @@ -8,7 +8,7 @@

Traffic

-
January 2021
+
January - July 2023
 @@ -258,12 +258,12 @@ export default { user: { name: 'Yiorgos Avraamu', new: true, - registered: 'Jan 1, 2021', + registered: 'Jan 1, 2023', }, country: { name: 'USA', flag: 'cif-us' }, usage: { value: 50, - period: 'Jun 11, 2021 - Jul 10, 2021', + period: 'Jun 11, 2023 - Jul 10, 2023', color: 'success', }, payment: { name: 'Mastercard', icon: 'cib-cc-mastercard' }, @@ -274,12 +274,12 @@ export default { user: { name: 'Avram Tarasios', new: false, - registered: 'Jan 1, 2021', + registered: 'Jan 1, 2023', }, country: { name: 'Brazil', flag: 'cif-br' }, usage: { value: 22, - period: 'Jun 11, 2021 - Jul 10, 2021', + period: 'Jun 11, 2023 - Jul 10, 2023', color: 'info', }, payment: { name: 'Visa', icon: 'cib-cc-visa' }, @@ -287,11 +287,11 @@ export default { }, { avatar: { src: avatar3, status: 'warning' }, - user: { name: 'Quintin Ed', new: true, registered: 'Jan 1, 2021' }, + user: { name: 'Quintin Ed', new: true, registered: 'Jan 1, 2023' }, country: { name: 'India', flag: 'cif-in' }, usage: { value: 74, - period: 'Jun 11, 2021 - Jul 10, 2021', + period: 'Jun 11, 2023 - Jul 10, 2023', color: 'warning', }, payment: { name: 'Stripe', icon: 'cib-cc-stripe' }, @@ -299,11 +299,11 @@ export default { }, { avatar: { src: avatar4, status: 'secondary' }, - user: { name: 'Enéas Kwadwo', new: true, registered: 'Jan 1, 2021' }, + user: { name: 'Enéas Kwadwo', new: true, registered: 'Jan 1, 2023' }, country: { name: 'France', flag: 'cif-fr' }, usage: { value: 98, - period: 'Jun 11, 2021 - Jul 10, 2021', + period: 'Jun 11, 2023 - Jul 10, 2023', color: 'danger', }, payment: { name: 'PayPal', icon: 'cib-cc-paypal' }, @@ -314,12 +314,12 @@ export default { user: { name: 'Agapetus Tadeáš', new: true, - registered: 'Jan 1, 2021', + registered: 'Jan 1, 2023', }, country: { name: 'Spain', flag: 'cif-es' }, usage: { value: 22, - period: 'Jun 11, 2021 - Jul 10, 2021', + period: 'Jun 11, 2023 - Jul 10, 2023', color: 'primary', }, payment: { name: 'Google Wallet', icon: 'cib-cc-apple-pay' }, @@ -330,12 +330,12 @@ export default { user: { name: 'Friderik Dávid', new: true, - registered: 'Jan 1, 2021', + registered: 'Jan 1, 2023', }, country: { name: 'Poland', flag: 'cif-pl' }, usage: { value: 43, - period: 'Jun 11, 2021 - Jul 10, 2021', + period: 'Jun 11, 2023 - Jul 10, 2023', color: 'success', }, payment: { name: 'Amex', icon: 'cib-cc-amex' }, From f0606c35f27d6b4576d1f2ba8431d16dcda972bb Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 2 Jan 2024 18:58:16 +0100 Subject: [PATCH 080/122] chore: update dependencies and devDependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @vitejs/plugin-vue ^4.5.0 → ^4.6.2 chart.js ^4.4.0 → ^4.4.1 eslint ^8.54.0 → ^8.56.0 eslint-plugin-vue ^9.18.1 → ^9.19.2 postcss ^8.4.31 → ^8.4.32 sass ^1.69.5 → ^1.69.6 vite ^4.5.0 → ^4.5.1 vue ^3.3.9 → ^3.4.3 --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 377afa2e..64c5d666 100644 --- a/package.json +++ b/package.json @@ -26,19 +26,19 @@ "@coreui/vue": "^5.0.0-rc.0", "@coreui/vue-chartjs": "^3.0.0-rc.0", "@popperjs/core": "^2.11.8", - "chart.js": "^4.4.0", + "chart.js": "^4.4.1", "simplebar-vue": "^2.3.3", - "vue": "^3.3.9", + "vue": "^3.4.3", "vue-router": "^4.2.5", "vuex": "^4.1.0" }, "devDependencies": { - "@vitejs/plugin-vue": "^4.5.0", + "@vitejs/plugin-vue": "^4.6.2", "autoprefixer": "^10.4.16", - "eslint": "^8.54.0", - "eslint-plugin-vue": "^9.18.1", - "postcss": "^8.4.31", - "sass": "^1.69.5", - "vite": "^4.5.0" + "eslint": "^8.56.0", + "eslint-plugin-vue": "^9.19.2", + "postcss": "^8.4.32", + "sass": "^1.69.6", + "vite": "^4.5.1" } } From 2da1dc45ca5c55f959e77dd75e36788221e465ab Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 2 Jan 2024 18:59:33 +0100 Subject: [PATCH 081/122] docs: update the year --- LICENSE | 2 +- README.md | 2 +- index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index b4870dd9..eee6fcc1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2023 creativeLabs Łukasz Holeczek. +Copyright (c) 2024 creativeLabs Łukasz Holeczek. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 85c93be9..0307d814 100644 --- a/README.md +++ b/README.md @@ -173,6 +173,6 @@ CoreUI is an MIT-licensed open source project and is completely free to use. How ## Copyright and License -copyright 2023 creativeLabs Łukasz Holeczek. +copyright 2024 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-free-react-admin-template/blob/main/LICENSE). diff --git a/index.html b/index.html index a4fa3cd7..ba17034b 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ * CoreUI Free Vue.js Admin Template * @version v5.0.0-rc.0 * @link https://coreui.io/product/free-vue-admin-template/ -* Copyright (c) 2023 creativeLabs Łukasz Holeczek +* Copyright (c) 2024 creativeLabs Łukasz Holeczek * Licensed under MIT (https://github.com/coreui/coreui-free-vue-admin-template/blob/main/LICENSE) --> From 241c16846a5e268aed2f1aa6cc73d0eb2798229f Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 2 Jan 2024 19:49:54 +0100 Subject: [PATCH 082/122] build: upgrade Vite to 5.x --- .eslintignore | 2 +- package.json | 4 ++-- vite.config.js => vite.config.mjs | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename vite.config.js => vite.config.mjs (100%) diff --git a/.eslintignore b/.eslintignore index fc6857ad..dc70b364 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,4 @@ node_modules/* /dist/** .eslintrc.js -vite.config.js +vite.config.mjs diff --git a/package.json b/package.json index 64c5d666..3e1e85bf 100644 --- a/package.json +++ b/package.json @@ -33,12 +33,12 @@ "vuex": "^4.1.0" }, "devDependencies": { - "@vitejs/plugin-vue": "^4.6.2", + "@vitejs/plugin-vue": "^5.0.2", "autoprefixer": "^10.4.16", "eslint": "^8.56.0", "eslint-plugin-vue": "^9.19.2", "postcss": "^8.4.32", "sass": "^1.69.6", - "vite": "^4.5.1" + "vite": "^5.0.10" } } diff --git a/vite.config.js b/vite.config.mjs similarity index 100% rename from vite.config.js rename to vite.config.mjs From da5a96342804ae8d9122e2a1c396870cc720e529 Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 2 Jan 2024 19:56:54 +0100 Subject: [PATCH 083/122] chore: update dependencies and devDependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @coreui/vue ^5.0.0-rc.0 → ^5.0.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e1e85bf..9832620f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@coreui/icons": "^3.0.1", "@coreui/icons-vue": "2.0.0", "@coreui/utils": "^2.0.2", - "@coreui/vue": "^5.0.0-rc.0", + "@coreui/vue": "^5.0.0-rc.1", "@coreui/vue-chartjs": "^3.0.0-rc.0", "@popperjs/core": "^2.11.8", "chart.js": "^4.4.1", From e5aeb255597df334d2ce4b6f859aa4f31cf26e4e Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 2 Jan 2024 20:08:19 +0100 Subject: [PATCH 084/122] refactor: make the sidebar logo clickable --- src/components/AppSidebar.vue | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue index 7f30fde9..681f896b 100644 --- a/src/components/AppSidebar.vue +++ b/src/components/AppSidebar.vue @@ -14,32 +14,24 @@ " > - - - - + + + + + + - + diff --git a/src/views/icons/Flags.vue b/src/views/icons/Flags.vue index cd23c088..a6004b0b 100644 --- a/src/views/icons/Flags.vue +++ b/src/views/icons/Flags.vue @@ -6,21 +6,18 @@ const icons = flagSet diff --git a/src/views/notifications/Alerts.vue b/src/views/notifications/Alerts.vue index a85699b0..1e1a634e 100644 --- a/src/views/notifications/Alerts.vue +++ b/src/views/notifications/Alerts.vue @@ -7,6 +7,7 @@ const alert = () => {