Skip to content

Commit 5844f03

Browse files
woothuwoothu
committed
Chore: v3-alpha.2 version merge
2 parents 7253a90 + 6c7a636 commit 5844f03

File tree

8 files changed

+368
-234
lines changed

8 files changed

+368
-234
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "3.0.0-alpha.1",
3+
"version": "3.0.0-alpha.2",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",

‎src/App.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ export default {
1919
@import '~simple-line-icons/scss/simple-line-icons.scss';
2020
/* Import Flag Icons Set */
2121
@import '~flag-icon-css/css/flag-icon.min.css';
22-
/* Import Bootstrap Vue Styles */
23-
@import '~bootstrap-vue/dist/bootstrap-vue.css';
2422
// Import Main styles for this application
2523
@import 'assets/scss/style';
2624
</style>

‎src/router/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Colors = () => import('@/views/theme/Colors')
1111
const Typography = () => import('@/views/theme/Typography')
1212

1313
const Charts = () => import('@/views/Charts')
14-
const Widgets = () => import('@/views/Widgets')
14+
const Widgets = () => import('@/views/widgets/Widgets')
1515

1616
// Views - Components
1717
const Cards = () => import('@/views/base/Cards')

‎src/views/Dashboard.vue

Lines changed: 6 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,6 @@
11
<template>
22
<div class="animated fadeIn">
3-
<CRow>
4-
<CCol sm="6" lg="3">
5-
<CWidget06 header="9.823" text="Members online">
6-
<template slot="dropdown">
7-
<CDropdown class="float-right"
8-
variant="transparent p-0"
9-
right
10-
buttonContent="<i class='icon-settings'></i>"
11-
tag="div"
12-
>
13-
<!-- <template slot="buttonContent">
14-
15-
</template> -->
16-
<CDropdownItem>Action</CDropdownItem>
17-
<CDropdownItem>Another action</CDropdownItem>
18-
<CDropdownItem>Something else here...</CDropdownItem>
19-
<CDropdownItem disabled>Disabled action</CDropdownItem>
20-
</CDropdown>
21-
</template>
22-
<CSimplePointedChart class='px-3' :data='[65, 59, 84, 84, 51, 55, 40]'
23-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
24-
style='height:70px' label='Members' pointHoverColor='primary'/>
25-
</CWidget06>
26-
</CCol>
27-
<CCol sm="6" lg="3">
28-
<CWidget06 variant="info" header="9.823" text="Members online">
29-
<CDropdown slot="dropdown"
30-
class="float-right"
31-
variant="transparent p-0"
32-
right
33-
no-caret
34-
buttonContent="<i class='icon-location-pin'></i>"
35-
tag="div"
36-
>
37-
<!-- <i slot="buttonContent"
38-
class="icon-location-pin"
39-
></i> -->
40-
<CDropdownItem>Action</CDropdownItem>
41-
<CDropdownItem>Another action</CDropdownItem>
42-
<CDropdownItem>Something else here...</CDropdownItem>
43-
<CDropdownItem disabled>Disabled action</CDropdownItem>
44-
</CDropdown>
45-
<CSimplePointedChart class="px-3"
46-
:data="[1, 18, 9, 17, 34, 22, 11]"
47-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
48-
style="height:70px"
49-
label="Members"
50-
:options="{ elements: { line: { tension: 0.00001 }}}"
51-
pointHoverColor="info"
52-
/>
53-
</CWidget06>
54-
</CCol>
55-
<CCol sm="6" lg="3">
56-
<CWidget06 variant="warning" header="9.823" text="Members online">
57-
<template slot='dropdown'>
58-
<CDropdown class="float-right"
59-
variant="transparent p-0"
60-
right
61-
buttonContent="<i class='icon-settings'></i>"
62-
tag="div"
63-
>
64-
65-
<CDropdownItem>Action</CDropdownItem>
66-
<CDropdownItem>Another action</CDropdownItem>
67-
<CDropdownItem>Something else here...</CDropdownItem>
68-
<CDropdownItem disabled>Disabled action</CDropdownItem>
69-
</CDropdown>
70-
</template>
71-
<CSimpleLineChart chartId="CWidget06_3" :data='[78, 81, 80, 45, 34, 12, 40]'
72-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
73-
style='height:70px' color ='rgba(255,255,255,.2)' label='Members'
74-
:options="{elements: {line: {borderWidth: 2.5}}}" pointHoverColor='warning'/>
75-
</CWidget06>
76-
</CCol>
77-
<CCol sm="6" lg="3">
78-
<CWidget06 variant="danger" header="9.823" text="Members online">
79-
<template slot="dropdown">
80-
<CDropdown class="float-right"
81-
variant="transparent p-0"
82-
right
83-
buttonContent="<i class='icon-settings'></i>"
84-
>
85-
<!-- <template slot="buttonContent">
86-
<i class="icon-settings"></i>
87-
</template> -->
88-
<CDropdownItem>Action</CDropdownItem>
89-
<CDropdownItem>Another action</CDropdownItem>
90-
<CDropdownItem>Something else here...</CDropdownItem>
91-
<CDropdownItem disabled>Disabled action</CDropdownItem>
92-
</CDropdown>
93-
</template>
94-
<CSimpleBarChart chartId="CWidget06_4" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]'
95-
label='Members' color='rgb(250, 152, 152)' style='height:70px' />
96-
</CWidget06>
97-
</CCol>
98-
</CRow>
99-
3+
<Widgets06/>
1004
<CCard>
1015
<CCardBody>
1026
<CRow>
@@ -151,36 +55,7 @@
15155
</CRow>
15256
</CCardFooter>
15357
</CCard>
154-
<CRow>
155-
<CCol md="3" sm="6">
156-
<CWidget04 variant="facebook" rightHeader="89k" rightFooter="friends" leftHeader="459" leftFooter="feeds">
157-
<CSimpleLineChart :data='[65, 59, 84, 84, 51, 55, 40]' label='Friends'
158-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
159-
style='height:100px' color='rgba(255,255,255,.1)'/>
160-
</CWidget04>
161-
</CCol>
162-
<CCol md="3" sm="6">
163-
<CWidget04 variant="twitter" rightHeader="973k" rightFooter="followers" leftHeader="1.792" leftFooter="tweets">
164-
<CSimpleLineChart :data='[1, 13, 9, 17, 34, 41, 38]' label='Followers'
165-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
166-
style='height:100px' color='rgba(255,255,255,.1)'/>
167-
</CWidget04>
168-
</CCol>
169-
<CCol md="3" sm="6">
170-
<CWidget04 variant="linkedin" rightHeader="500+" rightFooter="contracts" leftHeader="292" leftFooter="feeds">
171-
<CSimpleLineChart :data='[78, 81, 80, 45, 34, 12, 40]' label='Contracts'
172-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
173-
style='height:100px' color='rgba(255,255,255,.1)'/>
174-
</CWidget04>
175-
</CCol>
176-
<CCol md="3" sm="6">
177-
<CWidget04 variant='google-plus' rightHeader='894' rightFooter='followers' leftHeader='92' leftFooter='circles'>
178-
<CSimpleLineChart :data='[35, 23, 56, 22, 97, 23, 64]' label='Followers'
179-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
180-
style='height:100px' color='rgba(255,255,255,.1)'/>
181-
</CWidget04>
182-
</CCol>
183-
</CRow><!--/.row-->
58+
<Widgets04/>
18459
<CRow>
18560
<CCol md="12">
18661
<CCard header="Traffic &amp; Sales" bodyWrapper>
@@ -459,6 +334,8 @@
459334

