From c86088837295102dcddd4a9faa75235bb93ac807 Mon Sep 17 00:00:00 2001 From: xidedix Date: Thu, 21 Feb 2019 18:05:27 +0100 Subject: [PATCH 001/316] chore: dependencies update - update: `@coreui/coreui` to `^2.1.7` - update: `@coreui/react` to `^2.1.4` - update: `bootstrap` to `^4.3.1` - update: `core-js` to `^2.6.5` - update: `enzyme` to `^3.9.0` - update: `enzyme-adapter-react-16` to `^1.9.1` - update: `prop-types` to `^15.7.2` - update: `react` to `^16.8.2` - update: `react-app-polyfill` to `^0.2.1` - update: `react-dom` to `^16.8.2` - update: `react-test-renderer` to `^16.8.2` - update: `reactstrap` to `^7.1.0` - update: `react-scripts` to `2.1.5` --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 2155dff52..d259c4034 100644 --- a/package.json +++ b/package.json @@ -12,33 +12,33 @@ "url": "git@github.com:coreui/coreui-free-react-admin-template.git" }, "dependencies": { - "@coreui/coreui": "^2.1.5", + "@coreui/coreui": "^2.1.7", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", - "@coreui/react": "^2.1.3", - "bootstrap": "^4.2.1", + "@coreui/react": "^2.1.4", + "bootstrap": "^4.3.1", "chart.js": "^2.7.3", "classnames": "^2.2.6", - "core-js": "^2.6.1", - "enzyme": "^3.8.0", - "enzyme-adapter-react-16": "^1.7.1", + "core-js": "^2.6.5", + "enzyme": "^3.9.0", + "enzyme-adapter-react-16": "^1.9.1", "flag-icon-css": "^3.2.1", "font-awesome": "^4.7.0", "node-sass": "^4.11.0", - "prop-types": "^15.6.2", - "react": "^16.7.0", - "react-app-polyfill": "^0.2.0", + "prop-types": "^15.7.2", + "react": "^16.8.2", + "react-app-polyfill": "^0.2.1", "react-chartjs-2": "^2.7.4", - "react-dom": "^16.7.0", + "react-dom": "^16.8.2", "react-loadable": "^5.5.0", "react-router-config": "^4.4.0-beta.6", "react-router-dom": "^4.3.1", - "react-test-renderer": "^16.7.0", - "reactstrap": "^7.0.2", + "react-test-renderer": "^16.8.2", + "reactstrap": "^7.1.0", "simple-line-icons": "^2.4.1" }, "devDependencies": { - "react-scripts": "2.1.3" + "react-scripts": "2.1.5" }, "scripts": { "start": "react-scripts start", From 4af6e9b25e6a623e30730043d90bdf8eab7cd19b Mon Sep 17 00:00:00 2001 From: xidedix Date: Thu, 21 Feb 2019 18:06:39 +0100 Subject: [PATCH 002/316] refactor(DefaultHeader): Dashboard router link --- src/containers/DefaultLayout/DefaultHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/DefaultLayout/DefaultHeader.js b/src/containers/DefaultLayout/DefaultHeader.js index f4d856b4f..90e341967 100644 --- a/src/containers/DefaultLayout/DefaultHeader.js +++ b/src/containers/DefaultLayout/DefaultHeader.js @@ -30,7 +30,7 @@ class DefaultHeader extends Component { - + @@ -242,7 +242,7 @@ const Dropdowns = () => { direction="dropup" to the <CDropdown>{' '} component.

- + Dropdown @@ -264,7 +264,7 @@ const Dropdowns = () => { Separated link - + @@ -279,7 +279,7 @@ const Dropdowns = () => { direction="dropend" to the <CDropdown>{' '} component.

- + Dropdown @@ -301,7 +301,7 @@ const Dropdowns = () => { Separated link - + @@ -316,7 +316,7 @@ const Dropdowns = () => { direction="dropstart" to the <CDropdown>{' '} component.

- + @@ -330,7 +330,7 @@ const Dropdowns = () => { Small split button - + diff --git a/src/views/components/charts/Charts.js b/src/views/components/charts/Charts.js index 13bb5cdde..76b082fdd 100644 --- a/src/views/components/charts/Charts.js +++ b/src/views/components/charts/Charts.js @@ -8,7 +8,7 @@ import { CChartPolarArea, CChartRadar, } from '@coreui/react-chartjs' -import { DocsLink } from 'src/reusable' +import { DocsLink } from 'src/components' const Charts = () => { const random = () => Math.round(Math.random() * 100) diff --git a/src/views/components/forms/checks-radios/ChecksRadios.js b/src/views/components/forms/checks-radios/ChecksRadios.js index 805ecdba2..3430d1440 100644 --- a/src/views/components/forms/checks-radios/ChecksRadios.js +++ b/src/views/components/forms/checks-radios/ChecksRadios.js @@ -1,6 +1,6 @@ import React from 'react' import { CCard, CCardBody, CCardHeader, CCol, CFormCheck, CFormSwitch, CRow } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const ChecksRadios = () => { return ( @@ -14,10 +14,10 @@ const ChecksRadios = () => { React Checkbox - + - + @@ -32,10 +32,10 @@ const ChecksRadios = () => { are automatically styled to match with a lighter color to help indicate the input's state.

- + - + @@ -50,7 +50,7 @@ const ChecksRadios = () => { are automatically styled to match with a lighter color to help indicate the input's state.

- + { label="Checked radio" defaultChecked /> - + @@ -74,7 +74,7 @@ const ChecksRadios = () => { React Radio Disabled - + { defaultChecked disabled /> - + @@ -105,7 +105,7 @@ const ChecksRadios = () => { properly to render a toggle switch. Switches also support the disabled{' '} attribute.

- + { defaultChecked disabled /> - + @@ -133,7 +133,7 @@ const ChecksRadios = () => { React Switches Sizes - + { label="Extra large switch checkbox input" id="formSwitchCheckDefaultXL" /> - + @@ -159,11 +159,11 @@ const ChecksRadios = () => { By default, any number of checkboxes and radios that are immediate sibling will be vertically stacked and appropriately spaced.

- + - - + + { label="Disabled radio" disabled /> - + @@ -201,7 +201,7 @@ const ChecksRadios = () => { Group checkboxes or radios on the same horizontal row by adding inline{' '} boolean property to any <CFormCheck>.

- + { label="3 (disabled)" disabled /> - - + + { label="3 (disabled)" disabled /> - + @@ -252,7 +252,7 @@ const ChecksRadios = () => { Remember to still provide some form of accessible name for assistive technologies (for instance, using aria-label).

- +
@@ -265,7 +265,7 @@ const ChecksRadios = () => { aria-label="..." /> -
+ @@ -280,10 +280,10 @@ const ChecksRadios = () => { property on the <CFormCheck> component. These toggle buttons can further be grouped in a button group if needed.

- + - - + + { label="Checked" defaultChecked /> - - + + - +

Radio toggle buttons

- + { autoComplete="off" label="Radio" /> - +

Outlined styles

Different variants of button, such at the various outlined styles, are supported.

- +
{ label="Radio" />
-
+ diff --git a/src/views/components/forms/floating-labels/FloatingLabels.js b/src/views/components/forms/floating-labels/FloatingLabels.js index c25aebf01..1acafb448 100644 --- a/src/views/components/forms/floating-labels/FloatingLabels.js +++ b/src/views/components/forms/floating-labels/FloatingLabels.js @@ -11,7 +11,7 @@ import { CFormTextarea, CRow, } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const FloatingLabels = () => { return ( @@ -33,7 +33,7 @@ const FloatingLabels = () => { pseudo-element. Also note that the <CFormInput> must come first so we can utilize a sibling selector (e.g., ~).

- + Email address @@ -42,12 +42,12 @@ const FloatingLabels = () => { Password - +

When there's a value already defined, <CFormLabel> s will automatically adjust to their floated position.

- + { /> Input with value - + @@ -71,7 +71,7 @@ const FloatingLabels = () => { By default, <CFormTextarea>s will be the same height as{' '} <CFormInput>s.

- + { > Comments - +

To set a custom height on your <CFormTextarea;>, do not use the{' '} rows attribute. Instead, set an explicit height (either inline or via custom CSS).

- + { > Comments - + @@ -113,7 +113,7 @@ const FloatingLabels = () => { Selects with size and multiple are not supported.

- + @@ -123,7 +123,7 @@ const FloatingLabels = () => { Works with selects - + @@ -137,7 +137,7 @@ const FloatingLabels = () => { When working with the CoreUI for Bootstrap grid system, be sure to place form elements within column classes.

- + @@ -162,7 +162,7 @@ const FloatingLabels = () => { - + diff --git a/src/views/components/forms/form-control/FormControl.js b/src/views/components/forms/form-control/FormControl.js index be0189ad0..b064bff89 100644 --- a/src/views/components/forms/form-control/FormControl.js +++ b/src/views/components/forms/form-control/FormControl.js @@ -11,7 +11,7 @@ import { CFormTextarea, CRow, } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const FormControl = () => { return ( @@ -25,7 +25,7 @@ const FormControl = () => { React Form Control - +
Email address @@ -40,7 +40,7 @@ const FormControl = () => {
-
+
@@ -54,7 +54,7 @@ const FormControl = () => { Set heights using size property like size="lg" and{' '} size="sm".

- + { placeholder="Small input" aria-label="sm input example" /> - + @@ -88,7 +88,7 @@ const FormControl = () => { Add the disabled boolean attribute on an input to give it a grayed out appearance and remove pointer events.

- + { readOnly />
-
+ @@ -119,14 +119,14 @@ const FormControl = () => { the input's value. Read-only inputs appear lighter (just like disabled inputs), but retain the standard cursor.

- + - + @@ -141,7 +141,7 @@ const FormControl = () => { as plain text, use the plainText boolean property to remove the default form field styling and preserve the correct margin and padding.

- + Email @@ -164,8 +164,8 @@ const FormControl = () => { - - + +
@@ -191,7 +191,7 @@ const FormControl = () => {
-
+ @@ -201,7 +201,7 @@ const FormControl = () => { React Form Control File input - +
Default file input example @@ -222,7 +222,7 @@ const FormControl = () => { Large file input example
-
+
@@ -232,7 +232,7 @@ const FormControl = () => { React Form Control Color - + Color picker { defaultValue="#563d7c" title="Choose your color" /> - + diff --git a/src/views/components/forms/input-group/InputGroup.js b/src/views/components/forms/input-group/InputGroup.js index c4e85a7a9..427714ac6 100644 --- a/src/views/components/forms/input-group/InputGroup.js +++ b/src/views/components/forms/input-group/InputGroup.js @@ -19,7 +19,7 @@ import { CInputGroupText, CRow, } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const Select = () => { return ( @@ -38,7 +38,7 @@ const Select = () => { sides of an input. Remember to place <CFormLabel>s outside the input group.

- + @ { With textarea - + @@ -89,7 +89,7 @@ const Select = () => { custom form field validation within an input group. You may disable this with{' '} .flex-nowrap.

- + @ { aria-describedby="addon-wrapping" /> - + @@ -116,7 +116,7 @@ const Select = () => {

Sizing on the individual input group elements isn'tsupported.

- + Small { aria-describedby="inputGroup-sizing-lg" /> - + @@ -151,7 +151,7 @@ const Select = () => {

Place any checkbox or radio option within an input group's addon instead of text.

- + { - + @@ -187,13 +187,13 @@ const Select = () => { styles are only available for input groups with a single{' '} <CFormInput>.

- + First and last name - + @@ -207,7 +207,7 @@ const Select = () => { Multiple add-ons are supported and can be mixed with checkbox and radio input versions..

- + $ 0.00 @@ -218,7 +218,7 @@ const Select = () => { $ 0.00 - + @@ -232,7 +232,7 @@ const Select = () => { Multiple add-ons are supported and can be mixed with checkbox and radio input versions..

- + Button @@ -274,7 +274,7 @@ const Select = () => { Button - + @@ -284,7 +284,7 @@ const Select = () => { React Input group Buttons with dropdowns - + @@ -342,7 +342,7 @@ const Select = () => { - + @@ -352,7 +352,7 @@ const Select = () => { React Input group Segmented buttons - + @@ -385,7 +385,7 @@ const Select = () => { - + @@ -395,7 +395,7 @@ const Select = () => { React Input group Custom select - + Options @@ -440,7 +440,7 @@ const Select = () => { Button - + @@ -450,7 +450,7 @@ const Select = () => { React Input group Custom file input - + Upload @@ -495,7 +495,7 @@ const Select = () => { Button - + diff --git a/src/views/components/forms/layout/Layout.js b/src/views/components/forms/layout/Layout.js index 86bcba5af..27bae1961 100644 --- a/src/views/components/forms/layout/Layout.js +++ b/src/views/components/forms/layout/Layout.js @@ -14,7 +14,7 @@ import { CInputGroupText, CRow, } from '@coreui/react' -import { Example } from 'src/reusable' +import { DocsExample } from 'src/components' const Layout = () => { return ( @@ -29,7 +29,7 @@ const Layout = () => { More complex forms can be built using our grid classes. Use these for form layouts that require multiple columns, varied widths, and additional alignment options.

- + @@ -38,7 +38,7 @@ const Layout = () => { - + @@ -52,7 +52,7 @@ const Layout = () => { By adding
gutter modifier classes , you can have control over the gutter width in as well the inline as block direction.

- + @@ -61,11 +61,11 @@ const Layout = () => { - +

More complex layouts can also be created with the grid system.

- + Email @@ -105,7 +105,7 @@ const Layout = () => { Sign in - + @@ -127,7 +127,7 @@ const Layout = () => { alignment you need. For example, we've removed the padding-top on our stacked radio inputs label to better align the text baseline.

- + @@ -180,7 +180,7 @@ const Layout = () => { Sign in - + @@ -195,7 +195,7 @@ const Layout = () => { your <CFormLabel>s or <legend>s to correctly follow the size of .form-control-lg and .form-control-sm.

- + { /> - + @@ -254,7 +254,7 @@ const Layout = () => { split the rest, with specific column classes like{' '} <CCol sm="7">.

- + @@ -266,7 +266,7 @@ const Layout = () => { - + @@ -282,7 +282,7 @@ const Layout = () => { columns only take up as much space as needed. Put another way, the column sizes itself based on the contents.

- + @@ -317,11 +317,11 @@ const Layout = () => { Submit - +

You can then remix that once again with size-specific column classes.

- + @@ -356,7 +356,7 @@ const Layout = () => { Submit - + @@ -374,7 +374,7 @@ const Layout = () => { .align-items-center aligns the form elements to the middle, making the{' '} <CFormCheck> align properly.

- + @@ -403,7 +403,7 @@ const Layout = () => { Submit - + diff --git a/src/views/components/forms/range/Range.js b/src/views/components/forms/range/Range.js index 163525c69..0cdb5b693 100644 --- a/src/views/components/forms/range/Range.js +++ b/src/views/components/forms/range/Range.js @@ -1,6 +1,6 @@ import React from 'react' import { CCard, CCardBody, CCardHeader, CCol, CFormLabel, CFormRange, CRow } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const Range = () => { return ( @@ -18,10 +18,10 @@ const Range = () => { Create custom <input type="range"> controls with{' '} <CFormRange>.

- + Example range - + @@ -35,10 +35,10 @@ const Range = () => { Add the disabled boolean attribute on an input to give it a grayed out appearance and remove pointer events.

- + Disabled range - + @@ -53,10 +53,10 @@ const Range = () => { 0 and 100, respectively. You may specify new values for those using the min and max attributes.

- + Example range - + @@ -71,10 +71,10 @@ const Range = () => { specify a step value. In the example below, we double the number of steps by using step="0.5".

- + Example range - + diff --git a/src/views/components/forms/select/Select.js b/src/views/components/forms/select/Select.js index 8b91c5f9b..dc03a776c 100644 --- a/src/views/components/forms/select/Select.js +++ b/src/views/components/forms/select/Select.js @@ -1,6 +1,6 @@ import React from 'react' import { CCard, CCardBody, CCardHeader, CCol, CFormSelect, CRow } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const Select = () => { return ( @@ -14,14 +14,14 @@ const Select = () => { React Select Default - + - + @@ -35,7 +35,7 @@ const Select = () => { You may also choose from small and large custom selects to match our similarly sized text inputs.

- + @@ -48,29 +48,29 @@ const Select = () => { - +

The multiple attribute is also supported:

- + - +

As is the htmlSize property:

- + - + @@ -84,14 +84,14 @@ const Select = () => { Add the disabled boolean attribute on a select to give it a grayed out appearance and remove pointer events.

- + - + @@ -101,9 +101,9 @@ const Select = () => { React Select - + - + */} diff --git a/src/views/components/forms/validation/Validation.js b/src/views/components/forms/validation/Validation.js index 28538d850..160fa953c 100644 --- a/src/views/components/forms/validation/Validation.js +++ b/src/views/components/forms/validation/Validation.js @@ -16,7 +16,7 @@ import { CInputGroupText, CRow, } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const CustomStyles = () => { const [validated, setValidated] = useState(false) @@ -274,7 +274,7 @@ const Validation = () => { Custom feedback styles apply custom colors, borders, focus styles, and background icons to better communicate feedback.{' '}

- {CustomStyles()} + {CustomStyles()} @@ -294,7 +294,7 @@ const Validation = () => { While these feedback styles cannot be styled with CSS, you can still customize the feedback text through JavaScript.

- {BrowserDefaults()} + {BrowserDefaults()} @@ -315,7 +315,7 @@ const Validation = () => { attribute allows more than one id to be referenced, in case the field already points to additional form text).

- + Email @@ -388,7 +388,7 @@ const Validation = () => { - + @@ -412,7 +412,7 @@ const Validation = () => { <CFormCheck>s - +
@@ -478,7 +478,7 @@ const Validation = () => {
-
+ @@ -495,7 +495,7 @@ const Validation = () => { our column classes have this already, but your project may require an alternative setup.

- {Tooltips()} + {Tooltips()} diff --git a/src/views/components/icons/brands/Brands.js b/src/views/components/icons/brands/Brands.js index d9b308f46..29bcc580e 100644 --- a/src/views/components/icons/brands/Brands.js +++ b/src/views/components/icons/brands/Brands.js @@ -2,7 +2,7 @@ import React from 'react' import { CCard, CCardBody, CCardHeader, CCol, CRow } from '@coreui/react' import CIcon from '@coreui/icons-react' import { brandSet } from '@coreui/icons' -import { DocsLink } from 'src/reusable' +import { DocsLink } from 'src/components' const toKebabCase = (str) => { return str.replace(/([a-z0-9]|(?=[A-Z]))([A-Z])/g, '$1-$2').toLowerCase() diff --git a/src/views/components/icons/coreui-icons/CoreUIIcons.js b/src/views/components/icons/coreui-icons/CoreUIIcons.js index 2145cec2c..cb66a3ab5 100644 --- a/src/views/components/icons/coreui-icons/CoreUIIcons.js +++ b/src/views/components/icons/coreui-icons/CoreUIIcons.js @@ -2,7 +2,7 @@ import React from 'react' import { CCard, CCardBody, CCardHeader, CRow } from '@coreui/react' import { freeSet } from '@coreui/icons' import { getIconsView } from '../brands/Brands.js' -import { DocsLink } from 'src/reusable' +import { DocsLink } from 'src/components' const CoreUIIcons = () => { return ( diff --git a/src/views/components/icons/flags/Flags.js b/src/views/components/icons/flags/Flags.js index 146930b49..d86495a6a 100644 --- a/src/views/components/icons/flags/Flags.js +++ b/src/views/components/icons/flags/Flags.js @@ -2,7 +2,7 @@ import React from 'react' import { CCard, CCardBody, CCardHeader, CRow } from '@coreui/react' import { getIconsView } from '../brands/Brands.js' import { flagSet } from '@coreui/icons' -import { DocsLink } from 'src/reusable' +import { DocsLink } from 'src/components' const CoreUIIcons = () => { return ( diff --git a/src/views/components/notifications/alerts/Alerts.js b/src/views/components/notifications/alerts/Alerts.js index b4b60fa5d..234fb8fd8 100644 --- a/src/views/components/notifications/alerts/Alerts.js +++ b/src/views/components/notifications/alerts/Alerts.js @@ -9,7 +9,7 @@ import { CCol, CRow, } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const Alerts = () => { return ( @@ -32,7 +32,7 @@ const Alerts = () => { .

- + A simple primary alert—check it out! A simple secondary alert—check it out! A simple success alert—check it out! @@ -41,7 +41,7 @@ const Alerts = () => { A simple info alert—check it out! A simple light alert—check it out! A simple dark alert—check it out! - + @@ -55,7 +55,7 @@ const Alerts = () => { Use the <CAlertLink> component to immediately give matching colored links inside any alert.

- + A simple primary alert with an example link. Give it a click if you like. @@ -88,7 +88,7 @@ const Alerts = () => { A simple dark alert with an example link. Give it a click if you like. - + @@ -102,7 +102,7 @@ const Alerts = () => { Alert can also incorporate supplementary components & elements like heading, paragraph, and divider.

- + Well done!

@@ -116,7 +116,7 @@ const Alerts = () => { tidy.

-
+ @@ -129,7 +129,7 @@ const Alerts = () => {

Alerts can also be easily dismissed. Just add the dismissible prop.

- + { > Go right ahead and click that dimiss over there on the right. - + diff --git a/src/views/components/notifications/badges/Badges.js b/src/views/components/notifications/badges/Badges.js index 1297c910f..f8d4c0d82 100644 --- a/src/views/components/notifications/badges/Badges.js +++ b/src/views/components/notifications/badges/Badges.js @@ -1,6 +1,6 @@ import React from 'react' import { CButton, CCard, CCardBody, CCardHeader, CCol, CBadge, CRow } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const Badges = () => { return ( @@ -18,7 +18,7 @@ const Badges = () => { Bootstrap badge scale to suit the size of the parent element by using relative font sizing and em units.

- +

Example heading New

@@ -37,15 +37,15 @@ const Badges = () => {
Example heading New
-
+

Badges can be used as part of links or buttons to provide a counter.

- + Notifications 4 - +

Remark that depending on how you use them, badges may be complicated for users of screen readers and related assistive technologies. @@ -54,12 +54,12 @@ const Badges = () => { Unless the context is clear, consider including additional context with a visually hidden piece of additional text.

- + Profile 9 unread messages - + @@ -73,7 +73,7 @@ const Badges = () => { Add any of the below-mentioned color props to modify the presentation of a badge.

- + primary success danger @@ -81,7 +81,7 @@ const Badges = () => { info light dark - + @@ -92,7 +92,7 @@ const Badges = () => {

Apply the shape="rounded-pill" prop to make badges rounded.

- + primary @@ -114,7 +114,7 @@ const Badges = () => { dark - +
diff --git a/src/views/components/notifications/modals/Modals.js b/src/views/components/notifications/modals/Modals.js index 7631f0fa8..e7b3a939c 100644 --- a/src/views/components/notifications/modals/Modals.js +++ b/src/views/components/notifications/modals/Modals.js @@ -15,7 +15,7 @@ import { CRow, CTooltip, } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const LiveDemo = () => { const [visible, setVisible] = useState(false) @@ -476,7 +476,7 @@ const Modals = () => { include modal headers with dismiss actions whenever possible, or provide another explicit dismiss action.

- + { Save changes - + @@ -507,7 +507,7 @@ const Modals = () => { Toggle a working modal demo by clicking the button below. It will slide down and fade in from the top of the page.

- {LiveDemo()} + {LiveDemo()} @@ -522,7 +522,7 @@ const Modals = () => { modal will behave as though the backdrop is static, meaning it will not close when clicking outside it. Click the button below to try it.

- {StaticBackdrop()} + {StaticBackdrop()} @@ -537,16 +537,16 @@ const Modals = () => { modal will behave as though the backdrop is static, meaning it will not close when clicking outside it. Click the button below to try it.

- + {ScrollingLongContent()} - +

You can also create a scrollable modal that allows scroll the modal body by adding{' '} scrollable prop.

- + {ScrollingLongContent2()} - + @@ -560,8 +560,12 @@ const Modals = () => { Add alignment="center" to <CModal> to vertically center the modal.

- {VerticallyCentered()} - {VerticallyCentered2()} + + {VerticallyCentered()} + + + {VerticallyCentered2()} + @@ -576,7 +580,9 @@ const Modals = () => { modals as needed. When modals are closed, any tooltips and popovers within are also automatically dismissed.

- {TooltipsPopovers()} + + {TooltipsPopovers()} + @@ -636,7 +642,7 @@ const Modals = () => { - {OptionalSizes()} + {OptionalSizes()} @@ -706,7 +712,7 @@ const Modals = () => { - {FullscreenModal()} + {FullscreenModal()} diff --git a/src/views/components/notifications/toasts/Toasts.js b/src/views/components/notifications/toasts/Toasts.js index 1cdcf9069..25cfebf2d 100644 --- a/src/views/components/notifications/toasts/Toasts.js +++ b/src/views/components/notifications/toasts/Toasts.js @@ -12,7 +12,7 @@ import { CToastHeader, CToaster, } from '@coreui/react' -import { DocsCallout, Example } from 'src/reusable' +import { DocsCallout, DocsExample } from 'src/components' const ExampleToast = () => { const [toast, addToast] = useState(0) @@ -62,7 +62,7 @@ const Toasts = () => { we require a single element to contain your “toasted” content and strongly encourage a dismiss button.

- + { Hello, world! This is a toast message. - - {ExampleToast()} + + {ExampleToast()} @@ -95,7 +95,7 @@ const Toasts = () => {

Toasts are slightly translucent to blend in with what's below them.

- +
@@ -116,7 +116,7 @@ const Toasts = () => { Hello, world! This is a toast message.
-
+ @@ -130,7 +130,7 @@ const Toasts = () => { You can stack toasts by wrapping them in a toast container, which will vertically add some spacing.

- + @@ -169,7 +169,7 @@ const Toasts = () => { Hello, world! This is a toast message. - + @@ -188,18 +188,18 @@ const Toasts = () => { flexbox utilities to adjust the layout.

- +
Hello, world! This is a toast message.
-
+

Alternatively, you can also add additional controls and components to toasts.

- + Hello, world! This is a toast message. @@ -213,7 +213,7 @@ const Toasts = () => { - + @@ -232,14 +232,14 @@ const Toasts = () => { white property to our close button. For a crisp edge, we remove the default border with .border-0.

- +
Hello, world! This is a toast message.
-
+ diff --git a/src/views/theme/colors/Colors.js b/src/views/theme/colors/Colors.js index a6fef82d3..9e51a9867 100644 --- a/src/views/theme/colors/Colors.js +++ b/src/views/theme/colors/Colors.js @@ -3,7 +3,7 @@ import React, { useEffect, useState, createRef } from 'react' import classNames from 'classnames' import { CRow, CCol, CCard, CCardHeader, CCardBody } from '@coreui/react' import { rgbToHex } from '@coreui/utils' -import { DocsLink } from 'src/reusable' +import { DocsLink } from 'src/components' const ThemeView = () => { const [color, setColor] = useState('rgb(255, 255, 255)') diff --git a/src/views/theme/typography/Typography.js b/src/views/theme/typography/Typography.js index 81bbefba8..1cae4f6c9 100644 --- a/src/views/theme/typography/Typography.js +++ b/src/views/theme/typography/Typography.js @@ -1,6 +1,6 @@ import React from 'react' import { CCard, CCardHeader, CCardBody } from '@coreui/react' -import { DocsLink } from 'src/reusable' +import { DocsLink } from 'src/components' const Typography = () => { return ( From a36f5d49e2ea7155e9453ca85072df8930e18e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Wed, 11 Aug 2021 17:55:41 +0200 Subject: [PATCH 131/316] chore: clean-up --- src/components/AppSidebar.js | 1 - src/views/components/widgets/WidgetsDropdown.js | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js index 0126aafc6..7fbe84b7f 100644 --- a/src/components/AppSidebar.js +++ b/src/components/AppSidebar.js @@ -24,7 +24,6 @@ const AppSidebar = () => { selfHiding="md" unfoldable={unfoldable} visible={sidebarShow} - onShow={() => console.log('show')} onHide={() => { dispatch({ type: 'set', sidebarShow: false }) }} diff --git a/src/views/components/widgets/WidgetsDropdown.js b/src/views/components/widgets/WidgetsDropdown.js index ad7b8affc..6f9451d5c 100644 --- a/src/views/components/widgets/WidgetsDropdown.js +++ b/src/views/components/widgets/WidgetsDropdown.js @@ -140,21 +140,6 @@ const WidgetsDropdown = () => { }, ], }} - getDatasetAtEvent={(dataset, event) => { - console.log('init1') - console.log(dataset) - console.log(event) - }} - getElementAtEvent={(element, event) => { - console.log('init2') - console.log(element) - console.log(event) - }} - getElementsAtEvent={(element, event) => { - console.log('init3') - console.log(element) - console.log(event) - }} options={{ plugins: { legend: { From edbda35a96ff9ece54b5fd17066e8285ba9bd391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Wed, 11 Aug 2021 18:52:49 +0200 Subject: [PATCH 132/316] refactor: update widgets --- src/views/components/widgets/Widgets.js | 768 ++++++++++++------------ 1 file changed, 386 insertions(+), 382 deletions(-) diff --git a/src/views/components/widgets/Widgets.js b/src/views/components/widgets/Widgets.js index 355fe94a7..acc097712 100644 --- a/src/views/components/widgets/Widgets.js +++ b/src/views/components/widgets/Widgets.js @@ -62,7 +62,6 @@ const Widgets = () => { text="Lorem ipsum dolor sit amet enim." /> - { /> - - - } - iconPadding={3} - title="income" - value="$1.999,50" - color="primary" - /> + + + + - - } - iconPadding={3} - title="income" - value="$1.999,50" - color="info" - /> + + + + - - } - iconPadding={3} - title="income" - value="$1.999,50" - color="warning" - /> + + + + - - } - iconPadding={3} - title="income" - value="$1.999,50" - color="danger" - /> + + + + - - } - iconPadding={3} - title="income" - value="$1.999,50" - color="primary" - footer={ - - View more - - + + + + + + + + + + + + + + } + iconPadding={3} + title="income" + value="$1.999,50" + color="primary" + /> + + + } + iconPadding={3} + title="income" + value="$1.999,50" + color="info" + /> + + + } + iconPadding={3} + title="income" + value="$1.999,50" + color="warning" + /> + + + } + iconPadding={3} + title="income" + value="$1.999,50" + color="danger" + /> + + + } + iconPadding={3} + title="income" + value="$1.999,50" + color="primary" + footer={ + + View more + + } /> @@ -451,332 +781,6 @@ const Widgets = () => { /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ) } From 934b70a558a92455834206946353cd0d99cada61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Wed, 11 Aug 2021 20:11:23 +0200 Subject: [PATCH 133/316] chore: bump version of @coreui/react --- package.json | 2 +- yarn.lock | 987 ++++++++++++++++++++++++--------------------------- 2 files changed, 464 insertions(+), 525 deletions(-) diff --git a/package.json b/package.json index cfc86e967..74f6aa797 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@coreui/coreui": "4.0.1", "@coreui/icons": "^2.0.1", "@coreui/icons-react": "^2.0.0-rc.0", - "@coreui/react": "4.0.0-beta.2", + "@coreui/react": "4.0.0-beta.4", "@coreui/react-chartjs": "2.0.0-rc.0", "@coreui/utils": "^1.3.1", "@wojtekmaj/enzyme-adapter-react-17": "^0.6.3", diff --git a/yarn.lock b/yarn.lock index f828f6b6d..99a040e01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,10 +23,10 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" - integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== +"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" + integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== "@babel/core@7.12.3": version "7.12.3" @@ -51,19 +51,19 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab" - integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8" + integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.5" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.5" - "@babel/helpers" "^7.14.6" - "@babel/parser" "^7.14.6" + "@babel/generator" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" + "@babel/helper-module-transforms" "^7.15.0" + "@babel/helpers" "^7.14.8" + "@babel/parser" "^7.15.0" "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -71,12 +71,12 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785" - integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA== +"@babel/generator@^7.12.1", "@babel/generator@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" + integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.0" jsesc "^2.5.1" source-map "^0.5.0" @@ -95,26 +95,26 @@ "@babel/helper-explode-assignable-expression" "^7.14.5" "@babel/types" "^7.14.5" -"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" - integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== +"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" + integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A== dependencies: - "@babel/compat-data" "^7.14.5" + "@babel/compat-data" "^7.15.0" "@babel/helper-validator-option" "^7.14.5" browserslist "^4.16.6" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.14.6": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz#f114469b6c06f8b5c59c6c4e74621f5085362542" - integrity sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg== +"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7" + integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q== dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-function-name" "^7.14.5" - "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.15.0" "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" "@babel/helper-split-export-declaration" "^7.14.5" "@babel/helper-create-regexp-features-plugin@^7.14.5": @@ -169,12 +169,12 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-member-expression-to-functions@^7.14.5": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" - integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== +"@babel/helper-member-expression-to-functions@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b" + integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.0" "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5": version "7.14.5" @@ -183,19 +183,19 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e" - integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA== +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08" + integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg== dependencies: "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-simple-access" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" + "@babel/helper-simple-access" "^7.14.8" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.9" "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" "@babel/helper-optimise-call-expression@^7.14.5": version "7.14.5" @@ -218,22 +218,22 @@ "@babel/helper-wrap-function" "^7.14.5" "@babel/types" "^7.14.5" -"@babel/helper-replace-supers@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" - integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== +"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4" + integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA== dependencies: - "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.15.0" "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" -"@babel/helper-simple-access@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4" - integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw== +"@babel/helper-simple-access@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" + integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.14.8" "@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5": version "7.14.5" @@ -249,10 +249,10 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-validator-identifier@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" - integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== "@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.14.5": version "7.14.5" @@ -269,14 +269,14 @@ "@babel/traverse" "^7.14.5" "@babel/types" "^7.14.5" -"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.6": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635" - integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA== +"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.8": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357" + integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g== dependencies: "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": version "7.14.5" @@ -287,10 +287,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.7.0": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" - integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0", "@babel/parser@^7.7.0": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" + integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.14.5" @@ -301,10 +301,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" -"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" - integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== +"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a" + integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-remap-async-to-generator" "^7.14.5" @@ -635,16 +635,16 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939" - integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw== + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" + integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf" - integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA== +"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f" + integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A== dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-function-name" "^7.14.5" @@ -737,14 +737,14 @@ "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97" - integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A== +"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281" + integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig== dependencies: - "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-module-transforms" "^7.15.0" "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.14.5" + "@babel/helper-simple-access" "^7.14.8" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.14.5": @@ -766,10 +766,10 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" - integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" + integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.14.5" @@ -817,9 +817,9 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-transform-react-display-name@^7.12.1", "@babel/plugin-transform-react-display-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz#baa92d15c4570411301a85a74c13534873885b65" - integrity sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ== + version "7.15.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz#6aaac6099f1fcf6589d35ae6be1b6e10c8c602b9" + integrity sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -831,9 +831,9 @@ "@babel/plugin-transform-react-jsx" "^7.14.5" "@babel/plugin-transform-react-jsx-self@^7.12.1": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.5.tgz#703b5d1edccd342179c2a99ee8c7065c2b4403cc" - integrity sha512-M/fmDX6n0cfHK/NLTcPmrfVAORKDhK8tyjDhyxlUjYyPYYO8FRWwuxBA3WBx8kWN/uBUuwGa3s/0+hQ9JIN3Tg== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.9.tgz#33041e665453391eb6ee54a2ecf3ba1d46bd30f4" + integrity sha512-Fqqu0f8zv9W+RyOnx29BX/RlEsBRANbOf5xs5oxb2aHP4FKbLXxIaVPUiCti56LAR1IixMH4EyaixhUsKqoBHw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -845,15 +845,15 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz#39749f0ee1efd8a1bd729152cf5f78f1d247a44a" - integrity sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c" + integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw== dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-module-imports" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-jsx" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/types" "^7.14.9" "@babel/plugin-transform-react-pure-annotations@^7.12.1", "@babel/plugin-transform-react-pure-annotations@^7.14.5": version "7.14.5" @@ -924,11 +924,11 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-typescript@^7.12.1": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz#6e9c2d98da2507ebe0a883b100cde3c7279df36c" - integrity sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e" + integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w== dependencies: - "@babel/helper-create-class-features-plugin" "^7.14.6" + "@babel/helper-create-class-features-plugin" "^7.15.0" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript" "^7.14.5" @@ -1020,16 +1020,16 @@ semver "^5.5.0" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.7.tgz#5c70b22d4c2d893b03d8c886a5c17422502b932a" - integrity sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464" + integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q== dependencies: - "@babel/compat-data" "^7.14.7" - "@babel/helper-compilation-targets" "^7.14.5" + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-async-generator-functions" "^7.14.7" + "@babel/plugin-proposal-async-generator-functions" "^7.14.9" "@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import" "^7.14.5" @@ -1062,7 +1062,7 @@ "@babel/plugin-transform-async-to-generator" "^7.14.5" "@babel/plugin-transform-block-scoped-functions" "^7.14.5" "@babel/plugin-transform-block-scoping" "^7.14.5" - "@babel/plugin-transform-classes" "^7.14.5" + "@babel/plugin-transform-classes" "^7.14.9" "@babel/plugin-transform-computed-properties" "^7.14.5" "@babel/plugin-transform-destructuring" "^7.14.7" "@babel/plugin-transform-dotall-regex" "^7.14.5" @@ -1073,10 +1073,10 @@ "@babel/plugin-transform-literals" "^7.14.5" "@babel/plugin-transform-member-expression-literals" "^7.14.5" "@babel/plugin-transform-modules-amd" "^7.14.5" - "@babel/plugin-transform-modules-commonjs" "^7.14.5" + "@babel/plugin-transform-modules-commonjs" "^7.15.0" "@babel/plugin-transform-modules-systemjs" "^7.14.5" "@babel/plugin-transform-modules-umd" "^7.14.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" "@babel/plugin-transform-new-target" "^7.14.5" "@babel/plugin-transform-object-super" "^7.14.5" "@babel/plugin-transform-parameters" "^7.14.5" @@ -1091,11 +1091,11 @@ "@babel/plugin-transform-unicode-escapes" "^7.14.5" "@babel/plugin-transform-unicode-regex" "^7.14.5" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.0" babel-plugin-polyfill-corejs2 "^0.2.2" babel-plugin-polyfill-corejs3 "^0.2.2" babel-plugin-polyfill-regenerator "^0.2.2" - core-js-compat "^3.15.0" + core-js-compat "^3.16.0" semver "^6.3.0" "@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4": @@ -1143,11 +1143,11 @@ "@babel/plugin-transform-typescript" "^7.12.1" "@babel/runtime-corejs3@^7.10.2": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz#0ef292bbce40ca00f874c9724ef175a12476465c" - integrity sha512-Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA== + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz#28754263988198f2a928c09733ade2fb4d28089d" + integrity sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A== dependencies: - core-js-pure "^3.15.0" + core-js-pure "^3.16.0" regenerator-runtime "^0.13.4" "@babel/runtime@7.12.1": @@ -1158,9 +1158,9 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d" - integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg== + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" + integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== dependencies: regenerator-runtime "^0.13.4" @@ -1173,27 +1173,27 @@ "@babel/parser" "^7.14.5" "@babel/types" "^7.14.5" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.0": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" - integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.15.0", "@babel/traverse@^7.7.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" + integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.5" + "@babel/generator" "^7.15.0" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.7" - "@babel/types" "^7.14.5" + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff" - integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" + integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== dependencies: - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1222,7 +1222,7 @@ resolved "https://registry.yarnpkg.com/@coreui/coreui/-/coreui-4.0.0.tgz#52ebe0197411a829ba48057ade61923e05859eec" integrity sha512-8vH6fJrmvCR/Oy5v0E+/1AL3Ygb4jhQ7NXK2fMYWJyK13BePDm9muB3y6S0IdqkpBwjY3hHVwHyt2lJqJdesmQ== -"@coreui/coreui@4.0.1": +"@coreui/coreui@4.0.1", "@coreui/coreui@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@coreui/coreui/-/coreui-4.0.1.tgz#e5faf540aeea31b0cc8d428d73080a364e4bc6fd" integrity sha512-1mrWnbqoWb7+8ZAMUdlWt0AqVzDEkJglk7F3OaFsQtxienezFvlMNsd1YPPNo+taRzF7HZ8xSDIAItCvlOaMVg== @@ -1252,10 +1252,12 @@ "@coreui/chartjs" "^3.0.0" chart.js "^3.4.1" -"@coreui/react@4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@coreui/react/-/react-4.0.0-beta.2.tgz#f9f319f170d35e21bf65e4e08bf3d81cbfc51ec0" - integrity sha512-7rJGcL8s06AD/OUx78DnUB6q7oSjOk2JKAqtGLF3Lkd+Zf0YqVkk8dcrK6j8SG+mPURhbZSPcz5zpE1yf645hg== +"@coreui/react@4.0.0-beta.4": + version "4.0.0-beta.4" + resolved "https://registry.yarnpkg.com/@coreui/react/-/react-4.0.0-beta.4.tgz#b41b5270707784a200bf39b0008d4a324cc98dec" + integrity sha512-yjbAk5u3G2w/gJn+tfE/6mQagQoFp94EghHaes4E7GJlGcHwdfTp5AB5nRZp9DvYFy4vm3WsqWGD4yfQ34oilA== + dependencies: + "@coreui/coreui" "^4.0.1" "@coreui/utils@^1.3.1": version "1.3.1" @@ -1272,30 +1274,15 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== -"@es-joy/jsdoccomment@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.8.0.tgz#1add451f50f57597676ab85ee7bd0a273d7b7c43" - integrity sha512-Xd3GzYsL2sz2pcdtYt5Q0Wz1ol/o9Nt2UQL4nFPDcaEomvPmwjJsbjkKx1SKhl2h3TgwazNBLdcNr2m0UiGiFA== +"@es-joy/jsdoccomment@0.9.0-alpha.1": + version "0.9.0-alpha.1" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz#f48bd162e185ec7f9f222273a282d10e52fe52f7" + integrity sha512-Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA== dependencies: - comment-parser "^1.1.5" + comment-parser "1.1.6-beta.0" esquery "^1.4.0" jsdoc-type-pratt-parser "1.0.4" -"@eslint/eslintrc@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" - integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== - dependencies: - ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^13.9.0" - ignore "^4.0.6" - import-fresh "^3.2.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - strip-json-comments "^3.1.1" - "@eslint/eslintrc@^0.4.3": version "0.4.3" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" @@ -1563,9 +1550,9 @@ integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2" - integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" @@ -1749,9 +1736,9 @@ integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.14" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" - integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== + version "7.1.15" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024" + integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1760,39 +1747,39 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" - integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== + version "7.6.3" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5" + integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA== dependencies: "@babel/types" "^7.0.0" "@types/babel__template@*": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" - integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz#a34277cf8acbd3185ea74129e1f100491eb1da7f" - integrity sha512-IilJZ1hJBUZwMOVDNTdflOOLzJB/ZtljYVa7k3gEZN/jqIJIPkWHC6dvbX+DD2CwZDHB9wAKzZPzzqMIkW37/w== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== dependencies: "@babel/types" "^7.3.0" "@types/eslint@^7.2.6": - version "7.2.13" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.13.tgz#e0ca7219ba5ded402062ad6f926d491ebb29dd53" - integrity sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg== + version "7.28.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" + integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*": - version "0.0.49" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.49.tgz#3facb98ebcd4114a4ecef74e0de2175b56fd4464" - integrity sha512-K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw== + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== "@types/estree@0.0.39": version "0.0.39" @@ -1800,9 +1787,9 @@ integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== "@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" - integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + version "7.1.4" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" + integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== dependencies: "@types/minimatch" "*" "@types/node" "*" @@ -1823,9 +1810,9 @@ hoist-non-react-statics "^3.3.0" "@types/html-minifier-terser@^5.0.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" - integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" + integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" @@ -1846,30 +1833,25 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" - integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== "@types/minimatch@*": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" - integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*": - version "16.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.0.tgz#067a6c49dc7a5c2412a505628e26902ae967bf6f" - integrity sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg== + version "16.4.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.13.tgz#7dfd9c14661edc65cccd43a29eb454174642370d" + integrity sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg== "@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1877,24 +1859,24 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.0.0": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.1.tgz#54dd88bdc7f49958329666af3779561e47d5dab3" - integrity sha512-NVkb4p4YjI8E3O6+1m8I+8JlMpFZwfSbPGdaw0wXuyPRTEz0SLKwBUWNSO7Maoi8tQMPC8JLZNWkrcKPI7/sLA== + version "2.3.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3" + integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog== "@types/prop-types@*": - version "15.7.3" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" - integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== "@types/q@^1.5.1": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" - integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + version "1.5.5" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== "@types/react-redux@^7.1.16": - version "7.1.16" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.16.tgz#0fbd04c2500c12105494c83d4a3e45c084e3cb21" - integrity sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw== + version "7.1.18" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04" + integrity sha512-9iwAsPyJ9DLTRH+OFeIrm9cAbIj1i2ANL3sKQFATqnPWRbg+jEFXyZOKHiQK/N86pNRXbb4HRxAxo0SIX1XwzQ== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" @@ -1902,9 +1884,9 @@ redux "^4.0.0" "@types/react@*": - version "17.0.13" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.13.tgz#6b7c9a8f2868586ad87d941c02337c6888fb874f" - integrity sha512-D/G3PiuqTfE3IMNjLn/DCp6umjVCSvtZTPdtAFy5+Ved6CsdRvivfKeCzw79W4AatShtU4nGqgvOv5Gro534vQ== + version "17.0.17" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.17.tgz#1772d3d5425128e0635a716f49ef57c2955df055" + integrity sha512-nrfi7I13cAmrd0wje8czYpf5SFbryczCtPzFc6ijqvdjKcyA3tCvGxwchOUlxb2ucBPuJ9Y3oUqKrRqZvrz0lw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -1918,9 +1900,9 @@ "@types/node" "*" "@types/scheduler@*": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275" - integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA== + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== "@types/source-list-map@*": version "0.1.2" @@ -1945,9 +1927,9 @@ source-map "^0.6.1" "@types/webpack-sources@*": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.1.tgz#6af17e3a3ded71eec2b98008d7c12f498a0a4506" - integrity sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" + integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== dependencies: "@types/node" "*" "@types/source-list-map" "*" @@ -1978,27 +1960,27 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.28.1", "@typescript-eslint/eslint-plugin@^4.5.0": - version "4.28.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.1.tgz#c045e440196ae45464e08e20c38aff5c3a825947" - integrity sha512-9yfcNpDaNGQ6/LQOX/KhUFTR1sCKH+PBr234k6hI9XJ0VP5UqGxap0AnNwBnWFk1MNyWBylJH9ZkzBXC+5akZQ== + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.1.tgz#808d206e2278e809292b5de752a91105da85860b" + integrity sha512-AHqIU+SqZZgBEiWOrtN94ldR3ZUABV5dUG94j8Nms9rQnHFc8fvDOue/58K4CFz6r8OtDDc35Pw9NQPWo0Ayrw== dependencies: - "@typescript-eslint/experimental-utils" "4.28.1" - "@typescript-eslint/scope-manager" "4.28.1" + "@typescript-eslint/experimental-utils" "4.29.1" + "@typescript-eslint/scope-manager" "4.29.1" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.28.1", "@typescript-eslint/experimental-utils@^4.0.1": - version "4.28.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.1.tgz#3869489dcca3c18523c46018b8996e15948dbadc" - integrity sha512-n8/ggadrZ+uyrfrSEchx3jgODdmcx7MzVM2sI3cTpI/YlfSm0+9HEUaWw3aQn2urL2KYlWYMDgn45iLfjDYB+Q== +"@typescript-eslint/experimental-utils@4.29.1", "@typescript-eslint/experimental-utils@^4.0.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.1.tgz#0af2b17b0296b60c6b207f11062119fa9c5a8994" + integrity sha512-kl6QG6qpzZthfd2bzPNSJB2YcZpNOrP6r9jueXupcZHnL74WiuSjaft7WSu17J9+ae9zTlk0KJMXPUj0daBxMw== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.1" - "@typescript-eslint/types" "4.28.1" - "@typescript-eslint/typescript-estree" "4.28.1" + "@typescript-eslint/scope-manager" "4.29.1" + "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/typescript-estree" "4.29.1" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -2014,32 +1996,32 @@ eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.28.1", "@typescript-eslint/parser@^4.5.0": - version "4.28.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.1.tgz#5181b81658414f47291452c15bf6cd44a32f85bd" - integrity sha512-UjrMsgnhQIIK82hXGaD+MCN8IfORS1CbMdu7VlZbYa8LCZtbZjJA26De4IPQB7XYZbL8gJ99KWNj0l6WD0guJg== + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.1.tgz#17dfbb45c9032ffa0fe15881d20fbc2a4bdeb02d" + integrity sha512-3fL5iN20hzX3Q4OkG7QEPFjZV2qsVGiDhEwwh+EkmE/w7oteiOvUNzmpu5eSwGJX/anCryONltJ3WDmAzAoCMg== dependencies: - "@typescript-eslint/scope-manager" "4.28.1" - "@typescript-eslint/types" "4.28.1" - "@typescript-eslint/typescript-estree" "4.28.1" + "@typescript-eslint/scope-manager" "4.29.1" + "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/typescript-estree" "4.29.1" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.28.1": - version "4.28.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.1.tgz#fd3c20627cdc12933f6d98b386940d8d0ce8a991" - integrity sha512-o95bvGKfss6705x7jFGDyS7trAORTy57lwJ+VsYwil/lOUxKQ9tA7Suuq+ciMhJc/1qPwB3XE2DKh9wubW8YYA== +"@typescript-eslint/scope-manager@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358" + integrity sha512-Hzv/uZOa9zrD/W5mftZa54Jd5Fed3tL6b4HeaOpwVSabJK8CJ+2MkDasnX/XK4rqP5ZTWngK1ZDeCi6EnxPQ7A== dependencies: - "@typescript-eslint/types" "4.28.1" - "@typescript-eslint/visitor-keys" "4.28.1" + "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/visitor-keys" "4.29.1" "@typescript-eslint/types@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ== -"@typescript-eslint/types@4.28.1": - version "4.28.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.1.tgz#d0f2ecbef3684634db357b9bbfc97b94b828f83f" - integrity sha512-4z+knEihcyX7blAGi7O3Fm3O6YRCP+r56NJFMNGsmtdw+NCdpG5SgNz427LS9nQkRVTswZLhz484hakQwB8RRg== +"@typescript-eslint/types@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5" + integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA== "@typescript-eslint/typescript-estree@3.10.1": version "3.10.1" @@ -2055,13 +2037,13 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.28.1": - version "4.28.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.1.tgz#af882ae41740d1f268e38b4d0fad21e7e8d86a81" - integrity sha512-GhKxmC4sHXxHGJv8e8egAZeTZ6HI4mLU6S7FUzvFOtsk7ZIDN1ksA9r9DyOgNqowA9yAtZXV0Uiap61bIO81FQ== +"@typescript-eslint/typescript-estree@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.1.tgz#7b32a25ff8e51f2671ccc6b26cdbee3b1e6c5e7f" + integrity sha512-lIkkrR9E4lwZkzPiRDNq0xdC3f2iVCUjw/7WPJ4S2Sl6C3nRWkeE1YXCQ0+KsiaQRbpY16jNaokdWnm9aUIsfw== dependencies: - "@typescript-eslint/types" "4.28.1" - "@typescript-eslint/visitor-keys" "4.28.1" + "@typescript-eslint/types" "4.29.1" + "@typescript-eslint/visitor-keys" "4.29.1" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" @@ -2075,12 +2057,12 @@ dependencies: eslint-visitor-keys "^1.1.0" -"@typescript-eslint/visitor-keys@4.28.1": - version "4.28.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.1.tgz#162a515ee255f18a6068edc26df793cdc1ec9157" - integrity sha512-K4HMrdFqr9PFquPu178SaSb92CaWe2yErXyPumc8cYWxFmhgJsNY9eSePmO05j0JhBvf2Cdhptd6E6Yv9HVHcg== +"@typescript-eslint/visitor-keys@4.29.1": + version "4.29.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.1.tgz#0615be8b55721f5e854f3ee99f1a714f2d093e5d" + integrity sha512-zLqtjMoXvgdZY/PG6gqA73V8BjqPs4af1v2kiiETBObp+uC6gRYnJLmJHxC0QyUrrHDLJPIWNYxoBV3wbcRlag== dependencies: - "@typescript-eslint/types" "4.28.1" + "@typescript-eslint/types" "4.29.1" eslint-visitor-keys "^2.0.0" "@webassemblyjs/ast@1.9.0": @@ -2285,9 +2267,9 @@ acorn-globals@^6.0.0: acorn-walk "^7.1.1" acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.1.1: version "7.2.0" @@ -2358,9 +2340,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.6.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.1.tgz#ae65764bf1edde8cd861281cda5057852364a295" - integrity sha512-42VLtQUOLefAvKFAQIxIZDaThq6om/PrfP0CYk3/vn+y4BMNkKnbli8ON2QCiHov4KkzOSJ/xSoBJdayiiYvVQ== + version "8.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571" + integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -2652,9 +2634,9 @@ autoprefixer@^9.6.1: postcss-value-parser "^4.1.0" axe-core@^4.0.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.3.tgz#2a3afc332f0031b42f602f4a3de03c211ca98f72" - integrity sha512-pXnVMfJKSIWU2Ml4JHP7pZEPIrgBO1Fd3WGx+fPBsS+KRGhE4vxooD8XBGWbQOIVSZsVK7pUDBBkCicNu80yzQ== + version "4.3.2" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.2.tgz#fcf8777b82c62cfc69c7e9f32c0d2226287680e7" + integrity sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg== axobject-query@^2.2.0: version "2.2.0" @@ -2757,9 +2739,9 @@ babel-plugin-polyfill-corejs2@^0.2.2: semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b" - integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g== + version "0.2.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9" + integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ== dependencies: "@babel/helper-define-polyfill-provider" "^0.2.2" core-js-compat "^3.14.0" @@ -3069,16 +3051,16 @@ browserslist@4.14.2: escalade "^3.0.2" node-releases "^1.1.61" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.6.2, browserslist@^4.6.4: - version "4.16.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.16.7, browserslist@^4.6.2, browserslist@^4.6.4: + version "4.16.7" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.7.tgz#108b0d1ef33c4af1b587c54f390e7041178e4335" + integrity sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA== dependencies: - caniuse-lite "^1.0.30001219" + caniuse-lite "^1.0.30001248" colorette "^1.2.2" - electron-to-chromium "^1.3.723" + electron-to-chromium "^1.3.793" escalade "^3.1.1" - node-releases "^1.1.71" + node-releases "^1.1.73" bser@2.1.1: version "2.1.1" @@ -3088,9 +3070,9 @@ bser@2.1.1: node-int64 "^0.4.0" buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-indexof@^1.0.0: version "1.1.1" @@ -3255,10 +3237,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219: - version "1.0.30001242" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001242.tgz#04201627abcd60dc89211f22cbe2347306cda46b" - integrity sha512-KvNuZ/duufelMB3w2xtf9gEWCSxJwUgoxOx5b6ScLXC4kPc9xsczUVCPrQU26j5kOsHM4pSUL54tAZt5THQKug== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001248: + version "1.0.30001249" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz#90a330057f8ff75bfe97a94d047d5e14fabb2ee8" + integrity sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw== capture-exit@^2.0.0: version "2.0.0" @@ -3282,9 +3264,9 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -3294,12 +3276,7 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chart.js@^3.4.0, chart.js@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.4.1.tgz#ff3b2b2a04a37b83618b4a6399a5f87ccc0f1e8a" - integrity sha512-0R4mL7WiBcYoazIhrzSYnWcOw6RmrRn7Q4nKZNsBQZCBrlkZKodQbfeojCCo8eETPRCs1ZNTsAcZhIfyhyP61g== - -chart.js@^3.5.0: +chart.js@^3.4.0, chart.js@^3.4.1, chart.js@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.0.tgz#6eb075332d4ebbbb20a94e5a07a234052ed6c4fb" integrity sha512-J1a4EAb1Gi/KbhwDRmoovHTRuqT8qdF0kZ4XgwxpGethJHUdDrkqyPYwke0a+BuvSeUxPf8Cos6AX2AB8H8GLA== @@ -3472,7 +3449,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -3496,26 +3473,26 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" - integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== +color-string@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" + integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" color@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" - integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== dependencies: - color-convert "^1.9.1" - color-string "^1.5.4" + color-convert "^1.9.3" + color-string "^1.6.0" colorette@^1.2.1, colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== combined-stream@^1.0.8: version "1.0.8" @@ -3539,10 +3516,10 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -comment-parser@1.1.5, comment-parser@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.5.tgz#453627ef8f67dbcec44e79a9bd5baa37f0bce9b2" - integrity sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA== +comment-parser@1.1.6-beta.0: + version "1.1.6-beta.0" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.6-beta.0.tgz#57e503b18d0a5bd008632dcc54b1f95c2fffe8f6" + integrity sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw== common-tags@^1.8.0: version "1.8.0" @@ -3679,30 +3656,25 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.6.2: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb" - integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ== +core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.2: + version "3.16.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d" + integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ== dependencies: - browserslist "^4.16.6" + browserslist "^4.16.7" semver "7.0.0" -core-js-pure@^3.15.0: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.15.2.tgz#c8e0874822705f3385d3197af9348f7c9ae2e3ce" - integrity sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA== +core-js-pure@^3.16.0: + version "3.16.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.1.tgz#b997df2669c957a5b29f06e95813a171f993592e" + integrity sha512-TyofCdMzx0KMhi84mVRS8rL1XsRk2SPUNz2azmth53iRN0/08Uim9fdhQTaZTG1LqaXHYVci4RDHka6WrXfnvg== core-js@^2.4.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.0.1, core-js@^3.6.5: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" - integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== - -core-js@^3.16.1: +core-js@^3.0.1, core-js@^3.16.1, core-js@^3.6.5: version "3.16.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249" integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw== @@ -4078,7 +4050,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -4405,10 +4377,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.723: - version "1.3.766" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.766.tgz#2fd14a4e54f77665872f4e23fcf4968e83638220" - integrity sha512-u2quJ862q9reRKh/je3GXis3w38+RoXH1J9N3XjtsS6NzmUAosNsyZgUVFZPN/ZlJ3v6T0rTyZR3q/J5c6Sy5w== +electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.793: + version "1.3.802" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz#0afa989321de3e904ac653ee79e0d642883731a1" + integrity sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg== elliptic@^6.5.3: version "6.5.4" @@ -4544,9 +4516,9 @@ error-stack-parser@^2.0.6: stackframe "^1.1.1" es-abstract@^1.17.2, es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: - version "1.18.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" - integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== + version "1.18.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" + integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4554,11 +4526,12 @@ es-abstract@^1.17.2, es-abstract@^1.18.0, es-abstract@^1.18.0-next.1, es-abstrac get-intrinsic "^1.1.1" has "^1.0.3" has-symbols "^1.0.2" + internal-slot "^1.0.3" is-callable "^1.2.3" is-negative-zero "^2.0.1" is-regex "^1.1.3" is-string "^1.0.6" - object-inspect "^1.10.3" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -4654,41 +4627,41 @@ eslint-config-react-app@^6.0.0: dependencies: confusing-browser-globals "^1.0.10" -eslint-import-resolver-node@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== +eslint-import-resolver-node@^0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.5.tgz#939bbb0f74e179e757ca87f7a4a890dabed18ac4" + integrity sha512-XMoPKjSpXbkeJ7ZZ9icLnJMTY5Mc1kZbCakHquaFsXPpyWOwK0TK6CODO+0ca54UoM9LKOxyUNnoVZRl8TeaAg== dependencies: - debug "^2.6.9" - resolve "^1.13.1" + debug "^3.2.7" + resolve "^1.20.0" -eslint-module-utils@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" - integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== +eslint-module-utils@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" + integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q== dependencies: debug "^3.2.7" pkg-dir "^2.0.0" eslint-plugin-flowtype@^5.2.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.8.0.tgz#35b55e4ce559b90efbe913ed33630e391e301481" - integrity sha512-feK1xnUTsMSNTOw9jFw7aVgZl7Ep+ghpta/YEoaV6jbXU6Yso30B7BIj9ObHLzZ5TFJL7D98az080wfykLCrcw== + version "5.9.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.9.0.tgz#8d2d81d3d79bb53470ed62b97409b31684757e30" + integrity sha512-aBUVPA5Wt0XyuV3Wg8flfVqYJR6yR2nRLuyPwoTjCg5VTk4G1X1zQpInr39tUGgRxqrA+d+B9GYK4+/d1i0Rfw== dependencies: lodash "^4.17.15" string-natural-compare "^3.0.1" eslint-plugin-import@^2.22.1: - version "2.23.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97" - integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ== + version "2.24.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.0.tgz#697ffd263e24da5e84e03b282f5fb62251777177" + integrity sha512-Kc6xqT9hiYi2cgybOc0I2vC9OgAYga5o/rAFinam/yF/t5uBqxQbauNPMC6fgb640T/89P0gFoO27FOilJ/Cqg== dependencies: array-includes "^3.1.3" array.prototype.flat "^1.2.4" debug "^2.6.9" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.4" - eslint-module-utils "^2.6.1" + eslint-import-resolver-node "^0.3.5" + eslint-module-utils "^2.6.2" find-up "^2.0.0" has "^1.0.3" is-core-module "^2.4.0" @@ -4700,20 +4673,20 @@ eslint-plugin-import@^2.22.1: tsconfig-paths "^3.9.0" eslint-plugin-jest@^24.1.0: - version "24.3.6" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz#5f0ca019183c3188c5ad3af8e80b41de6c8e9173" - integrity sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg== + version "24.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262" + integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg== dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" eslint-plugin-jsdoc@^35.4.1: - version "35.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.4.1.tgz#7fb2a8c9bd8e304ab1feee48aa34544df5f79839" - integrity sha512-lnpu2Bj+ta2eAqwCWnb6f3Xjc78TWKo/oMCpDH5NfpPhYnePNtGZJzoAMgU5uo9BQqmXJ8pql8aiodOhg82ofw== + version "35.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.5.1.tgz#45932ee22669bbe06c97b82b936d56361efad370" + integrity sha512-pPYPWtsykwVEue1tYEyoppBj4dgF7XicF67tLLLraY6RQYBq7qMKjUHji19+hfiTtYKKBD0YfeK8hgjPAE5viw== dependencies: - "@es-joy/jsdoccomment" "^0.8.0" - comment-parser "1.1.5" - debug "^4.3.1" + "@es-joy/jsdoccomment" "0.9.0-alpha.1" + comment-parser "1.1.6-beta.0" + debug "^4.3.2" esquery "^1.4.0" jsdoc-type-pratt-parser "^1.0.4" lodash "^4.17.21" @@ -4827,53 +4800,7 @@ eslint-webpack-plugin@^2.5.2: normalize-path "^3.0.0" schema-utils "^3.0.0" -eslint@^7.11.0: - version "7.30.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8" - integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.2" - "@humanwhocodes/config-array" "^0.5.0" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.0.1" - doctrine "^3.0.0" - enquirer "^2.3.5" - escape-string-regexp "^4.0.0" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.1.2" - globals "^13.6.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.0.4" - natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.9" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -eslint@^7.32.0: +eslint@^7.11.0, eslint@^7.32.0: version "7.32.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== @@ -5148,9 +5075,9 @@ fast-diff@^1.1.2: integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-glob@^3.1.1: - version "3.2.6" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.6.tgz#434dd9529845176ea049acc9343e8282765c6e1a" - integrity sha512-GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -5298,9 +5225,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.0.tgz#da07fb8808050aba6fdeac2294542e5043583f05" - integrity sha512-XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A== + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== flatten@^1.0.2: version "1.0.3" @@ -5557,9 +5484,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" - integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== + version "13.10.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676" + integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g== dependencies: type-fest "^0.20.2" @@ -5599,9 +5526,9 @@ globby@^6.1.0: pinkie-promise "^2.0.0" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== growly@^1.3.0: version "1.3.0" @@ -5658,6 +5585,13 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -6129,11 +6063,12 @@ is-accessor-descriptor@^1.0.0: kind-of "^6.0.0" is-arguments@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" - integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -6146,9 +6081,9 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" - integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.3.tgz#fc9d9e364210480675653ddaea0518528d49a581" + integrity sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg== is-binary-path@^1.0.0: version "1.0.1" @@ -6165,11 +6100,12 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.0.1, is-boolean-object@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" - integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.1.5: version "1.1.6" @@ -6177,9 +6113,9 @@ is-buffer@^1.1.5: integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== is-callable@^1.1.4, is-callable@^1.1.5, is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== is-ci@^2.0.0: version "2.0.0" @@ -6201,9 +6137,9 @@ is-color-stop@^1.0.0: rgba-regex "^1.0.0" is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" - integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== + version "2.5.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" + integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== dependencies: has "^1.0.3" @@ -6222,9 +6158,11 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" - integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" is-descriptor@^0.1.0: version "0.1.6" @@ -6311,9 +6249,11 @@ is-negative-zero@^2.0.1: integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" - integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" is-number@^3.0.0: version "3.0.0" @@ -6374,12 +6314,12 @@ is-potential-custom-element-name@^1.0.1: integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-regex@^1.0.4, is-regex@^1.0.5, is-regex@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" - integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.2" + has-tostringtag "^1.0.0" is-regexp@^1.0.0: version "1.0.0" @@ -6402,14 +6342,16 @@ is-stream@^1.1.0: integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-string@^1.0.5, is-string@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" - integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" is-subset@^0.1.1: version "0.1.1" @@ -6961,15 +6903,20 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jsdoc-type-pratt-parser@1.0.4, jsdoc-type-pratt-parser@^1.0.4: +jsdoc-type-pratt-parser@1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz#5750d2d32ffb001866537d3baaedea7cf84c7036" integrity sha512-jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ== +jsdoc-type-pratt-parser@^1.0.4: + version "1.1.1" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz#10fe5e409ba38de22a48b555598955a26ff0160f" + integrity sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g== + jsdom@^16.4.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" - integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" acorn "^8.2.4" @@ -6996,7 +6943,7 @@ jsdom@^16.4.0: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.5" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -7046,7 +6993,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -7476,17 +7423,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.48.0, "mime-db@>= 1.43.0 < 2": - version "1.48.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" - integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== +mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24: - version "2.1.31" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" - integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== dependencies: - mime-db "1.48.0" + mime-db "1.49.0" mime@1.6.0: version "1.6.0" @@ -7666,9 +7613,9 @@ multicast-dns@^6.0.1: thunky "^1.0.2" nan@^2.12.1: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== nanoid@^3.1.23: version "3.1.23" @@ -7803,10 +7750,10 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.61, node-releases@^1.1.71: - version "1.1.73" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +node-releases@^1.1.61, node-releases@^1.1.73: + version "1.1.74" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e" + integrity sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw== normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" @@ -7902,10 +7849,10 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.10.3, object-inspect@^1.7.0, object-inspect@^1.9.0: - version "1.10.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" - integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== +object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== object-is@^1.0.1, object-is@^1.0.2, object-is@^1.1.2: version "1.1.5" @@ -9075,9 +9022,9 @@ postcss@7.0.36, postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, pos supports-color "^6.1.0" postcss@^8.1.0: - version "8.3.5" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" - integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA== + version "8.3.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" + integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== dependencies: colorette "^1.2.2" nanoid "^3.1.23" @@ -9633,20 +9580,13 @@ recursive-readdir@2.2.2: dependencies: minimatch "3.0.4" -redux@4.1.1: +redux@4.1.1, redux@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47" integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw== dependencies: "@babel/runtime" "^7.9.2" -redux@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4" - integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g== - dependencies: - "@babel/runtime" "^7.9.2" - regenerate-unicode-properties@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" @@ -9665,9 +9605,9 @@ regenerator-runtime@^0.11.0: integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== regenerator-transform@^0.14.2: version "0.14.5" @@ -9845,7 +9785,7 @@ resolve@1.18.1: is-core-module "^2.0.0" path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -10082,11 +10022,11 @@ schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: ajv-keywords "^3.5.2" schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -10451,9 +10391,9 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" - integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== + version "3.0.10" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" + integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== spdy-transport@^3.0.0: version "3.0.0" @@ -10811,9 +10751,9 @@ tapable@^1.0.0, tapable@^1.1.3: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tar@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== + version "6.1.7" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.7.tgz#c566d1107d38b09e92983a68db5534fc7f6cab42" + integrity sha512-PBoRkOJU0X3lejJ8GaRCsobjXTgFofRDSPdSUhRSdlwJfifRlQBwGXitDItdGFu0/h0XDMCkig0RN1iT7DBxhA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -11025,12 +10965,11 @@ ts-pnp@1.2.0, ts-pnp@^1.1.6: integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== tsconfig-paths@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" - integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + version "3.10.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" + integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q== dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" + json5 "^2.2.0" minimist "^1.2.0" strip-bom "^3.0.0" @@ -11131,9 +11070,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= uglify-js@^3.1.4: - version "3.13.10" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.10.tgz#a6bd0d28d38f592c3adb6b180ea6e07e1e540a8d" - integrity sha512-57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg== + version "3.14.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz#e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06" + integrity sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g== unbox-primitive@^1.0.1: version "1.0.1" @@ -11264,9 +11203,9 @@ url-loader@4.1.1: schema-utils "^3.0.0" url-parse@^1.4.3, url-parse@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" - integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== + version "1.5.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" + integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -11831,10 +11770,10 @@ ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^7.4.5: - version "7.5.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.2.tgz#09cc8fea3bec1bc5ed44ef51b42f945be36900f6" - integrity sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ== +ws@^7.4.6: + version "7.5.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" + integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== xml-name-validator@^3.0.0: version "3.0.0" From 18e90a48eab06e258cb28cf5c9b5e7b826db610b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Wed, 11 Aug 2021 20:29:00 +0200 Subject: [PATCH 134/316] release: v4.0.0-beta.1 --- package.json | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 74f6aa797..1e0dcff82 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@coreui/coreui-free-react-admin-template", "description": "CoreUI Free React Admin Template", - "version": "4.0.0-beta.0", + "version": "4.0.0-beta.1", "config": { "coreui_library_short_version": "4.0" }, diff --git a/public/index.html b/public/index.html index 7ef4dec76..7c3c32d8b 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/). + + + + ## 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?= Date: Sat, 9 Jul 2022 17:11:16 +0200 Subject: [PATCH 208/316] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 6bc7a7f91..f1ea5ecf4 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,4 @@ # These are supported funding model platforms -custom: "https://coreui.io/pro/" +custom: "https://coreui.io/pricing?support=react" open_collective: coreui From 31e296ecca7dc750cb66775f6e552c85816ede4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Sun, 10 Jul 2022 15:14:48 +0200 Subject: [PATCH 209/316] chore: update dependencies and devDependencies --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index b85e6b5cb..411528a0d 100644 --- a/package.json +++ b/package.json @@ -23,38 +23,38 @@ "test:debug": "react-scripts --inspect-brk test --runInBand" }, "config": { - "coreui_library_short_version": "4.2" + "coreui_library_short_version": "4.3" }, "dependencies": { "@coreui/chartjs": "^3.0.0", - "@coreui/coreui": "^4.1.5", + "@coreui/coreui": "^4.2.0", "@coreui/icons": "^2.1.0", "@coreui/icons-react": "^2.1.0", - "@coreui/react": "^4.2.2", + "@coreui/react": "^4.3.0", "@coreui/react-chartjs": "^2.1.0", "@coreui/utils": "^1.3.1", - "chart.js": "^3.7.1", + "chart.js": "^3.8.0", "classnames": "^2.3.1", - "core-js": "^3.22.6", + "core-js": "^3.23.4", "prop-types": "^15.8.1", - "react": "^18.1.0", + "react": "^18.2.0", "react-app-polyfill": "^3.0.0", - "react-dom": "^18.1.0", + "react-dom": "^18.2.0", "react-redux": "^8.0.2", "react-router-dom": "^6.3.0", "redux": "4.2.0", - "simplebar-react": "^2.3.7" + "simplebar-react": "^2.4.1" }, "devDependencies": { "@testing-library/jest-dom": "^5.16.4", - "@testing-library/react": "^13.2.0", - "@testing-library/user-event": "^14.2.0", + "@testing-library/react": "^13.3.0", + "@testing-library/user-event": "^14.2.1", "auto-changelog": "~2.4.0", "eslint-config-prettier": "^8.5.0", - "eslint-plugin-prettier": "^4.0.0", - "prettier": "2.6.2", + "eslint-plugin-prettier": "^4.2.1", + "prettier": "2.7.1", "react-scripts": "5.0.1", - "sass": "^1.52.1", + "sass": "^1.53.0", "web-vitals": "^2.1.4" }, "engines": { From 07d038ab6f21fcf76154d9c6d5c94b3b8dc3579f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Sun, 10 Jul 2022 15:15:37 +0200 Subject: [PATCH 210/316] refactor: remove docs version from urls --- package.json | 3 --- src/components/DocsCallout.js | 4 +--- src/components/DocsExample.js | 4 +--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 411528a0d..8449596e5 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,6 @@ "test:cov": "npm test -- --coverage --watchAll=false", "test:debug": "react-scripts --inspect-brk test --runInBand" }, - "config": { - "coreui_library_short_version": "4.3" - }, "dependencies": { "@coreui/chartjs": "^3.0.0", "@coreui/coreui": "^4.2.0", diff --git a/src/components/DocsCallout.js b/src/components/DocsCallout.js index 0af7ccd46..926ebfc43 100644 --- a/src/components/DocsCallout.js +++ b/src/components/DocsCallout.js @@ -2,14 +2,12 @@ import PropTypes from 'prop-types' import React from 'react' import { CCallout, CLink } from '@coreui/react' -import packageJson from '../../package.json' - const DocsCallout = (props) => { const { content, href, name } = props const plural = name.slice(-1) === 's' ? true : false - const _href = `https://coreui.io/react/docs/${packageJson.config.coreui_library_short_version}/${href}` + const _href = `https://coreui.io/react/docs/${href}` return ( diff --git a/src/components/DocsExample.js b/src/components/DocsExample.js index 5636da7f1..3340cbc80 100644 --- a/src/components/DocsExample.js +++ b/src/components/DocsExample.js @@ -4,12 +4,10 @@ import { CNav, CNavItem, CNavLink, CTabContent, CTabPane } from '@coreui/react' import CIcon from '@coreui/icons-react' import { cilCode, cilMediaPlay } from '@coreui/icons' -import packageJson from '../../package.json' - const DocsExample = (props) => { const { children, href } = props - const _href = `https://coreui.io/react/docs/${packageJson.config.coreui_library_short_version}/${href}` + const _href = `https://coreui.io/react/docs/${href}` return (
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 211/316] 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: , + }, ] export default _nav From f0f79cfca9498fbfea2e96d7bdf418552d6a8514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Sun, 10 Jul 2022 23:28:08 +0200 Subject: [PATCH 212/316] 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 213/316] 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 221/316] 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 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 ( - - - - } /> - } /> - } /> - } /> - } /> - - - - ) +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' ? ( + + ) : theme === 'auto' ? ( + + ) : ( + + )} + + + dispatch({ type: 'setTheme', theme: 'light' })} + > + Light + + dispatch({ type: 'setTheme', theme: 'dark' })} + > + Dark + + dispatch({ type: 'setTheme', theme: 'auto' })} + > + Auto + + + +
  • +
    +
  • diff --git a/src/components/header/AppHeaderDropdown.js b/src/components/header/AppHeaderDropdown.js index 5be919ee9..4332d8e52 100644 --- a/src/components/header/AppHeaderDropdown.js +++ b/src/components/header/AppHeaderDropdown.js @@ -31,7 +31,7 @@ const AppHeaderDropdown = () => { - Account + Account Updates @@ -60,7 +60,7 @@ const AppHeaderDropdown = () => { 42 - Settings + Settings Profile diff --git a/src/layout/DefaultLayout.js b/src/layout/DefaultLayout.js index 43bd64432..0b6311774 100644 --- a/src/layout/DefaultLayout.js +++ b/src/layout/DefaultLayout.js @@ -5,7 +5,7 @@ const DefaultLayout = () => { return (
    -
    +
    diff --git a/src/scss/_example.scss b/src/scss/_example.scss index f8791fb21..fdf64254b 100644 --- a/src/scss/_example.scss +++ b/src/scss/_example.scss @@ -1,33 +1,23 @@ +/* stylelint-disable declaration-no-important, scss/selector-no-redundant-nesting-selector */ +@import "@coreui/coreui/scss/functions"; +@import "@coreui/coreui/scss/variables"; +@import "@coreui/coreui/scss/mixins"; + .example { &:not(:first-child) { margin-top: 1.5rem; } .tab-content { - background-color: $light-50 !important; - - @at-root .dark-theme & { - background-color: rgba(255, 255, 255, .1) !important; - } - } - - code[class*="language-"], - pre[class*="language-"] { - font-size: .875rem !important; - } - - :not(pre) > code[class*="language-"], - pre[class*="language-"] { - background: transparent; + background-color: var(--#{$prefix}tertiary-bg) !important; } & + p { - margin-top: 1.5rem + margin-top: 1.5rem; } // Components examples - .preview, - .preview .col { + .preview { + p { margin-top: 2rem; } @@ -105,5 +95,20 @@ margin-top: .5rem; margin-bottom: .5rem; } + + .docs-example-modal { + .modal { + position: static; + display: block; + } + } } } + +@if $enable-dark-mode { + @include color-mode(dark) { + .example .tab-content { + background-color: var(--#{$prefix}secondary-bg) !important; + } + } +} \ No newline at end of file diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 373dbeec2..697b08ade 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -1,1791 +1,3 @@ -// Variables +// Variable overrides // -// If you want to customize your project please uncomment and update one of the following variables. - -// Color system - -// scss-docs-start gray-color-variables -// $white: #fff !default; -// $gray-base: #3c4b64 !default; -// $gray-100: #ebedef !default; -// $gray-200: #d8dbe0 !default; -// $gray-300: #c4c9d0 !default; -// $gray-400: #b1b7c1 !default; -// $gray-500: #9da5b1 !default; -// $gray-600: #8a93a2 !default; -// $gray-700: #768192 !default; -// $gray-800: #636f83 !default; -// $gray-900: #4f5d73 !default; -// $black: #000015 !default; -// scss-docs-end gray-color-variables - -// fusv-disable -// scss-docs-start gray-colors-map -// $grays: ( -// "100": $gray-100, -// "200": $gray-200, -// "300": $gray-300, -// "400": $gray-400, -// "500": $gray-500, -// "600": $gray-600, -// "700": $gray-700, -// "800": $gray-800, -// "900": $gray-900 -// ) !default; -// scss-docs-end gray-colors-map -// fusv-enable - -// $high-emphasis: rgba(shift-color($gray-base, +26), .95) !default; -// $medium-emphasis: rgba(shift-color($gray-base, +26), .681) !default; -// $disabled: rgba(shift-color($gray-base, +26), .38) !default; - -// $high-emphasis-inverse: rgba($white, .87) !default; -// $medium-emphasis-inverse: rgba($white, .6) !default; -// $disabled-inverse: rgba($white, .38) !default; - -// scss-docs-start color-variables -// $blue: #0d6efd !default; -// $indigo: #6610f2 !default; -// $purple: #6f42c1 !default; -// $pink: #d63384 !default; -// $red: #dc3545 !default; -// $orange: #fd7e14 !default; -// $yellow: #ffc107 !default; -// $green: #198754 !default; -// $teal: #20c997 !default; -// $cyan: #0dcaf0 !default; -// scss-docs-end color-variables - -// scss-docs-start colors-map -// $colors: ( -// "blue": $blue, -// "indigo": $indigo, -// "purple": $purple, -// "pink": $pink, -// "red": $red, -// "orange": $orange, -// "yellow": $yellow, -// "green": $green, -// "teal": $teal, -// "cyan": $cyan, -// "white": $white, -// "gray": $gray-600, -// "gray-dark": $gray-800 -// ) !default; -// scss-docs-end colors-map - -// fusv-disable -// $primary-dark: #1f1498 !default; -// $primary-base: #321fdb !default; -// $primary-50: #988fed !default; -// $primary-25: #ccc7f6 !default; - -// $secondary-dark: #212233 !default; -// $secondary-base: #9da5b1 !default; -// $secondary-50: #9da5b1 !default; -// $secondary-25: #ced2d8 !default; - -// $success-dark: #1b9e3e !default; -// $success-base: #2eb85c !default; -// $success-50: #96dbad !default; -// $success-25: #cbedd6 !default; - -// $info-dark: #2982cc !default; -// $info-base: #39f !default; -// $info-50: #80c6ff !default; -// $info-25: #c0e6ff !default; - -// $warning-dark: #f6960b !default; -// $warning-base: #f9b115 !default; -// $warning-50: #fcd88a !default; -// $warning-25: #feecc5 !default; - -// $danger-dark: #d93737 !default; -// $danger-base: #e55353 !default; -// $danger-50: #f2a9a9 !default; -// $danger-25: #f9d4d4 !default; - -// $light-dark: $gray-100 !default; -// $light-base: $gray-100 !default; -// $light-50: shift-color($light-base, -70) !default; -// $light-25: shift-color($light-base, -80) !default; - -// $dark-dark: $gray-900 !default; -// $dark-base: $gray-900 !default; -// $dark-50: shift-color($dark-base, -70) !default; -// $dark-25: shift-color($dark-base, -80) !default; -// fusv-enable - -// scss-docs-start theme-color-variables -// $primary: $primary-base !default; -// $secondary: $secondary-base !default; -// $success: $success-base !default; -// $info: $info-base !default; -// $warning: $warning-base !default; -// $danger: $danger-base !default; -// $light: $light-base !default; -// $dark: $dark-base !default; -// scss-docs-end theme-color-variables - -// scss-docs-start theme-colors-map -// $theme-colors: ( -// "primary": $primary, -// "secondary": $secondary, -// "success": $success, -// "info": $info, -// "warning": $warning, -// "danger": $danger, -// "light": $light, -// "dark": $dark -// ) !default; -// scss-docs-end theme-colors-map - -// The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7. -// See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast -// $min-contrast-ratio: 4.5 !default; - -// Customize the light and dark text colors for use in our color contrast function. -// $color-contrast-dark: $high-emphasis-inverse !default; -// $color-contrast-light: $high-emphasis !default; - -// fusv-disable -// $blue-100: tint-color($blue, 80%) !default; -// $blue-200: tint-color($blue, 60%) !default; -// $blue-300: tint-color($blue, 40%) !default; -// $blue-400: tint-color($blue, 20%) !default; -// $blue-500: $blue !default; -// $blue-600: shade-color($blue, 20%) !default; -// $blue-700: shade-color($blue, 40%) !default; -// $blue-800: shade-color($blue, 60%) !default; -// $blue-900: shade-color($blue, 80%) !default; - -// $indigo-100: tint-color($indigo, 80%) !default; -// $indigo-200: tint-color($indigo, 60%) !default; -// $indigo-300: tint-color($indigo, 40%) !default; -// $indigo-400: tint-color($indigo, 20%) !default; -// $indigo-500: $indigo !default; -// $indigo-600: shade-color($indigo, 20%) !default; -// $indigo-700: shade-color($indigo, 40%) !default; -// $indigo-800: shade-color($indigo, 60%) !default; -// $indigo-900: shade-color($indigo, 80%) !default; - -// $purple-100: tint-color($purple, 80%) !default; -// $purple-200: tint-color($purple, 60%) !default; -// $purple-300: tint-color($purple, 40%) !default; -// $purple-400: tint-color($purple, 20%) !default; -// $purple-500: $purple !default; -// $purple-600: shade-color($purple, 20%) !default; -// $purple-700: shade-color($purple, 40%) !default; -// $purple-800: shade-color($purple, 60%) !default; -// $purple-900: shade-color($purple, 80%) !default; - -// $pink-100: tint-color($pink, 80%) !default; -// $pink-200: tint-color($pink, 60%) !default; -// $pink-300: tint-color($pink, 40%) !default; -// $pink-400: tint-color($pink, 20%) !default; -// $pink-500: $pink !default; -// $pink-600: shade-color($pink, 20%) !default; -// $pink-700: shade-color($pink, 40%) !default; -// $pink-800: shade-color($pink, 60%) !default; -// $pink-900: shade-color($pink, 80%) !default; - -// $red-100: tint-color($red, 80%) !default; -// $red-200: tint-color($red, 60%) !default; -// $red-300: tint-color($red, 40%) !default; -// $red-400: tint-color($red, 20%) !default; -// $red-500: $red !default; -// $red-600: shade-color($red, 20%) !default; -// $red-700: shade-color($red, 40%) !default; -// $red-800: shade-color($red, 60%) !default; -// $red-900: shade-color($red, 80%) !default; - -// $orange-100: tint-color($orange, 80%) !default; -// $orange-200: tint-color($orange, 60%) !default; -// $orange-300: tint-color($orange, 40%) !default; -// $orange-400: tint-color($orange, 20%) !default; -// $orange-500: $orange !default; -// $orange-600: shade-color($orange, 20%) !default; -// $orange-700: shade-color($orange, 40%) !default; -// $orange-800: shade-color($orange, 60%) !default; -// $orange-900: shade-color($orange, 80%) !default; - -// $yellow-100: tint-color($yellow, 80%) !default; -// $yellow-200: tint-color($yellow, 60%) !default; -// $yellow-300: tint-color($yellow, 40%) !default; -// $yellow-400: tint-color($yellow, 20%) !default; -// $yellow-500: $yellow !default; -// $yellow-600: shade-color($yellow, 20%) !default; -// $yellow-700: shade-color($yellow, 40%) !default; -// $yellow-800: shade-color($yellow, 60%) !default; -// $yellow-900: shade-color($yellow, 80%) !default; - -// $green-100: tint-color($green, 80%) !default; -// $green-200: tint-color($green, 60%) !default; -// $green-300: tint-color($green, 40%) !default; -// $green-400: tint-color($green, 20%) !default; -// $green-500: $green !default; -// $green-600: shade-color($green, 20%) !default; -// $green-700: shade-color($green, 40%) !default; -// $green-800: shade-color($green, 60%) !default; -// $green-900: shade-color($green, 80%) !default; - -// $teal-100: tint-color($teal, 80%) !default; -// $teal-200: tint-color($teal, 60%) !default; -// $teal-300: tint-color($teal, 40%) !default; -// $teal-400: tint-color($teal, 20%) !default; -// $teal-500: $teal !default; -// $teal-600: shade-color($teal, 20%) !default; -// $teal-700: shade-color($teal, 40%) !default; -// $teal-800: shade-color($teal, 60%) !default; -// $teal-900: shade-color($teal, 80%) !default; - -// $cyan-100: tint-color($cyan, 80%) !default; -// $cyan-200: tint-color($cyan, 60%) !default; -// $cyan-300: tint-color($cyan, 40%) !default; -// $cyan-400: tint-color($cyan, 20%) !default; -// $cyan-500: $cyan !default; -// $cyan-600: shade-color($cyan, 20%) !default; -// $cyan-700: shade-color($cyan, 40%) !default; -// $cyan-800: shade-color($cyan, 60%) !default; -// $cyan-900: shade-color($cyan, 80%) !default; -// fusv-enable - -// Characters which are escaped by the escape-svg function -// $escaped-characters: ( -// ("<", "%3c"), -// (">", "%3e"), -// ("#", "%23"), -// ("(", "%28"), -// (")", "%29"), -// ) !default; - -// Options -// -// Quickly modify global styling by enabling or disabling optional features. - -// $enable-caret: true !default; -// $enable-rounded: true !default; -// $enable-shadows: false !default; -// $enable-gradients: false !default; -// $enable-transitions: true !default; -// $enable-reduced-motion: true !default; -// $enable-smooth-scroll: true !default; -// $enable-grid-classes: true !default; -// $enable-button-pointers: true !default; -// $enable-rfs: true !default; -// $enable-validation-icons: true !default; -// $enable-negative-margins: false !default; -// $enable-deprecation-messages: true !default; -// $enable-important-utilities: true !default; -// $enable-contrast-ratio-correction: true !default; -// $enable-contrast-ratio-warnings: false !default; -// $enable-ltr: true !default; -// $enable-rtl: false !default; - -// Set mobile breakpoint - -// $mobile-breakpoint: md !default; - -// Prefix for :root CSS variables - -// $variable-prefix: cui- !default; - -// Gradient -// -// The gradient which is added to components if `$enable-gradients` is `true` -// This gradient is also added to elements with `.bg-gradient` -// scss-docs-start variable-gradient -// $gradient: linear-gradient(180deg, rgba($white, .15), rgba($white, 0)) !default; -// scss-docs-end variable-gradient - -// Spacing -// -// Control the default styling of most Bootstrap elements by modifying these -// variables. Mostly focused on spacing. -// You can add more entries to the $spacers map, should you need more variation. - -// scss-docs-start spacer-variables-maps -// $spacer: 1rem !default; -// $spacers: ( -// 0: 0, -// 1: $spacer / 4, -// 2: $spacer / 2, -// 3: $spacer, -// 4: $spacer * 1.5, -// 5: $spacer * 3, -// ) !default; - -// $negative-spacers: if($enable-negative-margins, negativify-map($spacers), null) !default; -// scss-docs-end spacer-variables-maps - -// Position -// -// Define the edge positioning anchors of the position utilities. - -// scss-docs-start position-map -// $position-values: ( -// 0: 0, -// 50: 50%, -// 100: 100% -// ) !default; -// scss-docs-end position-map - -// Body -// -// Settings for the `` element. - -// $body-bg: $white !default; -// $body-color: $high-emphasis !default; -// $body-text-align: null !default; - - -// Links -// -// Style anchor elements. - -// $link-color: $primary !default; -// $link-decoration: underline !default; -// $link-shade-percentage: 20% !default; -// $link-hover-color: shift-color($link-color, $link-shade-percentage) !default; -// $link-hover-decoration: null !default; - -// $stretched-link-pseudo-element: after !default; -// $stretched-link-z-index: 1 !default; - -// Paragraphs -// -// Style p element. - -// $paragraph-margin-bottom: 1rem !default; - - -// Grid breakpoints -// -// Define the minimum dimensions at which your layout will change, -// adapting to different screen sizes, for use in media queries. - -// scss-docs-start grid-breakpoints -// $grid-breakpoints: ( -// xs: 0, -// sm: 576px, -// md: 768px, -// lg: 992px, -// xl: 1200px, -// xxl: 1400px -// ) !default; -// scss-docs-end grid-breakpoints - -// @include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); -// @include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints"); - - -// Grid containers -// -// Define the maximum width of `.container` for different screen sizes. - -// scss-docs-start container-max-widths -// $container-max-widths: ( -// sm: 540px, -// md: 720px, -// lg: 960px, -// xl: 1140px, -// xxl: 1320px -// ) !default; -// scss-docs-end container-max-widths - -// @include _assert-ascending($container-max-widths, "$container-max-widths"); - - -// Grid columns -// -// Set the number of columns and specify the width of the gutters. - -// $grid-columns: 12 !default; -// $grid-gutter-width: 1.5rem !default; -// $grid-row-columns: 6 !default; - -// $gutters: $spacers !default; - -// Container padding - -// $container-padding-x: $grid-gutter-width / 2 !default; - - -// Components -// -// Define common padding and border radius sizes and more. - -// scss-docs-start border-variables -// $border-width: 1px !default; -// $border-widths: ( -// 1: 1px, -// 2: 2px, -// 3: 3px, -// 4: 4px, -// 5: 5px -// ) !default; - -// $border-color: $gray-200 !default; -// scss-docs-end border-variables - -// scss-docs-start border-radius-variables -// $border-radius: .25rem !default; -// $border-radius-sm: .2rem !default; -// $border-radius-lg: .3rem !default; -// $border-radius-pill: 50rem !default; -// scss-docs-end border-radius-variables - -// scss-docs-start box-shadow-variables -// $box-shadow: 0 .5rem 1rem rgba($black, .15) !default; -// $box-shadow-sm: 0 .125rem .25rem rgba($black, .075) !default; -// $box-shadow-lg: 0 1rem 3rem rgba($black, .175) !default; -// $box-shadow-inset: inset 0 1px 2px rgba($black, .075) !default; -// scss-docs-end box-shadow-variables - -// $component-active-color: $high-emphasis-inverse !default; -// $component-active-bg: $primary !default; - -// scss-docs-start caret-variables -// $caret-width: .3em !default; -// $caret-vertical-align: $caret-width * .85 !default; -// $caret-spacing: $caret-width * .85 !default; -// scss-docs-end caret-variables - -// $transition-base: all .2s ease-in-out !default; -// $transition-fade: opacity .15s linear !default; -// scss-docs-start collapse-transition -// $transition-collapse: height .35s ease !default; -// scss-docs-end collapse-transition - -// stylelint-disable function-disallowed-list -// scss-docs-start aspect-ratios -// $aspect-ratios: ( -// "1x1": 100%, -// "4x3": calc(3 / 4 * 100%), -// "16x9": calc(9 / 16 * 100%), -// "21x9": calc(9 / 21 * 100%) -// ) !default; -// scss-docs-end aspect-ratios -// stylelint-enable function-disallowed-list - -// Typography -// -// Font, line-height, and color for body text, headings, and more. - -// scss-docs-start font-variables -// stylelint-disable value-keyword-case -// $font-family-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default; -// $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; -// stylelint-enable value-keyword-case -// $font-family-base: var(--#{$variable-prefix}font-sans-serif) !default; -// $font-family-code: var(--#{$variable-prefix}font-monospace) !default; - -// $font-size-root effects the value of `rem`, which is used for as well font sizes, paddings and margins -// $font-size-base effects the font size of the body text -// $font-size-root: null !default; -// $font-size-base: 1rem !default; // Assumes the browser default, typically `16px` -// $font-size-sm: $font-size-base * .875 !default; -// $font-size-lg: $font-size-base * 1.25 !default; - -// $font-weight-lighter: lighter !default; -// $font-weight-light: 300 !default; -// $font-weight-normal: 400 !default; -// $font-weight-medium: 500 !default; -// $font-weight-semibold: 600 !default; -// $font-weight-bold: 700 !default; -// $font-weight-bolder: bolder !default; - -// $font-weight-base: $font-weight-normal !default; - -// $line-height-base: 1.5 !default; -// $line-height-sm: 1.25 !default; -// $line-height-lg: 2 !default; - -// $h1-font-size: $font-size-base * 2.5 !default; -// $h2-font-size: $font-size-base * 2 !default; -// $h3-font-size: $font-size-base * 1.75 !default; -// $h4-font-size: $font-size-base * 1.5 !default; -// $h5-font-size: $font-size-base * 1.25 !default; -// $h6-font-size: $font-size-base !default; -// scss-docs-end font-variables - -// scss-docs-start font-sizes -// $font-sizes: ( -// 1: $h1-font-size, -// 2: $h2-font-size, -// 3: $h3-font-size, -// 4: $h4-font-size, -// 5: $h5-font-size, -// 6: $h6-font-size -// ) !default; -// scss-docs-end font-sizes - -// scss-docs-start headings-variables -// $headings-margin-bottom: $spacer / 2 !default; -// $headings-font-family: null !default; -// $headings-font-style: null !default; -// $headings-font-weight: 500 !default; -// $headings-line-height: 1.2 !default; -// $headings-color: unset !default; -// scss-docs-end headings-variables - -// scss-docs-start display-headings -// $display-font-sizes: ( -// 1: 5rem, -// 2: 4.5rem, -// 3: 4rem, -// 4: 3.5rem, -// 5: 3rem, -// 6: 2.5rem -// ) !default; - -// $display-font-weight: 300 !default; -// $display-line-height: $headings-line-height !default; -// scss-docs-end display-headings - -// scss-docs-start type-variables -// $lead-font-size: $font-size-base * 1.25 !default; -// $lead-font-weight: 300 !default; - -// $small-font-size: .875em !default; - -// $sub-sup-font-size: .75em !default; - -// $text-high-emphasis: $high-emphasis !default; -// $text-medium-emphasis: $medium-emphasis !default; -// $text-disabled: $disabled !default; -// $text-muted: $disabled !default; - -// $text-high-emphasis-inverse: $high-emphasis-inverse !default; -// $text-medium-emphasis-inverse: $medium-emphasis-inverse !default; -// $text-disabled-inverse: $disabled-inverse !default; - -// $initialism-font-size: $small-font-size !default; - -// $blockquote-margin-y: $spacer !default; -// $blockquote-font-size: $font-size-base * 1.25 !default; -// $blockquote-footer-color: $gray-600 !default; -// $blockquote-footer-font-size: $small-font-size !default; - -// $hr-margin-y: $spacer !default; -// $hr-color: inherit !default; -// $hr-height: $border-width !default; -// $hr-opacity: .25 !default; - -// $vr-color: inherit !default; -// $vr-width: $border-width !default; -// $vr-opacity: .25 !default; - -// $legend-margin-bottom: .5rem !default; -// $legend-font-size: 1.5rem !default; -// $legend-font-weight: null !default; - -// $mark-padding: .2em !default; - -// $dt-font-weight: $font-weight-bold !default; - -// $nested-kbd-font-weight: $font-weight-bold !default; - -// $list-inline-padding: .5rem !default; - -// $mark-bg: #fcf8e3 !default; -// scss-docs-end type-variables - -// Icons -// $icon-size-base: 1rem !default; -// $icon-size-sm: $icon-size-base * .875 !default; -// $icon-size-lg: $icon-size-base * 1.25 !default; -// $icon-size-xl: $icon-size-base * 1.5 !default; - - -// Tables -// -// Customizes the `.table` component with basic values, each used across all table variations. - -// scss-docs-start table-variables -// $table-cell-padding-y: .5rem !default; -// $table-cell-padding-x: .5rem !default; -// $table-cell-padding-y-sm: .25rem !default; -// $table-cell-padding-x-sm: .25rem !default; - -// $table-cell-vertical-align: top !default; - -// $table-color: $body-color !default; -// $table-bg: transparent !default; - -// $table-th-font-weight: 600 !default; - -// $table-striped-color: $table-color !default; -// $table-striped-bg-factor: .05 !default; -// $table-striped-bg: rgba($black, $table-striped-bg-factor) !default; - -// $table-active-color: $table-color !default; -// $table-active-bg-factor: .1 !default; -// $table-active-bg: rgba($black, $table-active-bg-factor) !default; - -// $table-hover-color: $table-color !default; -// $table-hover-bg-factor: .075 !default; -// $table-hover-bg: rgba($black, $table-hover-bg-factor) !default; - -// $table-border-factor: .1 !default; -// $table-border-width: $border-width !default; -// $table-border-color: $border-color !default; - -// $table-striped-order: odd !default; - -// $table-group-separator-color: currentColor !default; - -// $table-caption-color: $text-muted !default; - -// $table-bg-scale: -80% !default; -// scss-docs-end table-variables - -// scss-docs-start table-loop -// $table-variants: ( -// "primary": table-color-map(shift-color($primary, $table-bg-scale)), -// "secondary": table-color-map(shift-color($secondary, $table-bg-scale)), -// "success": table-color-map(shift-color($success, $table-bg-scale)), -// "danger": table-color-map(shift-color($danger, $table-bg-scale)), -// "warning": table-color-map(shift-color($warning, $table-bg-scale)), -// "info": table-color-map(shift-color($info, $table-bg-scale)), -// "light": table-color-map(shift-color($light, $table-bg-scale)), -// "dark": table-color-map(shift-color($dark, $table-bg-scale)) -// ) !default; -// scss-docs-end table-loop - - -// Buttons + Forms -// -// Shared variables that are reassigned to `$input-` and `$btn-` specific variables. - -// scss-docs-start input-btn-variables -// $input-btn-padding-y: .375rem !default; -// $input-btn-padding-x: .75rem !default; -// $input-btn-font-family: null !default; -// $input-btn-font-size: $font-size-base !default; -// $input-btn-line-height: $line-height-base !default; - -// $input-btn-focus-width: .25rem !default; -// $input-btn-focus-color-opacity: .25 !default; -// $input-btn-focus-color: rgba($component-active-bg, $input-btn-focus-color-opacity) !default; -// $input-btn-focus-blur: 0 !default; -// $input-btn-focus-box-shadow: 0 0 $input-btn-focus-blur $input-btn-focus-width $input-btn-focus-color !default; - -// $input-btn-padding-y-sm: .25rem !default; -// $input-btn-padding-x-sm: .5rem !default; -// $input-btn-font-size-sm: $font-size-sm !default; - -// $input-btn-padding-y-lg: .5rem !default; -// $input-btn-padding-x-lg: 1rem !default; -// $input-btn-font-size-lg: $font-size-lg !default; - -// $input-btn-border-width: $border-width !default; -// scss-docs-end input-btn-variables - - -// Buttons -// -// For each of Bootstrap's buttons, define text, background, and border color. - -// scss-docs-start btn-variables -// $btn-padding-y: $input-btn-padding-y !default; -// $btn-padding-x: $input-btn-padding-x !default; -// $btn-font-family: $input-btn-font-family !default; -// $btn-font-size: $input-btn-font-size !default; -// $btn-line-height: $input-btn-line-height !default; -// $btn-white-space: null !default; // Set to `nowrap` to prevent text wrapping - -// $btn-padding-y-sm: $input-btn-padding-y-sm !default; -// $btn-padding-x-sm: $input-btn-padding-x-sm !default; -// $btn-font-size-sm: $input-btn-font-size-sm !default; - -// $btn-padding-y-lg: $input-btn-padding-y-lg !default; -// $btn-padding-x-lg: $input-btn-padding-x-lg !default; -// $btn-font-size-lg: $input-btn-font-size-lg !default; - -// $btn-border-width: $input-btn-border-width !default; - -// $btn-font-weight: $font-weight-normal !default; -// $btn-box-shadow: inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075) !default; -// $btn-focus-width: $input-btn-focus-width !default; -// $btn-focus-box-shadow: $input-btn-focus-box-shadow !default; -// $btn-disabled-opacity: .65 !default; -// $btn-active-box-shadow: inset 0 3px 5px rgba($black, .125) !default; - -// $btn-link-color: $link-color !default; -// $btn-link-hover-color: $link-hover-color !default; -// $btn-link-disabled-color: $gray-600 !default; - -// Allows for customizing button radius independently from global border radius -// $btn-border-radius: $border-radius !default; -// $btn-border-radius-sm: $border-radius-sm !default; -// $btn-border-radius-lg: $border-radius-lg !default; - -// $btn-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; - -// $btn-hover-bg-shade-amount: 15% !default; -// $btn-hover-bg-tint-amount: 15% !default; -// $btn-hover-border-shade-amount: 20% !default; -// $btn-hover-border-tint-amount: 10% !default; -// $btn-active-bg-shade-amount: 20% !default; -// $btn-active-bg-tint-amount: 20% !default; -// $btn-active-border-shade-amount: 25% !default; -// $btn-active-border-tint-amount: 10% !default; - -// $button-variants: ( -// "primary": btn-color-map($primary, $primary), -// "secondary": btn-color-map($secondary, $secondary), -// "success": btn-color-map($success, $success), -// "danger": btn-color-map($danger, $danger), -// "warning": btn-color-map($warning, $warning), -// "info": btn-color-map($info, $info), -// "light": btn-color-map($light, $light), -// "dark": btn-color-map($dark, $dark) -// ) !default; - -// $button-outline-ghost-variants: ( -// "primary": btn-outline-color-map($primary), -// "secondary": btn-outline-color-map($secondary), -// "success": btn-outline-color-map($success), -// "danger": btn-outline-color-map($danger), -// "warning": btn-outline-color-map($warning), -// "info": btn-outline-color-map($info), -// "light": btn-outline-color-map($light), -// "dark": btn-outline-color-map($dark) -// ) !default; -// scss-docs-end btn-variables - - -// Forms -// scss-docs-start form-variables -// scss-docs-start form-text-variables -// $form-text-margin-top: .25rem !default; -// $form-text-font-size: $small-font-size !default; -// $form-text-font-style: null !default; -// $form-text-font-weight: null !default; -// $form-text-color: $text-muted !default; -// scss-docs-end form-text-variables - -// scss-docs-start form-label-variables -// $form-label-margin-bottom: .5rem !default; -// $form-label-font-size: null !default; -// $form-label-font-style: null !default; -// $form-label-font-weight: null !default; -// $form-label-color: null !default; -// scss-docs-end form-label-variables - -// scss-docs-start form-input-variables -// $input-padding-y: $input-btn-padding-y !default; -// $input-padding-x: $input-btn-padding-x !default; -// $input-font-family: $input-btn-font-family !default; -// $input-font-size: $input-btn-font-size !default; -// $input-font-weight: $font-weight-base !default; -// $input-line-height: $input-btn-line-height !default; - -// $input-padding-y-sm: $input-btn-padding-y-sm !default; -// $input-padding-x-sm: $input-btn-padding-x-sm !default; -// $input-font-size-sm: $input-btn-font-size-sm !default; - -// $input-padding-y-lg: $input-btn-padding-y-lg !default; -// $input-padding-x-lg: $input-btn-padding-x-lg !default; -// $input-font-size-lg: $input-btn-font-size-lg !default; - -// $input-bg: $white !default; -// $input-disabled-bg: $gray-200 !default; -// $input-disabled-border-color: $gray-400 !default; - -// $input-color: $body-color !default; -// $input-border-color: $gray-400 !default; -// $input-border-width: $input-btn-border-width !default; -// $input-box-shadow: $box-shadow-inset !default; - -// $input-border-radius: $border-radius !default; -// $input-border-radius-sm: $border-radius-sm !default; -// $input-border-radius-lg: $border-radius-lg !default; - -// $input-focus-bg: $input-bg !default; -// $input-focus-border-color: tint-color($component-active-bg, 50%) !default; -// $input-focus-color: $input-color !default; -// $input-focus-width: $input-btn-focus-width !default; -// $input-focus-box-shadow: $input-btn-focus-box-shadow !default; - -// $input-placeholder-color: $gray-600 !default; -// $input-plaintext-color: $body-color !default; - -// $input-height-border: $input-border-width * 2 !default; - -// $input-height-inner: add($input-line-height * 1em, $input-padding-y * 2) !default; -// $input-height-inner-half: add($input-line-height * .5em, $input-padding-y) !default; -// $input-height-inner-quarter: add($input-line-height * .25em, $input-padding-y / 2) !default; - -// $input-height: add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default; -// $input-height-sm: add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default; -// $input-height-lg: add($input-line-height * 1em, add($input-padding-y-lg * 2, $input-height-border, false)) !default; - -// $input-transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; -// scss-docs-end form-input-variables - -// scss-docs-start form-check-variables -// $form-check-input-width: 1em !default; -// $form-check-min-height: $font-size-base * $line-height-base !default; -// $form-check-padding-start: $form-check-input-width + .5em !default; -// $form-check-margin-bottom: .125rem !default; -// $form-check-label-color: unset !default; -// $form-check-label-cursor: null !default; -// $form-check-transition: null !default; - -// $form-check-input-active-filter: brightness(90%) !default; - -// $form-check-input-bg: $input-bg !default; -// $form-check-input-border: 1px solid rgba($black, .25) !default; -// $form-check-input-border-radius: .25em !default; -// $form-check-radio-border-radius: 50% !default; -// $form-check-input-focus-border: $input-focus-border-color !default; -// $form-check-input-focus-box-shadow: $input-btn-focus-box-shadow !default; - -// $form-check-input-checked-color: $component-active-color !default; -// $form-check-input-checked-bg-color: $component-active-bg !default; -// $form-check-input-checked-border-color: $form-check-input-checked-bg-color !default; -// $form-check-input-checked-bg-image: url("data:image/svg+xml,") !default; -// $form-check-radio-checked-bg-image: url("data:image/svg+xml,") !default; - -// $form-check-input-indeterminate-color: $component-active-color !default; -// $form-check-input-indeterminate-bg-color: $component-active-bg !default; -// $form-check-input-indeterminate-border-color: $form-check-input-indeterminate-bg-color !default; -// $form-check-input-indeterminate-bg-image: url("data:image/svg+xml,") !default; - -// $form-check-input-disabled-opacity: .5 !default; -// $form-check-label-disabled-opacity: $form-check-input-disabled-opacity !default; -// $form-check-btn-check-disabled-opacity: $btn-disabled-opacity !default; - -// $form-check-inline-margin-end: 1rem !default; -// scss-docs-end form-check-variables - -// scss-docs-start form-switch-variables -// $form-switch-color: rgba(0, 0, 0, .25) !default; -// $form-switch-width: 1.5em !default; -// $form-switch-padding-start: $form-switch-width + .5em !default; -// $form-switch-bg-image: url("data:image/svg+xml,") !default; -// $form-switch-border-radius: $form-switch-width !default; -// $form-switch-transition: background-position .15s ease-in-out !default; - -// $form-switch-focus-color: $input-focus-border-color !default; -// $form-switch-focus-bg-image: url("data:image/svg+xml,") !default; - -// $form-switch-checked-color: $component-active-color !default; -// $form-switch-checked-bg-image: url("data:image/svg+xml,") !default; -// $form-switch-checked-bg-position: right center !default; - -// $form-switch-widths: ( -// lg: ( -// width: 1.75em, -// height: 1.25em -// ), -// xl: ( -// width: 2em, -// height: 1.5em -// ) -// ) !default; -// scss-docs-end form-switch-variables - -// $form-check-inline-margin-end: 1rem !default; - -// scss-docs-start input-group-variables -// $input-group-addon-padding-y: $input-padding-y !default; -// $input-group-addon-padding-x: $input-padding-x !default; -// $input-group-addon-font-weight: $input-font-weight !default; -// $input-group-addon-color: $input-color !default; -// $input-group-addon-bg: $gray-200 !default; -// $input-group-addon-border-color: $input-border-color !default; -// scss-docs-end input-group-variables - -// scss-docs-start form-select-variables -// $form-select-padding-y: $input-padding-y !default; -// $form-select-padding-x: $input-padding-x !default; -// $form-select-font-family: $input-font-family !default; -// $form-select-font-size: $input-font-size !default; -// $form-select-indicator-padding: $form-select-padding-x * 3 !default; // Extra padding for background-image -// $form-select-font-weight: $input-font-weight !default; -// $form-select-line-height: $input-line-height !default; -// $form-select-color: $input-color !default; -// $form-select-bg: $input-bg !default; -// $form-select-disabled-color: null !default; -// $form-select-disabled-bg: $gray-200 !default; -// $form-select-disabled-border-color: $input-disabled-border-color !default; -// $form-select-bg-position: right $form-select-padding-x center !default; -// $form-select-bg-size: 16px 12px !default; // In pixels because image dimensions -// $form-select-indicator-color: $gray-800 !default; -// $form-select-indicator: url("data:image/svg+xml,") !default; - -// $form-select-feedback-icon-padding-end: $form-select-padding-x * 2.5 + $form-select-indicator-padding !default; -// $form-select-feedback-icon-position: center right $form-select-indicator-padding !default; -// $form-select-feedback-icon-size: $input-height-inner-half $input-height-inner-half !default; - -// $form-select-border-width: $input-border-width !default; -// $form-select-border-color: $input-border-color !default; -// $form-select-border-radius: $border-radius !default; -// $form-select-box-shadow: $box-shadow-inset !default; - -// $form-select-focus-border-color: $input-focus-border-color !default; -// $form-select-focus-width: $input-focus-width !default; -// $form-select-focus-box-shadow: 0 0 0 $form-select-focus-width $input-btn-focus-color !default; - -// $form-select-padding-y-sm: $input-padding-y-sm !default; -// $form-select-padding-x-sm: $input-padding-x-sm !default; -// $form-select-font-size-sm: $input-font-size-sm !default; - -// $form-select-padding-y-lg: $input-padding-y-lg !default; -// $form-select-padding-x-lg: $input-padding-x-lg !default; -// $form-select-font-size-lg: $input-font-size-lg !default; -// scss-docs-end form-select-variables - -// scss-docs-start form-range-variables -// $form-range-track-width: 100% !default; -// $form-range-track-height: .5rem !default; -// $form-range-track-cursor: pointer !default; -// $form-range-track-bg: $gray-300 !default; -// $form-range-track-border-radius: 1rem !default; -// $form-range-track-box-shadow: $box-shadow-inset !default; - -// $form-range-thumb-width: 1rem !default; -// $form-range-thumb-height: $form-range-thumb-width !default; -// $form-range-thumb-bg: $component-active-bg !default; -// $form-range-thumb-border: 0 !default; -// $form-range-thumb-border-radius: 1rem !default; -// $form-range-thumb-box-shadow: 0 .1rem .25rem rgba($black, .1) !default; -// $form-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-focus-box-shadow !default; -// $form-range-thumb-focus-box-shadow-width: $input-focus-width !default; // For focus box shadow issue in Edge -// $form-range-thumb-active-bg: tint-color($component-active-bg, 70%) !default; -// $form-range-thumb-disabled-bg: $gray-500 !default; -// $form-range-thumb-transition: background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; -// scss-docs-end form-range-variables - -// scss-docs-start form-file-variables -// $form-file-button-color: $input-color !default; -// $form-file-button-bg: $input-group-addon-bg !default; -// $form-file-button-hover-bg: shade-color($form-file-button-bg, 5%) !default; -// scss-docs-end form-file-variables - -// scss-docs-start form-floating-variables -// $form-floating-height: add(3.5rem, $input-height-border) !default; -// $form-floating-padding-x: $input-padding-x !default; -// $form-floating-padding-y: 1rem !default; -// $form-floating-input-padding-t: 1.625rem !default; -// $form-floating-input-padding-b: .625rem !default; -// $form-floating-label-opacity: .65 !default; -// $form-floating-label-transform: scale(.85) translateY(-.5rem) translateX(.15rem) !default; -// $form-floating-transition: opacity .1s ease-in-out, transform .1s ease-in-out !default; -// scss-docs-end form-floating-variables - -// Form validation - -// scss-docs-start form-feedback-variables -// $form-feedback-margin-top: $form-text-margin-top !default; -// $form-feedback-font-size: $form-text-font-size !default; -// $form-feedback-font-style: $form-text-font-style !default; -// $form-feedback-valid-color: $success !default; -// $form-feedback-invalid-color: $danger !default; - -// $form-feedback-icon-valid-color: $form-feedback-valid-color !default; -// $form-feedback-icon-valid: url("data:image/svg+xml,") !default; -// $form-feedback-icon-invalid-color: $form-feedback-invalid-color !default; -// $form-feedback-icon-invalid: url("data:image/svg+xml,") !default; -// scss-docs-end form-feedback-variables - -// scss-docs-start form-validation-states -// $form-validation-states: ( -// "valid": ( -// "color": $form-feedback-valid-color, -// "icon": $form-feedback-icon-valid -// ), -// "invalid": ( -// "color": $form-feedback-invalid-color, -// "icon": $form-feedback-icon-invalid -// ) -// ) !default; -// scss-docs-end form-validation-states -// scss-docs-end form-variables -// Z-index master list -// -// Warning: Avoid customizing these values. They're used for a bird's eye view -// of components dependent on the z-axis and are designed to all work together. - -// scss-docs-start zindex-stack -// $zindex-dropdown: 1000 !default; -// $zindex-sticky: 1020 !default; -// $zindex-fixed: 1030 !default; -// $zindex-modal-backdrop: 1040 !default; -// $zindex-offcanvas: 1050 !default; -// $zindex-modal: 1060 !default; -// $zindex-popover: 1070 !default; -// $zindex-tooltip: 1080 !default; -// $zindex-toaster: 1090 !default; -// scss-docs-end zindex-stack - - -// Navs -// scss-docs-start nav-variables -// $nav-link-padding-y: .5rem !default; -// $nav-link-padding-x: 1rem !default; -// $nav-link-font-size: null !default; -// $nav-link-font-weight: null !default; -// $nav-link-color: $link-color !default; -// $nav-link-hover-color: $link-hover-color !default; -// $nav-link-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !default; -// $nav-link-disabled-color: $gray-600 !default; - -// $nav-tabs-border-color: $gray-300 !default; -// $nav-tabs-border-width: $border-width !default; -// $nav-tabs-border-radius: $border-radius !default; -// $nav-tabs-link-hover-border-color: $gray-200 $gray-200 $nav-tabs-border-color !default; -// $nav-tabs-link-active-color: $gray-700 !default; -// $nav-tabs-link-active-bg: $body-bg !default; -// $nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default; - -// $nav-pills-border-radius: $border-radius !default; -// $nav-pills-link-active-color: $component-active-color !default; -// $nav-pills-link-active-bg: $component-active-bg !default; -// scss-docs-end nav-variables - - -// Navbar - -// scss-docs-start navbar-variables -// $navbar-padding-y: $spacer / 2 !default; -// $navbar-padding-x: null !default; - -// $navbar-nav-link-padding-x: .5rem !default; - -// $navbar-brand-font-size: $font-size-lg !default; -// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link -// $nav-link-height: $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default; -// $navbar-brand-height: $navbar-brand-font-size * $line-height-base !default; -// $navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default; -// $navbar-brand-margin-end: 1rem !default; - -// $navbar-toggler-padding-y: .25rem !default; -// $navbar-toggler-padding-x: .75rem !default; -// $navbar-toggler-font-size: $font-size-lg !default; -// $navbar-toggler-border-radius: $btn-border-radius !default; -// $navbar-toggler-focus-width: $btn-focus-width !default; -// $navbar-toggler-transition: box-shadow .15s ease-in-out !default; -// scss-docs-end navbar-variables - -// scss-docs-start navbar-theme-variables -// $navbar-dark-color: $medium-emphasis-inverse !default; -// $navbar-dark-hover-color: $high-emphasis-inverse !default; -// $navbar-dark-active-color: $high-emphasis-inverse !default; -// $navbar-dark-disabled-color: $disabled-inverse !default; -// $navbar-dark-toggler-icon-bg: url("data:image/svg+xml,") !default; -// $navbar-dark-toggler-border-color: rgba($white, .1) !default; - -// $navbar-light-color: $medium-emphasis !default; -// $navbar-light-hover-color: $high-emphasis !default; -// $navbar-light-active-color: $high-emphasis !default; -// $navbar-light-disabled-color: $disabled !default; -// $navbar-light-toggler-icon-bg: url("data:image/svg+xml,") !default; -// $navbar-light-toggler-border-color: rgba($black, .1) !default; - -// $navbar-light-brand-color: $navbar-light-active-color !default; -// $navbar-light-brand-hover-color: $navbar-light-active-color !default; -// $navbar-dark-brand-color: $navbar-dark-active-color !default; -// $navbar-dark-brand-hover-color: $navbar-dark-active-color !default; -// scss-docs-end navbar-theme-variables - - -// Dropdowns -// -// Dropdown menu container and contents. -// scss-docs-start dropdown-variables -// $dropdown-min-width: 10rem !default; -// $dropdown-padding-x: 0 !default; -// $dropdown-padding-y: .5rem !default; -// $dropdown-spacer: .125rem !default; -// $dropdown-font-size: $font-size-base !default; -// $dropdown-color: $body-color !default; -// $dropdown-bg: $white !default; -// $dropdown-border-color: rgba($black, .15) !default; -// $dropdown-border-radius: $border-radius !default; -// $dropdown-border-width: $border-width !default; -// $dropdown-inner-border-radius: subtract($dropdown-border-radius, $dropdown-border-width) !default; -// $dropdown-divider-bg: $dropdown-border-color !default; -// $dropdown-divider-margin-y: $spacer / 2 !default; -// $dropdown-box-shadow: $box-shadow !default; - -// $dropdown-link-color: $gray-900 !default; -// $dropdown-link-hover-color: shade-color($gray-900, 10%) !default; -// $dropdown-link-hover-bg: $gray-200 !default; - -// $dropdown-link-active-color: $component-active-color !default; -// $dropdown-link-active-bg: $component-active-bg !default; - -// $dropdown-link-disabled-color: $gray-500 !default; - -// $dropdown-item-padding-y: $spacer / 4 !default; -// $dropdown-item-padding-x: $spacer !default; - -// $dropdown-header-color: $gray-600 !default; -// $dropdown-header-padding: $dropdown-padding-y $dropdown-item-padding-x !default; -// scss-docs-end dropdown-variables - -// scss-docs-start dropdown-dark-variables -// $dropdown-dark-color: $gray-300 !default; -// $dropdown-dark-bg: $gray-800 !default; -// $dropdown-dark-border-color: $dropdown-border-color !default; -// $dropdown-dark-divider-bg: $dropdown-divider-bg !default; -// $dropdown-dark-box-shadow: null !default; -// $dropdown-dark-link-color: $dropdown-dark-color !default; -// $dropdown-dark-link-hover-color: $high-emphasis-inverse !default; -// $dropdown-dark-link-hover-bg: rgba($white, .15) !default; -// $dropdown-dark-link-active-color: $dropdown-link-active-color !default; -// $dropdown-dark-link-active-bg: $dropdown-link-active-bg !default; -// $dropdown-dark-link-disabled-color: $gray-500 !default; -// $dropdown-dark-header-color: $gray-500 !default; -// scss-docs-end dropdown-dark-variables - - -// Pagination - -// scss-docs-start pagination-variables -// $pagination-padding-y: .375rem !default; -// $pagination-padding-x: .75rem !default; -// $pagination-padding-y-sm: .25rem !default; -// $pagination-padding-x-sm: .5rem !default; -// $pagination-padding-y-lg: .75rem !default; -// $pagination-padding-x-lg: 1.5rem !default; - -// $pagination-color: $link-color !default; -// $pagination-bg: $white !default; -// $pagination-border-width: $border-width !default; -// $pagination-border-radius: $border-radius !default; -// $pagination-margin-start: -$pagination-border-width !default; -// $pagination-border-color: $gray-300 !default; - -// $pagination-focus-color: $link-hover-color !default; -// $pagination-focus-bg: $gray-200 !default; -// $pagination-focus-box-shadow: $input-btn-focus-box-shadow !default; -// $pagination-focus-outline: 0 !default; - -// $pagination-hover-color: $link-hover-color !default; -// $pagination-hover-bg: $gray-200 !default; -// $pagination-hover-border-color: $gray-300 !default; - -// $pagination-active-color: $component-active-color !default; -// $pagination-active-bg: $component-active-bg !default; -// $pagination-active-border-color: $pagination-active-bg !default; - -// $pagination-disabled-color: $gray-600 !default; -// $pagination-disabled-bg: $white !default; -// $pagination-disabled-border-color: $gray-300 !default; - -// $pagination-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; -// scss-docs-end pagination-variables - -// $pagination-border-radius-sm: $border-radius-sm !default; -// $pagination-border-radius-lg: $border-radius-lg !default; -// scss-docs-end pagination-variables - - -// Cards -// scss-docs-start card-variables -// $card-spacer-y: $spacer !default; -// $card-spacer-x: $spacer !default; -// $card-title-spacer-y: $spacer / 2 !default; -// $card-border-width: $border-width !default; -// $card-border-radius: $border-radius !default; -// $card-border-color: rgba($black, .125) !default; -// $card-inner-border-radius: subtract($card-border-radius, $card-border-width) !default; -// $card-cap-padding-y: $card-spacer-y / 2 !default; -// $card-cap-padding-x: $card-spacer-x !default; -// $card-cap-bg: rgba($black, .03) !default; -// $card-cap-color: unset !default; -// $card-height: null !default; -// $card-color: unset !default; -// $card-bg: $white !default; -// $card-img-overlay-padding: $spacer !default; -// $card-group-margin: $grid-gutter-width / 2 !default; -// scss-docs-end card-variables - -// Accordion -// scss-docs-start accordion-variables -// $accordion-padding-y: 1rem !default; -// $accordion-padding-x: 1.25rem !default; -// $accordion-color: $body-color !default; -// $accordion-bg: $body-bg !default; -// $accordion-border-width: $border-width !default; -// $accordion-border-color: rgba($black, .125) !default; -// $accordion-border-radius: $border-radius !default; -// $accordion-inner-border-radius: subtract($accordion-border-radius, $accordion-border-width) !default; - -// $accordion-body-padding-y: $accordion-padding-y !default; -// $accordion-body-padding-x: $accordion-padding-x !default; - -// $accordion-button-padding-y: $accordion-padding-y !default; -// $accordion-button-padding-x: $accordion-padding-x !default; -// $accordion-button-color: $accordion-color !default; -// $accordion-button-bg: $accordion-bg !default; -// $accordion-transition: $btn-transition, border-radius .15s ease !default; -// $accordion-button-active-bg: tint-color($component-active-bg, 90%) !default; -// $accordion-button-active-color: shade-color($primary, 10%) !default; - -// $accordion-button-focus-border-color: $input-focus-border-color !default; -// $accordion-button-focus-box-shadow: $btn-focus-box-shadow !default; - -// $accordion-icon-width: 1.25rem !default; -// $accordion-icon-color: $accordion-color !default; -// $accordion-icon-active-color: $accordion-button-active-color !default; -// $accordion-icon-transition: transform .2s ease-in-out !default; -// $accordion-icon-transform: rotate(-180deg) !default; - -// $accordion-button-icon: url("data:image/svg+xml,") !default; -// $accordion-button-active-icon: url("data:image/svg+xml,") !default; -// scss-docs-end accordion-variables - -// Tooltips - -// scss-docs-start tooltip-variables -// $tooltip-font-size: $font-size-sm !default; -// $tooltip-max-width: 200px !default; -// $tooltip-color: $high-emphasis-inverse !default; -// $tooltip-bg: $black !default; -// $tooltip-border-radius: $border-radius !default; -// $tooltip-opacity: .9 !default; -// $tooltip-padding-y: $spacer / 4 !default; -// $tooltip-padding-x: $spacer / 2 !default; -// $tooltip-margin: 0 !default; - -// $tooltip-arrow-width: .8rem !default; -// $tooltip-arrow-height: .4rem !default; -// $tooltip-arrow-color: $tooltip-bg !default; -// scss-docs-end tooltip-variables - -// Form tooltips must come after regular tooltips -// scss-docs-start tooltip-feedback-variables -// $form-feedback-tooltip-padding-y: $tooltip-padding-y !default; -// $form-feedback-tooltip-padding-x: $tooltip-padding-x !default; -// $form-feedback-tooltip-font-size: $tooltip-font-size !default; -// $form-feedback-tooltip-line-height: null !default; -// $form-feedback-tooltip-opacity: $tooltip-opacity !default; -// $form-feedback-tooltip-border-radius: $tooltip-border-radius !default; -// scss-docs-end tooltip-feedback-variables - - -// Popovers -// scss-docs-start popover-variables -// $popover-font-size: $font-size-sm !default; -// $popover-bg: $white !default; -// $popover-max-width: 276px !default; -// $popover-border-width: $border-width !default; -// $popover-border-color: rgba($black, .2) !default; -// $popover-border-radius: $border-radius-lg !default; -// $popover-inner-border-radius: subtract($popover-border-radius, $popover-border-width) !default; -// $popover-box-shadow: $box-shadow !default; - -// $popover-header-bg: shade-color($popover-bg, 6%) !default; -// $popover-header-color: $headings-color !default; -// $popover-header-padding-y: .5rem !default; -// $popover-header-padding-x: $spacer !default; - -// $popover-body-color: $body-color !default; -// $popover-body-padding-y: $spacer !default; -// $popover-body-padding-x: $spacer !default; - -// $popover-arrow-width: 1rem !default; -// $popover-arrow-height: .5rem !default; -// $popover-arrow-color: $popover-bg !default; - -// $popover-arrow-outer-color: fade-in($popover-border-color, .05) !default; -// scss-docs-end popover-variables - - -// Toasts -// scss-docs-start toast-variables -// $toast-max-width: 350px !default; -// $toast-padding-x: .75rem !default; -// $toast-padding-y: .5rem !default; -// $toast-font-size: .875rem !default; -// $toast-color: unset !default; -// $toast-background-color: rgba($white, .85) !default; -// $toast-border-width: 1px !default; -// $toast-border-color: rgba(0, 0, 0, .1) !default; -// $toast-border-radius: $border-radius !default; -// $toast-box-shadow: $box-shadow !default; -// $toast-spacing: $container-padding-x !default; - -// $toast-header-color: $gray-600 !default; -// $toast-header-background-color: rgba($white, .85) !default; -// $toast-header-border-color: rgba(0, 0, 0, .05) !default; -// scss-docs-end toast-variables - - -// Badges -// scss-docs-start badge-variables -// $badge-font-size: .75em !default; -// $badge-font-weight: $font-weight-bold !default; -// $badge-color: $high-emphasis-inverse !default; -// $badge-padding-y: .35em !default; -// $badge-padding-x: .65em !default; -// $badge-border-radius: $border-radius !default; -// scss-docs-end badge-variables - -// $badge-font-size-sm: .65em !default; -// $badge-padding-y-sm: .3em !default; -// $badge-padding-x-sm: .5em !default; -// scss-docs-end badge-variables - - -// Modals - -// scss-docs-start modal-variables -// $modal-inner-padding: $spacer !default; - -// $modal-footer-margin-between: .5rem !default; - -// $modal-dialog-margin: .5rem !default; -// $modal-dialog-margin-y-sm-up: 1.75rem !default; - -// $modal-title-line-height: $line-height-base !default; - -// $modal-content-color: unset !default; -// $modal-content-bg: $white !default; -// $modal-content-border-color: rgba($black, .2) !default; -// $modal-content-border-width: $border-width !default; -// $modal-content-border-radius: $border-radius-lg !default; -// $modal-content-inner-border-radius: subtract($modal-content-border-radius, $modal-content-border-width) !default; -// $modal-content-box-shadow-xs: $box-shadow-sm !default; -// $modal-content-box-shadow-sm-up: $box-shadow !default; - -// $modal-backdrop-bg: $black !default; -// $modal-backdrop-opacity: .5 !default; -// $modal-header-border-color: $border-color !default; -// $modal-footer-border-color: $modal-header-border-color !default; -// $modal-header-border-width: $modal-content-border-width !default; -// $modal-footer-border-width: $modal-header-border-width !default; -// $modal-header-padding-y: $modal-inner-padding !default; -// $modal-header-padding-x: $modal-inner-padding !default; -// $modal-header-padding: $modal-header-padding-y $modal-header-padding-x !default; // Keep this for backwards compatibility - -// $modal-sm: 300px !default; -// $modal-md: 500px !default; -// $modal-lg: 800px !default; -// $modal-xl: 1140px !default; - -// $modal-fade-transform: translate(0, -50px) !default; -// $modal-show-transform: none !default; -// $modal-transition: transform .3s ease-out !default; -// $modal-scale-transform: scale(1.02) !default; -// scss-docs-end modal-variables - - -// Avatars -// scss-docs-start avatar-variables -// $avatar-width: 2rem !default; - -// $avatar-widths: ( -// sm: 1.5rem, -// md: 2.5rem, -// lg: 3rem, -// xl: 4rem -// ) !default; - -// $avatar-transition: margin .15s !default; -// scss-docs-end avatar-variables - -// Alerts -// -// Define alert colors, border radius, and padding. - -// scss-docs-start alert-variables -// $alert-padding-y: $spacer !default; -// $alert-padding-x: $spacer !default; -// $alert-margin-bottom: 1rem !default; -// $alert-border-radius: $border-radius !default; -// $alert-link-font-weight: $font-weight-bold !default; -// $alert-border-width: $border-width !default; -// $alert-bg-scale: -80% !default; -// $alert-border-scale: -70% !default; -// $alert-color-scale: 40% !default; -// $alert-dismissible-padding-r: $alert-padding-x * 3 !default; // 3x covers width of x plus default padding on either side -// scss-docs-end alert-variables - -// $alert-variants: ( -// "primary": alert-color-map($primary), -// "secondary": alert-color-map($secondary), -// "success": alert-color-map($success), -// "danger": alert-color-map($danger), -// "warning": alert-color-map($warning), -// "info": alert-color-map($info), -// "light": alert-color-map($light), -// "dark": alert-color-map($dark) -// ) !default; -// scss-docs-end alert-variables - -// Callouts -// scss-docs-start callout-variables -// $callout-padding-y: $spacer !default; -// $callout-padding-x: $spacer !default; -// $callout-margin-y: $spacer !default; -// $callout-margin-x: 0 !default; -// $callout-border-radius: $border-radius !default; -// $callout-border-width: $border-width !default; -// $callout-border-color: $border-color !default; -// $callout-border-left-width: (4 * $callout-border-width) !default; - -// $callout-variants: ( -// "primary": $primary, -// "secondary": $secondary, -// "success": $success, -// "danger": $danger, -// "warning": $warning, -// "info": $info, -// "light": $light, -// "dark": $dark -// ) !default; -// scss-docs-end callout-variables - - -// Progress bars - -// scss-docs-start progress-variables -// $progress-height: 1rem !default; -// $progress-font-size: $font-size-base * .75 !default; -// $progress-bg: $gray-200 !default; -// $progress-border-radius: $border-radius !default; -// $progress-box-shadow: $box-shadow-inset !default; -// $progress-bar-color: $high-emphasis-inverse !default; -// $progress-bar-bg: $primary !default; -// $progress-bar-animation-timing: 1s linear infinite !default; -// $progress-bar-transition: width .6s ease !default; -// scss-docs-end progress-variables - -// List group -// scss-docs-start list-group-variables -// $list-group-color: unset !default; -// $list-group-bg: $white !default; -// $list-group-border-color: rgba($black, .125) !default; -// $list-group-border-width: $border-width !default; -// $list-group-border-radius: $border-radius !default; - -// $list-group-item-padding-y: $spacer / 2 !default; -// $list-group-item-padding-x: $spacer !default; -// $list-group-item-bg-scale: -80% !default; -// $list-group-item-color-scale: 40% !default; - -// $list-group-hover-bg: $gray-100 !default; -// $list-group-active-color: $component-active-color !default; -// $list-group-active-bg: $component-active-bg !default; -// $list-group-active-border-color: $list-group-active-bg !default; - -// $list-group-disabled-color: $gray-600 !default; -// $list-group-disabled-bg: $list-group-bg !default; - -// $list-group-action-color: $gray-700 !default; -// $list-group-action-hover-color: $list-group-action-color !default; - -// $list-group-action-active-color: $body-color !default; -// $list-group-action-active-bg: $gray-200 !default; -// scss-docs-end list-group-variables - -// $list-group-variants: ( -// "primary": list-group-color-map($primary), -// "secondary": list-group-color-map($secondary), -// "success": list-group-color-map($success), -// "danger": list-group-color-map($danger), -// "warning": list-group-color-map($warning), -// "info": list-group-color-map($info), -// "light": list-group-color-map($light), -// "dark": list-group-color-map($dark) -// ) !default; -// scss-docs-end list-group-variables - - -// Header -// scss-docs-start header-variables -// $header-min-height: 4rem !default; -// $header-padding-y: $spacer / 2 !default; -// $header-padding-x: $spacer / 2 !default; -// $header-brand-font-size: $font-size-lg !default; -// $header-color: $medium-emphasis !default; -// $header-bg: $white !default; -// $header-border-color: $border-color !default; -// $header-border-width: 1px !default; -// $header-hover-color: $high-emphasis !default; -// $header-active-color: $high-emphasis !default; -// $header-disabled-color: $disabled !default; - -// Compute the header-brand padding-y so the header-brand will have the same height as header-text and nav-link -// $nav-link-height: $font-size-base * $line-height-base + $nav-link-padding-y * 2 !default; -// $header-brand-height: $header-brand-font-size * $line-height-base !default; -// $header-brand-padding-y: ($nav-link-height - $header-brand-height) / 2 !default; -// $header-brand-margin-end: 1rem !default; -// $header-brand-font-size: $font-size-lg !default; -// $header-brand-color: $gray-900 !default; -// $header-brand-hover-color: shade-color($gray-900, 10%) !default; - -// $header-toggler-padding-y: .25rem !default; -// $header-toggler-padding-x: .75rem !default; -// $header-toggler-font-size: $font-size-lg !default; -// $header-toggler-bg: transparent !default; -// $header-toggler-border: 0 !default; -// $header-toggler-border-radius: $btn-border-radius !default; - -// $header-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$header-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E") !default; -// $header-toggler-hover-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$header-hover-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E") !default; -// $header-toggler-border-color: rgba($black, .1) !default; - -// $header-nav-link-padding-x: .5rem !default; - -// $header-divider-border-width: 1px !default; -// $header-divider-border-color: $header-border-color !default; -// scss-docs-end header-variables - -// Subheader -// scss-docs-start subheader-variables -// $subheader-min-height: 3rem !default; -// $subheader-padding-y: $spacer / 2 !default; -// $subheader-padding-x: $spacer !default; -// $subheader-border-color: $border-color !default; -// $subheader-border-width: 1px !default; - -// $subheader-nav-link-padding-x: .5rem !default; -// scss-docs-end subheader-variables - -// Default theme -// scss-docs-start subheader-default-themes -// $subheader-bg: $white !default; -// $subheader-color: $medium-emphasis !default; -// $subheader-hover-color: $high-emphasis !default; -// $subheader-active-color: $high-emphasis !default; -// $subheader-disabled-color: $disabled !default; -// scss-docs-end subheader-default-themes - - -// Image thumbnails - -// scss-docs-start thumbnail-variables -// $thumbnail-padding: .25rem !default; -// $thumbnail-bg: $body-bg !default; -// $thumbnail-border-width: $border-width !default; -// $thumbnail-border-color: $gray-300 !default; -// $thumbnail-border-radius: $border-radius !default; -// $thumbnail-box-shadow: $box-shadow-sm !default; -// scss-docs-end thumbnail-variables - - -// Figures - -// scss-docs-start figure-variables -// $figure-caption-font-size: $small-font-size !default; -// $figure-caption-color: $gray-600 !default; -// scss-docs-end figure-variables - - -// Breadcrumbs -// scss-docs-start breadcrumb-variables -// $breadcrumb-font-size: null !default; -// $breadcrumb-padding-y: 0 !default; -// $breadcrumb-padding-x: 0 !default; -// $breadcrumb-item-padding-x: .5rem !default; -// $breadcrumb-margin-bottom: 1rem !default; -// $breadcrumb-bg: unset !default; -// $breadcrumb-divider-color: $gray-600 !default; -// $breadcrumb-active-color: $gray-600 !default; -// $breadcrumb-divider: quote("/") !default; -// $breadcrumb-divider-flipped: $breadcrumb-divider !default; -// $breadcrumb-border-radius: null !default; -// scss-docs-end breadcrumb-variables - -// Carousel -// scss-docs-start carousel-variables -// $carousel-control-color: $high-emphasis-inverse !default; -// $carousel-control-width: 15% !default; -// $carousel-control-opacity: .5 !default; -// $carousel-control-hover-opacity: .9 !default; -// $carousel-control-transition: opacity .15s ease !default; - -// $carousel-indicator-width: 30px !default; -// $carousel-indicator-height: 3px !default; -// $carousel-indicator-hit-area-height: 10px !default; -// $carousel-indicator-spacer: 3px !default; -// $carousel-indicator-opacity: .5 !default; -// $carousel-indicator-active-bg: $white !default; -// $carousel-indicator-active-opacity: 1 !default; -// $carousel-indicator-transition: opacity .6s ease !default; - -// $carousel-caption-width: 70% !default; -// $carousel-caption-color: $high-emphasis-inverse !default; -// $carousel-caption-padding-y: 1.25rem !default; -// $carousel-caption-spacer: 1.25rem !default; - -// $carousel-control-icon-width: 2rem !default; - -// $carousel-control-prev-icon-bg: url("data:image/svg+xml,") !default; -// $carousel-control-next-icon-bg: url("data:image/svg+xml,") !default; - -// $carousel-transition-duration: .6s !default; -// $carousel-transition: transform $carousel-transition-duration ease-in-out !default; // Define transform transition first if using multiple transitions (e.g., `transform 2s ease, opacity .5s ease-out`) - -// $carousel-dark-indicator-active-bg: $black !default; -// $carousel-dark-caption-color: $high-emphasis !default; -// $carousel-dark-control-icon-filter: invert(1) grayscale(100) !default; -// scss-docs-end carousel-variables - -// scss-docs-start sidebar-variables -// $sidebar-width: 16rem !default; -// $sidebar-widths: ( -// sm: 12rem, -// lg: 20rem, -// xl: 24rem -// ) !default; -// $sidebar-padding-y: 0 !default; -// $sidebar-padding-x: 0 !default; -// $sidebar-color: $high-emphasis-inverse !default; -// $sidebar-bg: $gray-base !default; -// $sidebar-border-width: 0 !default; -// $sidebar-border-color: transparent !default; -// $sidebar-transition: margin-left .15s, margin-right .15s, box-shadow .075s, transform .15s, width .15s, z-index 0s ease .15s !default; - -// $sidebar-brand-height: 4rem !default; -// $sidebar-brand-color: $high-emphasis-inverse !default; -// $sidebar-brand-bg: rgba($black, .2) !default; - -// $sidebar-header-height: 4rem !default; -// $sidebar-header-padding-y: .75rem !default; -// $sidebar-header-padding-x: 1rem !default; -// $sidebar-header-bg: rgba($black, .2) !default; -// $sidebar-header-height-transition: height .15s, padding .15s !default; - -// $sidebar-narrow-width: 4rem !default; - -// $sidebar-backdrop-bg: $black !default; -// $sidebar-backdrop-opacity: .5 !default; -// $sidebar-backdrop-transition: opacity .15s linear !default; - -// $sidebar-nav-title-padding-y: .75rem !default; -// $sidebar-nav-title-padding-x: 1rem !default; -// $sidebar-nav-title-margin-top: 1rem !default; -// $sidebar-nav-title-color: $medium-emphasis-inverse !default; -// $sidebar-nav-title-transition: height .15s, margin .15s !default; - -// $sidebar-nav-link-padding-y: .8445rem !default; -// $sidebar-nav-link-padding-x: 1rem !default; -// $sidebar-nav-link-color: $medium-emphasis-inverse !default; -// $sidebar-nav-link-bg: transparent !default; -// $sidebar-nav-link-transition: background .15s ease, color .15s ease !default; -// $sidebar-nav-link-icon-color: $medium-emphasis-inverse !default; - -// $sidebar-nav-link-hover-color: $high-emphasis-inverse !default; -// $sidebar-nav-link-hover-bg: rgba($white, .05) !default; -// $sidebar-nav-link-hover-icon-color: $high-emphasis-inverse !default; - -// $sidebar-nav-link-active-color: $high-emphasis-inverse !default; -// $sidebar-nav-link-active-bg: rgba($white, .05) !default; -// $sidebar-nav-link-active-icon-color: $high-emphasis-inverse !default; - -// $sidebar-nav-link-disabled-color: $disabled-inverse !default; -// $sidebar-nav-link-disabled-icon-color: $sidebar-nav-link-icon-color !default; - -// $sidebar-nav-icon-width: 4rem !default; -// $sidebar-nav-icon-height: 1.25rem !default; -// $sidebar-nav-icon-font-size: $sidebar-nav-icon-height !default; - -// $sidebar-nav-group-bg: rgba(0, 0, 0, .2) !default; -// $sidebar-nav-group-transition: background .15s ease-in-out !default; -// $sidebar-nav-group-items-transition: height .15s ease !default; -// $sidebar-nav-group-toggle-show-color: $sidebar-nav-link-color !default; - -// $sidebar-nav-group-indicator-color: $medium-emphasis-inverse !default; -// $sidebar-nav-group-indicator-icon: url("data:image/svg+xml,") !default; -// $sidebar-nav-group-indicator-hover-color: $sidebar-nav-link-hover-color !default; -// $sidebar-nav-group-indicator-hover-icon: url("data:image/svg+xml,") !default; -// $sidebar-nav-group-indicator-transition: transform .15s !default; - -// $sidebar-footer-height: auto !default; -// $sidebar-footer-padding-y: .75rem !default; -// $sidebar-footer-padding-x: 1rem !default; -// $sidebar-footer-bg: rgba($black, .2) !default; -// $sidebar-footer-height-transition: height .15s, padding .15s !default; - -// $sidebar-toggler-height: 3rem !default; -// $sidebar-toggler-bg: rgba($black, .2) !default; -// $sidebar-toggler-transition: transform .15s !default; - -// $sidebar-toggler-indicator-width: 4rem !default; -// $sidebar-toggler-indicator-height: 3rem !default; -// $sidebar-toggler-indicator-color: $gray-600 !default; -// $sidebar-toggler-indicator-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-toggler-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E") !default; -// $sidebar-toggler-hover-bg: rgba(0, 0, 0, .3) !default; -// $sidebar-toggler-indicator-hover-color: $sidebar-nav-link-hover-color !default; -// $sidebar-toggler-indicator-hover-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-toggler-indicator-hover-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E") !default; -// scss-docs-end sidebar-variables - -// Footer -// scss-docs-start footer-variables -// $footer-min-height: 3rem !default; -// $footer-padding-y: $spacer / 2 !default; -// $footer-padding-x: $spacer !default; -// $footer-bg: $gray-100 !default; -// $footer-color: $body-color !default; -// $footer-border-width: 1px !default; -// $footer-border-color: $border-color !default; -// scss-docs-end footer-variables - -// Spinners -// scss-docs-start spinner-variables -// $spinner-width: 2rem !default; -// $spinner-height: $spinner-width !default; -// $spinner-vertical-align: -.125em !default; -// $spinner-border-width: .25em !default; -// $spinner-animation-speed: .75s !default; - -// $spinner-width-sm: 1rem !default; -// $spinner-height-sm: $spinner-width-sm !default; -// $spinner-border-width-sm: .2em !default; -// scss-docs-end spinner-variables - - -// Close -// scss-docs-start close-variables -// $btn-close-width: 1em !default; -// $btn-close-height: $btn-close-width !default; -// $btn-close-padding-x: .25em !default; -// $btn-close-padding-y: $btn-close-padding-x !default; -// $btn-close-color: $high-emphasis !default; -// $btn-close-bg: url("data:image/svg+xml,") !default; -// $btn-close-focus-shadow: $input-btn-focus-box-shadow !default; -// $btn-close-opacity: .5 !default; -// $btn-close-hover-opacity: .75 !default; -// $btn-close-focus-opacity: 1 !default; -// $btn-close-disabled-opacity: .25 !default; -// $btn-close-white-filter: invert(1) grayscale(100%) brightness(200%) !default; -// scss-docs-end close-variables - - -// Offcanvas - -// scss-docs-start offcanvas-variables -// $offcanvas-padding-y: $modal-inner-padding !default; -// $offcanvas-padding-x: $modal-inner-padding !default; -// $offcanvas-horizontal-width: 400px !default; -// $offcanvas-vertical-height: 30vh !default; -// $offcanvas-transition-duration: .3s !default; -// $offcanvas-border-color: $modal-content-border-color !default; -// $offcanvas-border-width: $modal-content-border-width !default; -// $offcanvas-title-line-height: $modal-title-line-height !default; -// $offcanvas-bg-color: $modal-content-bg !default; -// $offcanvas-color: $modal-content-color !default; -// $offcanvas-box-shadow: $modal-content-box-shadow-xs !default; -// scss-docs-end offcanvas-variables - -// Code - -// $code-font-size: $small-font-size !default; -// $code-color: $pink !default; - -// $kbd-padding-y: .2rem !default; -// $kbd-padding-x: .4rem !default; -// $kbd-font-size: $code-font-size !default; -// $kbd-color: $high-emphasis-inverse !default; -// $kbd-bg: $gray-900 !default; - -// $pre-color: unset !default; +// If you want to customize your project please add your variables below. diff --git a/src/store.js b/src/store.js index ab446364c..d0d7df485 100644 --- a/src/store.js +++ b/src/store.js @@ -2,10 +2,16 @@ 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: diff --git a/src/views/charts/MainChart.js b/src/views/charts/MainChart.js new file mode 100644 index 000000000..de6c5ff3c --- /dev/null +++ b/src/views/charts/MainChart.js @@ -0,0 +1,107 @@ +import React from 'react' +import { CChartLine } from '@coreui/react-chartjs' +import { getStyle } from '@coreui/utils' + +const MainChart = () => { + const random = () => Math.round(Math.random() * 100) + + return ( + + ) +} + +export default MainChart diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js index e979a0c16..e69957c7d 100644 --- a/src/views/dashboard/Dashboard.js +++ b/src/views/dashboard/Dashboard.js @@ -18,8 +18,6 @@ import { CTableHeaderCell, CTableRow, } from '@coreui/react' -import { CChartLine } from '@coreui/react-chartjs' -import { getStyle, hexToRgba } from '@coreui/utils' import CIcon from '@coreui/icons-react' import { cibCcAmex, @@ -53,6 +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' const Dashboard = () => { const random = (min, max) => Math.floor(Math.random() * (max - min + 1) + min) @@ -208,90 +207,7 @@ const Dashboard = () => { - + @@ -400,7 +316,7 @@ const Dashboard = () => {
    - + diff --git a/src/views/pages/login/Login.js b/src/views/pages/login/Login.js index 6b889d530..320cacd4d 100644 --- a/src/views/pages/login/Login.js +++ b/src/views/pages/login/Login.js @@ -18,7 +18,7 @@ import { cilLockLocked, cilUser } from '@coreui/icons' const Login = () => { return ( -
    +
    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 222/316] 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 223/316] 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 224/316] 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 225/316] 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 226/316] 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 227/316] 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 228/316] 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 = ( -
    - -
    -) - -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 ( - + + +
    + } + > } /> } /> diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js index 25443a13d..8d49845c0 100644 --- a/src/components/AppHeader.js +++ b/src/components/AppHeader.js @@ -14,6 +14,7 @@ import { CHeaderToggler, CNavLink, CNavItem, + useColorModes, } from '@coreui/react' import CIcon from '@coreui/icons-react' import { @@ -31,9 +32,11 @@ 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 dispatch = useDispatch() const sidebarShow = useSelector((state) => state.sidebarShow) - const theme = useSelector((state) => state.theme) return ( @@ -81,9 +84,9 @@ const AppHeader = () => { - {theme === 'dark' ? ( + {colorMode === 'dark' ? ( - ) : theme === 'auto' ? ( + ) : colorMode === 'auto' ? ( ) : ( @@ -91,29 +94,29 @@ const AppHeader = () => { dispatch({ type: 'setTheme', theme: 'light' })} + onClick={() => setColorMode('light')} > Light dispatch({ type: 'setTheme', theme: 'dark' })} + onClick={() => setColorMode('dark')} > Dark dispatch({ type: 'setTheme', theme: 'auto' })} + onClick={() => setColorMode('auto')} > 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 229/316] 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 ( - + + }} + /> + ) } diff --git a/src/views/widgets/WidgetsDropdown.js b/src/views/widgets/WidgetsDropdown.js index 94bbb6f90..478661ebb 100644 --- a/src/views/widgets/WidgetsDropdown.js +++ b/src/views/widgets/WidgetsDropdown.js @@ -1,4 +1,4 @@ -import React from 'react' +import React, { useEffect, useRef } from 'react' import { CRow, CCol, @@ -14,6 +14,27 @@ import CIcon from '@coreui/icons-react' import { cilArrowBottom, cilArrowTop, cilOptions } from '@coreui/icons' const WidgetsDropdown = () => { + const widgetChartRef1 = useRef(null) + const widgetChartRef2 = useRef(null) + + useEffect(() => { + document.documentElement.addEventListener('ColorSchemeChange', () => { + if (widgetChartRef1.current) { + setTimeout(() => { + widgetChartRef1.current.data.datasets[0].pointBackgroundColor = getStyle('--cui-primary') + widgetChartRef1.current.update() + }) + } + + if (widgetChartRef2.current) { + setTimeout(() => { + widgetChartRef2.current.data.datasets[0].pointBackgroundColor = getStyle('--cui-info') + widgetChartRef2.current.update() + }) + } + }) + }, [widgetChartRef1, widgetChartRef2]) + return ( @@ -44,6 +65,7 @@ const WidgetsDropdown = () => { } chart={ { } chart={ Date: Mon, 12 Jun 2023 15:56:42 +0200 Subject: [PATCH 230/316] 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 231/316] 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 232/316] 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 233/316] 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 234/316] 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 = () => {
    {item.user.name}
    -
    +
    {item.user.new ? 'New' : 'Recurring'} | Registered:{' '} {item.user.registered}
    @@ -343,11 +347,9 @@ const Dashboard = () => { -
    -
    - {item.usage.value}% -
    -
    +
    +
    {item.usage.value}%
    +
    {item.usage.period}
    @@ -357,8 +359,8 @@ const Dashboard = () => { -
    Last login
    - {item.activity} +
    Last login
    +
    {item.activity}
    ))} From cfe2ebd5a5eac60b235724a3ecf56ef2f0855e29 Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 16 Jun 2023 14:36:35 +0200 Subject: [PATCH 235/316] 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 236/316] 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 237/316] 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 238/316] 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 239/316] 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 <input type="range"> controls with{' '} <CFormRange>.

    - + Example range @@ -32,7 +32,7 @@ const Range = () => { Add the disabled boolean attribute on an input to give it a grayed out appearance and remove pointer events.

    - + Disabled range @@ -50,7 +50,7 @@ const Range = () => { 0 and 100, respectively. You may specify new values for those using the min and max attributes.

    - + Example range @@ -68,7 +68,7 @@ const Range = () => { specify a step value. In the example below, we double the number of steps by using step="0.5".

    - + Example range From a1e9db0b0b137eb621c5ee3ca973df6c41290ff0 Mon Sep 17 00:00:00 2001 From: mrholek Date: Wed, 28 Jun 2023 12:58:22 +0200 Subject: [PATCH 240/316] 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 260/316] 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 | | --- | --- | -| [![CoreUI Pro React Admin Template](https://coreui.io/images/templates/coreui_pro_default_light_dark.webp)](https://coreui.io/product/react-dashboard-template/?theme=default) | [![CoreUI Pro React Admin Template](https://coreui.io/images/templates/coreui_pro_light_light_dark.webp)](https://coreui.io/product/react-dashboard-template/?theme=light)| [![CoreUI Pro React Admin Template](https://coreui.io/images/templates/coreui_pro_dark_1440.webp)](https://coreui.io/product/react-dashboard-template/?theme=dark) +| [![CoreUI PRO React Admin Template](https://coreui.io/images/templates/coreui_pro_default_light_dark.webp)](https://coreui.io/product/react-dashboard-template/?theme=default) | [![CoreUI PRO React Admin Template](https://coreui.io/images/templates/coreui_pro_light_light_dark.webp)](https://coreui.io/product/react-dashboard-template/?theme=light)| | Default Theme v3 | Light Theme v3 | | --- | --- | -| [![CoreUI Pro React Admin Template](https://coreui.io/images/templates/coreui_pro_default_v3_light_dark.webp)](https://coreui.io/product/react-dashboard-template/?theme=default-v3) | [![CoreUI Pro React Admin Template](https://coreui.io/images/templates/coreui_pro_light_v3_light_dark.webp)](https://coreui.io/product/react-dashboard-template/?theme=light)| +| [![CoreUI PRO React Admin Template](https://coreui.io/images/templates/coreui_pro_default_v3_light_dark.webp)](https://coreui.io/product/react-dashboard-template/?theme=default-v3) | [![CoreUI PRO React Admin Template](https://coreui.io/images/templates/coreui_pro_light_v3_light_dark.webp)](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 261/316] 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 262/316] 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 <CButton> can show and hide multiple elements.

    - 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.

    - + - + - + - + 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 = () => {
    - + 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 = () => { - Sign in + + Sign in + @@ -178,7 +180,9 @@ const Layout = () => {
    - 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 = () => {

    This - button + button {' '} triggers a popover on click.

    @@ -376,9 +390,15 @@ const OptionalSizes = () => { const [visibleSm, setVisibleSm] = useState(false) return ( <> - 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 + ) From 6cb34cfc3e9d3ed4173e807a10d3a47657c9ab73 Mon Sep 17 00:00:00 2001 From: mrholek Date: Mon, 13 Nov 2023 19:58:21 +0100 Subject: [PATCH 263/316] 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 264/316] 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 265/316] 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 = () => {

    Traffic

    -
    January - July 2021
    +
    January - July 2023
    @@ -208,22 +209,31 @@ const Dashboard = () => {
    - - {progressExample.map((item, index) => ( - + + {progressExample.map((item, index, items) => ( +
    {item.title}
    - +
    {item.value} ({item.percent}%) - +
    ))}
    - - - + @@ -232,20 +242,21 @@ const Dashboard = () => { - +
    -
    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
    @@ -314,7 +324,7 @@ const Dashboard = () => {
    - + diff --git a/src/views/theme/colors/Colors.js b/src/views/theme/colors/Colors.js index 4a1570353..ef844e163 100644 --- a/src/views/theme/colors/Colors.js +++ b/src/views/theme/colors/Colors.js @@ -1,5 +1,5 @@ -import PropTypes from 'prop-types' import React, { useEffect, useState, createRef } from 'react' +import PropTypes from 'prop-types' import classNames from 'classnames' import { CRow, CCol, CCard, CCardHeader, CCardBody } from '@coreui/react' import { rgbToHex } from '@coreui/utils' diff --git a/src/views/widgets/Widgets.js b/src/views/widgets/Widgets.js index c6be871f6..a9bf51e12 100644 --- a/src/views/widgets/Widgets.js +++ b/src/views/widgets/Widgets.js @@ -41,41 +41,37 @@ const Widgets = () => { 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" /> - - - + + + } title="income" value="$1.999,50" color="primary" /> - + } title="income" value="$1.999,50" color="info" /> - + } title="income" value="$1.999,50" color="warning" /> - + } title="income" value="$1.999,50" @@ -632,11 +614,10 @@ const Widgets = () => { - - - + + + } title="income" value="$1.999,50" @@ -654,9 +635,8 @@ const Widgets = () => { } /> - + } title="income" value="$1.999,50" @@ -674,9 +654,8 @@ const Widgets = () => { } /> - + } title="income" value="$1.999,50" @@ -694,9 +673,8 @@ const Widgets = () => { } /> - + } title="income" value="$1.999,50" @@ -716,11 +694,10 @@ const Widgets = () => { - - - + + + } padding={false} title="income" @@ -728,9 +705,8 @@ const Widgets = () => { color="primary" /> - + } padding={false} title="income" @@ -738,9 +714,8 @@ const Widgets = () => { color="info" /> - + } padding={false} title="income" @@ -748,9 +723,8 @@ const Widgets = () => { color="warning" /> - + } padding={false} title="income" @@ -760,13 +734,13 @@ const Widgets = () => { - + - + - + } @@ -800,67 +774,61 @@ const Widgets = () => { /> - - - + + + } value="87.500" title="Visitors" progress={{ color: 'info', value: 75 }} - className="mb-4" /> - + } value="385" title="New Clients" progress={{ color: 'success', value: 75 }} - className="mb-4" /> - + } value="1238" title="Products sold" progress={{ color: 'warning', value: 75 }} - className="mb-4" /> - + } value="28%" title="Returning Visitors" progress={{ color: 'primary', value: 75 }} - className="mb-4" /> - + } value="5:34:11" title="Avg. Time" progress={{ color: 'danger', value: 75 }} - className="mb-4" /> - + } value="972" - title="comments" + title="Comments" progress={{ color: 'info', value: 75 }} - className="mb-4" /> - - - + + + } @@ -868,10 +836,9 @@ const Widgets = () => { title="Visitors" inverse progress={{ value: 75 }} - className="mb-4" /> - + } @@ -879,10 +846,9 @@ const Widgets = () => { title="New Clients" inverse progress={{ value: 75 }} - className="mb-4" /> - + } @@ -890,10 +856,9 @@ const Widgets = () => { title="Products sold" inverse progress={{ value: 75 }} - className="mb-4" /> - + } @@ -901,10 +866,9 @@ const Widgets = () => { title="Returning Visitors" inverse progress={{ value: 75 }} - className="mb-4" /> - + } @@ -912,18 +876,16 @@ const Widgets = () => { title="Avg. Time" inverse progress={{ value: 75 }} - className="mb-4" /> - + } value="972" - title="comments" + title="Comments" inverse progress={{ value: 75 }} - className="mb-4" /> diff --git a/src/views/widgets/WidgetsBrand.js b/src/views/widgets/WidgetsBrand.js index b5eb528ac..f09393aae 100644 --- a/src/views/widgets/WidgetsBrand.js +++ b/src/views/widgets/WidgetsBrand.js @@ -5,7 +5,7 @@ import CIcon from '@coreui/icons-react' import { cibFacebook, cibLinkedin, cibTwitter, cilCalendar } from '@coreui/icons' import { CChart } from '@coreui/react-chartjs' -const WidgetsBrand = ({ withCharts }) => { +const WidgetsBrand = (props) => { const chartOptions = { elements: { line: { @@ -35,11 +35,10 @@ const WidgetsBrand = ({ withCharts }) => { } return ( - - + + { /> - + { /> - + { /> - + { } WidgetsBrand.propTypes = { + className: PropTypes.string, withCharts: PropTypes.bool, } diff --git a/src/views/widgets/WidgetsDropdown.js b/src/views/widgets/WidgetsDropdown.js index ed4174b23..85e2fc969 100644 --- a/src/views/widgets/WidgetsDropdown.js +++ b/src/views/widgets/WidgetsDropdown.js @@ -1,4 +1,6 @@ import React, { useEffect, useRef } from 'react' +import PropTypes from 'prop-types' + import { CRow, CCol, @@ -13,7 +15,7 @@ import { CChartBar, CChartLine } from '@coreui/react-chartjs' import CIcon from '@coreui/icons-react' import { cilArrowBottom, cilArrowTop, cilOptions } from '@coreui/icons' -const WidgetsDropdown = () => { +const WidgetsDropdown = (props) => { const widgetChartRef1 = useRef(null) const widgetChartRef2 = useRef(null) @@ -36,10 +38,9 @@ const WidgetsDropdown = () => { }, [widgetChartRef1, widgetChartRef2]) return ( - - + + @@ -128,9 +129,8 @@ const WidgetsDropdown = () => { } /> - + @@ -218,9 +218,8 @@ const WidgetsDropdown = () => { } /> - + @@ -291,9 +290,8 @@ const WidgetsDropdown = () => { } /> - + @@ -390,4 +388,9 @@ const WidgetsDropdown = () => { ) } +WidgetsDropdown.propTypes = { + className: PropTypes.string, + withCharts: PropTypes.bool, +} + export default WidgetsDropdown From 004030755bb743316390286a814573038e7c0764 Mon Sep 17 00:00:00 2001 From: mrholek Date: Wed, 15 Nov 2023 11:39:18 +0100 Subject: [PATCH 266/316] 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.1 → ^4.0.0-rc.0 @coreui/coreui ^5.0.0-beta.2 → ^5.0.0-rc.0 @coreui/react ^5.0.0-beta.1 → ^5.0.0-rc.0 @coreui/react-chartjs ^3.0.0-beta.0 → ^3.0.0-rc.0 @testing-library/jest-dom ^5.17.0 → ^6.1.4 eslint-config-prettier ^8.10.0 → ^9.0.0 eslint-plugin-prettier ^4.2.1 → ^5.0.1 prettier 2.8.8 → 3.1.0 --- package.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 98a050226..ee891a24e 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ "test:debug": "react-scripts --inspect-brk test --runInBand" }, "dependencies": { - "@coreui/chartjs": "^4.0.0-beta.1", - "@coreui/coreui": "^5.0.0-beta.2", + "@coreui/chartjs": "^4.0.0-rc.0", + "@coreui/coreui": "^5.0.0-rc.0", "@coreui/icons": "^3.0.1", "@coreui/icons-react": "^2.2.1", - "@coreui/react": "^5.0.0-beta.1", - "@coreui/react-chartjs": "^3.0.0-beta.0", + "@coreui/react": "^5.0.0-rc.0", + "@coreui/react-chartjs": "^3.0.0-rc.0", "@coreui/utils": "^2.0.2", "@popperjs/core": "^2.11.8", "chart.js": "^4.4.0", @@ -43,12 +43,13 @@ "simplebar-react": "^3.2.4" }, "devDependencies": { - "@testing-library/jest-dom": "^5.17.0", + "@babel/plugin-proposal-private-property-in-object": "^7.21.11", + "@testing-library/jest-dom": "^6.1.4", "@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", - "prettier": "2.8.8", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-prettier": "^5.0.1", + "prettier": "3.1.0", "react-scripts": "5.0.1", "sass": "^1.69.5", "web-vitals": "^3.5.0" From 30f8ee04a333c4d735cdead1a7799fab3ae93228 Mon Sep 17 00:00:00 2001 From: mrholek Date: Wed, 15 Nov 2023 11:45:52 +0100 Subject: [PATCH 267/316] release: v5.0.0-rc.0 --- package.json | 2 +- public/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ee891a24e..c377ac217 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-react-admin-template", - "version": "5.0.0-beta.0", + "version": "5.0.0-rc.0", "description": "CoreUI Free React Admin Template", "homepage": ".", "bugs": { diff --git a/public/index.html b/public/index.html index 3fa4ca470..851936cc6 100644 --- a/public/index.html +++ b/public/index.html @@ -1,7 +1,7 @@ diff --git a/src/components/AppFooter.js b/src/components/AppFooter.js index 2f26d8b6e..fd126f460 100644 --- a/src/components/AppFooter.js +++ b/src/components/AppFooter.js @@ -8,7 +8,7 @@ const AppFooter = () => { CoreUI - © 2023 creativeLabs. + © 2024 creativeLabs.
    Powered by From 1d05bd4cd636da9a1ea884ea964085883323b93f Mon Sep 17 00:00:00 2001 From: mrholek Date: Mon, 11 Mar 2024 18:34:00 +0100 Subject: [PATCH 282/316] refactor: migrate from CRA to Vite --- .env | 2 -- .eslintrc.js | 2 -- .prettierignore | 2 +- .prettierrc.js | 6 ++--- README.md | 10 +++++--- index.html | 29 +++++++++++++++++++++ jest.config.js | 17 ------------- jsconfig.json | 6 ----- package.json | 27 ++++++++------------ public/index.html | 50 ------------------------------------ src/App.test.js | 9 ------- src/index.js | 12 +++------ src/reportWebVitals.js | 13 ---------- src/setupTests.js | 5 ---- vite.config.mjs | 57 ++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 110 insertions(+), 137 deletions(-) delete mode 100644 .env create mode 100644 index.html delete mode 100644 jest.config.js delete mode 100644 jsconfig.json delete mode 100644 public/index.html delete mode 100644 src/App.test.js delete mode 100644 src/reportWebVitals.js delete mode 100644 src/setupTests.js create mode 100644 vite.config.mjs diff --git a/.env b/.env deleted file mode 100644 index 0c48d3cda..000000000 --- a/.env +++ /dev/null @@ -1,2 +0,0 @@ -PORT=3000 -CHOKIDAR_USEPOLLING=true diff --git a/.eslintrc.js b/.eslintrc.js index e08f0b57a..e9c55eec0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -13,8 +13,6 @@ module.exports = { }, }, extends: [ - 'react-app', - 'react-app/jest', 'plugin:react/recommended', // Uses the recommended rules from @eslint-plugin-react 'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. ], diff --git a/.prettierignore b/.prettierignore index 849ddff3b..567609b12 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1 @@ -dist/ +build/ diff --git a/.prettierrc.js b/.prettierrc.js index 415ca0578..66f90b933 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,7 +1,7 @@ module.exports = { semi: false, - trailingComma: "all", + trailingComma: 'all', singleQuote: true, printWidth: 100, - tabWidth: 2 -}; \ No newline at end of file + tabWidth: 2, +} diff --git a/README.md b/README.md index 24a987dd0..896332553 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,8 @@ Within the download you'll find the following directories and files, logically g ``` coreui-free-react-admin-template ├── public/ # static files -│ └── index.html # html template +│ ├── favicon.ico +│ └── manifest.json │ ├── src/ # project root │ ├── assets/ # images, icons, etc. @@ -126,12 +127,15 @@ coreui-free-react-admin-template │ ├── views/ # application views │ ├── _nav.js # sidebar navigation config │ ├── App.js -│ ├── ... │ ├── index.js │ ├── routes.js # routes config │ └── store.js # template state example │ -└── package.json +├── index.html # html template +├── ... +├── package.json +├── ... +└── vite.config.mjs # vite config ``` ## Documentation diff --git a/index.html b/index.html new file mode 100644 index 000000000..ceddb2461 --- /dev/null +++ b/index.html @@ -0,0 +1,29 @@ + + + + + + + + + + + CoreUI Free React.js Admin Template + + + + + +
    + + + + diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index abf16ab93..000000000 --- a/jest.config.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Copyright (c) 2013-present, creativeLabs Lukasz Holeczek. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -'use strict' - -module.exports = { - collectCoverageFrom: [ - 'src/**/*.{js,jsx}', - '!**/*index.js', - '!src/serviceWorker.js', - '!src/polyfill.js', - ], -} diff --git a/jsconfig.json b/jsconfig.json deleted file mode 100644 index 63f923e44..000000000 --- a/jsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": "." - }, - "include": ["src"] -} \ No newline at end of file diff --git a/package.json b/package.json index 3b1991bf7..56a6e587a 100644 --- a/package.json +++ b/package.json @@ -13,13 +13,10 @@ "license": "MIT", "author": "The CoreUI Team (https://github.com/orgs/coreui/people)", "scripts": { - "build": "react-scripts build", - "eject": "react-scripts eject", + "build": "vite build", "lint": "eslint \"src/**/*.js\"", - "start": "react-scripts start", - "test": "react-scripts test", - "test:cov": "npm test -- --coverage --watchAll=false", - "test:debug": "react-scripts --inspect-brk test --runInBand" + "serve": "vite preview", + "start": "vite" }, "dependencies": { "@coreui/chartjs": "^4.0.0-rc.0", @@ -35,7 +32,6 @@ "core-js": "^3.36.0", "prop-types": "^15.8.1", "react": "^18.2.0", - "react-app-polyfill": "^3.0.0", "react-dom": "^18.2.0", "react-redux": "^9.1.0", "react-router-dom": "^6.22.3", @@ -43,19 +39,16 @@ "simplebar-react": "^3.2.4" }, "devDependencies": { - "@babel/plugin-proposal-private-property-in-object": "^7.21.11", - "@testing-library/jest-dom": "^6.4.2", - "@testing-library/react": "^14.2.1", - "@testing-library/user-event": "^14.5.2", + "@vitejs/plugin-react": "^4.2.1", + "autoprefixer": "^10.4.18", + "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-react": "^7.34.0", + "eslint-plugin-react-hooks": "^4.6.0", + "postcss": "^8.4.35", "prettier": "3.2.5", - "react-scripts": "5.0.1", "sass": "^1.71.1", - "web-vitals": "^3.5.2" - }, - "engines": { - "node": ">=10", - "npm": ">=6" + "vite": "^5.1.6" } } diff --git a/public/index.html b/public/index.html deleted file mode 100644 index eeb29ba81..000000000 --- a/public/index.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - CoreUI Free React.js Admin Template - - - - - - - -
    - - - diff --git a/src/App.test.js b/src/App.test.js deleted file mode 100644 index 3a7a8cc56..000000000 --- a/src/App.test.js +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react' -import { render, screen } from '@testing-library/react' -import App from './App' - -test('renders learn react link', () => { - render() - const linkElement = screen.getByText(/learn react/i) - expect(linkElement).toBeInTheDocument() -}) diff --git a/src/index.js b/src/index.js index d19a3bcd3..11d6e8658 100644 --- a/src/index.js +++ b/src/index.js @@ -1,10 +1,9 @@ -import 'react-app-polyfill/stable' -import 'core-js' import React from 'react' import { createRoot } from 'react-dom/client' -import App from './App' -import reportWebVitals from './reportWebVitals' import { Provider } from 'react-redux' +import 'core-js' + +import App from './App' import store from './store' createRoot(document.getElementById('root')).render( @@ -12,8 +11,3 @@ createRoot(document.getElementById('root')).render( , ) - -// If you want to start measuring performance in your app, pass a function -// to log results (for example: reportWebVitals(console.log)) -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals() diff --git a/src/reportWebVitals.js b/src/reportWebVitals.js deleted file mode 100644 index dc6ff0781..000000000 --- a/src/reportWebVitals.js +++ /dev/null @@ -1,13 +0,0 @@ -const reportWebVitals = (onPerfEntry) => { - if (onPerfEntry && onPerfEntry instanceof Function) { - import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { - getCLS(onPerfEntry) - getFID(onPerfEntry) - getFCP(onPerfEntry) - getLCP(onPerfEntry) - getTTFB(onPerfEntry) - }) - } -} - -export default reportWebVitals diff --git a/src/setupTests.js b/src/setupTests.js deleted file mode 100644 index 52aaef1d2..000000000 --- a/src/setupTests.js +++ /dev/null @@ -1,5 +0,0 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom' diff --git a/vite.config.mjs b/vite.config.mjs new file mode 100644 index 000000000..ee16a3581 --- /dev/null +++ b/vite.config.mjs @@ -0,0 +1,57 @@ +import { defineConfig, loadEnv } from 'vite' +import react from '@vitejs/plugin-react' +import path from 'node:path' +import autoprefixer from 'autoprefixer' + +export default defineConfig(({ mode }) => { + // Load .env + const env = loadEnv(mode, process.cwd(), '') + process.env = { ...process.env, ...env } + + return { + base: './', + build: { + outDir: 'build', + }, + css: { + postcss: { + plugins: [ + autoprefixer({}), // add options if needed + ], + }, + }, + define: { + // vitejs does not support process.env so we have to redefine it + 'process.env': process.env, + }, + esbuild: { + loader: 'jsx', + include: /src\/.*\.jsx?$/, + exclude: [], + }, + optimizeDeps: { + force: true, + esbuildOptions: { + loader: { + '.js': 'jsx', + }, + }, + }, + plugins: [react()], + resolve: { + alias: [ + { + find: 'src/', + replacement: `${path.resolve(__dirname, 'src')}/`, + }, + ], + extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.scss'], + }, + server: { + port: 3000, + proxy: { + // https://vitejs.dev/config/server-options.html + }, + }, + } +}) From b57048543adf84edfc7aaff7808f03eeed961065 Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 22 Mar 2024 12:45:41 +0100 Subject: [PATCH 283/316] chore: clean-up --- vite.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.mjs b/vite.config.mjs index ee16a3581..66ffff2cf 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -45,7 +45,7 @@ export default defineConfig(({ mode }) => { replacement: `${path.resolve(__dirname, 'src')}/`, }, ], - extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.scss'], + extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.scss'], }, server: { port: 3000, From 0a7196fc53ff844fe4427f50b4d36de54d299b03 Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 22 Mar 2024 13:05:15 +0100 Subject: [PATCH 284/316] chore: update dependencies and devDependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @coreui/coreui ^5.0.0-rc-2 → ^5.0.0-rc.3 @coreui/react ^5.0.0-rc.2 → ^5.0.0-rc.3 autoprefixer ^10.4.18 → ^10.4.19 core-js ^3.36.0 → ^3.36.1 eslint-plugin-react ^7.34.0 → ^7.34.1 postcss ^8.4.35 → ^8.4.38 sass ^1.71.1 → ^1.72.0 vite ^5.1.6 → ^5.2.2 --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 56a6e587a..e70fe6eff 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,13 @@ "@coreui/coreui": "^5.0.0-rc-2", "@coreui/icons": "^3.0.1", "@coreui/icons-react": "^2.2.1", - "@coreui/react": "^5.0.0-rc.2", + "@coreui/react": "^5.0.0-rc.3", "@coreui/react-chartjs": "^3.0.0-rc.0", "@coreui/utils": "^2.0.2", "@popperjs/core": "^2.11.8", "chart.js": "^4.4.2", "classnames": "^2.5.1", - "core-js": "^3.36.0", + "core-js": "^3.36.1", "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -40,15 +40,15 @@ }, "devDependencies": { "@vitejs/plugin-react": "^4.2.1", - "autoprefixer": "^10.4.18", + "autoprefixer": "^10.4.19", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-react": "^7.34.0", + "eslint-plugin-react": "^7.34.1", "eslint-plugin-react-hooks": "^4.6.0", - "postcss": "^8.4.35", + "postcss": "^8.4.38", "prettier": "3.2.5", - "sass": "^1.71.1", - "vite": "^5.1.6" + "sass": "^1.72.0", + "vite": "^5.2.2" } } From cc07a0478c98a23b20634bf0ebfe2917df6ba16f Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 22 Mar 2024 13:06:20 +0100 Subject: [PATCH 285/316] docs: update README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 896332553..101aa0a32 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ CoreUI is meant to be the UX game changer. Pure & transparent code is devoid of * [CoreUI Free Bootstrap Admin Template](https://github.com/coreui/coreui-free-bootstrap-admin-template) * [CoreUI Free Angular Admin Template](https://github.com/coreui/coreui-free-angular-admin-template) -* [CoreUI Free React.js Admin Template](https://github.com/coreui/coreui-free-react-admin-template) +* [CoreUI Free React.js Admin Template (Vite)](https://github.com/coreui/coreui-free-react-admin-template) +* [CoreUI Free React.js Admin Template (Create React App)](https://github.com/coreui/coreui-free-react-admin-template-cra) * [CoreUI Free Vue.js Admin Template](https://github.com/coreui/coreui-free-vue-admin-template) ## CoreUI PRO @@ -140,7 +141,7 @@ coreui-free-react-admin-template ## Documentation -The documentation for the CoreUI Admin Template is hosted at our website [CoreUI for React](https://coreui.io/react/) +The documentation for the CoreUI Admin Template is hosted at our website [CoreUI for React](https://coreui.io/react/docs/templates/installation/) ## Versioning From 49af4079f9166012c2d76bb806aae5292e7992e9 Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 22 Mar 2024 13:06:58 +0100 Subject: [PATCH 286/316] release: v5.0.0-rc.1 --- index.html | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index ceddb2461..2e283fb93 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ diff --git a/src/components/AppFooter.js b/src/components/AppFooter.js index fd126f460..217c5a04c 100644 --- a/src/components/AppFooter.js +++ b/src/components/AppFooter.js @@ -8,7 +8,7 @@ const AppFooter = () => { CoreUI - © 2024 creativeLabs. + © 2025 creativeLabs.
    Powered by From 74b0aaf708de9b9a417c9b9f0236a8febdac2da3 Mon Sep 17 00:00:00 2001 From: mrholek Date: Tue, 4 Feb 2025 14:37:27 +0100 Subject: [PATCH 312/316] refactor: migrate to CSS logical properties and values --- src/scss/_theme.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/scss/_theme.scss b/src/scss/_theme.scss index 49e1c79e6..b014421f2 100644 --- a/src/scss/_theme.scss +++ b/src/scss/_theme.scss @@ -4,8 +4,7 @@ body { .wrapper { width: 100%; - @include ltr-rtl("padding-left", var(--cui-sidebar-occupy-start, 0)); - @include ltr-rtl("padding-right", var(--cui-sidebar-occupy-end, 0)); + padding-inline: var(--cui-sidebar-occupy-start, 0) var(--cui-sidebar-occupy-end, 0); will-change: auto; @include transition(padding .15s); } @@ -33,13 +32,13 @@ body { } .sidebar-toggler { - @include ltr-rtl("margin-left", auto); + margin-inline-start: auto; } .sidebar-narrow, .sidebar-narrow-unfoldable:not(:hover) { .sidebar-toggler { - @include ltr-rtl("margin-right", auto); + margin-inline-end: auto } } From 69269e8e347d023d20a1b1dc8a27df9bdc5acfff Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 7 Feb 2025 13:22:45 +0100 Subject: [PATCH 313/316] chore: update dependencies and devDependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @coreui/react ^5.4.1 → ^5.5.0 sass ^1.83.4 → ^1.84.0 vite ^6.0.11 → ^6.1.0 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d2476e36e..fd106e849 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@coreui/coreui": "^5.2.0", "@coreui/icons": "^3.0.1", "@coreui/icons-react": "^2.3.0", - "@coreui/react": "^5.4.1", + "@coreui/react": "^5.5.0", "@coreui/react-chartjs": "^3.0.0", "@coreui/utils": "^2.0.2", "@popperjs/core": "^2.11.8", @@ -49,7 +49,7 @@ "globals": "^15.14.0", "postcss": "^8.5.1", "prettier": "3.4.2", - "sass": "^1.83.4", - "vite": "^6.0.11" + "sass": "^1.84.0", + "vite": "^6.1.0" } } From b78e444d202979e41b4f26388b548c9d642aa692 Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 7 Feb 2025 13:27:12 +0100 Subject: [PATCH 314/316] release: v5.3.0 --- index.html | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index e2b715c93..84b9a228b 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@