Skip to content

Commit

Permalink
Merge pull request #599 from homotechsual/react
Browse files Browse the repository at this point in the history
Replace keyboard input handling.
  • Loading branch information
KelvinTegelaar authored Jan 14, 2022
2 parents 26dc974 + a4540cf commit 3d1f990
Show file tree
Hide file tree
Showing 28 changed files with 112 additions and 361 deletions.
31 changes: 31 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"react-dom": "^17.0.2",
"react-final-form": "^6.5.7",
"react-final-form-listeners": "^1.0.3",
"react-hotkeys-hook": "^3.4.4",
"react-media-hook": "^0.4.9",
"react-papaparse": "^3.18.2",
"react-redux": "^7.2.5",
Expand Down
33 changes: 0 additions & 33 deletions src/assets/brand/logo-negative.js

This file was deleted.

32 changes: 0 additions & 32 deletions src/assets/brand/logo.js

This file was deleted.

12 changes: 0 additions & 12 deletions src/assets/brand/sygnet.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/AppBreadcrumb.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { useLocation } from 'react-router-dom'

import routes from '../routes'
import routes from 'src/routes'

import { CBreadcrumb, CBreadcrumbItem } from '@coreui/react'

Expand Down
4 changes: 2 additions & 2 deletions src/components/AppHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import {
} from '@coreui/react'
import { faBars } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { AppBreadcrumb } from './index'
import AppBreadcrumb from 'src/components/AppBreadcrumb'
import AppHeaderDropdown from 'src/components/header/AppHeaderDropdown'
import AppHeaderSearch from 'src/components/header/AppHeaderSearch'
import cyberdrainlogo from 'src/assets/images/CIPP.png'
import { toggleSidebarShow } from '../store/features/app'
import { toggleSidebarShow } from 'src/store/features/app'

const AppHeader = () => {
const dispatch = useDispatch()
Expand Down
6 changes: 3 additions & 3 deletions src/components/AppSidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React from 'react'
import { useSelector, useDispatch } from 'react-redux'
import { CSidebar, CSidebarBrand, CSidebarNav } from '@coreui/react'
import { CImage } from '@coreui/react'
import { AppSidebarNav } from './AppSidebarNav'
import { AppSidebarNav } from 'src/components/AppSidebarNav'
import cyberdrainlogo from 'src/assets/images/CIPP.png'
import SimpleBar from 'simplebar-react'
import 'simplebar/dist/simplebar.min.css'
import navigation from '../_nav'
import { setSidebarVisible } from '../store/features/app'
import navigation from 'src/_nav'
import { setSidebarVisible } from 'src/store/features/app'

const AppSidebar = () => {
const dispatch = useDispatch()
Expand Down
8 changes: 4 additions & 4 deletions src/components/CippPage.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useEffect } from 'react'
import PropTypes from 'prop-types'
import TenantSelector from './cipp/TenantSelector'
import TenantSelector from 'src/components/cipp/TenantSelector'
import { CAlert, CCard, CCardBody, CCardHeader } from '@coreui/react'
import CippDatatable from './cipp/CippDatatable'
import CippDatatable from 'src/components/cipp/CippDatatable'
import { useDispatch, useSelector } from 'react-redux'
import { useSearchParams } from 'react-router-dom'
import { setCurrentTenant } from '../store/features/app'
import { useListTenantsQuery } from '../store/api/tenants'
import { setCurrentTenant } from 'src/store/features/app'
import { useListTenantsQuery } from 'src/store/api/tenants'

export function CippPage({ tenantSelector = true, title, children, titleButton = null }) {
const { data: tenants = [], isSuccess } = useListTenantsQuery()
Expand Down
Loading

0 comments on commit 3d1f990

Please sign in to comment.