sean/manja_ui_dev
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Merge branch 'dev' into v3-alpha, for 3.0.0-alpha.4 release

Browse Source
This commit is contained in:
woothu
2019-07-08 20:02:45 +02:00
parent f73cf9ca86 7407fb8d4e
commit 847c09ddfc
15 changed files with 9376 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+9242 -81
View File
File diff suppressed because it is too large Load Diff
package.json
+11 -11
View File
@@ -1,6 +1,6 @@
{ {
"name": "@coreui/coreui-free-vue-admin-template", "name": "@coreui/coreui-free-vue-admin-template",
"version": "3.0.0-alpha.3", "version": "3.0.0-alpha.4",
"description": "Open Source Bootstrap Admin Template", "description": "Open Source Bootstrap Admin Template",
"author": "Łukasz Holeczek", "author": "Łukasz Holeczek",
"homepage": "http://coreui.io", "homepage": "http://coreui.io",
@@ -18,24 +18,24 @@
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
"@coreui/coreui-vue-chartjs": "coreui/coreui-vue-chartjs", "@coreui/coreui-vue-chartjs": "coreui/coreui-vue-chartjs",
"@coreui/icons": "coreui/coreui-icons#v1-alpha", "@coreui/icons": "coreui/coreui-icons#v1-alpha",
"@coreui/vue": "../coreui-vue", "@coreui/vue": "coreui/coreui-vue#3.0.0-alpha.4",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-router": "^3.0.6" "vue-router": "^3.0.7"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "^3.8.0", "@vue/cli-plugin-babel": "^3.9.2",
"@vue/cli-plugin-e2e-nightwatch": "^3.8.0", "@vue/cli-plugin-e2e-nightwatch": "^3.9.2",
"@vue/cli-plugin-eslint": "^3.8.0", "@vue/cli-plugin-eslint": "^3.9.2",
"@vue/cli-plugin-unit-jest": "^3.8.0", "@vue/cli-plugin-unit-jest": "^3.9.0",
"@vue/cli-service": "^3.8.4", "@vue/cli-service": "^3.9.2",
"@vue/test-utils": "^1.0.0-beta.25", "@vue/test-utils": "^1.0.0-beta.25",
"babel-core": "^6.26.3", "babel-core": "^6.26.3",
"babel-plugin-dynamic-import-node": "^2.2.0", "babel-plugin-dynamic-import-node": "^2.3.0",
"babel-plugin-module-resolver": "^3.2.0", "babel-plugin-module-resolver": "^3.2.0",
"babel-preset-vue-app": "^2.0.0", "babel-preset-vue-app": "^2.0.0",
"babel-jest": "^23.6.0", "babel-jest": "23.6.0",
"growl": "^1.10.5", "growl": "^1.10.5",
"https-proxy-agent": "^2.2.1", "https-proxy-agent": "^2.2.2",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10"
src/containers/TheSidebar.vue
+1 -1
View File
@@ -9,7 +9,7 @@
</template> </template>
<script> <script>
import nav from '@/_nav' import nav from './_nav'
export default { export default {
name: 'TheSidebar', name: 'TheSidebar',
computed: { computed: {
src/_nav.js → src/containers/_nav.js
View File
src/views/Dashboard.vue
+3 -3
View File
@@ -82,7 +82,7 @@
</CRow> </CRow>
</CCardFooter> </CCardFooter>
</CCard> </CCard>
<WidgetsSocial/> <WidgetsBrand/>
<CRow> <CRow>
<CCol md="12"> <CCol md="12">
<CCard header-html="Traffic &amp; Sales" body-wrapper> <CCard header-html="Traffic &amp; Sales" body-wrapper>
@@ -451,7 +451,7 @@
<script> <script>
import MainChartExample from './charts/MainChartExample' import MainChartExample from './charts/MainChartExample'
import WidgetsDropdown from './widgets/WidgetsDropdown' import WidgetsDropdown from './widgets/WidgetsDropdown'
import WidgetsSocial from './widgets/WidgetsSocial' import WidgetsBrand from './widgets/WidgetsBrand'
import CChartLineSimple from './charts/CChartLineSimple' import CChartLineSimple from './charts/CChartLineSimple'
export default { export default {
@@ -459,7 +459,7 @@ export default {
components: { components: {
MainChartExample, MainChartExample,
WidgetsDropdown, WidgetsDropdown,
WidgetsSocial, WidgetsBrand,
CChartLineSimple CChartLineSimple
}, },
data () { data () {
src/views/base/Carousels.vue
+6 -4
View File
@@ -23,18 +23,20 @@
arrows arrows
indicators indicators
animate animate
height="400px"
> >
<CCarouselItem <CCarouselItem
caption="First Slide" caption="First Slide"
img-src="https://lorempixel.com/1024/480/technics/2/" image="https://lorempixel.com/1024/480/technics/2/"
text="Nulla vitae elit libero, a pharetra augue mollis interdum." text="Nulla vitae elit libero, a pharetra augue mollis interdum."
/> />
<CCarouselItem <CCarouselItem
active caption="Blank page"
img-src="https://lorempixel.com/1024/480/technics/4/" :image="{ blankColor: 'grey' }"
text="Nulla vitae elit libero, a pharetra augue mollis interdum."
/> />
<CCarouselItem <CCarouselItem
img-src="https://lorempixel.com/1024/480/technics/8/" image="https://lorempixel.com/1024/480/technics/8/"
/> />
</CCarousel> </CCarousel>
</CCardBody> </CCardBody>
src/views/base/Forms.vue
+11 -22
View File
@@ -487,12 +487,12 @@
type="email" type="email"
placeholder="Email" placeholder="Email"
autocomplete="email" autocomplete="email"
appendHtml="<i class='cui-envelope-open'></i>" append-html="<i class='cui-envelope-open'></i>"
/> />
<CFormInput <CFormInput
prependHtml="<i class='cui-euro'></i>" prependHtml="<i class='cui-euro'></i>"
placeholder="ex. $1.000.000" placeholder="ex. $1.000.000"
appendHtml=".00" append-html=".00"
/> />
</CCardBody> </CCardBody>
<CCardFooter> <CCardFooter>
@@ -529,10 +529,10 @@
autocomplete="email" autocomplete="email"
> >
<template #prepend> <template #prepend>
<CButton variant="primary"><i class="fa fa-facebook"></i></CButton> <CButton variant="primary"><CIcon name="facebook" height="14"/></CButton>
</template> </template>
<template #append> <template #append>
<CButton variant="primary"><i class="fa fa-twitter"></i></CButton> <CButton variant="primary"><CIcon name="twitter" height="14"/></CButton>
</template> </template>
</CFormInput> </CFormInput>
</CCardBody> </CCardBody>
@@ -684,19 +684,19 @@
<CForm> <CForm>
<CFormInput <CFormInput
prepend-html="Username" prepend-html="Username"
appendHtml="<i class='cui-user'></i>" append-html="<i class='cui-user'></i>"
/> />
<CFormInput <CFormInput
prepend-html="Email" prepend-html="Email"
type="email" type="email"
autocomplete="email" autocomplete="email"
appendHtml="<i class='cui-envelope-closed'></i>" append-html="<i class='cui-envelope-closed'></i>"
/> />
<CFormInput <CFormInput
prepend-html="Password" prepend-html="Password"
type="password" type="password"
autocomplete="current-password" autocomplete="current-password"
appendHtml="<i class='fa fa-asterisk'></i>" append-html="<i class='cui-shield'></i>"
/> />
<div class="c-form-group c-form-actions"> <div class="c-form-group c-form-actions">
<CButton type="submit" size="sm" variant="primary"> <CButton type="submit" size="sm" variant="primary">
@@ -716,19 +716,19 @@
<CForm> <CForm>
<CFormInput <CFormInput
placeholder="Username" placeholder="Username"
appendHtml="<i class='cui-user'></i>" append-html="<i class='cui-user'></i>"
/> />
<CFormInput <CFormInput
placeholder="Email" placeholder="Email"
type="email" type="email"
autocomplete="email" autocomplete="email"
appendHtml="<i class='cui-envelope-closed'></i>" append-html="<i class='cui-envelope-closed'></i>"
/> />
<CFormInput <CFormInput
placeholder="Password" placeholder="Password"
type="password" type="password"
autocomplete="current-password" autocomplete="current-password"
appendHtml="<i class='fa fa-asterisk'></i>" append-html="<i class='cui-shield'></i>"
/> />
<div class="c-form-group c-form-actions"> <div class="c-form-group c-form-actions">
<CButton type="submit" class="c-btn c-btn-sm c-btn-secondary"> <CButton type="submit" class="c-btn c-btn-sm c-btn-secondary">
@@ -760,7 +760,7 @@
placeholder="Password" placeholder="Password"
type="password" type="password"
autocomplete="current-password" autocomplete="current-password"
prependHtml="<i class='fa fa-asterisk'></i>" prependHtml="<i class='cui-shield'></i>"
/> />
<div class="c-form-group c-form-actions"> <div class="c-form-group c-form-actions">
<CButton type="submit" size="sm" variant="success"> <CButton type="submit" size="sm" variant="success">
@@ -847,14 +847,6 @@ export default {
return { return {
selected: [], // Must be an array reference! selected: [], // Must be an array reference!
show: true, show: true,
id: 'sdfjosdf22',
cInput: '',
smh: 'shnsad',
trueValue:'someTrueValue',
falseValue:'someFalseValue',
checks: ['someTrueValue','hehehe2','',1,1,1,1,1,1,1,1,1,1,1,1],
isValid: '',
testkkk: 2,
horizontal: { label:'col-3', input:'col-9' }, horizontal: { label:'col-3', input:'col-9' },
options: ['Option 1', 'Option 2', 'Option 3'], options: ['Option 1', 'Option 2', 'Option 3'],
selectOptions: [ selectOptions: [
@@ -869,9 +861,6 @@ export default {
'Radios - custom', 'Inline Radios - custom'] 'Radios - custom', 'Inline Radios - custom']
} }
}, },
updated () {
console.log('parent updated')
},
methods: { methods: {
validator (val) { validator (val) {
return val ? val.length >= 4 : false return val ? val.length >= 4 : false
src/views/base/Navbars.vue
+6 -5
View File
@@ -43,7 +43,6 @@
<CCardBody> <CCardBody>
<CNavbar <CNavbar
toggleable="md" toggleable="md"
type="dark"
variant="info" variant="info"
sticky sticky
> >
@@ -63,7 +62,9 @@
placeholder="Search" placeholder="Search"
size="sm" size="sm"
/> />
<CButton size="sm" class="c-my-2 c-my-sm-0" type="submit">Search</CButton> <CButton variant="light" size="sm" class="c-my-2 c-my-sm-0">
Search
</CButton>
</CForm> </CForm>
<CDropdown <CDropdown
@@ -128,7 +129,7 @@
<small>dropdown</small> <small>dropdown</small>
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CNavbar type="dark" variant="primary"> <CNavbar>
<!-- <CNavbarToggle @click="navbarDropdown = !navbarDropdown"></CNavbarToggle> <!-- <CNavbarToggle @click="navbarDropdown = !navbarDropdown"></CNavbarToggle>
<CCollapse :show="navbarDropdown" navbar> --> <CCollapse :show="navbarDropdown" navbar> -->
<CNavbarNav> <CNavbarNav>
@@ -164,7 +165,7 @@
<small>form</small> <small>form</small>
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CNavbar type="light" variant="light"> <CNavbar light variant="light">
<CForm inline> <CForm inline>
<CFormInput <CFormInput
class="c-mr-sm-2" class="c-mr-sm-2"
@@ -182,7 +183,7 @@
<small>input group</small> <small>input group</small>
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CNavbar type="light" variant="light"> <CNavbar light variant="light">
<CForm inline> <CForm inline>
<CFormInput <CFormInput
class="c-mr-sm-2" class="c-mr-sm-2"
src/views/base/Paginations.vue
+3 -1
View File
@@ -4,7 +4,7 @@
<CCard> <CCard>
<CCardHeader> <CCardHeader>
<i class="fa fa-align-justify"></i> <i class="fa fa-align-justify"></i>
<strong> Bootstrap Pagination</strong> <strong> Responsive bootstrap Pagination</strong>
<!-- <div class="c-card-header-actions"> <!-- <div class="c-card-header-actions">
<a href="https://bootstrap-vue.js.org/docs/components/pagination" class="c-card-header-action" rel="noreferrer noopener" target="_blank"> <a href="https://bootstrap-vue.js.org/docs/components/pagination" class="c-card-header-action" rel="noreferrer noopener" target="_blank">
<small class="c-text-muted">docs</small> <small class="c-text-muted">docs</small>
@@ -16,6 +16,7 @@
<CPagination <CPagination
:active-page.sync="currentPage" :active-page.sync="currentPage"
:pages="10" :pages="10"
responsive
/> />
<br> <br>
@@ -32,6 +33,7 @@
size="lg" size="lg"
:active-page.sync="currentPage" :active-page.sync="currentPage"
:pages="10" :pages="10"
responsive
/> />
<br> <br>
</div> </div>
src/views/base/Tabs.vue
+4 -7
View File
@@ -7,7 +7,7 @@
Tabs Tabs
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CTabs add-tab-classes="c-mt-1"> <CTabs>
<CTab title-html="Home" active> <CTab title-html="Home" active>
1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore 1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
@@ -39,10 +39,7 @@
Tabs Tabs
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CTabs <CTabs pills>
pills
add-nav-classes="c-mb-3"
>
<CTab title-html="Home" active> <CTab title-html="Home" active>
1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore 1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
@@ -74,7 +71,7 @@
Tabs with icons Tabs with icons
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CTabs add-tab-classes="c-mt-1"> <CTabs>
<CTab active> <CTab active>
<template slot="title"> <template slot="title">
<i class="cui-calculator"></i> <i class="cui-calculator"></i>
@@ -156,7 +153,7 @@
Tabs vertical Tabs vertical
</CCardHeader> </CCardHeader>
<CCardBody> <CCardBody>
<CTabs pills vertical="4"> <CTabs pills vertical add-tabs-wrapper-classes="c-pl-3">
<CTab active> <CTab active>
<template slot="title"> <template slot="title">
<i class="cui-calculator"></i> {{tabs[0]}} <i class="cui-calculator"></i> {{tabs[0]}}
src/views/notifications/Alerts.vue
+4 -18
View File
@@ -111,32 +111,18 @@
<CAlert <CAlert
:show.sync="dismissibleAlerts[2]" :show.sync="dismissibleAlerts[2]"
dismissible
iconHtml="<i>Close</i>"
>
Dismissible Alert with custom icon!
</CAlert>
<CAlert
:show.sync="dismissibleAlerts[3]"
dismissible="customButton"
v-slot="{dismiss}" v-slot="{dismiss}"
class="c-alert-dismissible"
> >
Dismissible Alert with custom button! Dismissible Alert with custom button!
<CButton <CButton
class="c-position-absolute c-bg-primary" class="c-position-absolute"
variant="primary"
style="right:10px;top: 50%;transform: translateY(-50%);" style="right:10px;top: 50%;transform: translateY(-50%);"
textHtml="<i>Close</i>" textHtml="<i>Close</i>"
@click="dismiss" @click="dismiss"
/> />
</CAlert> </CAlert>
<CAlert
:show.sync="dismissibleAlerts[4]"
dismissible="disabled"
>
Disabled dismissible Alert!
</CAlert>
<CButton <CButton
@click="showDismissibleAlerts" @click="showDismissibleAlerts"
variant="info" variant="info"
@@ -195,7 +181,7 @@ export default {
return { return {
dismissSecs: 10, dismissSecs: 10,
dismissCountDown: 10, dismissCountDown: 10,
dismissibleAlerts: [true, true, true, true, true], dismissibleAlerts: [true, true, true],
} }
}, },
methods: { methods: {
src/views/notifications/Modals.vue
+7 -17
View File
@@ -80,7 +80,6 @@
<CModal <CModal
title="Modal title" title="Modal title"
class="c-modal-primary"
:visible.sync="primaryModal" :visible.sync="primaryModal"
> >
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -92,7 +91,7 @@
</CModal> </CModal>
<CModal <CModal
title="Modal title" title="Modal title"
class="c-modal-success" variant="success"
:visible.sync="successModal" :visible.sync="successModal"
> >
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -104,7 +103,7 @@
</CModal> </CModal>
<CModal <CModal
title="Modal title" title="Modal title"
class="c-modal-warning" variant="warning"
:visible.sync="warningModal" :visible.sync="warningModal"
> >
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -116,7 +115,7 @@
</CModal> </CModal>
<CModal <CModal
title="Modal title" title="Modal title"
class="c-modal-danger" variant="danger"
:visible.sync="dangerModal" :visible.sync="dangerModal"
> >
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -128,7 +127,7 @@
</CModal> </CModal>
<CModal <CModal
title="Modal title" title="Modal title"
class="c-modal-info" variant="info"
:visible.sync="infoModal" :visible.sync="infoModal"
> >
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -140,20 +139,11 @@
</CModal> </CModal>
<CModal <CModal
:visible.sync="darkModal" :visible.sync="darkModal"
:no-backdrop="false" :no-close-on-backdrop="true"
:no-close-on-backdrop="fsalse"
:no-fade="false"
:centered="true" :centered="true"
title="Modal title 2" title="Modal title 2"
size="lg" size="lg"
variant="dark" variant="dark"
border-variant="danger2"
add-modal-classess="hehe1"
add-dialog-classess="hehe2"
add-content-classess="hehe3"
:no-header="false"
:no-body="false"
:no-footer="false"
> >
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
@@ -162,12 +152,12 @@
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum. proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
<template #header="{hide}"> <template #header="{hide}">
<h5 class="c-modal-title">Custom modal title</h5> <h6 class="c-modal-title">Custom smaller modal title</h6>
<CButtonClose @click="hide()" class="c-text-white"/> <CButtonClose @click="hide()" class="c-text-white"/>
</template> </template>
<template #footer="{hide}"> <template #footer="{hide}">
<CButton @click="hide()" variant="danger">Discard</CButton> <CButton @click="hide()" variant="danger">Discard</CButton>
<CButton @click="hide()" variant="success">Accept</CButton> <CButton @click="hide(true)" variant="success">Accept</CButton>
</template> </template>
</CModal> </CModal>
</div> </div>
src/views/widgets/Widgets.vue
+25 -56
View File
@@ -121,48 +121,6 @@
</CWidgetIcon> </CWidgetIcon>
</CCol> </CCol>
</CRow> </CRow>
<CRow>
<CCol col="12" sm="6" lg="3">
<CWidgetIcon
header="$1.999,50"
text="Income"
variant="primary"
link="#"
>
<CIcon name="settings" width="24"/>
</CWidgetIcon>
</CCol>
<CCol col="12" sm="6" lg="3">
<CWidgetIcon
header="$1.999,50"
text="Income"
variant="info"
link="#"
>
<CIcon name="laptop" width="24"/>
</CWidgetIcon>
</CCol>
<CCol col="12" sm="6" lg="3">
<CWidgetIcon
header="$1.999,50"
text="Income"
variant="warning"
link="#"
>
<CIcon name="moon" width="24"/>
</CWidgetIcon>
</CCol>
<CCol col="12" sm="6" lg="3">
<CWidgetIcon
header="$1.999,50"
text="Income"
variant="danger"
link="#"
>
<CIcon name="bell" width="24"/>
</CWidgetIcon>
</CCol>
</CRow>
<CRow> <CRow>
<CCol col="12" sm="6" lg="3"> <CCol col="12" sm="6" lg="3">
<CWidgetIcon <CWidgetIcon
@@ -234,10 +192,21 @@
no-padding no-padding
> >
<CIcon name="moon" class="c-mx-5 " width="24"/> <CIcon name="moon" class="c-mx-5 " width="24"/>
<template #footer>
<CCardFooter class="c-card-footer c-px-3 c-py-2">
<CLink
class="c-font-weight-bold c-font-xs c-btn-block c-text-muted"
href="https://coreui.io/"
>
View more
<CIcon name="arrowRight" class="c-float-right" width="16"/>
</CLink>
</CCardFooter>
</template>
</CWidgetIcon> </CWidgetIcon>
</CCol> </CCol>
</CRow> </CRow>
<CRow> <!-- <CRow>
<CCol col="12" sm="6" lg="4"> <CCol col="12" sm="6" lg="4">
<CWidgetIcon <CWidgetIcon
header="$1.999,50" header="$1.999,50"
@@ -271,9 +240,9 @@
<CIcon name="moon" class="c-mx-5" width="24"/> <CIcon name="moon" class="c-mx-5" width="24"/>
</CWidgetIcon> </CWidgetIcon>
</CCol> </CCol>
</CRow> </CRow> -->
<WidgetsSocial noCharts/> <WidgetsBrand noCharts/>
<WidgetsSocial/> <WidgetsBrand/>
<CCardGroup class="c-mb-4"> <CCardGroup class="c-mb-4">
<CWidgetProgressIcon <CWidgetProgressIcon
header="87.500" header="87.500"
@@ -473,7 +442,7 @@
<WidgetsDropdown/> <WidgetsDropdown/>
<CRow> <CRow>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
<CWidgetSmallText <CWidgetHeaderDetails
right-header="SALE" right-header="SALE"
right-footer="Today 6:43 AM" right-footer="Today 6:43 AM"
left-header="$1.890,65" left-header="$1.890,65"
@@ -481,10 +450,10 @@
> >
<CChartLineSimple style="height:40px"/> <CChartLineSimple style="height:40px"/>
<CChartBarSimple style="height:40px"/> <CChartBarSimple style="height:40px"/>
</CWidgetSmallText> </CWidgetHeaderDetails>
</CCol> </CCol>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
<CWidgetSmallText <CWidgetHeaderDetails
variant="success" variant="success"
right-header="SALE" right-header="SALE"
right-footer="Today 6:43 AM" right-footer="Today 6:43 AM"
@@ -493,10 +462,10 @@
> >
<CChartLineSimple style="height:40px"/> <CChartLineSimple style="height:40px"/>
<CChartBarSimple style="height:40px"/> <CChartBarSimple style="height:40px"/>
</CWidgetSmallText> </CWidgetHeaderDetails>
</CCol> </CCol>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
<CWidgetSmallText <CWidgetHeaderDetails
variant="danger" variant="danger"
right-header="SALE" right-header="SALE"
right-footer="Today 6:43 AM" right-footer="Today 6:43 AM"
@@ -505,10 +474,10 @@
> >
<CChartLineSimple style="height:40px"/> <CChartLineSimple style="height:40px"/>
<CChartBarSimple style="height:40px"/> <CChartBarSimple style="height:40px"/>
</CWidgetSmallText> </CWidgetHeaderDetails>
</CCol> </CCol>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
<CWidgetSmallText <CWidgetHeaderDetails
variant="warning" variant="warning"
right-header="SALE" right-header="SALE"
right-footer="Today 6:43 AM" right-footer="Today 6:43 AM"
@@ -517,7 +486,7 @@
> >
<CChartLineSimple style="height:40px"/> <CChartLineSimple style="height:40px"/>
<CChartBarSimple style="height:40px"/> <CChartBarSimple style="height:40px"/>
</CWidgetSmallText> </CWidgetHeaderDetails>
</CCol> </CCol>
</CRow> </CRow>
<CRow> <CRow>
@@ -556,7 +525,7 @@
</template> </template>
<script> <script>
import WidgetsSocial from './WidgetsSocial' import WidgetsBrand from './WidgetsBrand'
import WidgetsDropdown from './WidgetsDropdown' import WidgetsDropdown from './WidgetsDropdown'
import { CChartLineSimple, CChartBarSimple } from '../charts/index.js' import { CChartLineSimple, CChartBarSimple } from '../charts/index.js'
@@ -565,7 +534,7 @@ export default {
components: { components: {
CChartLineSimple, CChartLineSimple,
CChartBarSimple, CChartBarSimple,
WidgetsSocial, WidgetsBrand,
WidgetsDropdown WidgetsDropdown
} }
} }
src/views/widgets/WidgetsSocial.vue → src/views/widgets/WidgetsBrand.vue
+16 -16
View File
@@ -2,7 +2,7 @@
<CRow> <CRow>
<template v-if="!noCharts"> <template v-if="!noCharts">
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
variant="facebook" variant="facebook"
right-header="89k" right-header="89k"
right-footer="friends" right-footer="friends"
@@ -22,10 +22,10 @@
label="Friends" label="Friends"
labels="months" labels="months"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
variant="twitter" variant="twitter"
right-header="973k" right-header="973k"
right-footer="followers" right-footer="followers"
@@ -45,10 +45,10 @@
label="Followers" label="Followers"
labels="months" labels="months"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
variant="linkedin" variant="linkedin"
right-header="500+" right-header="500+"
right-footer="contracts" right-footer="contracts"
@@ -68,10 +68,10 @@
label="Contracts" label="Contracts"
labels="months" labels="months"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
right-header="12" right-header="12"
right-footer="events" right-footer="events"
left-header="4" left-header="4"
@@ -91,12 +91,12 @@
label="Followers" label="Followers"
labels="months" labels="months"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
</template> </template>
<template v-else> <template v-else>
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
variant="facebook" variant="facebook"
right-header="89k" right-header="89k"
right-footer="friends" right-footer="friends"
@@ -108,10 +108,10 @@
height="56" height="56"
class="c-my-4" class="c-my-4"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
variant="twitter" variant="twitter"
right-header="973k" right-header="973k"
right-footer="followers" right-footer="followers"
@@ -123,10 +123,10 @@
height="56" height="56"
class="c-my-4" class="c-my-4"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
variant="linkedin" variant="linkedin"
right-header="500+" right-header="500+"
right-footer="contracts" right-footer="contracts"
@@ -138,10 +138,10 @@
height="56" height="56"
class="c-my-4" class="c-my-4"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
<CCol md="3" sm="6"> <CCol md="3" sm="6">
<CWidgetSocial <CWidgetBrand
right-header="12" right-header="12"
right-footer="events" right-footer="events"
left-header="4" left-header="4"
@@ -153,7 +153,7 @@
height="56" height="56"
class="c-my-4" class="c-my-4"
/> />
</CWidgetSocial> </CWidgetBrand>
</CCol> </CCol>
</template> </template>
</CRow> </CRow>
src/views/widgets/WidgetsDropdown.vue
+12 -11
View File
@@ -2,7 +2,7 @@
<CRow> <CRow>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
<CWidgetDropdown header="9.823" text="Members online"> <CWidgetDropdown header="9.823" text="Members online">
<template #dropdown> <template #default>
<CDropdown <CDropdown
class="c-float-right" class="c-float-right"
variant="transparent c-p-0" variant="transparent c-p-0"
@@ -15,6 +15,7 @@
<CDropdownItem disabled>Disabled action</CDropdownItem> <CDropdownItem disabled>Disabled action</CDropdownItem>
</CDropdown> </CDropdown>
</template> </template>
<template #footer>
<CChartLineSimple <CChartLineSimple
pointed pointed
class="c-px-3" class="c-px-3"
@@ -24,11 +25,12 @@
label="Members" label="Members"
labels="months" labels="months"
/> />
</template>
</CWidgetDropdown> </CWidgetDropdown>
</CCol> </CCol>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
<CWidgetDropdown variant="info" header="9.823" text="Members online"> <CWidgetDropdown variant="info" header="9.823" text="Members online">
<template #dropdown> <template #default>
<CDropdown <CDropdown
class="c-float-right" class="c-float-right"
variant="transparent c-p-0" variant="transparent c-p-0"
@@ -42,6 +44,7 @@
<CDropdownItem disabled>Disabled action</CDropdownItem> <CDropdownItem disabled>Disabled action</CDropdownItem>
</CDropdown> </CDropdown>
</template> </template>
<template #footer>
<CChartLineSimple <CChartLineSimple
pointed pointed
class="c-px-3" class="c-px-3"
@@ -52,6 +55,7 @@
label="Members" label="Members"
labels="months" labels="months"
/> />
</template>
</CWidgetDropdown> </CWidgetDropdown>
</CCol> </CCol>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
@@ -60,8 +64,7 @@
header="9.823" header="9.823"
text="Members online" text="Members online"
> >
<template #default>
<template #dropdown>
<CDropdown <CDropdown
class="c-float-right" class="c-float-right"
variant="transparent c-p-0" variant="transparent c-p-0"
@@ -74,6 +77,7 @@
<CDropdownItem disabled>Disabled action</CDropdownItem> <CDropdownItem disabled>Disabled action</CDropdownItem>
</CDropdown> </CDropdown>
</template> </template>
<template #footer>
<CChartLineSimple <CChartLineSimple
style="height:70px" style="height:70px"
background-color="rgba(255,255,255,.2)" background-color="rgba(255,255,255,.2)"
@@ -83,6 +87,7 @@
label="Members" label="Members"
labels="months" labels="months"
/> />
</template>
</CWidgetDropdown> </CWidgetDropdown>
</CCol> </CCol>
<CCol sm="6" lg="3"> <CCol sm="6" lg="3">
@@ -91,8 +96,7 @@
header="9.823" header="9.823"
text="Members online" text="Members online"
> >
<template #default>
<template #dropdown>
<CDropdown <CDropdown
class="c-float-right" class="c-float-right"
variant="transparent c-p-0" variant="transparent c-p-0"
@@ -105,12 +109,14 @@
<CDropdownItem disabled>Disabled action</CDropdownItem> <CDropdownItem disabled>Disabled action</CDropdownItem>
</CDropdown> </CDropdown>
</template> </template>
<template #footer>
<CChartBarSimple <CChartBarSimple
style="height:70px" style="height:70px"
background-color="rgb(250, 152, 152)" background-color="rgb(250, 152, 152)"
label="Members" label="Members"
labels="months" labels="months"
/> />
</template>
</CWidgetDropdown> </CWidgetDropdown>
</CCol> </CCol>
</CRow> </CRow>
@@ -121,11 +127,6 @@ import { CChartLineSimple, CChartBarSimple } from '../charts/index.js'
export default { export default {
name: 'WidgetsDropdown', name: 'WidgetsDropdown',
// data () {
// return {
// months: ['January', 'February', 'March', 'April', 'May', 'June', 'July']
// }
// },
components: { CChartLineSimple, CChartBarSimple } components: { CChartLineSimple, CChartBarSimple }
} }
</script> </script>