+
+### Gold Sponsors
+
+Support this project by [becoming a Gold Sponsor](https://opencollective.com/coreui/contribute/gold-sponsor-40960/). A big company logo will be added here with a link to your website.
+
+
+
+### Silver Sponsors
+
+Support this project by [becoming a Silver Sponsor](https://opencollective.com/coreui/contribute/silver-sponsor-40967/). A medium company logo will be added here with a link to your website.
+
+
+
+### Bronze Sponsors
+
+Support this project by [becoming a Bronze Sponsor](https://opencollective.com/coreui/contribute/bronze-sponsor-40966/). The company avatar will show up here with a link to your OpenCollective Profile.
+
+
+
+### Backers
+
+Thanks to all the backers and sponsors! Support this project by [becoming a backer](https://opencollective.com/coreui/contribute/backer-40965/).
+
+
+
+
## Copyright and License
-copyright 2021 creativeLabs Łukasz Holeczek.
+copyright 2022 creativeLabs Łukasz Holeczek.
Code released under [the MIT license](https://github.com/coreui/coreui-free-react-admin-template/blob/master/LICENSE).
There is only one limitation you can't can’t re-distribute the CoreUI as stock. You can’t do this if you modify the CoreUI. In past we faced some problems with persons who tried to sell CoreUI based templates.
-## Support CoreUI Development
-
-CoreUI is an MIT licensed open source project and completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying [CoreUI Pro Version](https://coreui.io/pro/).
-
-We're also open to conversations regarding custom sponsorship / consulting arrangements. Get in touch on [Twitter](https://twitter.com/lukaszholeczek).
From b7f962a3a9a02cea6944839621a5d2ff577564ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Holeczek?=
From 8700f05a6c6bfa719f54a14b5090b0126f6652bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Holeczek?=
Date: Sun, 10 Jul 2022 15:27:38 +0200
Subject: [PATCH 033/138] refactor: add link to documenation
---
src/_nav.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/_nav.js b/src/_nav.js
index f6c671725..8f3d730db 100644
--- a/src/_nav.js
+++ b/src/_nav.js
@@ -5,6 +5,7 @@ import {
cilCalculator,
cilChartPie,
cilCursor,
+ cilDescription,
cilDrop,
cilNotes,
cilPencil,
@@ -293,6 +294,12 @@ const _nav = [
},
],
},
+ {
+ component: CNavItem,
+ name: 'Docs',
+ href: 'https://coreui.io/react/docs/templates/installation/',
+ icon:
Date: Sun, 10 Jul 2022 23:28:08 +0200
Subject: [PATCH 034/138] chore: clean-uo
---
src/views/base/accordion/Accordion.js | 5 +----
src/views/base/breadcrumbs/Breadcrumbs.js | 5 +----
src/views/base/cards/Cards.js | 5 +----
src/views/base/carousels/Carousels.js | 5 +----
src/views/base/collapses/Collapses.js | 5 +----
src/views/base/list-groups/ListGroups.js | 5 +----
src/views/base/navs/Navs.js | 5 +----
src/views/base/paginations/Paginations.js | 5 +----
src/views/base/placeholders/Placeholders.js | 5 +----
src/views/base/popovers/Popovers.js | 5 +----
src/views/base/progress/Progress.js | 5 +----
src/views/base/spinners/Spinners.js | 5 +----
src/views/base/tables/Tables.js | 5 +----
src/views/base/tooltips/Tooltips.js | 5 +----
src/views/buttons/button-groups/ButtonGroups.js | 5 +----
src/views/buttons/buttons/Buttons.js | 5 +----
src/views/buttons/dropdowns/Dropdowns.js | 5 +----
src/views/forms/checks-radios/ChecksRadios.js | 5 +----
src/views/forms/floating-labels/FloatingLabels.js | 5 +----
src/views/forms/form-control/FormControl.js | 5 +----
src/views/forms/input-group/InputGroup.js | 5 +----
src/views/forms/range/Range.js | 5 +----
src/views/forms/select/Select.js | 5 +----
src/views/forms/validation/Validation.js | 5 +----
src/views/notifications/alerts/Alerts.js | 5 +----
src/views/notifications/badges/Badges.js | 5 +----
src/views/notifications/modals/Modals.js | 5 +----
src/views/notifications/toasts/Toasts.js | 5 +----
28 files changed, 28 insertions(+), 112 deletions(-)
diff --git a/src/views/base/accordion/Accordion.js b/src/views/base/accordion/Accordion.js
index 943d1711e..21e88215b 100644
--- a/src/views/base/accordion/Accordion.js
+++ b/src/views/base/accordion/Accordion.js
@@ -10,14 +10,11 @@ import {
CAccordionHeader,
CAccordionItem,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Accordion = () => {
return (
-
-
diff --git a/src/views/base/breadcrumbs/Breadcrumbs.js b/src/views/base/breadcrumbs/Breadcrumbs.js
index dd8e85b00..8ddd0cc0e 100644
--- a/src/views/base/breadcrumbs/Breadcrumbs.js
+++ b/src/views/base/breadcrumbs/Breadcrumbs.js
@@ -9,14 +9,11 @@ import {
CRow,
CLink,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Breadcrumbs = () => {
return (
-
-
diff --git a/src/views/base/cards/Cards.js b/src/views/base/cards/Cards.js
index 7dd84c488..b9bdfffcd 100644
--- a/src/views/base/cards/Cards.js
+++ b/src/views/base/cards/Cards.js
@@ -19,16 +19,13 @@ import {
CCol,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
import ReactImg from 'src/assets/images/react.jpg'
const Cards = () => {
return (
-
-
diff --git a/src/views/base/carousels/Carousels.js b/src/views/base/carousels/Carousels.js
index e64a81c37..3f09b3b3e 100644
--- a/src/views/base/carousels/Carousels.js
+++ b/src/views/base/carousels/Carousels.js
@@ -9,7 +9,7 @@ import {
CCol,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
import AngularImg from 'src/assets/images/angular.jpg'
import ReactImg from 'src/assets/images/react.jpg'
@@ -24,9 +24,6 @@ const slidesLight = [
const Carousels = () => {
return (
-
-
diff --git a/src/views/base/collapses/Collapses.js b/src/views/base/collapses/Collapses.js
index ef148d380..37e608e08 100644
--- a/src/views/base/collapses/Collapses.js
+++ b/src/views/base/collapses/Collapses.js
@@ -1,6 +1,6 @@
import React, { useState } from 'react'
import { CButton, CCard, CCardBody, CCardHeader, CCol, CCollapse, CRow } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Collapses = () => {
const [visible, setVisible] = useState(false)
@@ -10,9 +10,6 @@ const Collapses = () => {
return (
-
-
diff --git a/src/views/base/list-groups/ListGroups.js b/src/views/base/list-groups/ListGroups.js
index 282e40cf2..91cfbf1eb 100644
--- a/src/views/base/list-groups/ListGroups.js
+++ b/src/views/base/list-groups/ListGroups.js
@@ -10,14 +10,11 @@ import {
CListGroupItem,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const ListGroups = () => {
return (
-
-
diff --git a/src/views/base/navs/Navs.js b/src/views/base/navs/Navs.js
index 5beadd0fb..89310faf2 100644
--- a/src/views/base/navs/Navs.js
+++ b/src/views/base/navs/Navs.js
@@ -13,14 +13,11 @@ import {
CNavItem,
CNavLink,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Navs = () => {
return (
-
-
diff --git a/src/views/base/paginations/Paginations.js b/src/views/base/paginations/Paginations.js
index cf14e0ad0..f85961504 100644
--- a/src/views/base/paginations/Paginations.js
+++ b/src/views/base/paginations/Paginations.js
@@ -8,14 +8,11 @@ import {
CPaginationItem,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Paginations = () => {
return (
-
-
diff --git a/src/views/base/placeholders/Placeholders.js b/src/views/base/placeholders/Placeholders.js
index 99c88b792..5342f2214 100644
--- a/src/views/base/placeholders/Placeholders.js
+++ b/src/views/base/placeholders/Placeholders.js
@@ -11,16 +11,13 @@ import {
CPlaceholder,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
import ReactImg from 'src/assets/images/react.jpg'
const Placeholders = () => {
return (
-
-
diff --git a/src/views/base/popovers/Popovers.js b/src/views/base/popovers/Popovers.js
index 277f5467f..8d98e0def 100644
--- a/src/views/base/popovers/Popovers.js
+++ b/src/views/base/popovers/Popovers.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CButton, CCard, CCardBody, CCardHeader, CPopover, CRow, CCol } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Popovers = () => {
return (
-
-
diff --git a/src/views/base/progress/Progress.js b/src/views/base/progress/Progress.js
index 07cd7d206..42b9819f3 100644
--- a/src/views/base/progress/Progress.js
+++ b/src/views/base/progress/Progress.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CCard, CCardBody, CCardHeader, CCol, CProgress, CProgressBar, CRow } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Progress = () => {
return (
-
-
diff --git a/src/views/base/spinners/Spinners.js b/src/views/base/spinners/Spinners.js
index 8833aa7ec..918c2713a 100644
--- a/src/views/base/spinners/Spinners.js
+++ b/src/views/base/spinners/Spinners.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CButton, CCard, CCardBody, CCardHeader, CCol, CSpinner, CRow } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Accordion = () => {
return (
-
-
diff --git a/src/views/base/tables/Tables.js b/src/views/base/tables/Tables.js
index 57997517b..f06843d0b 100644
--- a/src/views/base/tables/Tables.js
+++ b/src/views/base/tables/Tables.js
@@ -13,14 +13,11 @@ import {
CTableHeaderCell,
CTableRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Tables = () => {
return (
-
-
diff --git a/src/views/base/tooltips/Tooltips.js b/src/views/base/tooltips/Tooltips.js
index de6020bb8..bdb4d9aac 100644
--- a/src/views/base/tooltips/Tooltips.js
+++ b/src/views/base/tooltips/Tooltips.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CButton, CCard, CCardBody, CCardHeader, CLink, CTooltip, CRow, CCol } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Tooltips = () => {
return (
-
-
diff --git a/src/views/buttons/button-groups/ButtonGroups.js b/src/views/buttons/button-groups/ButtonGroups.js
index c6aeb54ce..d48eb0071 100644
--- a/src/views/buttons/button-groups/ButtonGroups.js
+++ b/src/views/buttons/button-groups/ButtonGroups.js
@@ -18,14 +18,11 @@ import {
CInputGroupText,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const ButtonGroups = () => {
return (
-
-
diff --git a/src/views/buttons/buttons/Buttons.js b/src/views/buttons/buttons/Buttons.js
index d7b9e74c6..48f6fcf75 100644
--- a/src/views/buttons/buttons/Buttons.js
+++ b/src/views/buttons/buttons/Buttons.js
@@ -2,14 +2,11 @@ import React from 'react'
import { CButton, CCard, CCardBody, CCardHeader, CCol, CRow } from '@coreui/react'
import CIcon from '@coreui/icons-react'
import { cilBell } from '@coreui/icons'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Buttons = () => {
return (
-
-
diff --git a/src/views/buttons/dropdowns/Dropdowns.js b/src/views/buttons/dropdowns/Dropdowns.js
index bc688956c..414f651fc 100644
--- a/src/views/buttons/dropdowns/Dropdowns.js
+++ b/src/views/buttons/dropdowns/Dropdowns.js
@@ -13,14 +13,11 @@ import {
CDropdownToggle,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Dropdowns = () => {
return (
-
-
diff --git a/src/views/forms/checks-radios/ChecksRadios.js b/src/views/forms/checks-radios/ChecksRadios.js
index 84dcd6393..f35862ec1 100644
--- a/src/views/forms/checks-radios/ChecksRadios.js
+++ b/src/views/forms/checks-radios/ChecksRadios.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CCard, CCardBody, CCardHeader, CCol, CFormCheck, CFormSwitch, CRow } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const ChecksRadios = () => {
return (
-
-
diff --git a/src/views/forms/floating-labels/FloatingLabels.js b/src/views/forms/floating-labels/FloatingLabels.js
index 1acafb448..d40f5b35c 100644
--- a/src/views/forms/floating-labels/FloatingLabels.js
+++ b/src/views/forms/floating-labels/FloatingLabels.js
@@ -11,14 +11,11 @@ import {
CFormTextarea,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const FloatingLabels = () => {
return (
-
-
diff --git a/src/views/forms/form-control/FormControl.js b/src/views/forms/form-control/FormControl.js
index b064bff89..9bdb1076a 100644
--- a/src/views/forms/form-control/FormControl.js
+++ b/src/views/forms/form-control/FormControl.js
@@ -11,14 +11,11 @@ import {
CFormTextarea,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const FormControl = () => {
return (
-
-
diff --git a/src/views/forms/input-group/InputGroup.js b/src/views/forms/input-group/InputGroup.js
index 427714ac6..4b9da78db 100644
--- a/src/views/forms/input-group/InputGroup.js
+++ b/src/views/forms/input-group/InputGroup.js
@@ -19,14 +19,11 @@ import {
CInputGroupText,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Select = () => {
return (
-
-
diff --git a/src/views/forms/range/Range.js b/src/views/forms/range/Range.js
index 0cdb5b693..905c3134d 100644
--- a/src/views/forms/range/Range.js
+++ b/src/views/forms/range/Range.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CCard, CCardBody, CCardHeader, CCol, CFormLabel, CFormRange, CRow } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Range = () => {
return (
-
-
diff --git a/src/views/forms/select/Select.js b/src/views/forms/select/Select.js
index eccf1c1fe..e81f6a568 100644
--- a/src/views/forms/select/Select.js
+++ b/src/views/forms/select/Select.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CCard, CCardBody, CCardHeader, CCol, CFormSelect, CRow } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Select = () => {
return (
-
-
diff --git a/src/views/forms/validation/Validation.js b/src/views/forms/validation/Validation.js
index 160fa953c..7053aa3b3 100644
--- a/src/views/forms/validation/Validation.js
+++ b/src/views/forms/validation/Validation.js
@@ -16,7 +16,7 @@ import {
CInputGroupText,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const CustomStyles = () => {
const [validated, setValidated] = useState(false)
@@ -252,9 +252,6 @@ const Tooltips = () => {
const Validation = () => {
return (
-
-
diff --git a/src/views/notifications/alerts/Alerts.js b/src/views/notifications/alerts/Alerts.js
index 7cb442c3a..6d0200b74 100644
--- a/src/views/notifications/alerts/Alerts.js
+++ b/src/views/notifications/alerts/Alerts.js
@@ -9,14 +9,11 @@ import {
CCol,
CRow,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Alerts = () => {
return (
-
-
diff --git a/src/views/notifications/badges/Badges.js b/src/views/notifications/badges/Badges.js
index f8d4c0d82..f2c63b58d 100644
--- a/src/views/notifications/badges/Badges.js
+++ b/src/views/notifications/badges/Badges.js
@@ -1,13 +1,10 @@
import React from 'react'
import { CButton, CCard, CCardBody, CCardHeader, CCol, CBadge, CRow } from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const Badges = () => {
return (
-
-
diff --git a/src/views/notifications/modals/Modals.js b/src/views/notifications/modals/Modals.js
index 4d582883f..fcd31116b 100644
--- a/src/views/notifications/modals/Modals.js
+++ b/src/views/notifications/modals/Modals.js
@@ -15,7 +15,7 @@ import {
CRow,
CTooltip,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const LiveDemo = () => {
const [visible, setVisible] = useState(false)
@@ -460,9 +460,6 @@ const FullscreenModal = () => {
const Modals = () => {
return (
-
-
diff --git a/src/views/notifications/toasts/Toasts.js b/src/views/notifications/toasts/Toasts.js
index 50489cede..09422abbf 100644
--- a/src/views/notifications/toasts/Toasts.js
+++ b/src/views/notifications/toasts/Toasts.js
@@ -12,7 +12,7 @@ import {
CToastHeader,
CToaster,
} from '@coreui/react'
-import { DocsCallout, DocsExample } from 'src/components'
+import { DocsExample } from 'src/components'
const ExampleToast = () => {
const [toast, addToast] = useState(0)
@@ -48,9 +48,6 @@ const ExampleToast = () => {
const Toasts = () => {
return (
-
-
From 4ca8dfc3bed0dc3d9b40820e8d60b8f94d023369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Holeczek?=
Date: Sun, 10 Jul 2022 23:37:20 +0200
Subject: [PATCH 035/138] release: v4.4.0
---
package.json | 4 ++--
public/index.html | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 8449596e5..5117bbd64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-react-admin-template",
- "version": "4.3.1",
+ "version": "4.4.0",
"description": "CoreUI Free React Admin Template",
"homepage": ".",
"bugs": {
@@ -14,7 +14,7 @@
"author": "The CoreUI Team (https://github.com/orgs/coreui/people)",
"scripts": {
"build": "react-scripts build",
- "changelog": "auto-changelog --starting-version 4.3.1 --commit-limit false --hide-credit",
+ "changelog": "auto-changelog --starting-version 4.4.0 --commit-limit false --hide-credit",
"eject": "react-scripts eject",
"lint": "eslint \"src/**/*.js\"",
"start": "react-scripts start",
diff --git a/public/index.html b/public/index.html
index e017911e4..c148491cc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,7 +1,7 @@
From fa93c9a2fba719fe4424cfbf509f6914612e832d Mon Sep 17 00:00:00 2001
From: mrholek
Date: Tue, 9 May 2023 20:03:07 +0200
Subject: [PATCH 043/138] feat: add dark mode support
---
package.json | 2 +-
src/App.js | 63 +-
src/components/AppHeader.js | 61 +-
src/components/header/AppHeaderDropdown.js | 4 +-
src/layout/DefaultLayout.js | 2 +-
src/scss/_example.scss | 41 +-
src/scss/_variables.scss | 1792 +-------------------
src/store.js | 6 +
src/views/charts/MainChart.js | 107 ++
src/views/dashboard/Dashboard.js | 90 +-
src/views/pages/login/Login.js | 2 +-
src/views/pages/page404/Page404.js | 2 +-
src/views/pages/page500/Page500.js | 2 +-
src/views/pages/register/Register.js | 2 +-
14 files changed, 255 insertions(+), 1921 deletions(-)
create mode 100644 src/views/charts/MainChart.js
diff --git a/package.json b/package.json
index da08efaab..accecf866 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
},
"dependencies": {
"@coreui/chartjs": "^3.1.1",
- "@coreui/coreui": "^4.2.6",
+ "@coreui/coreui": "4.3.0-alpha.0",
"@coreui/icons": "^3.0.1",
"@coreui/icons-react": "^2.1.0",
"@coreui/react": "^4.6.0",
diff --git a/src/App.js b/src/App.js
index 7c2488188..dd068fe6f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,13 +1,29 @@
-import React, { Component, Suspense } from 'react'
+import React, { Suspense, useEffect } from 'react'
import { HashRouter, Route, Routes } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+
+import { CSpinner } from '@coreui/react'
import './scss/style.scss'
const loading = (
-
-
-
-
-
- )
+const App = () => {
+ const theme = useSelector((state) => state.theme)
+
+ if (theme) {
+ document.documentElement.dataset.coreuiTheme =
+ theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : theme
}
+
+ useEffect(() => {
+ window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
+ if (theme !== 'light' || theme !== 'dark') {
+ setTheme(getPreferredTheme(theme))
+ }
+ })
+ }, [])
+
+ return (
+
+
+
+
+
+
+ )
}
export default App
diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js
index dd5f544e3..25443a13d 100644
--- a/src/components/AppHeader.js
+++ b/src/components/AppHeader.js
@@ -3,6 +3,10 @@ import { NavLink } from 'react-router-dom'
import { useSelector, useDispatch } from 'react-redux'
import {
CContainer,
+ CDropdown,
+ CDropdownItem,
+ CDropdownMenu,
+ CDropdownToggle,
CHeader,
CHeaderBrand,
CHeaderDivider,
@@ -12,7 +16,15 @@ import {
CNavItem,
} from '@coreui/react'
import CIcon from '@coreui/icons-react'
-import { cilBell, cilEnvelopeOpen, cilList, cilMenu } from '@coreui/icons'
+import {
+ cilBell,
+ cilContrast,
+ cilEnvelopeOpen,
+ cilList,
+ cilMenu,
+ cilMoon,
+ cilSun,
+} from '@coreui/icons'
import { AppBreadcrumb } from './index'
import { AppHeaderDropdown } from './header/index'
@@ -21,6 +33,7 @@ import { logo } from 'src/assets/brand/logo'
const AppHeader = () => {
const dispatch = useDispatch()
const sidebarShow = useSelector((state) => state.sidebarShow)
+ const theme = useSelector((state) => state.theme)
return (
@@ -63,6 +76,52 @@ const AppHeader = () => {
+
+
+
+
+ {theme === 'dark' ? (
+
+
+ dispatch({ type: 'setTheme', theme: 'light' })}
+ >
+
+ dispatch({ type: 'setTheme', theme: 'dark' })}
+ >
+
+ dispatch({ type: 'setTheme', theme: 'auto' })}
+ >
+
+
+
+
+
+
- Account
+ Account
- Settings
+ Settings
-
+
)
+const getPreferredTheme = (storedTheme) => {
+ if (storedTheme) {
+ return storedTheme
+ }
+
+ return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+}
+
+const setTheme = (theme) => {
+ document.documentElement.dataset.coreuiTheme =
+ theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : theme
+}
+
// Containers
const DefaultLayout = React.lazy(() => import('./layout/DefaultLayout'))
@@ -17,22 +33,35 @@ const Register = React.lazy(() => import('./views/pages/register/Register'))
const Page404 = React.lazy(() => import('./views/pages/page404/Page404'))
const Page500 = React.lazy(() => import('./views/pages/page500/Page500'))
-class App extends Component {
- render() {
- return (
-
+
@@ -400,7 +316,7 @@ const Dashboard = () => {
-
+
+
diff --git a/src/views/pages/page404/Page404.js b/src/views/pages/page404/Page404.js
index 09e2cf4b2..c14e859fc 100644
--- a/src/views/pages/page404/Page404.js
+++ b/src/views/pages/page404/Page404.js
@@ -13,7 +13,7 @@ import { cilMagnifyingGlass } from '@coreui/icons'
const Page404 = () => {
return (
-
+
diff --git a/src/views/pages/page500/Page500.js b/src/views/pages/page500/Page500.js
index d7f6db305..11d867b89 100644
--- a/src/views/pages/page500/Page500.js
+++ b/src/views/pages/page500/Page500.js
@@ -13,7 +13,7 @@ import { cilMagnifyingGlass } from '@coreui/icons'
const Page500 = () => {
return (
-
+
diff --git a/src/views/pages/register/Register.js b/src/views/pages/register/Register.js
index ee8afffb8..4dc5b7ae7 100644
--- a/src/views/pages/register/Register.js
+++ b/src/views/pages/register/Register.js
@@ -16,7 +16,7 @@ import { cilLockLocked, cilUser } from '@coreui/icons'
const Register = () => {
return (
-
+
From 0613a3acb2e900a667eac1d659cd3129287561a2 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Tue, 9 May 2023 23:15:33 +0200
Subject: [PATCH 044/138] docs: update comments
---
public/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/index.html b/public/index.html
index b25132580..21d293335 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,9 +2,9 @@
From ef6012e658eef26ac97500be90e98575a6511360 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Tue, 9 May 2023 23:15:44 +0200
Subject: [PATCH 045/138] chore: clean-up
---
src/views/dashboard/Dashboard.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js
index e69957c7d..73341242e 100644
--- a/src/views/dashboard/Dashboard.js
+++ b/src/views/dashboard/Dashboard.js
@@ -54,8 +54,6 @@ import WidgetsDropdown from '../widgets/WidgetsDropdown'
import MainChart from '../charts/MainChart'
const Dashboard = () => {
- const random = (min, max) => Math.floor(Math.random() * (max - min + 1) + min)
-
const progressExample = [
{ title: 'Visits', value: '29.703 Users', percent: 40, color: 'success' },
{ title: 'Unique', value: '24.093 Users', percent: 20, color: 'info' },
From b4541954369519ca1a259ab28df846600319b30b Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 10 May 2023 10:04:45 +0200
Subject: [PATCH 046/138] refactor: update main chart
---
src/views/dashboard/Dashboard.js | 2 +-
src/views/{charts => dashboard}/MainChart.js | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename src/views/{charts => dashboard}/MainChart.js (100%)
diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js
index 73341242e..2bb1922a6 100644
--- a/src/views/dashboard/Dashboard.js
+++ b/src/views/dashboard/Dashboard.js
@@ -51,7 +51,7 @@ import avatar6 from 'src/assets/images/avatars/6.jpg'
import WidgetsBrand from '../widgets/WidgetsBrand'
import WidgetsDropdown from '../widgets/WidgetsDropdown'
-import MainChart from '../charts/MainChart'
+import MainChart from './MainChart'
const Dashboard = () => {
const progressExample = [
diff --git a/src/views/charts/MainChart.js b/src/views/dashboard/MainChart.js
similarity index 100%
rename from src/views/charts/MainChart.js
rename to src/views/dashboard/MainChart.js
From 88df73ad723ed03387b996808985ef627b586a37 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 12 May 2023 18:40:29 +0200
Subject: [PATCH 047/138] refactor: improve theme switch
---
src/App.js | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/App.js b/src/App.js
index dd068fe6f..b2ada6a90 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,6 +1,6 @@
import React, { Suspense, useEffect } from 'react'
import { HashRouter, Route, Routes } from 'react-router-dom'
-import { useSelector } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
import { CSpinner } from '@coreui/react'
import './scss/style.scss'
@@ -34,14 +34,15 @@ const Page404 = React.lazy(() => import('./views/pages/page404/Page404'))
const Page500 = React.lazy(() => import('./views/pages/page500/Page500'))
const App = () => {
+ const dispatch = useDispatch()
const theme = useSelector((state) => state.theme)
-
- if (theme) {
- document.documentElement.dataset.coreuiTheme =
- theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : theme
- }
+ const urlParams = new URLSearchParams(window.location.href.split('?')[1])
useEffect(() => {
+ if (urlParams.get('theme')) {
+ dispatch({ type: 'setTheme', theme: urlParams.get('theme') })
+ }
+
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
if (theme !== 'light' || theme !== 'dark') {
setTheme(getPreferredTheme(theme))
@@ -49,6 +50,10 @@ const App = () => {
})
}, [])
+ useEffect(() => {
+ setTheme(getPreferredTheme(theme))
+ }, [theme])
+
return (
From ccd3674280fdb5357b27384e8489107188cb6fd8 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 12 May 2023 18:41:17 +0200
Subject: [PATCH 048/138] chore: update dependencies
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index accecf866..e783eb289 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"@coreui/coreui": "4.3.0-alpha.0",
"@coreui/icons": "^3.0.1",
"@coreui/icons-react": "^2.1.0",
- "@coreui/react": "^4.6.0",
+ "@coreui/react": "^4.9.0-alpha.1",
"@coreui/react-chartjs": "^2.1.2",
"@coreui/utils": "^2.0.1",
"chart.js": "^3.9.1",
From 307e9f5554cc5b9f594bc41b3b6f7bab1924d7fc Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 12 Jun 2023 15:14:59 +0200
Subject: [PATCH 049/138] chore: update dependencies and devDependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@coreui/chartjs ^3.1.1 → ^3.1.2
@coreui/coreui 4.3.0-alpha.0 → 4.3.0-beta.0
@coreui/react 4.9.0-alpha.0 → 4.9.0-beta.0
@coreui/react-chartjs ^2.1.2 → ^2.1.3
@coreui/utils ^2.0.1 → ^2.0.2
chart.js ^3.9.1 → ^4.3.0
core-js ^3.29.0 → ^3.31.0
eslint-config-prettier ^8.7.0 → ^8.8.0
prettier 2.8.4 → 2.8.8
react-redux ^8.0.5 → ^8.0.7
react-router-dom ^6.8.2 → ^6.12.1
sass ^1.58.3 → ^1.63.3
simplebar-react ^2.4.3 → ^3.2.4
web-vitals ^3.1.1 → ^3.3.2
---
package.json | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/package.json b/package.json
index e783eb289..b4ec91f04 100644
--- a/package.json
+++ b/package.json
@@ -22,35 +22,35 @@
"test:debug": "react-scripts --inspect-brk test --runInBand"
},
"dependencies": {
- "@coreui/chartjs": "^3.1.1",
- "@coreui/coreui": "4.3.0-alpha.0",
+ "@coreui/chartjs": "^3.1.2",
+ "@coreui/coreui": "4.3.0-beta.0",
"@coreui/icons": "^3.0.1",
"@coreui/icons-react": "^2.1.0",
- "@coreui/react": "^4.9.0-alpha.1",
- "@coreui/react-chartjs": "^2.1.2",
- "@coreui/utils": "^2.0.1",
+ "@coreui/react": "^4.9.0-beta.0",
+ "@coreui/react-chartjs": "^2.1.3",
+ "@coreui/utils": "^2.0.2",
"chart.js": "^3.9.1",
"classnames": "^2.3.2",
- "core-js": "^3.29.0",
+ "core-js": "^3.31.0",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-app-polyfill": "^3.0.0",
"react-dom": "^18.2.0",
- "react-redux": "^8.0.5",
- "react-router-dom": "^6.8.2",
+ "react-redux": "^8.0.7",
+ "react-router-dom": "^6.12.1",
"redux": "4.2.1",
- "simplebar-react": "^2.4.3"
+ "simplebar-react": "^3.2.4"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
- "eslint-config-prettier": "^8.7.0",
+ "eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
- "prettier": "2.8.4",
+ "prettier": "2.8.8",
"react-scripts": "5.0.1",
- "sass": "^1.58.3",
- "web-vitals": "^3.1.1"
+ "sass": "^1.63.3",
+ "web-vitals": "^3.3.2"
},
"engines": {
"node": ">=10",
From 3504643bce5e17f227fa7179f063934e34bccb89 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 12 Jun 2023 15:54:42 +0200
Subject: [PATCH 050/138] refactor: move useColorModes
---
src/App.js | 45 +++++++++----------------------------
src/components/AppHeader.js | 21 +++++++++--------
src/store.js | 6 -----
3 files changed, 22 insertions(+), 50 deletions(-)
diff --git a/src/App.js b/src/App.js
index b2ada6a90..b1af84d3d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,29 +1,9 @@
import React, { Suspense, useEffect } from 'react'
import { HashRouter, Route, Routes } from 'react-router-dom'
-import { useDispatch, useSelector } from 'react-redux'
-import { CSpinner } from '@coreui/react'
+import { CSpinner, useColorModes } from '@coreui/react'
import './scss/style.scss'
-const loading = (
-
-
+
+
+ }
+ >
@@ -81,9 +84,9 @@ const AppHeader = () => {
- {theme === 'dark' ? (
+ {colorMode === 'dark' ? (
dispatch({ type: 'setTheme', theme: 'light' })}
+ onClick={() => setColorMode('light')}
>
dispatch({ type: 'setTheme', theme: 'dark' })}
+ onClick={() => setColorMode('dark')}
>
dispatch({ type: 'setTheme', theme: 'auto' })}
+ onClick={() => setColorMode('auto')}
>
diff --git a/src/store.js b/src/store.js
index d0d7df485..ab446364c 100644
--- a/src/store.js
+++ b/src/store.js
@@ -2,16 +2,10 @@ import { createStore } from 'redux'
const initialState = {
sidebarShow: true,
- theme: localStorage.getItem('coreui-free-react-admin-template-theme') ?? 'light',
}
const changeState = (state = initialState, { type, ...rest }) => {
switch (type) {
- case 'setTheme':
- const event = new Event('ColorSchemeChange')
- document.documentElement.dispatchEvent(event)
- localStorage.setItem('coreui-free-react-admin-template-theme', rest.theme)
- return { ...state, ...rest }
case 'set':
return { ...state, ...rest }
default:
From c5533162749f98da06b86294e7ce82d88a8642ba Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 12 Jun 2023 15:54:57 +0200
Subject: [PATCH 051/138] refactor: add color modes support
---
src/views/dashboard/MainChart.js | 204 +++++++++++++++------------
src/views/widgets/WidgetsDropdown.js | 25 +++-
2 files changed, 139 insertions(+), 90 deletions(-)
diff --git a/src/views/dashboard/MainChart.js b/src/views/dashboard/MainChart.js
index de6c5ff3c..b017c23ee 100644
--- a/src/views/dashboard/MainChart.js
+++ b/src/views/dashboard/MainChart.js
@@ -1,106 +1,132 @@
-import React from 'react'
+import React, { useEffect, useRef } from 'react'
+
import { CChartLine } from '@coreui/react-chartjs'
import { getStyle } from '@coreui/utils'
const MainChart = () => {
+ const chartRef = useRef(null)
+
+ useEffect(() => {
+ document.documentElement.addEventListener('ColorSchemeChange', () => {
+ if (chartRef.current) {
+ setTimeout(() => {
+ chartRef.current.options.scales.x.grid.borderColor = getStyle(
+ '--cui-border-color-translucent',
+ )
+ chartRef.current.options.scales.x.grid.color = getStyle('--cui-border-color-translucent')
+ chartRef.current.options.scales.x.ticks.color = getStyle('--cui-body-color')
+ chartRef.current.options.scales.y.grid.borderColor = getStyle(
+ '--cui-border-color-translucent',
+ )
+ chartRef.current.options.scales.y.grid.color = getStyle('--cui-border-color-translucent')
+ chartRef.current.options.scales.y.ticks.color = getStyle('--cui-body-color')
+ chartRef.current.update()
+ })
+ }
+ })
+ }, [chartRef])
+
const random = () => Math.round(Math.random() * 100)
return (
-
+
@@ -44,6 +65,7 @@ const WidgetsDropdown = () => {
}
chart={
{
}
chart={
Date: Mon, 12 Jun 2023 15:56:42 +0200
Subject: [PATCH 052/138] refactor: update SimpleBar to v3
---
src/components/AppSidebar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js
index a75bf6523..4d81c268e 100644
--- a/src/components/AppSidebar.js
+++ b/src/components/AppSidebar.js
@@ -10,7 +10,7 @@ import { logoNegative } from 'src/assets/brand/logo-negative'
import { sygnet } from 'src/assets/brand/sygnet'
import SimpleBar from 'simplebar-react'
-import 'simplebar/dist/simplebar.min.css'
+import 'simplebar-react/dist/simplebar.min.css';
// sidebar nav config
import navigation from '../_nav'
From 3411c2fffa3eb2d28c76354f5bbee18df7025e8c Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 12 Jun 2023 15:56:42 +0200
Subject: [PATCH 053/138] refactor: update SimpleBar to v3
---
src/components/AppSidebar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js
index a75bf6523..d279a1101 100644
--- a/src/components/AppSidebar.js
+++ b/src/components/AppSidebar.js
@@ -10,7 +10,7 @@ import { logoNegative } from 'src/assets/brand/logo-negative'
import { sygnet } from 'src/assets/brand/sygnet'
import SimpleBar from 'simplebar-react'
-import 'simplebar/dist/simplebar.min.css'
+import 'simplebar-react/dist/simplebar.min.css'
// sidebar nav config
import navigation from '../_nav'
From efec57820b90a5e094bae41cc22a570773d79837 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Tue, 13 Jun 2023 16:01:54 +0200
Subject: [PATCH 054/138] chore: update dependencies and devDependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@coreui/react ^4.9.0-beta.0 → ^4.9.0-beta.1
react-redux ^8.0.7 → ^8.1.0
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index b4ec91f04..32f972953 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"@coreui/coreui": "4.3.0-beta.0",
"@coreui/icons": "^3.0.1",
"@coreui/icons-react": "^2.1.0",
- "@coreui/react": "^4.9.0-beta.0",
+ "@coreui/react": "^4.9.0-beta.1",
"@coreui/react-chartjs": "^2.1.3",
"@coreui/utils": "^2.0.2",
"chart.js": "^3.9.1",
@@ -36,7 +36,7 @@
"react": "^18.2.0",
"react-app-polyfill": "^3.0.0",
"react-dom": "^18.2.0",
- "react-redux": "^8.0.7",
+ "react-redux": "^8.1.0",
"react-router-dom": "^6.12.1",
"redux": "4.2.1",
"simplebar-react": "^3.2.4"
From 615f93333c23dbacd4884d3bcdb534db5725d026 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Tue, 13 Jun 2023 16:03:40 +0200
Subject: [PATCH 055/138] refactor: improve color modes handling
---
src/App.js | 14 +++++++++++---
src/store.js | 1 +
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/App.js b/src/App.js
index b1af84d3d..9d50b99c1 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,6 @@
import React, { Suspense, useEffect } from 'react'
import { HashRouter, Route, Routes } from 'react-router-dom'
+import { useSelector } from 'react-redux'
import { CSpinner, useColorModes } from '@coreui/react'
import './scss/style.scss'
@@ -14,14 +15,21 @@ const Page404 = React.lazy(() => import('./views/pages/page404/Page404'))
const Page500 = React.lazy(() => import('./views/pages/page500/Page500'))
const App = () => {
- const { setColorMode } = useColorModes('coreui-free-react-admin-template-theme')
- const urlParams = new URLSearchParams(window.location.href.split('?')[1])
+ const { isColorModeSet, setColorMode } = useColorModes('coreui-free-react-admin-template-theme')
+ const theme = useSelector((state) => state.theme)
useEffect(() => {
+ const urlParams = new URLSearchParams(window.location.href.split('?')[1])
if (urlParams.get('theme')) {
setColorMode(urlParams.get('theme'))
}
- }, [])
+
+ if (isColorModeSet()) {
+ return
+ }
+
+ setColorMode(theme)
+ }, []) // eslint-disable-line react-hooks/exhaustive-deps
return (
diff --git a/src/store.js b/src/store.js
index ab446364c..559c5983e 100644
--- a/src/store.js
+++ b/src/store.js
@@ -2,6 +2,7 @@ import { createStore } from 'redux'
const initialState = {
sidebarShow: true,
+ theme: 'light',
}
const changeState = (state = initialState, { type, ...rest }) => {
From f399a308d0988986ddc204873903e315dc2701d8 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 14 Jun 2023 15:27:16 +0200
Subject: [PATCH 056/138] refactor: update main view
---
src/views/dashboard/Dashboard.js | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js
index 2bb1922a6..c03b691c1 100644
--- a/src/views/dashboard/Dashboard.js
+++ b/src/views/dashboard/Dashboard.js
@@ -314,16 +314,20 @@ const Dashboard = () => {
-
+
-
+
- User
- Country
- Usage
- Payment Method
- Activity
+ User
+
+ Country
+
+ Usage
+
+ Payment Method
+
+ Activity
@@ -334,7 +338,7 @@ const Dashboard = () => {
-
-)
-
-const getPreferredTheme = (storedTheme) => {
- if (storedTheme) {
- return storedTheme
- }
-
- return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
-}
-
-const setTheme = (theme) => {
- document.documentElement.dataset.coreuiTheme =
- theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : theme
-}
-
// Containers
const DefaultLayout = React.lazy(() => import('./layout/DefaultLayout'))
@@ -34,29 +14,24 @@ const Page404 = React.lazy(() => import('./views/pages/page404/Page404'))
const Page500 = React.lazy(() => import('./views/pages/page500/Page500'))
const App = () => {
- const dispatch = useDispatch()
- const theme = useSelector((state) => state.theme)
+ const { setColorMode } = useColorModes('coreui-free-react-admin-template-theme')
const urlParams = new URLSearchParams(window.location.href.split('?')[1])
useEffect(() => {
if (urlParams.get('theme')) {
- dispatch({ type: 'setTheme', theme: urlParams.get('theme') })
+ setColorMode(urlParams.get('theme'))
}
-
- window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
- if (theme !== 'light' || theme !== 'dark') {
- setTheme(getPreferredTheme(theme))
- }
- })
}, [])
- useEffect(() => {
- setTheme(getPreferredTheme(theme))
- }, [theme])
-
return (
{item.user.name}
-
+
- Sign in
+
+ Sign in
+
@@ -314,7 +318,9 @@ const Layout = () => {
- Submit
+
+ Submit
+
@@ -353,7 +359,9 @@ const Layout = () => {
- Submit
+
+ Submit
+
@@ -400,7 +408,9 @@ const Layout = () => {
- Submit
+
+ Submit
+
diff --git a/src/views/notifications/modals/Modals.js b/src/views/notifications/modals/Modals.js
index d65dd44b2..11e375884 100644
--- a/src/views/notifications/modals/Modals.js
+++ b/src/views/notifications/modals/Modals.js
@@ -21,7 +21,9 @@ const LiveDemo = () => {
const [visible, setVisible] = useState(false)
return (
<>
- setVisible(!visible)}>Launch demo modal
+ setVisible(!visible)}>
+ Launch demo modal
+
setVisible(false)}>
Modal title
@@ -42,7 +44,9 @@ const StaticBackdrop = () => {
const [visible, setVisible] = useState(false)
return (
<>
- setVisible(!visible)}>Launch static backdrop modal
+ setVisible(!visible)}>
+ Launch static backdrop modal
+
setVisible(false)}>
Modal title
@@ -65,7 +69,9 @@ const ScrollingLongContent = () => {
const [visible, setVisible] = useState(false)
return (
<>
- setVisible(!visible)}>Launch demo modal
+ setVisible(!visible)}>
+ Launch demo modal
+
setVisible(false)}>
Modal title
@@ -165,7 +171,9 @@ const ScrollingLongContent2 = () => {
const [visible, setVisible] = useState(false)
return (
<>
- setVisible(!visible)}>Launch demo modal
+ setVisible(!visible)}>
+ Launch demo modal
+
setVisible(false)}>
Modal title
@@ -265,7 +273,9 @@ const VerticallyCentered = () => {
const [visible, setVisible] = useState(false)
return (
<>
- setVisible(!visible)}>Vertically centered modal
+ setVisible(!visible)}>
+ Vertically centered modal
+
setVisible(false)}>
Modal title
@@ -289,7 +299,9 @@ const VerticallyCentered2 = () => {
const [visible, setVisible] = useState(false)
return (
<>
- setVisible(!visible)}>Vertically centered scrollable modal
+ setVisible(!visible)}>
+ Vertically centered scrollable modal
+
setVisible(false)}>
Modal title
@@ -332,7 +344,9 @@ const TooltipsPopovers = () => {
const [visible, setVisible] = useState(false)
return (
<>
- setVisible(!visible)}>Launch demo modal
+ setVisible(!visible)}>
+ Launch demo modal
+
setVisible(false)}>
Modal title
@@ -342,7 +356,7 @@ const TooltipsPopovers = () => {
setVisibleXL(!visibleXL)}>Extra large modal
- setVisibleLg(!visibleLg)}>Large modal
- setVisibleSm(!visibleSm)}>Small large modal
+ setVisibleXL(!visibleXL)}>
+ Extra large modal
+
+ setVisibleLg(!visibleLg)}>
+ Large modal
+
+ setVisibleSm(!visibleSm)}>
+ Small large modal
+
setVisibleXL(false)}>
Extra large modal
@@ -411,12 +431,24 @@ const FullscreenModal = () => {
return (
<>
- setVisible(!visible)}>Full screen
- setVisibleSm(!visibleSm)}>Full screen below sm
- setVisibleMd(!visibleMd)}>Full screen below md
- setVisibleLg(!visibleLg)}>Full screen below lg
- setVisibleXL(!visibleXL)}>Full screen below xl
- setVisibleXXL(!visibleXXL)}>Full screen below xxl
+ setVisible(!visible)}>
+ Full screen
+
+ setVisibleSm(!visibleSm)}>
+ Full screen below sm
+
+ setVisibleMd(!visibleMd)}>
+ Full screen below md
+
+ setVisibleLg(!visibleLg)}>
+ Full screen below lg
+
+ setVisibleXL(!visibleXL)}>
+ Full screen below xl
+
+ setVisibleXXL(!visibleXXL)}>
+ Full screen below xxl
+
setVisible(false)}>
Full screen
diff --git a/src/views/notifications/toasts/Toasts.js b/src/views/notifications/toasts/Toasts.js
index 9631a0e83..639b78b48 100644
--- a/src/views/notifications/toasts/Toasts.js
+++ b/src/views/notifications/toasts/Toasts.js
@@ -39,7 +39,9 @@ const ExampleToast = () => {
)
return (
<>
- addToast(exampleToast)}>Send a toast
+ addToast(exampleToast)}>
+ Send a toast
+
Date: Mon, 13 Nov 2023 19:58:21 +0100
Subject: [PATCH 085/138] fix: make the sidebar close button visible under the
`lg` breakpoint
---
src/components/AppSidebar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js
index 156ae8014..6e9f3495f 100644
--- a/src/components/AppSidebar.js
+++ b/src/components/AppSidebar.js
@@ -45,7 +45,7 @@ const AppSidebar = () => {
dispatch({ type: 'set', sidebarShow: false })}
/>
From 8f55012707027a38dba8b39e27ce2f656e6e3af4 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 13 Nov 2023 20:13:12 +0100
Subject: [PATCH 086/138] refactor: resolve deprecation warning
---
src/store.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/store.js b/src/store.js
index 559c5983e..8ad30dad6 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,4 +1,4 @@
-import { createStore } from 'redux'
+import { legacy_createStore as createStore } from 'redux'
const initialState = {
sidebarShow: true,
From f8d4f9f0c6427c79708236a346488d4a34b1f970 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 15 Nov 2023 11:31:41 +0100
Subject: [PATCH 087/138] refactor: improve responsive behavior
---
src/components/AppContent.js | 2 +-
src/views/dashboard/Dashboard.js | 76 ++++++++------
src/views/theme/colors/Colors.js | 2 +-
src/views/widgets/Widgets.js | 146 ++++++++++-----------------
src/views/widgets/WidgetsBrand.js | 25 ++---
src/views/widgets/WidgetsDropdown.js | 23 +++--
6 files changed, 123 insertions(+), 151 deletions(-)
diff --git a/src/components/AppContent.js b/src/components/AppContent.js
index b72cc6bd6..b9a39ef50 100644
--- a/src/components/AppContent.js
+++ b/src/components/AppContent.js
@@ -7,7 +7,7 @@ import routes from '../routes'
const AppContent = () => {
return (
-
+
{routes.map((route, idx) => {
diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js
index da59f7818..5b0b61041 100644
--- a/src/views/dashboard/Dashboard.js
+++ b/src/views/dashboard/Dashboard.js
@@ -1,4 +1,5 @@
import React from 'react'
+import classNames from 'classnames'
import {
CAvatar,
@@ -90,12 +91,12 @@ const Dashboard = () => {
user: {
name: 'Yiorgos Avraamu',
new: true,
- registered: 'Jan 1, 2021',
+ registered: 'Jan 1, 2023',
},
country: { name: 'USA', flag: cifUs },
usage: {
value: 50,
- period: 'Jun 11, 2021 - Jul 10, 2021',
+ period: 'Jun 11, 2023 - Jul 10, 2023',
color: 'success',
},
payment: { name: 'Mastercard', icon: cibCcMastercard },
@@ -106,12 +107,12 @@ const Dashboard = () => {
user: {
name: 'Avram Tarasios',
new: false,
- registered: 'Jan 1, 2021',
+ registered: 'Jan 1, 2023',
},
country: { name: 'Brazil', flag: cifBr },
usage: {
value: 22,
- period: 'Jun 11, 2021 - Jul 10, 2021',
+ period: 'Jun 11, 2023 - Jul 10, 2023',
color: 'info',
},
payment: { name: 'Visa', icon: cibCcVisa },
@@ -119,11 +120,11 @@ const Dashboard = () => {
},
{
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: cifIn },
usage: {
value: 74,
- period: 'Jun 11, 2021 - Jul 10, 2021',
+ period: 'Jun 11, 2023 - Jul 10, 2023',
color: 'warning',
},
payment: { name: 'Stripe', icon: cibCcStripe },
@@ -131,11 +132,11 @@ const Dashboard = () => {
},
{
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: cifFr },
usage: {
value: 98,
- period: 'Jun 11, 2021 - Jul 10, 2021',
+ period: 'Jun 11, 2023 - Jul 10, 2023',
color: 'danger',
},
payment: { name: 'PayPal', icon: cibCcPaypal },
@@ -146,12 +147,12 @@ const Dashboard = () => {
user: {
name: 'Agapetus Tadeáš',
new: true,
- registered: 'Jan 1, 2021',
+ registered: 'Jan 1, 2023',
},
country: { name: 'Spain', flag: cifEs },
usage: {
value: 22,
- period: 'Jun 11, 2021 - Jul 10, 2021',
+ period: 'Jun 11, 2023 - Jul 10, 2023',
color: 'primary',
},
payment: { name: 'Google Wallet', icon: cibCcApplePay },
@@ -162,12 +163,12 @@ const Dashboard = () => {
user: {
name: 'Friderik Dávid',
new: true,
- registered: 'Jan 1, 2021',
+ registered: 'Jan 1, 2023',
},
country: { name: 'Poland', flag: cifPl },
usage: {
value: 43,
- period: 'Jun 11, 2021 - Jul 10, 2021',
+ period: 'Jun 11, 2023 - Jul 10, 2023',
color: 'success',
},
payment: { name: 'Amex', icon: cibCcAmex },
@@ -177,7 +178,7 @@ const Dashboard = () => {
return (
<>
-
@@ -185,7 +186,7 @@ const Dashboard = () => {
@@ -208,22 +209,31 @@ const Dashboard = () => {
-
- {progressExample.map((item, index) => (
-
+
+ {progressExample.map((item, index, items) => (
+
))}
-
-
@@ -232,20 +242,21 @@ const Dashboard = () => {
-
+
-
+
-
{progressGroupExample1.map((item, index) => (
-
-
+
-
+
@@ -314,7 +324,7 @@ const Dashboard = () => {
-
+
Widgets
-
+
-
-
-
+
+
+
-
+
-
+
-
+
{
-
-
-
+
+
+
{
text="Lorem ipsum dolor sit amet enim."
/>
-
+
{
text="Lorem ipsum dolor sit amet enim."
/>
-
+
{
text="Lorem ipsum dolor sit amet enim."
/>
-
+
{
-
-
+
+
{
}}
/>
}
- className="mb-4"
title="title"
value="1,123"
/>
@@ -273,7 +264,6 @@ const Widgets = () => {
}}
/>
}
- className="mb-4"
title="title"
value="1,123"
/>
@@ -345,7 +335,6 @@ const Widgets = () => {
}}
/>
}
- className="mb-4"
title="title"
value="1,123"
/>
@@ -425,7 +414,6 @@ const Widgets = () => {
}}
/>
}
- className="mb-4"
title="title"
value="1,123"
/>
@@ -505,7 +493,6 @@ const Widgets = () => {
}}
/>
}
- className="mb-4"
title="title"
value="1,123"
/>
@@ -585,45 +572,40 @@ const Widgets = () => {
}}
/>
}
- className="mb-4"
title="title"
value="1,123"
/>
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
{item.user.new ? 'New' : 'Recurring'} | Registered:{' '}
{item.user.registered}
@@ -343,11 +347,9 @@ const Dashboard = () => {
-
- Sign in
+
+ Sign in
+
@@ -178,7 +180,9 @@ const Layout = () => {
-
- {item.usage.value}%
-
-
+
-
))}
From cfe2ebd5a5eac60b235724a3ecf56ef2f0855e29 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 16 Jun 2023 14:36:35 +0200
Subject: [PATCH 057/138] refactor: improve color modes handling
---
src/App.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/App.js b/src/App.js
index 9d50b99c1..05aa83455 100644
--- a/src/App.js
+++ b/src/App.js
@@ -16,19 +16,20 @@ const Page500 = React.lazy(() => import('./views/pages/page500/Page500'))
const App = () => {
const { isColorModeSet, setColorMode } = useColorModes('coreui-free-react-admin-template-theme')
- const theme = useSelector((state) => state.theme)
+ const storedTheme = useSelector((state) => state.theme)
useEffect(() => {
const urlParams = new URLSearchParams(window.location.href.split('?')[1])
- if (urlParams.get('theme')) {
- setColorMode(urlParams.get('theme'))
+ const theme = urlParams.get('theme').match(/^[A-Za-z0-9\s]+/)[0]
+ if (theme) {
+ setColorMode(theme)
}
if (isColorModeSet()) {
return
}
- setColorMode(theme)
+ setColorMode(storedTheme)
}, []) // eslint-disable-line react-hooks/exhaustive-deps
return (
From a1f20124664fea8b8b63171e4147c980b199a7f4 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 28 Jun 2023 11:27:53 +0200
Subject: [PATCH 058/138] refactor: update color modes support
---
src/App.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/App.js b/src/App.js
index 05aa83455..7f8e6d7ea 100644
--- a/src/App.js
+++ b/src/App.js
@@ -20,7 +20,7 @@ const App = () => {
useEffect(() => {
const urlParams = new URLSearchParams(window.location.href.split('?')[1])
- const theme = urlParams.get('theme').match(/^[A-Za-z0-9\s]+/)[0]
+ const theme = urlParams.get('theme') && urlParams.get('theme').match(/^[A-Za-z0-9\s]+/)[0]
if (theme) {
setColorMode(theme)
}
From f4f57434047b85fa7e0b6a3addf5f1ef8a930b4b Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 28 Jun 2023 12:54:24 +0200
Subject: [PATCH 059/138] chore: update dependencies and devDependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
react-redux ^8.1.0 → ^8.1.1
react-router-dom ^6.12.1 → ^6.14.0
sass ^1.63.3 → ^1.63.6
---
package.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 32f972953..a9b35bf24 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"@coreui/coreui": "4.3.0-beta.0",
"@coreui/icons": "^3.0.1",
"@coreui/icons-react": "^2.1.0",
- "@coreui/react": "^4.9.0-beta.1",
+ "@coreui/react": "^4.9.0-beta.2",
"@coreui/react-chartjs": "^2.1.3",
"@coreui/utils": "^2.0.2",
"chart.js": "^3.9.1",
@@ -36,8 +36,8 @@
"react": "^18.2.0",
"react-app-polyfill": "^3.0.0",
"react-dom": "^18.2.0",
- "react-redux": "^8.1.0",
- "react-router-dom": "^6.12.1",
+ "react-redux": "^8.1.1",
+ "react-router-dom": "^6.14.0",
"redux": "4.2.1",
"simplebar-react": "^3.2.4"
},
@@ -49,7 +49,7 @@
"eslint-plugin-prettier": "^4.2.1",
"prettier": "2.8.8",
"react-scripts": "5.0.1",
- "sass": "^1.63.3",
+ "sass": "^1.63.6",
"web-vitals": "^3.3.2"
},
"engines": {
From 00fffd18d2272f413f0589a9434f8f8f84dbafd0 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 28 Jun 2023 12:55:45 +0200
Subject: [PATCH 060/138] refactor: update color modeshandling
---
src/components/AppHeader.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js
index 8d49845c0..80bb87dc8 100644
--- a/src/components/AppHeader.js
+++ b/src/components/AppHeader.js
@@ -32,8 +32,7 @@ import { AppHeaderDropdown } from './header/index'
import { logo } from 'src/assets/brand/logo'
const AppHeader = () => {
- const { getColorMode, setColorMode } = useColorModes('coreui-free-react-admin-template-theme')
- const colorMode = getColorMode()
+ const { colorMode, setColorMode } = useColorModes('coreui-free-react-admin-template-theme')
const dispatch = useDispatch()
const sidebarShow = useSelector((state) => state.sidebarShow)
From 746e0613ca0bce36053f37c5c43685ba0920283b Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 28 Jun 2023 12:56:09 +0200
Subject: [PATCH 061/138] refactor: update examples
---
src/components/DocsExample.js | 5 +++--
src/scss/_example.scss | 2 +-
src/views/forms/range/Range.js | 8 ++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/DocsExample.js b/src/components/DocsExample.js
index 3340cbc80..5fb2a0569 100644
--- a/src/components/DocsExample.js
+++ b/src/components/DocsExample.js
@@ -5,7 +5,7 @@ import CIcon from '@coreui/icons-react'
import { cilCode, cilMediaPlay } from '@coreui/icons'
const DocsExample = (props) => {
- const { children, href } = props
+ const { children, href, tabContentClassName } = props
const _href = `https://coreui.io/react/docs/${href}`
@@ -25,7 +25,7 @@ const DocsExample = (props) => {
-
+
{children}
@@ -37,6 +37,7 @@ const DocsExample = (props) => {
DocsExample.propTypes = {
children: PropTypes.node,
href: PropTypes.string,
+ tabContentClassName: PropTypes.string,
}
export default React.memo(DocsExample)
diff --git a/src/scss/_example.scss b/src/scss/_example.scss
index fdf64254b..2ce6eb7f4 100644
--- a/src/scss/_example.scss
+++ b/src/scss/_example.scss
@@ -9,7 +9,7 @@
}
.tab-content {
- background-color: var(--#{$prefix}tertiary-bg) !important;
+ background-color: rgba(var(--#{$prefix}tertiary-bg-rgb), var(--#{$prefix}bg-opacity, 1)) !important;
}
& + p {
diff --git a/src/views/forms/range/Range.js b/src/views/forms/range/Range.js
index 905c3134d..1423f7b73 100644
--- a/src/views/forms/range/Range.js
+++ b/src/views/forms/range/Range.js
@@ -15,7 +15,7 @@ const Range = () => {
Create custom
+
Example range
@@ -32,7 +32,7 @@ const Range = () => {
Add the
+
Disabled range
@@ -50,7 +50,7 @@ const Range = () => {
+
Example range
@@ -68,7 +68,7 @@ const Range = () => {
specify a
+
Example range
From a1e9db0b0b137eb621c5ee3ca973df6c41290ff0 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 28 Jun 2023 12:58:22 +0200
Subject: [PATCH 062/138] release: v4.6.0-beta.0
---
package.json | 2 +-
public/index.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index a9b35bf24..9f5d8f34b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-react-admin-template",
- "version": "4.5.0",
+ "version": "4.6.0-beta.0",
"description": "CoreUI Free React Admin Template",
"homepage": ".",
"bugs": {
diff --git a/public/index.html b/public/index.html
index 21d293335..5d2e83841 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,7 +1,7 @@
-
-### Platinum Sponsors
-
-Support this project by [becoming a Platinum Sponsor](https://opencollective.com/coreui/contribute/platinum-sponsor-40959/). A large company logo will be added here with a link to your website.
-
-
-
-### Gold Sponsors
-
-Support this project by [becoming a Gold Sponsor](https://opencollective.com/coreui/contribute/gold-sponsor-40960/). A big company logo will be added here with a link to your website.
-
-
-
-### Silver Sponsors
-
-Support this project by [becoming a Silver Sponsor](https://opencollective.com/coreui/contribute/silver-sponsor-40967/). A medium company logo will be added here with a link to your website.
-
-
-
-### Bronze Sponsors
-
-Support this project by [becoming a Bronze Sponsor](https://opencollective.com/coreui/contribute/bronze-sponsor-40966/). The company avatar will show up here with a link to your OpenCollective Profile.
-
-
-
-### Backers
-
-Thanks to all the backers and sponsors! Support this project by [becoming a backer](https://opencollective.com/coreui/contribute/backer-40965/).
-
-
-
-
+CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/?framework=bootstrap&src=github-coreui-free-react-admin-template) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
## Copyright and License
From c43863789242955b13cea7fff11c0d682f6cd485 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Tue, 7 Nov 2023 21:17:12 +0100
Subject: [PATCH 082/138] docs: update README
---
README.md | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index fdbf2749b..1df83973f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ CoreUI is meant to be the UX game changer. Pure & transparent code is devoid of
## Table of Contents
* [Versions](#versions)
-* [CoreUI Pro](#coreui-pro)
+* [CoreUI PRO](#coreui-pro)
* [CoreUI PRO React Admin Templates](#coreui-pro-react-admin-templates)
* [Quick Start](#quick-start)
* [Installation](#installation)
@@ -43,22 +43,22 @@ CoreUI is meant to be the UX game changer. Pure & transparent code is devoid of
* [CoreUI Free React.js Admin Template](https://github.com/coreui/coreui-free-react-admin-template)
* [CoreUI Free Vue.js Admin Template](https://github.com/coreui/coreui-free-vue-admin-template)
-## CoreUI Pro
+## CoreUI PRO
-* 💪 [CoreUI Pro Angular Admin Template](https://coreui.io/product/angular-dashboard-template/)
-* 💪 [CoreUI Pro Bootstrap Admin Template](https://coreui.io/product/bootstrap-dashboard-template/)
-* 💪 [CoreUI Pro React Admin Template](https://coreui.io/product/react-dashboard-template/)
-* 💪 [CoreUI Pro Vue Admin Template](https://coreui.io/product/vue-dashboard-template/)
+* 💪 [CoreUI PRO Angular Admin Template](https://coreui.io/product/angular-dashboard-template/)
+* 💪 [CoreUI PRO Bootstrap Admin Template](https://coreui.io/product/bootstrap-dashboard-template/)
+* 💪 [CoreUI PRO React Admin Template](https://coreui.io/product/react-dashboard-template/)
+* 💪 [CoreUI PRO Vue Admin Template](https://coreui.io/product/vue-dashboard-template/)
## CoreUI PRO React Admin Templates
| Default Theme | Light Theme |
| --- | --- |
-| [](https://coreui.io/product/react-dashboard-template/?theme=default) | [](https://coreui.io/product/react-dashboard-template/?theme=light)| [](https://coreui.io/product/react-dashboard-template/?theme=dark)
+| [](https://coreui.io/product/react-dashboard-template/?theme=default) | [](https://coreui.io/product/react-dashboard-template/?theme=light)|
| Default Theme v3 | Light Theme v3 |
| --- | --- |
-| [](https://coreui.io/product/react-dashboard-template/?theme=default-v3) | [](https://coreui.io/product/react-dashboard-template/?theme=light)|
+| [](https://coreui.io/product/react-dashboard-template/?theme=default-v3) | [](https://coreui.io/product/react-dashboard-template/?theme=light)|
## Quick Start
@@ -147,12 +147,19 @@ See [the Releases section of our project](https://github.com/coreui/coreui-free-
## Creators
**Łukasz Holeczek**
+
*
*
-*
-**CoreUI team**
-* https://github.com/orgs/coreui/people
+**Andrzej Kopański**
+
+*
+
+**CoreUI Team**
+
+*
+*
+*
## Community
@@ -163,7 +170,7 @@ Get updates on CoreUI's development and chat with the project maintainers and co
## Support CoreUI Development
-CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/?framework=bootstrap&src=github-coreui-free-react-admin-template) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
+CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/?framework=react&src=github-coreui-free-react-admin-template) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
## Copyright and License
From 2539b121da93109cf5cfb6e07eead012264f3a81 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Wed, 8 Nov 2023 13:20:11 +0100
Subject: [PATCH 083/138] chore: update dependencies and devDependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@coreui/chartjs ^4.0.0-beta.0 → ^4.0.0-beta.1
@coreui/coreui ^5.0.0-beta.1 → ^5.0.0-beta.2
@testing-library/react ^14.0.0 → ^14.1.0
---
package.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index dae126b5e..98a050226 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
"test:debug": "react-scripts --inspect-brk test --runInBand"
},
"dependencies": {
- "@coreui/chartjs": "^4.0.0-beta.0",
- "@coreui/coreui": "^5.0.0-beta.1",
+ "@coreui/chartjs": "^4.0.0-beta.1",
+ "@coreui/coreui": "^5.0.0-beta.2",
"@coreui/icons": "^3.0.1",
"@coreui/icons-react": "^2.2.1",
"@coreui/react": "^5.0.0-beta.1",
@@ -44,7 +44,7 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^5.17.0",
- "@testing-library/react": "^14.0.0",
+ "@testing-library/react": "^14.1.0",
"@testing-library/user-event": "^14.5.1",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-prettier": "^4.2.1",
From 1328195e02a868b350a42679e46664e0e9427e07 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 10 Nov 2023 18:33:03 +0100
Subject: [PATCH 084/138] refactor: update examples
---
src/components/AppSidebar.js | 3 +-
src/views/base/cards/Cards.js | 56 ++++++++++++-----
src/views/base/collapses/Collapses.js | 12 +++-
src/views/base/jumbotrons/Jumbotrons.js | 4 +-
src/views/base/placeholders/Placeholders.js | 4 +-
src/views/base/spinners/Spinners.js | 8 +--
src/views/forms/form-control/FormControl.js | 2 +-
src/views/forms/layout/Layout.js | 20 +++++--
src/views/notifications/modals/Modals.js | 66 +++++++++++++++------
src/views/notifications/toasts/Toasts.js | 4 +-
10 files changed, 131 insertions(+), 48 deletions(-)
diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js
index 4d0c60036..156ae8014 100644
--- a/src/components/AppSidebar.js
+++ b/src/components/AppSidebar.js
@@ -30,7 +30,8 @@ const AppSidebar = () => {
return (
{
Some quick example text to build on the card title and make up the bulk of the
card's content.
- Go somewhere
+
+ Go somewhere
+
@@ -235,7 +237,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -250,7 +254,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -278,7 +284,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
2 days ago
@@ -310,7 +318,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -321,7 +331,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -340,7 +352,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -349,7 +363,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -364,7 +380,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -390,7 +408,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -399,7 +419,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -408,7 +430,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -449,7 +473,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
@@ -477,7 +503,9 @@ const Cards = () => {
With supporting text below as a natural lead-in to additional content.
- Go somewhere
+
+ Go somewhere
+
diff --git a/src/views/base/collapses/Collapses.js b/src/views/base/collapses/Collapses.js
index 6f98a69cd..218518933 100644
--- a/src/views/base/collapses/Collapses.js
+++ b/src/views/base/collapses/Collapses.js
@@ -27,7 +27,9 @@ const Collapses = () => {
>
Link
- setVisible(!visible)}>Button
+ setVisible(!visible)}>
+ Button
+
@@ -81,8 +83,12 @@ const Collapses = () => {
A
- setVisibleA(!visibleA)}>Toggle first element
- setVisibleB(!visibleB)}>Toggle second element
+ setVisibleA(!visibleA)}>
+ Toggle first element
+
+ setVisibleB(!visibleB)}>
+ Toggle second element
+
{
setVisibleA(!visibleA)
diff --git a/src/views/base/jumbotrons/Jumbotrons.js b/src/views/base/jumbotrons/Jumbotrons.js
index 560681367..18c9223b8 100644
--- a/src/views/base/jumbotrons/Jumbotrons.js
+++ b/src/views/base/jumbotrons/Jumbotrons.js
@@ -18,7 +18,9 @@ const Jumbotrons = () => {
previous versions of Bootstrap. Check out the examples below for how you can remix and
restyle it to your liking.
- Example button
+
+ Example button
+
diff --git a/src/views/base/placeholders/Placeholders.js b/src/views/base/placeholders/Placeholders.js
index 9639b168b..4f0e80f21 100644
--- a/src/views/base/placeholders/Placeholders.js
+++ b/src/views/base/placeholders/Placeholders.js
@@ -39,7 +39,9 @@ const Placeholders = () => {
Some quick example text to build on the card title and make up the bulk of the
card's content.
- Go somewhere
+
+ Go somewhere
+
diff --git a/src/views/base/spinners/Spinners.js b/src/views/base/spinners/Spinners.js
index 7347cf0c1..c3b927f54 100644
--- a/src/views/base/spinners/Spinners.js
+++ b/src/views/base/spinners/Spinners.js
@@ -93,19 +93,19 @@ const Accordion = () => {
as needed.
-
+
-
+
Loading...
-
+
-
+
Loading...
diff --git a/src/views/forms/form-control/FormControl.js b/src/views/forms/form-control/FormControl.js
index 5949a79ce..caea5f722 100644
--- a/src/views/forms/form-control/FormControl.js
+++ b/src/views/forms/form-control/FormControl.js
@@ -183,7 +183,7 @@ const FormControl = () => {
+
@@ -357,8 +359,8 @@ const Dashboard = () => {
{item.usage.value}%
+
{item.usage.period}
Last login
- {item.activity}
+ Last login
+ {item.activity}
<input type="range"> controls with{' '}
<CFormRange>.
- disabled boolean attribute on an input to give it a grayed out
appearance and remove pointer events.
- 0 and 100, respectively. You may specify new values for
those using the min and max attributes.
- step value. In the example below, we double the number of steps
by using step="0.5".
-
-
-### Gold Sponsors
-
-Support this project by [becoming a Gold Sponsor](https://opencollective.com/coreui/contribute/gold-sponsor-40960/). A big company logo will be added here with a link to your website.
-
-
-
-### Silver Sponsors
-
-Support this project by [becoming a Silver Sponsor](https://opencollective.com/coreui/contribute/silver-sponsor-40967/). A medium company logo will be added here with a link to your website.
-
-
-
-### Bronze Sponsors
-
-Support this project by [becoming a Bronze Sponsor](https://opencollective.com/coreui/contribute/bronze-sponsor-40966/). The company avatar will show up here with a link to your OpenCollective Profile.
-
-
-
-### Backers
-
-Thanks to all the backers and sponsors! Support this project by [becoming a backer](https://opencollective.com/coreui/contribute/backer-40965/).
-
-
-
-
+CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/?framework=bootstrap&src=github-coreui-free-react-admin-template) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
## Copyright and License
From c43863789242955b13cea7fff11c0d682f6cd485 Mon Sep 17 00:00:00 2001
From: mrholek <CButton> can show and hide multiple elements.
-
+
Confirm identity
diff --git a/src/views/forms/layout/Layout.js b/src/views/forms/layout/Layout.js
index 9d2b21fd2..8fdc2a88c 100644
--- a/src/views/forms/layout/Layout.js
+++ b/src/views/forms/layout/Layout.js
@@ -102,7 +102,9 @@ const Layout = () => {
This
Traffic
-January - July 2021
+ January - July 2023
{item.title}
-
+
{item.value} ({item.percent}%)
-
+
-
New Clients
+ New Clients
9,123
-
Recurring Clients
+
+ Recurring Clients
+
22,643
{progressGroupExample1.map((item, index) => (
@@ -259,18 +270,17 @@ const Dashboard = () => {
))}
-
Pageviews
+ Pageviews
78,623
-
Organic
+ Organic
49,123