From 8c0deeed169267155323a5b6bdbbdfaf8a856a41 Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Wed, 27 May 2020 10:40:33 +0200 Subject: [PATCH] refactor: turn logos extensions from svg to js --- src/assets/icons/index.js | 9 ++++ src/assets/icons/logo-negative.js | 30 ++++++++++++++ src/assets/icons/logo.js | 41 ++++++++++--------- src/assets/icons/sygnet.js | 9 ++++ src/assets/img/brand/coreui-react-neg.svg | 40 ------------------ src/assets/img/brand/coreui-react.svg | 40 ------------------ src/assets/img/brand/coreui-signet-white.svg | 16 -------- src/containers/TheHeader.js | 3 +- src/containers/TheSidebar.js | 8 +--- src/index.js | 12 +++++- src/routes.js | 2 +- .../base/{basic-forms => forms}/BasicForms.js | 0 12 files changed, 83 insertions(+), 127 deletions(-) create mode 100644 src/assets/icons/index.js create mode 100644 src/assets/icons/logo-negative.js create mode 100644 src/assets/icons/sygnet.js delete mode 100644 src/assets/img/brand/coreui-react-neg.svg delete mode 100644 src/assets/img/brand/coreui-react.svg delete mode 100644 src/assets/img/brand/coreui-signet-white.svg rename src/views/base/{basic-forms => forms}/BasicForms.js (100%) diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js new file mode 100644 index 0000000..ecf4bfe --- /dev/null +++ b/src/assets/icons/index.js @@ -0,0 +1,9 @@ +import { sygnet } from './sygnet' +import { logo } from './logo' +import { logoNegative } from './logo-negative' + +export { + sygnet, + logo, + logoNegative +} \ No newline at end of file diff --git a/src/assets/icons/logo-negative.js b/src/assets/icons/logo-negative.js new file mode 100644 index 0000000..337875e --- /dev/null +++ b/src/assets/icons/logo-negative.js @@ -0,0 +1,30 @@ +export const logoNegative = ['608 134', ` + coreui react pro logo + + + + + + + + + + + + + + + + + + + + + + + + + + + +`] diff --git a/src/assets/icons/logo.js b/src/assets/icons/logo.js index 8ed51e6..01d6ddd 100644 --- a/src/assets/icons/logo.js +++ b/src/assets/icons/logo.js @@ -1,28 +1,29 @@ -export const logo = ['556 134', ''] - -/* +export const logo = ['608 134', ` + coreui react pro - - - - - - - + + + + + + + + + - + - - + + - - - - - - + + + + + + - */ \ No newline at end of file +`] diff --git a/src/assets/icons/sygnet.js b/src/assets/icons/sygnet.js new file mode 100644 index 0000000..fddab7e --- /dev/null +++ b/src/assets/icons/sygnet.js @@ -0,0 +1,9 @@ +export const sygnet = ['160 160', ` + coreui logo + + + + + + +`] diff --git a/src/assets/img/brand/coreui-react-neg.svg b/src/assets/img/brand/coreui-react-neg.svg deleted file mode 100644 index abb375e..0000000 --- a/src/assets/img/brand/coreui-react-neg.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - coreui react - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/img/brand/coreui-react.svg b/src/assets/img/brand/coreui-react.svg deleted file mode 100644 index 9d44bb8..0000000 --- a/src/assets/img/brand/coreui-react.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - coreui react - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/img/brand/coreui-signet-white.svg b/src/assets/img/brand/coreui-signet-white.svg deleted file mode 100644 index ee9700d..0000000 --- a/src/assets/img/brand/coreui-signet-white.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - signet_white - - - - - - - diff --git a/src/containers/TheHeader.js b/src/containers/TheHeader.js index 5299b73..9346ff3 100644 --- a/src/containers/TheHeader.js +++ b/src/containers/TheHeader.js @@ -22,7 +22,6 @@ import { TheHeaderDropdownNotif, TheHeaderDropdownTasks } from './index' -import logo from '../assets/img/brand/coreui-react-neg.svg' const TheHeader = () => { const dispatch = useDispatch() @@ -51,7 +50,7 @@ const TheHeader = () => { onClick={toggleSidebar} /> - + diff --git a/src/containers/TheSidebar.js b/src/containers/TheSidebar.js index 3df27b8..62c3264 100644 --- a/src/containers/TheSidebar.js +++ b/src/containers/TheSidebar.js @@ -14,10 +14,6 @@ import { import { CIcon } from '@coreui/icons-react' -//logo -import logo from '../assets/img/brand/coreui-react-neg.svg' -import sygnet from '../assets/img/brand/coreui-signet-white.svg' - // sidebar nav config import navigation from './_nav' @@ -33,12 +29,12 @@ const TheSidebar = () => { diff --git a/src/index.js b/src/index.js index c0fb604..b4213a7 100644 --- a/src/index.js +++ b/src/index.js @@ -7,12 +7,20 @@ import App from './App'; import * as serviceWorker from './serviceWorker'; import { freeSet, flagSet, brandSet } from '@coreui/icons'; -import { logo } from './assets/icons/logo' +import { logo, logoNegative, sygnet } from './assets/icons' import { Provider } from 'react-redux' import store from './store' -React.icons = {...freeSet, ...flagSet, ...brandSet, logo} +React.icons = { + ...freeSet, + ...flagSet, + ...brandSet, + logo, + logoNegative, + sygnet +} + ReactDOM.render( diff --git a/src/routes.js b/src/routes.js index c30414b..9620be9 100644 --- a/src/routes.js +++ b/src/routes.js @@ -7,7 +7,7 @@ const Breadcrumbs = React.lazy(() => import('./views/base/breadcrumbs/Breadcrumb const Cards = React.lazy(() => import('./views/base/cards/Cards')); const Carousels = React.lazy(() => import('./views/base/carousels/Carousels')); const Collapses = React.lazy(() => import('./views/base/collapses/Collapses')); -const BasicForms = React.lazy(() => import('./views/base/basic-forms/BasicForms')); +const BasicForms = React.lazy(() => import('./views/base/forms/BasicForms')); const Jumbotrons = React.lazy(() => import('./views/base/jumbotrons/Jumbotrons')); const ListGroups = React.lazy(() => import('./views/base/list-groups/ListGroups')); diff --git a/src/views/base/basic-forms/BasicForms.js b/src/views/base/forms/BasicForms.js similarity index 100% rename from src/views/base/basic-forms/BasicForms.js rename to src/views/base/forms/BasicForms.js