460335
<script>
461336
import MainChartExample from './dashboard/MainChartExample'
337+
import Widgets06 from './widgets/Widgets06'
338+
import Widgets04 from './widgets/Widgets04'
462339
import SocialBoxChartExample from './dashboard/SocialBoxChartExample'
463340
import CalloutChartExample from './dashboard/CalloutChartExample'
464341
@@ -468,6 +345,8 @@ export default {
468345
MainChartExample,
469346
SocialBoxChartExample,
470347
CalloutChartExample,
348+
Widgets06,
349+
Widgets04
471350
},
472351
data: function () {
473352
return {

‎src/views/notifications/Alerts.vue

Lines changed: 71 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -90,39 +90,60 @@
9090
<CCol cols="12" md="6">
9191
<CCard>
9292
<CCardHeader>
93-
<i class="fa fa-align-justify"></i> Alerts <small>dismissible</small>
93+
<i class="fa fa-align-justify"></i> Alerts
94+
<small>dismissible</small>
9495
</CCardHeader>
9596
<CCardBody>
96-
<div>
97-
<CAlert :show="true" dismissible disabled>
98-
Dismissible Alert!
99-
</CAlert>
100-
<!-- :dismissible="{attrs: {disabled:'disabled', 'aria-label':'close it'}, class:'hehe' } -->
101-
<CAlert :show="true"
102-
dismissible>
103-
Dismissible Alert!
104-
<CButtonClose slot-scope="{ dismiss }"
105-
@click="dismiss"
106-
aria-label="close it"
107-
style="color:red">
108-
ok
109-
</CButtonClose>
110-
</CAlert>
111-
<CAlert show dismissible>
112-
Dismissible Alert!
113-
</CAlert>
114-
<CAlert variant="danger"
115-
dismissible
116-
fade
117-
:show="showDismissibleAlert"
118-
@dismissed="showDismissibleAlert=false"
97+
<CAlert
98+
dismissible
99+
:show.sync="dismissibleAlerts[0]"
119100
>
120101
Dismissible Alert!
121102
</CAlert>
122-
<CButton @click="showDismissibleAlert=true" variant="info" class="m-1">
123-
Show dismissible alert ({{showDismissibleAlert?'visible':'hidden'}})
103+
104+
<CAlert
105+
dismissible
106+
fade
107+
:show.sync="dismissibleAlerts[1]"
108+
>
109+
Dismissible Alert with fade effect!
110+
</CAlert>
111+
112+
<CAlert
113+
:show.sync="dismissibleAlerts[2]"
114+
dismissible
115+
iconHtml="<i>Close</i>"
116+
>
117+
Dismissible Alert with custom icon!
118+
</CAlert>
119+
120+
<CAlert
121+
:show.sync="dismissibleAlerts[3]"
122+
class="alert-dismissible"
123+
v-slot="{dismiss}"
124+
>
125+
Dismissible Alert with custom button!
126+
<CButton
127+
class="position-absolute bg-primary"
128+
style="right:10px;top: 50%;transform: translateY(-50%);"
129+
text="<i>Close</i>"
130+
@click="dismiss"
131+
/>
132+
</CAlert>
133+
134+
<CAlert
135+
:show.sync="dismissibleAlerts[4]"
136+
dismissible="disabled"
137+
>
138+
Disabled dismissible Alert!
139+
</CAlert>
140+
<CButton
141+
@click="showDismissibleAlerts"
142+
variant="info"
143+
class="m-1"
144+
>
145+
Show dismissible alerts
124146
</CButton>
125-
</div>
126147
</CCardBody>
127148
</CCard>
128149
<CCard>
@@ -131,19 +152,20 @@
131152
</CCardHeader>
132153
<CCardBody>
133154
<div>
134-
<CAlert :show="dismissCountDown"
135-
dismissible
136-
variant="warning"
137-
@dismissed="dismissCountdown=0"
138-
@dismiss-count-down="countDownChanged">
139-
Alert will dismiss after <strong>{{dismissCountDown}}</strong> seconds...
155+
<CAlert
156+
:show.sync="dismissCountDown"
157+
dismissible
158+
variant="warning"
159+
fade
160+
>
161+
Alert will dismiss after
162+
<strong>{{dismissCountDown}}</strong> seconds...
140163
</CAlert>
141164

142-
<CAlert :show="dismissCountDown"
165+
<CAlert :show.sync="dismissCountDown"
143166
dismissible
144167
variant="info"
145-
@dismissed="dismissCountdown=0"
146-
@dismiss-count-down="countDownChanged">
168+
>
147169
Alert will dismiss after {{dismissCountDown}} seconds...
148170
<CProgress variant="info"
149171
:max="dismissSecs"
@@ -169,8 +191,11 @@ export default {
169191
data () {
170192
return {
171193
dismissSecs: 10,
172-
dismissCountDown: 0,
173-
showDismissibleAlert: false
194+
dismissCountDown: 10,
195+
dismissibleAlerts: [true, true, true, true, true],
196+
// dismissibleAlert: true,
197+
// dismissibleAlert2: true,
198+
// dismissibleAlert3: true
174199
}
175200
},
176201
methods: {
@@ -179,6 +204,14 @@ export default {
179204
},
180205
showAlert () {
181206
this.dismissCountDown = this.dismissSecs
207+
},
208+
showDismissibleAlerts () {
209+
// this.dismissibleAlert = true
210+
// this.dismissibleAlert2 = true
211+
// this.dismissibleAlert3 = true
212+
this.dismissibleAlerts = this.dismissibleAlerts.map(
213+
alert => alert = true
214+
)
182215
}
183216
}
184217
}

0 commit comments

Comments
 (0)