Skip to content

Commit c6ae3df

Browse files
authored
Merge pull request #86 from maisamaf/feature/v4.0.0
feature/v4.0.0
2 parents a4a2ac0 + ba87a33 commit c6ae3df

File tree

100 files changed

+2567
-3465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+2567
-3465
lines changed

CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
## [3.1.0] 2023-05-31
1+
## [4.0.0] 2024-02-22
22

3-
- Update dependencies & devDependencies
4-
- Add two-way binding support for `ArgonInput`
3+
- Update dependencies and devDependencies
4+
- Refactor code from `options api` to `composition api`
5+
- Add two-way binding to `ArgonInput`
6+
- Add new component: `DefaultCounterCard`
57

68
## [3.0.0] 2022-05-26
79

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [Vue Argon Dashboard 2](http://demos.creative-tim.com/vue-argon-dashboard/?ref=readme-vad) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?url=https://www.creative-tim.com/product/vue-argon-dashboard&text=Check%20Vue%Argon%20Dashboard%20made%20by%20@CreativeTim%20#webdesign%20#dashboard%20#argondesign%20#vue%20https://www.creative-tim.com/product/vue-argon-dashboard)
22

3-
![version](https://img.shields.io/badge/version-3.1.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-argon-dashboard.svg)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-argon-dashboard.svg)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aissue+is%3Aclosed)
3+
![version](https://img.shields.io/badge/version-4.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-argon-dashboard.svg)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-argon-dashboard.svg)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aissue+is%3Aclosed)
44

55
![Image](https://s3.amazonaws.com/creativetim_bucket/products/156/original/vue-argon-dashboard.jpg)
66

package.json

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-argon-dashboard-2",
3-
"version": "3.1.0",
3+
"version": "4.0.0",
44
"private": true,
55
"author": "Creative Tim",
66
"license": "SEE LICENSE IN <https://www.creative-tim.com/license>",
@@ -21,29 +21,33 @@
2121
},
2222
"dependencies": {
2323
"@popperjs/core": "2.11.8",
24-
"bootstrap": "5.3.0",
25-
"chart.js": "4.3.0",
26-
"core-js": "3.30.2",
24+
"bootstrap": "5.3.3",
25+
"chart.js": "4.4.1",
26+
"core-js": "3.36.0",
2727
"dropzone": "6.0.0-beta.2",
2828
"quill": "1.3.7",
29-
"vue": "3.3.4",
30-
"vue-flatpickr-component": "11.0.3",
31-
"vue-router": "4.2.2",
29+
"vue": "3.4.19",
30+
"vue-count-to": "1.0.13",
31+
"vue-flatpickr-component": "11.0.4",
32+
"vue-router": "4.3.0",
3233
"vuex": "4.1.0"
3334
},
3435
"devDependencies": {
36+
"@babel/eslint-parser": "7.23.10",
3537
"@vue/cli-plugin-babel": "5.0.8",
3638
"@vue/cli-plugin-eslint": "5.0.8",
3739
"@vue/cli-plugin-router": "5.0.8",
3840
"@vue/cli-service": "5.0.8",
39-
"@vue/compiler-sfc": "3.3.4",
40-
"@vue/eslint-config-prettier": "7.1.0",
41-
"@babel/eslint-parser": "7.21.8",
42-
"eslint": "8.41.0",
43-
"eslint-plugin-prettier": "4.2.1",
44-
"eslint-plugin-vue": "9.14.1",
45-
"prettier": "2.8.8",
46-
"sass": "1.62.1",
47-
"sass-loader": "13.3.1"
41+
"@vue/compiler-sfc": "3.4.19",
42+
"@vue/eslint-config-prettier": "9.0.0",
43+
"eslint": "8.56.0",
44+
"eslint-plugin-prettier": "5.1.3",
45+
"eslint-plugin-vue": "9.21.1",
46+
"prettier": "3.2.5",
47+
"sass": "1.71.1",
48+
"sass-loader": "13.3.2"
49+
},
50+
"engines": {
51+
"node": ">=8 <=21"
4852
}
4953
}

public/index.html

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!--
22
=========================================================
3-
* Vue Argon Dashboard 2 - v3.0.1
3+
* Vue Argon Dashboard 2 - v4.0.0
44
=========================================================
55
66
* Product Page: https://creative-tim.com/product/vue-argon-dashboard
7-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
@@ -13,12 +13,10 @@
1313
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1414
-->
1515

16-
<!DOCTYPE html>
16+
<!doctype html>
1717

1818
<html lang="">
19-
2019
<head>
21-
2220
<meta charset="utf-8" />
2321

2422
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -47,25 +45,18 @@
4745
/>
4846

4947
<script async defer src="https://buttons.github.io/buttons.js"></script>
50-
5148
</head>
5249

5350
<body class="bg-gray-100">
54-
5551
<noscript>
56-
5752
<strong>
58-
We're sorry but Vue Argon Dashboard 2 doesn't work properly without JavaScript
59-
enabled. Please enable it to continue.
53+
We're sorry but Vue Argon Dashboard 2 doesn't work properly without
54+
JavaScript enabled. Please enable it to continue.
6055
</strong>
61-
6256
</noscript>
6357

6458
<div id="app" class="g-sidenav-show"></div>
6559

6660
<!-- built files will be auto injected -->
67-
6861
</body>
69-
7062
</html>
71-

src/App.vue

Lines changed: 37 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,70 @@
11
<!--
22
=========================================================
3-
* Vue Argon Dashboard 2 - v3.0.1
3+
* Vue Argon Dashboard 2 - v4.0.0
44
=========================================================
55
66
* Product Page: https://creative-tim.com/product/vue-argon-dashboard
7-
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
7+
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
88
99
Coded by www.creative-tim.com
1010
1111
=========================================================
1212
1313
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
1414
-->
15+
<script setup>
16+
import { computed } from "vue";
17+
import { useStore } from "vuex";
18+
import Sidenav from "./examples/Sidenav";
19+
import Configurator from "@/examples/Configurator.vue";
20+
import Navbar from "@/examples/Navbars/Navbar.vue";
21+
import AppFooter from "@/examples/Footer.vue";
1522
23+
const store = useStore();
24+
const isNavFixed = computed(() => store.state.isNavFixed);
25+
const darkMode = computed(() => store.state.darkMode);
26+
const isAbsolute = computed(() => store.state.isAbsolute);
27+
const showSidenav = computed(() => store.state.showSidenav);
28+
const layout = computed(() => store.state.layout);
29+
const showNavbar = computed(() => store.state.showNavbar);
30+
const showFooter = computed(() => store.state.showFooter);
31+
const showConfig = computed(() => store.state.showConfig);
32+
const hideConfigButton = computed(() => store.state.hideConfigButton);
33+
const toggleConfigurator = () => store.commit("toggleConfigurator");
34+
35+
const navClasses = computed(() => {
36+
return {
37+
"position-sticky bg-white left-auto top-2 z-index-sticky":
38+
isNavFixed.value && !darkMode.value,
39+
"position-sticky bg-default left-auto top-2 z-index-sticky":
40+
isNavFixed.value && darkMode.value,
41+
"position-absolute px-4 mx-0 w-100 z-index-2": isAbsolute.value,
42+
"px-0 mx-4": !isAbsolute.value,
43+
};
44+
});
45+
</script>
1646
<template>
17-
1847
<div
19-
v-show="this.$store.state.layout === 'landing'"
48+
v-show="layout === 'landing'"
2049
class="landing-bg h-100 bg-gradient-primary position-fixed w-100"
2150
></div>
2251

23-
<sidenav
24-
:custom_class="this.$store.state.mcolor"
25-
:class="[
26-
this.$store.state.isTransparent,
27-
this.$store.state.isRTL ? 'fixed-end' : 'fixed-start',
28-
]"
29-
v-if="this.$store.state.showSidenav"
30-
/>
52+
<sidenav v-if="showSidenav" />
3153

3254
<main
3355
class="main-content position-relative max-height-vh-100 h-100 border-radius-lg"
3456
>
35-
3657
<!-- nav -->
3758

38-
<navbar
39-
:class="[navClasses]"
40-
:textWhite="
41-
this.$store.state.isAbsolute ? 'text-white opacity-8' : 'text-white'
42-
"
43-
:minNav="navbarMinimize"
44-
v-if="this.$store.state.showNavbar"
45-
/>
59+
<navbar :class="[navClasses]" v-if="showNavbar" />
4660

4761
<router-view />
4862

49-
<app-footer v-show="this.$store.state.showFooter" />
63+
<app-footer v-show="showFooter" />
5064

5165
<configurator
5266
:toggle="toggleConfigurator"
53-
:class="[
54-
this.$store.state.showConfig ? 'show' : '',
55-
this.$store.state.hideConfigButton ? 'd-none' : '',
56-
]"
67+
:class="[showConfig ? 'show' : '', hideConfigButton ? 'd-none' : '']"
5768
/>
58-
5969
</main>
60-
6170
</template>
62-
63-
<script>
64-
import Sidenav from "./examples/Sidenav";
65-
import Configurator from "@/examples/Configurator.vue";
66-
import Navbar from "@/examples/Navbars/Navbar.vue";
67-
import AppFooter from "@/examples/Footer.vue";
68-
import { mapMutations } from "vuex";
69-
70-
export default {
71-
name: "App",
72-
components: {
73-
Sidenav,
74-
Configurator,
75-
Navbar,
76-
AppFooter,
77-
},
78-
methods: {
79-
...mapMutations(["toggleConfigurator", "navbarMinimize"]),
80-
},
81-
computed: {
82-
navClasses() {
83-
return {
84-
"position-sticky bg-white left-auto top-2 z-index-sticky":
85-
this.$store.state.isNavFixed && !this.$store.state.darkMode,
86-
"position-sticky bg-default left-auto top-2 z-index-sticky":
87-
this.$store.state.isNavFixed && this.$store.state.darkMode,
88-
"position-absolute px-4 mx-0 w-100 z-index-2": this.$store.state
89-
.isAbsolute,
90-
"px-0 mx-4": !this.$store.state.isAbsolute,
91-
};
92-
},
93-
},
94-
beforeMount() {
95-
this.$store.state.isTransparent = "bg-transparent";
96-
},
97-
};
98-
</script>
99-

