Skip to content

Commit 32e631e

Browse files
committed
fix: update template
1 parent f6b1ce0 commit 32e631e

File tree

13 files changed

+11462
-1778
lines changed

13 files changed

+11462
-1778
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ Then in file ".env" complete this database configuration:
147147
Then go to `my-project/.env`
148148
And modify this line:
149149

150-
* APP_URL = ;
150+
* APP_URL =
151151

152152
To make it look like this:
153153

154-
* APP_URL = http://example.com/sub-folder;
154+
* APP_URL = http://example.com/sub-folder
155155

156156

157157
### Next step

package-lock.json

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

package.json

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,58 @@
7171
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
7272
},
7373
"dependencies": {
74-
"@coreui/coreui": "3.0.0-beta.3",
75-
"@coreui/coreui-chartjs": "2.0.0-beta.0",
76-
"@coreui/icons": "1.0.0-beta.3",
74+
"@coreui/chartjs": "^2.0.0",
75+
"@coreui/coreui": "^3.0.0",
76+
"@coreui/icons": "^1.0.1",
77+
"@coreui/utils": "^1.2.2",
78+
"@popperjs/core": "^2.0.6",
79+
"chart.js": "^2.9.3",
80+
"perfect-scrollbar": "1.5.0",
7781
"axios": "^0.19.0",
78-
"chart.js": "^2.8.0",
7982
"cropperjs": "^1.5.6",
8083
"laravel-mix": "^5.0.0",
81-
"pace-progress": "1.0.2",
82-
"perfect-scrollbar": "1.4.0"
84+
"pace-progress": "1.0.2"
8385
},
8486
"devDependencies": {
85-
"cross-env": "^6.0.0",
87+
"@babel/cli": "^7.8.4",
88+
"@babel/core": "^7.8.4",
89+
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
90+
"@babel/preset-env": "^7.8.4",
91+
"@coreui/svg-injector": "^1.0.0",
92+
"@coreui/vendors-injector": "^1.0.2",
93+
"autoprefixer": "^9.7.4",
94+
"babel-eslint": "^10.0.3",
95+
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
96+
"browser-sync": "^2.26.7",
97+
"chalk": "^3.0.0",
98+
"clean-css-cli": "^4.3.0",
99+
"copyfiles": "^2.2.0",
100+
"cross-env": "^7.0.0",
101+
"eslint": "^6.8.0",
102+
"eslint-config-xo": "^0.29.1",
103+
"eslint-plugin-import": "^2.20.1",
104+
"eslint-plugin-unicorn": "^16.1.1",
105+
"foreach-cli": "^1.8.1",
106+
"js-beautify": "^1.10.3",
107+
"jsdom": "^16.2.0",
108+
"minimist": "^1.2.0",
109+
"node-sass": "^4.13.1",
110+
"nodemon": "^2.0.2",
111+
"npm-run-all": "^4.1.5",
112+
"postcss-cli": "^7.1.0",
113+
"postcss-combine-duplicated-selectors": "^8.1.0",
114+
"postcss-merge-rules": "^4.0.3",
115+
"pug": "^2.0.4",
86116
"resolve-url-loader": "^3.1.0",
87-
"sass": "^1.23.6",
88-
"sass-loader": "^8.0.0",
117+
"rimraf": "^3.0.2",
118+
"sass-loader": "^8.0.2",
119+
"shelljs": "^0.8.3",
120+
"stylelint": "^13.2.0",
121+
"stylelint-config-recommended-scss": "^4.2.0",
122+
"stylelint-config-standard": "^20.0.0",
123+
"stylelint-order": "^4.0.0",
124+
"stylelint-scss": "^3.14.2",
125+
"sync-glob": "^1.4.0",
89126
"vue-template-compiler": "^2.6.10"
90127
},
91128
"engines": {

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"/css/pace.min.css": "/css/pace.min.css",
88
"/css/coreui-chartjs.css": "/css/coreui-chartjs.css",
99
"/css/cropper.css": "/css/cropper.css",
10+
"/js/coreui-utils.js": "/js/coreui-utils.js",
1011
"/js/axios.min.js": "/js/axios.min.js",
1112
"/js/pace.min.js": "/js/pace.min.js",
1213
"/js/coreui.bundle.min.js": "/js/coreui.bundle.min.js",
1314
"/js/Chart.min.js": "/js/Chart.min.js",
1415
"/js/coreui-chartjs.bundle.js": "/js/coreui-chartjs.bundle.js",
15-
"/js/coreui-chartjs.js": "/js/coreui-chartjs.js",
1616
"/js/cropper.js": "/js/cropper.js",
1717
"/js/main.js": "/js/main.js",
1818
"/js/colors.js": "/js/colors.js",

resources/js/coreui/charts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/**
55
* --------------------------------------------------------------------------
6-
* CoreUI Free Boostrap Admin Template (v3.0.0-alpha.1): main.js
6+
* CoreUI Boostrap Admin Template (v3.0.0): main.js
77
* Licensed under MIT (https://coreui.io/license)
88
* --------------------------------------------------------------------------
99
*/

resources/js/coreui/colors.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/* global rgbToHex */
1+
/* global coreui.Utils.rgbToHex */
22

33
/**
44
* --------------------------------------------------------------------------
5-
* CoreUI Free Boostrap Admin Template (v3.0.0-alpha.1): colors.js
5+
* CoreUI Boostrap Admin Template (v3.0.0): colors.js
66
* Licensed under MIT (https://coreui.io/license)
77
* --------------------------------------------------------------------------
88
*/
@@ -15,7 +15,7 @@ document.querySelectorAll('.theme-color').forEach((element) => {
1515
<table class="w-100">
1616
<tr>
1717
<td class="text-muted">HEX:</td>
18-
<td class="font-weight-bold">${rgbToHex(color)}</td>
18+
<td class="font-weight-bold">${coreui.Utils.rgbToHex(color)}</td>
1919
</tr>
2020
<tr>
2121
<td class="text-muted">RGB:</td>

resources/js/coreui/main.js

Lines changed: 17 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* eslint-disable object-shorthand */
2-
/* global Chart, coreui, getStyle, hexToRgba */
2+
/* global Chart, coreui, coreui.Utils.getStyle, coreui.Utils.hexToRgba */
33

44
/**
55
* --------------------------------------------------------------------------
6-
* CoreUI Free Boostrap Admin Template (v3.0.0-alpha.1): main.js
6+
* CoreUI Boostrap Admin Template (v3.0.0): main.js
77
* Licensed under MIT (https://coreui.io/license)
88
* --------------------------------------------------------------------------
99
*/
@@ -14,18 +14,19 @@ Chart.defaults.global.pointHitDetectionRadius = 1
1414
Chart.defaults.global.tooltips.enabled = false
1515
Chart.defaults.global.tooltips.mode = 'index'
1616
Chart.defaults.global.tooltips.position = 'nearest'
17-
Chart.defaults.global.tooltips.custom = coreui.ChartJS.CustomTooltips
17+
Chart.defaults.global.tooltips.custom = coreui.ChartJS.customTooltips
1818
Chart.defaults.global.defaultFontColor = '#646470'
19+
Chart.defaults.global.responsiveAnimationDuration = 1
1920

2021
document.body.addEventListener('classtoggle', event => {
2122
if (event.detail.className === 'c-dark-theme') {
2223
if (document.body.classList.contains('c-dark-theme')) {
23-
cardChart1.data.datasets[0].pointBackgroundColor = getStyle('--primary-dark-theme')
24-
cardChart2.data.datasets[0].pointBackgroundColor = getStyle('--info-dark-theme')
24+
cardChart1.data.datasets[0].pointBackgroundColor = coreui.Utils.getStyle('--primary-dark-theme')
25+
cardChart2.data.datasets[0].pointBackgroundColor = coreui.Utils.getStyle('--info-dark-theme')
2526
Chart.defaults.global.defaultFontColor = '#fff'
2627
} else {
27-
cardChart1.data.datasets[0].pointBackgroundColor = getStyle('--primary')
28-
cardChart2.data.datasets[0].pointBackgroundColor = getStyle('--info')
28+
cardChart1.data.datasets[0].pointBackgroundColor = coreui.Utils.getStyle('--primary')
29+
cardChart2.data.datasets[0].pointBackgroundColor = coreui.Utils.getStyle('--info')
2930
Chart.defaults.global.defaultFontColor = '#646470'
3031
}
3132

@@ -45,7 +46,7 @@ const cardChart1 = new Chart(document.getElementById('card-chart1'), {
4546
label: 'My First dataset',
4647
backgroundColor: 'transparent',
4748
borderColor: 'rgba(255,255,255,.55)',
48-
pointBackgroundColor: getStyle('--primary'),
49+
pointBackgroundColor: coreui.Utils.getStyle('--primary'),
4950
data: [65, 59, 84, 84, 51, 55, 40]
5051
}
5152
]
@@ -98,7 +99,7 @@ const cardChart2 = new Chart(document.getElementById('card-chart2'), {
9899
label: 'My First dataset',
99100
backgroundColor: 'transparent',
100101
borderColor: 'rgba(255,255,255,.55)',
101-
pointBackgroundColor: getStyle('--info'),
102+
pointBackgroundColor: coreui.Utils.getStyle('--info'),
102103
data: [1, 18, 9, 17, 34, 22, 11]
103104
}
104105
]
@@ -192,7 +193,8 @@ const cardChart4 = new Chart(document.getElementById('card-chart4'), {
192193
label: 'My First dataset',
193194
backgroundColor: 'rgba(255,255,255,.2)',
194195
borderColor: 'rgba(255,255,255,.55)',
195-
data: [78, 81, 80, 45, 34, 12, 40, 85, 65, 23, 12, 98, 34, 84, 67, 82]
196+
data: [78, 81, 80, 45, 34, 12, 40, 85, 65, 23, 12, 98, 34, 84, 67, 82],
197+
barPercentage: 0.6
196198
}
197199
]
198200
},
@@ -203,8 +205,7 @@ const cardChart4 = new Chart(document.getElementById('card-chart4'), {
203205
},
204206
scales: {
205207
xAxes: [{
206-
display: false,
207-
barPercentage: 0.6
208+
display: false
208209
}],
209210
yAxes: [{
210211
display: false
@@ -221,24 +222,24 @@ const mainChart = new Chart(document.getElementById('main-chart'), {
221222
datasets: [
222223
{
223224
label: 'My First dataset',
224-
backgroundColor: hexToRgba(getStyle('--info'), 10),
225-
borderColor: getStyle('--info'),
225+
backgroundColor: coreui.Utils.hexToRgba(coreui.Utils.getStyle('--info'), 10),
226+
borderColor: coreui.Utils.getStyle('--info'),
226227
pointHoverBackgroundColor: '#fff',
227228
borderWidth: 2,
228229
data: [165, 180, 70, 69, 77, 57, 125, 165, 172, 91, 173, 138, 155, 89, 50, 161, 65, 163, 160, 103, 114, 185, 125, 196, 183, 64, 137, 95, 112, 175]
229230
},
230231
{
231232
label: 'My Second dataset',
232233
backgroundColor: 'transparent',
233-
borderColor: getStyle('--success'),
234+
borderColor: coreui.Utils.getStyle('--success'),
234235
pointHoverBackgroundColor: '#fff',
235236
borderWidth: 2,
236237
data: [92, 97, 80, 100, 86, 97, 83, 98, 87, 98, 93, 83, 87, 98, 96, 84, 91, 97, 88, 86, 94, 86, 95, 91, 98, 91, 92, 80, 83, 82]
237238
},
238239
{
239240
label: 'My Third dataset',
240241
backgroundColor: 'transparent',
241-
borderColor: getStyle('--danger'),
242+
borderColor: coreui.Utils.getStyle('--danger'),
242243
pointHoverBackgroundColor: '#fff',
243244
borderWidth: 1,
244245
borderDash: [8, 5],
@@ -276,80 +277,3 @@ const mainChart = new Chart(document.getElementById('main-chart'), {
276277
}
277278
}
278279
})
279-
280-
const brandBoxChartLabels = ['January', 'February', 'March', 'April', 'May', 'June', 'July']
281-
282-
const brandBoxChartOptions = {
283-
responsive: true,
284-
maintainAspectRatio: false,
285-
legend: {
286-
display: false
287-
},
288-
scales: {
289-
xAxes: [{
290-
display:false
291-
}],
292-
yAxes: [{
293-
display:false
294-
}]
295-
},
296-
elements: {
297-
point: {
298-
radius: 0,
299-
hitRadius: 10,
300-
hoverRadius: 4,
301-
hoverBorderWidth: 3
302-
}
303-
}
304-
}
305-
306-
// eslint-disable-next-line no-unused-vars
307-
const brandBoxChart1 = new Chart(document.getElementById('social-box-chart-1'), {
308-
type: 'line',
309-
data: {
310-
labels: brandBoxChartLabels,
311-
datasets: [{
312-
label: 'My First dataset',
313-
backgroundColor: 'rgba(255,255,255,.1)',
314-
borderColor: 'rgba(255,255,255,.55)',
315-
pointHoverBackgroundColor: '#fff',
316-
borderWidth: 2,
317-
data: [65, 59, 84, 84, 51, 55, 40]
318-
}]
319-
},
320-
options: brandBoxChartOptions
321-
})
322-
323-
// eslint-disable-next-line no-unused-vars
324-
const brandBoxChart2 = new Chart(document.getElementById('social-box-chart-2'), {
325-
type: 'line',
326-
data: {
327-
labels: brandBoxChartLabels,
328-
datasets: [{
329-
label: 'My First dataset',
330-
backgroundColor: 'rgba(255,255,255,.1)',
331-
borderColor: 'rgba(255,255,255,.55)',
332-
pointHoverBackgroundColor: '#fff',
333-
borderWidth: 2,
334-
data: [1, 13, 9, 17, 34, 41, 38]
335-
}]
336-
},
337-
options: brandBoxChartOptions
338-
})
339-
340-
// eslint-disable-next-line no-unused-vars
341-
const brandBoxChart3 = new Chart(document.getElementById('social-box-chart-3'), {
342-
type: 'line',
343-
data: {
344-
labels: brandBoxChartLabels,
345-
datasets: [{
346-
label: 'My First dataset',
347-
backgroundColor: 'rgba(255,255,255,.1)',
348-
borderColor: 'rgba(255,255,255,.55)',
349-
pointHoverBackgroundColor: '#fff',
350-
borderWidth: 2,
351-
data: [78, 81, 80, 45, 34, 12, 40]
352-
}]
353-
},
354-
options: brandBoxChartOptions
355-
})

resources/js/coreui/popovers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/**
44
* --------------------------------------------------------------------------
5-
* CoreUI Free Boostrap Admin Template (v3.0.0-alpha.1): popovers.js
5+
* CoreUI Free Boostrap Admin Template (v3.0.0): popovers.js
66
* Licensed under MIT (https://coreui.io/license)
77
* --------------------------------------------------------------------------
88
*/

resources/js/coreui/tooltips.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* --------------------------------------------------------------------------
3-
* CoreUI Free Boostrap Admin Template (v3.0.0-alpha.1): tooltips.js
3+
* CoreUI Free Boostrap Admin Template (v3.0.0): tooltips.js
44
* Licensed under MIT (https://coreui.io/license)
55
* --------------------------------------------------------------------------
66
*/

0 commit comments

Comments
 (0)