Skip to content

Commit 7e9d384

Browse files
woothuwoothu
committed
feat: copy features from pro template
1 parent c68263b commit 7e9d384

File tree

21 files changed

+2994
-3141
lines changed

21 files changed

+2994
-3141
lines changed

‎package-lock.json‎

Lines changed: 2529 additions & 2794 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 26 additions & 26 deletions
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-beta.3",
3+
"version": "3.0.0",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": {
66
"name": "CoreUI",
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"homepage": "http://coreui.io",
18-
"copyright": "Copyright 2019 creativeLabs Łukasz Holeczek",
18+
"copyright": "Copyright 2020 creativeLabs Łukasz Holeczek",
1919
"license": "MIT",
2020
"scripts": {
2121
"serve": "vue-cli-service serve",
@@ -27,33 +27,33 @@
2727
"release": "npm-run-all clearCache lint build test:unit test:e2e"
2828
},
2929
"dependencies": {
30-
"@coreui/coreui": "^3.0.0-beta.4",
31-
"@coreui/icons": "^1.0.0",
32-
"@coreui/utils": "^1.2.2",
33-
"@coreui/vue": "coreui/coreui-vue#521325c669faccc8e3de43f0e01411ea06ecdea4",
34-
"@coreui/vue-chartjs": "^1.0.3",
35-
"vue": "^2.6.11",
36-
"vue-router": "^3.1.5",
37-
"vuex": "^3.1.2"
30+
"@coreui/coreui": "~3.0.0",
31+
"@coreui/icons": "~1.0.1",
32+
"@coreui/utils": "~1.2.2",
33+
"@coreui/vue": "~3.0.0",
34+
"@coreui/vue-chartjs": "~1.0.3",
35+
"vue": "~2.6.11",
36+
"vue-router": "~3.1.5",
37+
"vuex": "~3.1.2"
3838
},
3939
"devDependencies": {
40-
"@babel/core": "^7.8.3",
41-
"@vue/cli-plugin-babel": "^4.1.2",
42-
"@vue/cli-plugin-e2e-nightwatch": "^4.1.2",
43-
"@vue/cli-plugin-eslint": "^4.1.2",
44-
"@vue/cli-plugin-unit-jest": "^4.1.2",
45-
"@vue/cli-service": "^4.1.2",
40+
"@babel/core": "~7.8.4",
41+
"@vue/cli-plugin-babel": "~4.2.2",
42+
"@vue/cli-plugin-e2e-nightwatch": "~4.2.2",
43+
"@vue/cli-plugin-eslint": "~4.2.2",
44+
"@vue/cli-plugin-unit-jest": "~4.2.2",
45+
"@vue/cli-service": "~4.2.2",
4646
"@vue/test-utils": "1.0.0-beta.29",
47-
"babel-eslint": "^10.0.3",
48-
"babel-jest": "^25.1.0",
49-
"chromedriver": "^79.0.2",
50-
"core-js": "^3.6.4",
51-
"eslint": "^6.8.0",
52-
"eslint-plugin-vue": "^6.2.1",
53-
"node-sass": "^4.13.1",
54-
"npm-run-all": "^4.1.5",
55-
"sass-loader": "^8.0.2",
56-
"vue-template-compiler": "^2.6.11"
47+
"babel-eslint": "~10.0.3",
48+
"babel-jest": "~25.1.0",
49+
"chromedriver": "~80.0.1",
50+
"core-js": "~3.6.4",
51+
"eslint": "~6.8.0",
52+
"eslint-plugin-vue": "~6.2.1",
53+
"node-sass": "~4.13.1",
54+
"npm-run-all": "~4.1.5",
55+
"sass-loader": "~8.0.2",
56+
"vue-template-compiler": "~2.6.11"
5757
},
5858
"browserslist": [
5959
"> 1%",

‎src/containers/TheContainer.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="c-app">
33
<TheSidebar/>
4-
<div class="c-wrapper c-fixed-components">
4+
<CWrapper>
55
<TheHeader/>
66
<div class="c-body">
77
<main class="c-main">
@@ -13,7 +13,7 @@
1313
</main>
1414
<TheFooter/>
1515
</div>
16-
</div>
16+
</CWrapper>
1717
</div>
1818
</template>
1919

‎src/containers/TheFooter.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<CFooter :fixed="false">
33
<div>
44
<a href="https://coreui.io" target="_blank">CoreUI</a>
5-
<span class="ml-1">&copy; 2020 creativeLabs.</span>
5+
<span class="ml-1">&copy; {{new Date().getFullYear()}} creativeLabs.</span>
66
</div>
77
<div class="ml-auto">
88
<span class="mr-1">Powered by</span>

‎src/containers/_nav.js‎

Lines changed: 29 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -40,83 +40,67 @@ export default [
4040
items: [
4141
{
4242
name: 'Breadcrumbs',
43-
to: '/base/breadcrumbs',
44-
icon: 'cil-puzzle'
43+
to: '/base/breadcrumbs'
4544
},
4645
{
4746
name: 'Cards',
48-
to: '/base/cards',
49-
icon: 'cil-puzzle'
47+
to: '/base/cards'
5048
},
5149
{
5250
name: 'Carousels',
53-
to: '/base/carousels',
54-
icon: 'cil-puzzle'
51+
to: '/base/carousels'
5552
},
5653
{
5754
name: 'Collapses',
58-
to: '/base/collapses',
59-
icon: 'cil-puzzle'
55+
to: '/base/collapses'
6056
},
6157
{
6258
name: 'Forms',
63-
to: '/base/forms',
64-
icon: 'cil-puzzle'
59+
to: '/base/forms'
6560
},
6661
{
6762
name: 'Jumbotrons',
68-
to: '/base/jumbotrons',
69-
icon: 'cil-puzzle'
63+
to: '/base/jumbotrons'
7064
},
7165
{
7266
name: 'List Groups',
73-
to: '/base/list-groups',
74-
icon: 'cil-puzzle'
67+
to: '/base/list-groups'
7568
},
7669
{
7770
name: 'Navs',
78-
to: '/base/navs',
79-
icon: 'cil-puzzle'
71+
to: '/base/navs'
8072
},
8173
{
8274
name: 'Navbars',
83-
to: '/base/navbars',
84-
icon: 'cil-puzzle'
75+
to: '/base/navbars'
8576
},
8677
{
8778
name: 'Paginations',
88-
to: '/base/paginations',
89-
icon: 'cil-puzzle'
79+
to: '/base/paginations'
9080
},
9181
{
9282
name: 'Popovers',
93-
to: '/base/popovers',
94-
icon: 'cil-puzzle'
83+
to: '/base/popovers'
9584
},
9685
{
9786
name: 'Progress Bars',
98-
to: '/base/progress-bars',
99-
icon: 'cil-puzzle'
87+
to: '/base/progress-bars'
10088
},
10189
{
10290
name: 'Switches',
103-
to: '/base/switches',
104-
icon: 'cil-puzzle'
91+
to: '/base/switches'
10592
},
10693
{
10794
name: 'Tables',
108-
to: '/base/tables',
109-
icon: 'cil-puzzle'
95+
to: '/base/tables'
11096
},
11197
{
11298
name: 'Tabs',
113-
to: '/base/tabs',
114-
icon: 'cil-puzzle'
99+
to: '/base/tabs'
115100
},
116101
{
117102
name: 'Tooltips',
118-
to: '/base/tooltips',
119-
icon: 'cil-puzzle'
103+
to: '/base/tooltips'
120104
}
121105
]
122106
},
@@ -128,23 +112,19 @@ export default [
128112
items: [
129113
{
130114
name: 'Buttons',
131-
to: '/buttons/standard-buttons',
132-
icon: 'cil-cursor'
115+
to: '/buttons/standard-buttons'
133116
},
134117
{
135118
name: 'Button Dropdowns',
136-
to: '/buttons/dropdowns',
137-
icon: 'cil-cursor'
119+
to: '/buttons/dropdowns'
138120
},
139121
{
140122
name: 'Button Groups',
141-
to: '/buttons/button-groups',
142-
icon: 'cil-cursor'
123+
to: '/buttons/button-groups'
143124
},
144125
{
145126
name: 'Brand Buttons',
146-
to: '/buttons/brand-buttons',
147-
icon: 'cil-cursor'
127+
to: '/buttons/brand-buttons'
148128
}
149129
]
150130
},
@@ -163,21 +143,18 @@ export default [
163143
{
164144
name: 'CoreUI Icons',
165145
to: '/icons/coreui-icons',
166-
icon: 'cil-star',
167146
badge: {
168147
color: 'info',
169148
text: 'NEW'
170149
}
171150
},
172151
{
173152
name: 'Brands',
174-
to: '/icons/brands',
175-
icon: 'cil-star'
153+
to: '/icons/brands'
176154
},
177155
{
178156
name: 'Flags',
179-
to: '/icons/flags',
180-
icon: 'cil-star'
157+
to: '/icons/flags'
181158
}
182159
]
183160
},
@@ -189,18 +166,15 @@ export default [
189166
items: [
190167
{
191168
name: 'Alerts',
192-
to: '/notifications/alerts',
193-
icon: 'cil-bell'
169+
to: '/notifications/alerts'
194170
},
195171
{
196172
name: 'Badges',
197-
to: '/notifications/badges',
198-
icon: 'cil-bell'
173+
to: '/notifications/badges'
199174
},
200175
{
201176
name: 'Modals',
202-
to: '/notifications/modals',
203-
icon: 'cil-bell'
177+
to: '/notifications/modals'
204178
}
205179
]
206180
},
@@ -231,23 +205,19 @@ export default [
231205
items: [
232206
{
233207
name: 'Login',
234-
to: '/pages/login',
235-
icon: 'cil-star'
208+
to: '/pages/login'
236209
},
237210
{
238211
name: 'Register',
239-
to: '/pages/register',
240-
icon: 'cil-star'
212+
to: '/pages/register'
241213
},
242214
{
243215
name: 'Error 404',
244-
to: '/pages/404',
245-
icon: 'cil-star'
216+
to: '/pages/404'
246217
},
247218
{
248219
name: 'Error 500',
249-
to: '/pages/500',
250-
icon: 'cil-star'
220+
to: '/pages/500'
251221
}
252222
]
253223
},