src/assets/css/nucleo-icons.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ License - nucleoapp.com/license/
77
@font-face {
88
font-family: "NucleoIcons";
99
src: url("../fonts/nucleo-icons.eot");
10-
src: url("../fonts/nucleo-icons.eot") format("embedded-opentype"),
10+
src:
11+
url("../fonts/nucleo-icons.eot") format("embedded-opentype"),
1112
url("../fonts/nucleo-icons.woff2") format("woff2"),
1213
url("../fonts/nucleo-icons.woff") format("woff"),
1314
url("../fonts/nucleo-icons.ttf") format("truetype"),

src/assets/js/dark-mode.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const sidebarWhite = document.querySelectorAll(".sidenav.bg-white");
55
const hr_card = document.querySelectorAll("div:not(.bg-gradient-dark) hr");
66
const text_btn = document.querySelectorAll("button:not(.btn) > .text-dark");
77
const text_span = document.querySelectorAll(
8-
"span.text-dark, .breadcrumb .text-dark"
8+
"span.text-dark, .breadcrumb .text-dark",
99
);
1010
const text_span_white = document.querySelectorAll("span.text-white");
1111
const text_strong = document.querySelectorAll("strong.text-dark");
@@ -15,16 +15,16 @@ const secondary = document.querySelectorAll(".text-secondary");
1515
const bg_gray_100 = document.querySelectorAll(".bg-gray-100");
1616
const bg_gray_600 = document.querySelectorAll(".bg-gray-600");
1717
const btn_text_dark = document.querySelectorAll(
18-
".btn.btn-link.text-dark, .btn .ni.text-dark"
18+
".btn.btn-link.text-dark, .btn .ni.text-dark",
1919
);
2020
const btn_text_white = document.querySelectorAll(
21-
".btn.btn-link.text-white, .btn .ni.text-white"
21+
".btn.btn-link.text-white, .btn .ni.text-white",
2222
);
2323
const card_border = document.querySelectorAll(".card.border");
2424
const card_border_dark = document.querySelectorAll(".card.border.border-dark");
2525
const svg = document.querySelectorAll("g");
2626
const navLinks = document.querySelectorAll(
27-
".navbar-main .nav-link, .navbar-main .breadcrumb-item, .navbar-main .breadcrumb-item a, .navbar-main h6"
27+
".navbar-main .nav-link, .navbar-main .breadcrumb-item, .navbar-main .breadcrumb-item a, .navbar-main h6",
2828
);
2929
const cardNavLinksIcons = document.querySelectorAll(".card .nav .nav-link i");
3030
const cardNavSpan = document.querySelectorAll(".card .nav .nav-link span");

src/assets/js/nav-pills.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ export default function setNavPills() {
3535
if (item.classList.contains("flex-column")) {
3636
for (var j = 1; j <= nodes.indexOf(li); j++) {
3737
sum += item.querySelector(
38-
"li:nth-child(" + j + ")"
38+
"li:nth-child(" + j + ")",
3939
).offsetHeight;
4040
}
4141
moving_div.style.transform =
4242
"translate3d(0px," + sum + "px, 0px)";
4343
moving_div.style.height = item.querySelector(
44-
"li:nth-child(" + j + ")"
44+
"li:nth-child(" + j + ")",
4545
).offsetHeight;
4646
} else {
4747
for (var j = 1; j <= nodes.indexOf(li); j++) {
4848
sum += item.querySelector(
49-
"li:nth-child(" + j + ")"
49+
"li:nth-child(" + j + ")",
5050
).offsetWidth;
5151
}
5252
moving_div.style.transform =
@@ -98,7 +98,7 @@ export default function setNavPills() {
9898
item.querySelector("li:nth-child(" + index + ")").offsetWidth +
9999
"px";
100100
moving_div.style.height = item.querySelector(
101-
"li:nth-child(" + j + ")"
101+
"li:nth-child(" + j + ")",
102102
).offsetHeight;
103103
} else {
104104
for (var j = 1; j <= nodes.indexOf(li); j++) {

src/assets/js/tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import bootstrap from "bootstrap/dist/js/bootstrap";
33
// initialization of Tooltips
44
export default function setTooltip() {
55
var tooltipTriggerList = [].slice.call(
6-
document.querySelectorAll('[data-bs-toggle="tooltip"]')
6+
document.querySelectorAll('[data-bs-toggle="tooltip"]'),
77
);
88
// eslint-disable-next-line no-unused-vars
99
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {

src/assets/scss/argon-dashboard/_dark-version.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,13 @@
122122
&.input-group-static {
123123
.form-control {
124124
background-image: $dark-version-input-bg-image !important;
125-
background-size: 0 100%, 100% 100%;
125+
background-size:
126+
0 100%,
127+
100% 100%;
126128
&:focus {
127-
background-size: 100% 100%, 100% 100%;
129+
background-size:
130+
100% 100%,
131+
100% 100%;
128132
}
129133
}
130134
}

0 commit comments

Comments
 (0)