From f332877c812b50590407e1cd2957a0199da1399a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Mon, 30 Aug 2021 16:43:00 +0200 Subject: [PATCH] refactor: update logos and icons --- src/assets/brand/logo-negative.js | 31 +++++++++++++++++++++ src/assets/brand/logo.js | 30 ++++++++++++++++++++ src/assets/brand/sygnet.js | 12 ++++++++ src/assets/icons/{icons.js => index.js} | 2 -- src/assets/icons/logo.js | 29 ------------------- src/components/AppHeader.vue | 24 ++++++++-------- src/components/AppSidebar.vue | 12 ++++---- src/main.js | 37 ++++++++++++------------- 8 files changed, 110 insertions(+), 67 deletions(-) create mode 100644 src/assets/brand/logo-negative.js create mode 100644 src/assets/brand/logo.js create mode 100644 src/assets/brand/sygnet.js rename src/assets/icons/{icons.js => index.js} (98%) delete mode 100644 src/assets/icons/logo.js diff --git a/src/assets/brand/logo-negative.js b/src/assets/brand/logo-negative.js new file mode 100644 index 00000000..1c99aa91 --- /dev/null +++ b/src/assets/brand/logo-negative.js @@ -0,0 +1,31 @@ +export const logoNegative = [ + '556 134', + ` + coreui vue logo + + + + + + + + + + + + + + + + + + + + + + + + + +`, +] diff --git a/src/assets/brand/logo.js b/src/assets/brand/logo.js new file mode 100644 index 00000000..b5e89f3a --- /dev/null +++ b/src/assets/brand/logo.js @@ -0,0 +1,30 @@ +export const logo = [ + '556 134', + ` + coreui vue + + + + + + + + + + + + + + + + + + + + + + + + +`, +] diff --git a/src/assets/brand/sygnet.js b/src/assets/brand/sygnet.js new file mode 100644 index 00000000..3a57fbdd --- /dev/null +++ b/src/assets/brand/sygnet.js @@ -0,0 +1,12 @@ +export const sygnet = [ + '160 160', + ` + coreui logo + + + + + + +`, +] diff --git a/src/assets/icons/icons.js b/src/assets/icons/index.js similarity index 98% rename from src/assets/icons/icons.js rename to src/assets/icons/index.js index 05b846c5..edbda0e3 100644 --- a/src/assets/icons/icons.js +++ b/src/assets/icons/index.js @@ -76,11 +76,9 @@ import { cilUserFollow, cilXCircle } from "@coreui/icons"; -import { logo } from "./logo"; export const iconsSet = Object.assign( {}, - { logo }, { cilArrowBottom, cilArrowRight, diff --git a/src/assets/icons/logo.js b/src/assets/icons/logo.js deleted file mode 100644 index 6923789f..00000000 --- a/src/assets/icons/logo.js +++ /dev/null @@ -1,29 +0,0 @@ -// Example of SVG converted to js array, so it can be used with CIcon. -// the first argument is two last values of svg viewBox, -// the second argument is the SVG content stripped of SVG tags -export const logo = ['556 134',` - - - - - - - - - - - - - - - - - - - - - - - - -`] diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue index b67de7fc..8e7bb6cc 100644 --- a/src/components/AppHeader.vue +++ b/src/components/AppHeader.vue @@ -5,9 +5,9 @@ - + - + Dashboard @@ -19,19 +19,19 @@ - - - + + + - - - + + + - - - + + + @@ -58,6 +58,7 @@ import { onMounted, ref, watch } from 'vue' import { onBeforeRouteUpdate } from 'vue-router' import AppHeaderDropdownAccnt from './AppHeaderDropdownAccnt' import router from '../router' +import { logo } from './../assets/brand/logo' export default { name: 'AppHeader', components: { @@ -100,6 +101,7 @@ export default { return { breadcrumbs, + logo, } }, } diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue index 59d77d74..503f25da 100644 --- a/src/components/AppSidebar.vue +++ b/src/components/AppSidebar.vue @@ -15,17 +15,13 @@ @@ -40,6 +36,8 @@ import { computed } from 'vue' import { useStore } from 'vuex' import { AppSidebarNav } from './AppSidebarNav' +import { logoNegative } from './../assets/brand/logo-negative' +import { sygnet } from './../assets/brand/sygnet' export default { name: 'AppSidebar', components: { @@ -48,6 +46,8 @@ export default { setup() { const store = useStore() return { + logoNegative, + sygnet, sidebarUnfoldable: computed(() => store.state.sidebarUnfoldable), sidebarVisible: computed(() => store.state.sidebarVisible), } diff --git a/src/main.js b/src/main.js index aa95816d..3490bf54 100644 --- a/src/main.js +++ b/src/main.js @@ -1,22 +1,21 @@ -import { createApp } from "vue"; -import App from "./App.vue"; -import router from "./router"; -import store from "./store"; +import { createApp } from 'vue' +import App from './App.vue' +import router from './router' +import store from './store' -import CoreuiVue from "@coreui/vue"; -import { CIcon } from "@coreui/icons-vue"; -import { iconsSet as icons } from "@/assets/icons/icons.js"; -import DocsCallout from "@/components/DocsCallout"; -import DocsExample from "@/components/DocsExample"; +import CoreuiVue from '@coreui/vue' +import { CIcon } from '@coreui/icons-vue' +import { iconsSet as icons } from '@/assets/icons' +import DocsCallout from '@/components/DocsCallout' +import DocsExample from '@/components/DocsExample' +const app = createApp(App) +app.use(store) +app.use(router) +app.use(CoreuiVue) +app.provide('icons', icons) +app.component('CIcon', CIcon) +app.component('DocsCallout', DocsCallout) +app.component('DocsExample', DocsExample) -const app = createApp(App); -app.use(store); -app.use(router); -app.use(CoreuiVue); -app.provide('icons', icons); -app.component("CIcon", CIcon); -app.component("DocsCallout", DocsCallout); -app.component("DocsExample", DocsExample); - -app.mount("#app"); +app.mount('#app')