‎src/main.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'core-js/stable'
22
import Vue from 'vue'
33
import App from './App'
44
import router from './router'
5-
import CoreuiVue from '@coreui/vue/src'
5+
import CoreuiVue from '@coreui/vue'
66
import { iconsSet as icons } from './assets/icons/icons.js'
77
import store from './store'
88

‎src/views/base/Collapses.vue‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@
3737
</CCollapse>
3838
</CCardBody>
3939
</CCard>
40+
<CCard>
41+
<CCardHeader @click.native="cardCollapse = !cardCollapse">
42+
<strong>Collapsible card</strong>
43+
</CCardHeader>
44+
<CCardBody>
45+
<CCollapse :show="cardCollapse" class="mt-2">
46+
<CCardText>Collapse contents Here</CCardText>
47+
</CCollapse>
48+
</CCardBody>
49+
</CCard>
4050
</CCol>
4151
</CRow>
4252
</template>
@@ -47,6 +57,7 @@ export default {
4757
data () {
4858
return {
4959
collapse: false,
60+
cardCollapse: true,
5061
innerCollapse: false,
5162
text: `
5263
Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry

‎src/views/base/Paginations.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<CCard>
44
<CCardHeader>
55
<CIcon name="cil-justify-center"/>
6-
<strong> Responsive bootstrap Pagination</strong>
6+
<strong> Pagination </strong>
7+
<small>size</small>
78
<div class="card-header-actions">
89
<a
910
href="https://coreui.io/vue/docs/components/pagination"
@@ -31,7 +32,7 @@
3132
:pages="10"/>
3233
<br>
3334

34-
<div>
35+
<div class="d-md-down-none">
3536
<h6>Large</h6>
3637
<CPagination
3738
size="lg"
@@ -86,7 +87,7 @@ export default {
8687
name: 'Paginations',
8788
data () {
8889
return {
89-
currentPage: 3,
90+
currentPage: 3
9091
}
9192
}
9293
}

‎src/views/charts/MainChartExample.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<script>
1010
import { CChartLine } from '@coreui/vue-chartjs'
11-
import { getColor, hexToRgba } from '@coreui/utils/src'
11+
import { getStyle, hexToRgba } from '@coreui/utils/src'
1212
1313
function random (min, max) {
1414
return Math.floor(Math.random() * (max - min + 1) + min)
@@ -21,9 +21,9 @@ export default {
2121
},
2222
computed: {
2323
defaultDatasets () {
24-
const brandSuccess = getColor('success') || '#4dbd74'
25-
const brandInfo = getColor('info') || '#20a8d8'
26-
const brandDanger = getColor('danger') || '#f86c6b'
24+
const brandSuccess = getStyle('success2') || '#4dbd74'
25+
const brandInfo = getStyle('info') || '#20a8d8'
26+
const brandDanger = getStyle('danger') || '#f86c6b'
2727
2828
let elements = 27
2929
const data1 = []

0 commit comments

Comments
 (0)