release: v5.4.0

src/_nav.js

@@ -10,10 +10,7 @@ import {
   cilExternalLink,
   cilNotes,
   cilPencil,
-<<<<<<< HEAD
-=======
   cilPeople,
->>>>>>> 33b7218 (Initial commit)
   cilPuzzle,
   cilSpeedometer,
   cilStar,
@@ -32,15 +29,12 @@ const _nav = [
     },
   },
   {
-<<<<<<< HEAD
-=======
     component: CNavItem,
     name: 'Users',
     to: '/users',
     icon: <CIcon icon={cilPeople} customClassName="nav-icon" />,
   },
   {
->>>>>>> 33b7218 (Initial commit)
     component: CNavTitle,
     name: 'Theme',
   },

src/components/header/AppHeaderDropdown.js

@@ -1,8 +1,5 @@
 import React from 'react'
-<<<<<<< HEAD
-=======
 import { useNavigate } from 'react-router-dom'
->>>>>>> 33b7218 (Initial commit)
 import {
   CAvatar,
   CBadge,
@@ -13,10 +10,7 @@ import {
   CDropdownMenu,
   CDropdownToggle,
 } from '@coreui/react'
-<<<<<<< HEAD
-=======
 import { useAuth } from '../../context/AuthContext'
->>>>>>> 33b7218 (Initial commit)
 import {
   cilBell,
   cilCreditCard,
@@ -33,8 +27,6 @@ import CIcon from '@coreui/icons-react'
 import avatar8 from './../../assets/images/avatars/8.jpg'
 
 const AppHeaderDropdown = () => {
-<<<<<<< HEAD
-=======
   const { user, logout } = useAuth();
   const navigate = useNavigate();
 
@@ -43,7 +35,6 @@ const AppHeaderDropdown = () => {
     navigate('/login');
   };
 
->>>>>>> 33b7218 (Initial commit)
   return (
     <CDropdown variant="nav-item">
       <CDropdownToggle placement="bottom-end" className="py-0 pe-0" caret={false}>
@@ -65,21 +56,6 @@ const AppHeaderDropdown = () => {
             42
           </CBadge>
         </CDropdownItem>
-<<<<<<< HEAD
-        <CDropdownItem href="#">
-          <CIcon icon={cilTask} className="me-2" />
-          Tasks
-          <CBadge color="danger" className="ms-2">
-            42
-          </CBadge>
-        </CDropdownItem>
-        <CDropdownItem href="#">
-          <CIcon icon={cilCommentSquare} className="me-2" />
-          Comments
-          <CBadge color="warning" className="ms-2">
-            42
-          </CBadge>
-=======
         <CDropdownItem>
           <CIcon icon={cilUser} className="me-2" />
           {user?.username || 'User'}
@@ -88,7 +64,6 @@ const AppHeaderDropdown = () => {
         <CDropdownItem onClick={handleLogout}>
           <CIcon icon={cilLockLocked} className="me-2" />
           Logout
->>>>>>> 33b7218 (Initial commit)
         </CDropdownItem>
         <CDropdownHeader className="bg-body-secondary fw-semibold my-2">Settings</CDropdownHeader>
         <CDropdownItem href="#">

src/layout/DefaultLayout.js

@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-import React from 'react'
-import { AppContent, AppSidebar, AppFooter, AppHeader } from '../components/index'
-
-const DefaultLayout = () => {
-=======
 import React, { useEffect } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { AppContent, AppSidebar, AppFooter, AppHeader } from '../components/index'
@@ -18,7 +12,6 @@ const DefaultLayout = () => {
       navigate('/login')
     }
   }, [user, navigate])
->>>>>>> 33b7218 (Initial commit)
   return (
     <div>
       <AppSidebar />

src/routes.js

@@ -1,10 +1,7 @@
 import React from 'react'
 
 const Dashboard = React.lazy(() => import('./views/dashboard/Dashboard'))
-<<<<<<< HEAD
-=======
 const Users = React.lazy(() => import('./views/pages/users/Users'))
->>>>>>> 33b7218 (Initial commit)
 const Colors = React.lazy(() => import('./views/theme/colors/Colors'))
 const Typography = React.lazy(() => import('./views/theme/typography/Typography'))
 
@@ -39,10 +36,7 @@ const Layout = React.lazy(() => import('./views/forms/layout/Layout'))
 const Range = React.lazy(() => import('./views/forms/range/Range'))
 const Select = React.lazy(() => import('./views/forms/select/Select'))
 const Validation = React.lazy(() => import('./views/forms/validation/Validation'))
-<<<<<<< HEAD
-=======
 const CustomerForm = React.lazy(() => import('./views/forms/CustomerForm'))
->>>>>>> 33b7218 (Initial commit)
 
 const Charts = React.lazy(() => import('./views/charts/Charts'))
 
@@ -95,10 +89,7 @@ const routes = [
   { path: '/forms/floating-labels', name: 'Floating Labels', element: FloatingLabels },
   { path: '/forms/layout', name: 'Layout', element: Layout },
   { path: '/forms/validation', name: 'Validation', element: Validation },
-<<<<<<< HEAD
-=======
   { path: '/customer-form', name: 'Customer Form', element: CustomerForm },
->>>>>>> 33b7218 (Initial commit)
   { path: '/icons', exact: true, name: 'Icons', element: CoreUIIcons },
   { path: '/icons/coreui-icons', name: 'CoreUI Icons', element: CoreUIIcons },
   { path: '/icons/flags', name: 'Flags', element: Flags },
@@ -109,10 +100,7 @@ const routes = [
   { path: '/notifications/modals', name: 'Modals', element: Modals },
   { path: '/notifications/toasts', name: 'Toasts', element: Toasts },
   { path: '/widgets', name: 'Widgets', element: Widgets },
-<<<<<<< HEAD
-=======
   { path: '/users', name: 'Users', element: Users },
->>>>>>> 33b7218 (Initial commit)
 ]
 
 export default routes

src/views/dashboard/Dashboard.js

@@ -2,10 +2,6 @@ import React from 'react'
 import classNames from 'classnames'
 
 import {
-<<<<<<< HEAD
-  CAvatar,
-=======
->>>>>>> 33b7218 (Initial commit)
   CButton,
   CButtonGroup,
   CCard,
@@ -15,15 +11,6 @@ import {
   CCol,
   CProgress,
   CRow,
-<<<<<<< HEAD
-  CTable,
-  CTableBody,
-  CTableDataCell,
-  CTableHead,
-  CTableHeaderCell,
-  CTableRow,
-=======
->>>>>>> 33b7218 (Initial commit)
 } from '@coreui/react'
 import CIcon from '@coreui/icons-react'
 import {
@@ -49,28 +36,13 @@ import {
   cilUserFemale,
 } from '@coreui/icons'
 
-<<<<<<< HEAD
-import avatar1 from 'src/assets/images/avatars/1.jpg'
-import avatar2 from 'src/assets/images/avatars/2.jpg'
-import avatar3 from 'src/assets/images/avatars/3.jpg'
-import avatar4 from 'src/assets/images/avatars/4.jpg'
-import avatar5 from 'src/assets/images/avatars/5.jpg'
-import avatar6 from 'src/assets/images/avatars/6.jpg'
-
-import WidgetsBrand from '../widgets/WidgetsBrand'
-import WidgetsDropdown from '../widgets/WidgetsDropdown'
-import MainChart from './MainChart'
-
-const Dashboard = () => {
-=======
 import WidgetsBrand from '../widgets/WidgetsBrand'
 import WidgetsDropdown from '../widgets/WidgetsDropdown'
 import MainChart from './MainChart'
 import OpenStreetMapView from './OpenStreetMapView'
 
 const Dashboard = () => {
 
->>>>>>> 33b7218 (Initial commit)
   const progressExample = [
     { title: 'Visits', value: '29.703 Users', percent: 40, color: 'success' },
     { title: 'Unique', value: '24.093 Users', percent: 20, color: 'info' },
@@ -101,96 +73,6 @@ const Dashboard = () => {
     { title: 'LinkedIn', icon: cibLinkedin, percent: 8, value: '27,319' },
   ]
 
-<<<<<<< HEAD
-  const tableExample = [
-    {
-      avatar: { src: avatar1, status: 'success' },
-      user: {
-        name: 'Yiorgos Avraamu',
-        new: true,
-        registered: 'Jan 1, 2023',
-      },
-      country: { name: 'USA', flag: cifUs },
-      usage: {
-        value: 50,
-        period: 'Jun 11, 2023 - Jul 10, 2023',
-        color: 'success',
-      },
-      payment: { name: 'Mastercard', icon: cibCcMastercard },
-      activity: '10 sec ago',
-    },
-    {
-      avatar: { src: avatar2, status: 'danger' },
-      user: {
-        name: 'Avram Tarasios',
-        new: false,
-        registered: 'Jan 1, 2023',
-      },
-      country: { name: 'Brazil', flag: cifBr },
-      usage: {
-        value: 22,
-        period: 'Jun 11, 2023 - Jul 10, 2023',
-        color: 'info',
-      },
-      payment: { name: 'Visa', icon: cibCcVisa },
-      activity: '5 minutes ago',
-    },
-    {
-      avatar: { src: avatar3, status: 'warning' },
-      user: { name: 'Quintin Ed', new: true, registered: 'Jan 1, 2023' },
-      country: { name: 'India', flag: cifIn },
-      usage: {
-        value: 74,
-        period: 'Jun 11, 2023 - Jul 10, 2023',
-        color: 'warning',
-      },
-      payment: { name: 'Stripe', icon: cibCcStripe },
-      activity: '1 hour ago',
-    },
-    {
-      avatar: { src: avatar4, status: 'secondary' },
-      user: { name: 'Enéas Kwadwo', new: true, registered: 'Jan 1, 2023' },
-      country: { name: 'France', flag: cifFr },
-      usage: {
-        value: 98,
-        period: 'Jun 11, 2023 - Jul 10, 2023',
-        color: 'danger',
-      },
-      payment: { name: 'PayPal', icon: cibCcPaypal },
-      activity: 'Last month',
-    },
-    {
-      avatar: { src: avatar5, status: 'success' },
-      user: {
-        name: 'Agapetus Tadeáš',
-        new: true,
-        registered: 'Jan 1, 2023',
-      },
-      country: { name: 'Spain', flag: cifEs },
-      usage: {
-        value: 22,
-        period: 'Jun 11, 2023 - Jul 10, 2023',
-        color: 'primary',
-      },
-      payment: { name: 'Google Wallet', icon: cibCcApplePay },
-      activity: 'Last week',
-    },
-    {
-      avatar: { src: avatar6, status: 'danger' },
-      user: {
-        name: 'Friderik Dávid',
-        new: true,
-        registered: 'Jan 1, 2023',
-      },
-      country: { name: 'Poland', flag: cifPl },
-      usage: {
-        value: 43,
-        period: 'Jun 11, 2023 - Jul 10, 2023',
-        color: 'success',
-      },
-      payment: { name: 'Amex', icon: cibCcAmex },
-      activity: 'Last week',
-=======
   // If tableData is supposed to be a prop, add it to the function signature:
   // const Dashboard = ({ tableData }) => {
 
@@ -223,7 +105,6 @@ const Dashboard = () => {
       usage: { value: 65, period: 'Jun 2023', color: 'danger' },
       payment: { icon: cibCcStripe },
       activity: 'Yesterday',
->>>>>>> 33b7218 (Initial commit)
     },
   ]
 
@@ -374,61 +255,6 @@ const Dashboard = () => {
 
               <br />
 
-<<<<<<< HEAD
-              <CTable align="middle" className="mb-0 border" hover responsive>
-                <CTableHead className="text-nowrap">
-                  <CTableRow>
-                    <CTableHeaderCell className="bg-body-tertiary text-center">
-                      <CIcon icon={cilPeople} />
-                    </CTableHeaderCell>
-                    <CTableHeaderCell className="bg-body-tertiary">User</CTableHeaderCell>
-                    <CTableHeaderCell className="bg-body-tertiary text-center">
-                      Country
-                    </CTableHeaderCell>
-                    <CTableHeaderCell className="bg-body-tertiary">Usage</CTableHeaderCell>
-                    <CTableHeaderCell className="bg-body-tertiary text-center">
-                      Payment Method
-                    </CTableHeaderCell>
-                    <CTableHeaderCell className="bg-body-tertiary">Activity</CTableHeaderCell>
-                  </CTableRow>
-                </CTableHead>
-                <CTableBody>
-                  {tableExample.map((item, index) => (
-                    <CTableRow v-for="item in tableItems" key={index}>
-                      <CTableDataCell className="text-center">
-                        <CAvatar size="md" src={item.avatar.src} status={item.avatar.status} />
-                      </CTableDataCell>
-                      <CTableDataCell>
-                        <div>{item.user.name}</div>
-                        <div className="small text-body-secondary text-nowrap">
-                          <span>{item.user.new ? 'New' : 'Recurring'}</span> | Registered:{' '}
-                          {item.user.registered}
-                        </div>
-                      </CTableDataCell>
-                      <CTableDataCell className="text-center">
-                        <CIcon size="xl" icon={item.country.flag} title={item.country.name} />
-                      </CTableDataCell>
-                      <CTableDataCell>
-                        <div className="d-flex justify-content-between text-nowrap">
-                          <div className="fw-semibold">{item.usage.value}%</div>
-                          <div className="ms-3">
-                            <small className="text-body-secondary">{item.usage.period}</small>
-                          </div>
-                        </div>
-                        <CProgress thin color={item.usage.color} value={item.usage.value} />
-                      </CTableDataCell>
-                      <CTableDataCell className="text-center">
-                        <CIcon size="xl" icon={item.payment.icon} />
-                      </CTableDataCell>
-                      <CTableDataCell>
-                        <div className="small text-body-secondary text-nowrap">Last login</div>
-                        <div className="fw-semibold text-nowrap">{item.activity}</div>
-                      </CTableDataCell>
-                    </CTableRow>
-                  ))}
-                </CTableBody>
-              </CTable>
-=======
             </CCardBody>
           </CCard>
         </CCol>
@@ -443,7 +269,6 @@ const Dashboard = () => {
               <div className="small text-body-secondary mt-2">
                 This map uses free OpenStreetMap tiles and does not require an API key or credit card.
               </div>
->>>>>>> 33b7218 (Initial commit)
             </CCardBody>
           </CCard>
         </CCol>