Skip to content

Commit

Permalink
Merge pull request #86 from maisamaf/feature/v4.0.0
Browse files Browse the repository at this point in the history
feature/v4.0.0
  • Loading branch information
sajadevo authored Feb 27, 2024
2 parents a4a2ac0 + ba87a33 commit c6ae3df
Show file tree
Hide file tree
Showing 100 changed files with 2,567 additions and 3,465 deletions.
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
## [3.1.0] 2023-05-31
## [4.0.0] 2024-02-22

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

## [3.0.0] 2022-05-26

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [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)

![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)
![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)

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

Expand Down
36 changes: 20 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-argon-dashboard-2",
"version": "3.1.0",
"version": "4.0.0",
"private": true,
"author": "Creative Tim",
"license": "SEE LICENSE IN <https://www.creative-tim.com/license>",
Expand All @@ -21,29 +21,33 @@
},
"dependencies": {
"@popperjs/core": "2.11.8",
"bootstrap": "5.3.0",
"chart.js": "4.3.0",
"core-js": "3.30.2",
"bootstrap": "5.3.3",
"chart.js": "4.4.1",
"core-js": "3.36.0",
"dropzone": "6.0.0-beta.2",
"quill": "1.3.7",
"vue": "3.3.4",
"vue-flatpickr-component": "11.0.3",
"vue-router": "4.2.2",
"vue": "3.4.19",
"vue-count-to": "1.0.13",
"vue-flatpickr-component": "11.0.4",
"vue-router": "4.3.0",
"vuex": "4.1.0"
},
"devDependencies": {
"@babel/eslint-parser": "7.23.10",
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-router": "5.0.8",
"@vue/cli-service": "5.0.8",
"@vue/compiler-sfc": "3.3.4",
"@vue/eslint-config-prettier": "7.1.0",
"@babel/eslint-parser": "7.21.8",
"eslint": "8.41.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "9.14.1",
"prettier": "2.8.8",
"sass": "1.62.1",
"sass-loader": "13.3.1"
"@vue/compiler-sfc": "3.4.19",
"@vue/eslint-config-prettier": "9.0.0",
"eslint": "8.56.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-vue": "9.21.1",
"prettier": "3.2.5",
"sass": "1.71.1",
"sass-loader": "13.3.2"
},
"engines": {
"node": ">=8 <=21"
}
}
19 changes: 5 additions & 14 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!--
=========================================================
* Vue Argon Dashboard 2 - v3.0.1
* Vue Argon Dashboard 2 - v4.0.0
=========================================================
* Product Page: https://creative-tim.com/product/vue-argon-dashboard
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
Coded by www.creative-tim.com
Expand All @@ -13,12 +13,10 @@
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-->

<!DOCTYPE html>
<!doctype html>

<html lang="">

<head>

<meta charset="utf-8" />

<meta http-equiv="X-UA-Compatible" content="IE=edge" />
Expand Down Expand Up @@ -47,25 +45,18 @@
/>

<script async defer src="https://buttons.github.io/buttons.js"></script>

</head>

<body class="bg-gray-100">

<noscript>

<strong>
We're sorry but Vue Argon Dashboard 2 doesn't work properly without JavaScript
enabled. Please enable it to continue.
We're sorry but Vue Argon Dashboard 2 doesn't work properly without
JavaScript enabled. Please enable it to continue.
</strong>

</noscript>

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

<!-- built files will be auto injected -->

</body>

</html>

103 changes: 37 additions & 66 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,99 +1,70 @@
<!--
=========================================================
* Vue Argon Dashboard 2 - v3.0.1
* Vue Argon Dashboard 2 - v4.0.0
=========================================================

* Product Page: https://creative-tim.com/product/vue-argon-dashboard
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)

Coded by www.creative-tim.com

=========================================================

* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-->
<script setup>
import { computed } from "vue";
import { useStore } from "vuex";
import Sidenav from "./examples/Sidenav";
import Configurator from "@/examples/Configurator.vue";
import Navbar from "@/examples/Navbars/Navbar.vue";
import AppFooter from "@/examples/Footer.vue";

const store = useStore();
const isNavFixed = computed(() => store.state.isNavFixed);
const darkMode = computed(() => store.state.darkMode);
const isAbsolute = computed(() => store.state.isAbsolute);
const showSidenav = computed(() => store.state.showSidenav);
const layout = computed(() => store.state.layout);
const showNavbar = computed(() => store.state.showNavbar);
const showFooter = computed(() => store.state.showFooter);
const showConfig = computed(() => store.state.showConfig);
const hideConfigButton = computed(() => store.state.hideConfigButton);
const toggleConfigurator = () => store.commit("toggleConfigurator");

const navClasses = computed(() => {
return {
"position-sticky bg-white left-auto top-2 z-index-sticky":
isNavFixed.value && !darkMode.value,
"position-sticky bg-default left-auto top-2 z-index-sticky":
isNavFixed.value && darkMode.value,
"position-absolute px-4 mx-0 w-100 z-index-2": isAbsolute.value,
"px-0 mx-4": !isAbsolute.value,
};
});
</script>
<template>

<div
v-show="this.$store.state.layout === 'landing'"
v-show="layout === 'landing'"
class="landing-bg h-100 bg-gradient-primary position-fixed w-100"
></div>

<sidenav
:custom_class="this.$store.state.mcolor"
:class="[
this.$store.state.isTransparent,
this.$store.state.isRTL ? 'fixed-end' : 'fixed-start',
]"
v-if="this.$store.state.showSidenav"
/>
<sidenav v-if="showSidenav" />

<main
class="main-content position-relative max-height-vh-100 h-100 border-radius-lg"
>

<!-- nav -->

<navbar
:class="[navClasses]"
:textWhite="
this.$store.state.isAbsolute ? 'text-white opacity-8' : 'text-white'
"
:minNav="navbarMinimize"
v-if="this.$store.state.showNavbar"
/>
<navbar :class="[navClasses]" v-if="showNavbar" />

<router-view />

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

<configurator
:toggle="toggleConfigurator"
:class="[
this.$store.state.showConfig ? 'show' : '',
this.$store.state.hideConfigButton ? 'd-none' : '',
]"
:class="[showConfig ? 'show' : '', hideConfigButton ? 'd-none' : '']"
/>

</main>

</template>

<script>
import Sidenav from "./examples/Sidenav";
import Configurator from "@/examples/Configurator.vue";
import Navbar from "@/examples/Navbars/Navbar.vue";
import AppFooter from "@/examples/Footer.vue";
import { mapMutations } from "vuex";

export default {
name: "App",
components: {
Sidenav,
Configurator,
Navbar,
AppFooter,
},
methods: {
...mapMutations(["toggleConfigurator", "navbarMinimize"]),
},
computed: {
navClasses() {
return {
"position-sticky bg-white left-auto top-2 z-index-sticky":
this.$store.state.isNavFixed && !this.$store.state.darkMode,
"position-sticky bg-default left-auto top-2 z-index-sticky":
this.$store.state.isNavFixed && this.$store.state.darkMode,
"position-absolute px-4 mx-0 w-100 z-index-2": this.$store.state
.isAbsolute,
"px-0 mx-4": !this.$store.state.isAbsolute,
};
},
},
beforeMount() {
this.$store.state.isTransparent = "bg-transparent";
},
};
</script>

3 changes: 2 additions & 1 deletion src/assets/css/nucleo-icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ License - nucleoapp.com/license/
@font-face {
font-family: "NucleoIcons";
src: url("../fonts/nucleo-icons.eot");
src: url("../fonts/nucleo-icons.eot") format("embedded-opentype"),
src:
url("../fonts/nucleo-icons.eot") format("embedded-opentype"),
url("../fonts/nucleo-icons.woff2") format("woff2"),
url("../fonts/nucleo-icons.woff") format("woff"),
url("../fonts/nucleo-icons.ttf") format("truetype"),
Expand Down
8 changes: 4 additions & 4 deletions src/assets/js/dark-mode.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const sidebarWhite = document.querySelectorAll(".sidenav.bg-white");
const hr_card = document.querySelectorAll("div:not(.bg-gradient-dark) hr");
const text_btn = document.querySelectorAll("button:not(.btn) > .text-dark");
const text_span = document.querySelectorAll(
"span.text-dark, .breadcrumb .text-dark"
"span.text-dark, .breadcrumb .text-dark",
);
const text_span_white = document.querySelectorAll("span.text-white");
const text_strong = document.querySelectorAll("strong.text-dark");
Expand All @@ -15,16 +15,16 @@ const secondary = document.querySelectorAll(".text-secondary");
const bg_gray_100 = document.querySelectorAll(".bg-gray-100");
const bg_gray_600 = document.querySelectorAll(".bg-gray-600");
const btn_text_dark = document.querySelectorAll(
".btn.btn-link.text-dark, .btn .ni.text-dark"
".btn.btn-link.text-dark, .btn .ni.text-dark",
);
const btn_text_white = document.querySelectorAll(
".btn.btn-link.text-white, .btn .ni.text-white"
".btn.btn-link.text-white, .btn .ni.text-white",
);
const card_border = document.querySelectorAll(".card.border");
const card_border_dark = document.querySelectorAll(".card.border.border-dark");
const svg = document.querySelectorAll("g");
const navLinks = document.querySelectorAll(
".navbar-main .nav-link, .navbar-main .breadcrumb-item, .navbar-main .breadcrumb-item a, .navbar-main h6"
".navbar-main .nav-link, .navbar-main .breadcrumb-item, .navbar-main .breadcrumb-item a, .navbar-main h6",
);
const cardNavLinksIcons = document.querySelectorAll(".card .nav .nav-link i");
const cardNavSpan = document.querySelectorAll(".card .nav .nav-link span");
Expand Down
8 changes: 4 additions & 4 deletions src/assets/js/nav-pills.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ export default function setNavPills() {
if (item.classList.contains("flex-column")) {
for (var j = 1; j <= nodes.indexOf(li); j++) {
sum += item.querySelector(
"li:nth-child(" + j + ")"
"li:nth-child(" + j + ")",
).offsetHeight;
}
moving_div.style.transform =
"translate3d(0px," + sum + "px, 0px)";
moving_div.style.height = item.querySelector(
"li:nth-child(" + j + ")"
"li:nth-child(" + j + ")",
).offsetHeight;
} else {
for (var j = 1; j <= nodes.indexOf(li); j++) {
sum += item.querySelector(
"li:nth-child(" + j + ")"
"li:nth-child(" + j + ")",
).offsetWidth;
}
moving_div.style.transform =
Expand Down Expand Up @@ -98,7 +98,7 @@ export default function setNavPills() {
item.querySelector("li:nth-child(" + index + ")").offsetWidth +
"px";
moving_div.style.height = item.querySelector(
"li:nth-child(" + j + ")"
"li:nth-child(" + j + ")",
).offsetHeight;
} else {
for (var j = 1; j <= nodes.indexOf(li); j++) {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import bootstrap from "bootstrap/dist/js/bootstrap";
// initialization of Tooltips
export default function setTooltip() {
var tooltipTriggerList = [].slice.call(
document.querySelectorAll('[data-bs-toggle="tooltip"]')
document.querySelectorAll('[data-bs-toggle="tooltip"]'),
);
// eslint-disable-next-line no-unused-vars
var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
Expand Down
8 changes: 6 additions & 2 deletions src/assets/scss/argon-dashboard/_dark-version.scss
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,13 @@
&.input-group-static {
.form-control {
background-image: $dark-version-input-bg-image !important;
background-size: 0 100%, 100% 100%;
background-size:
0 100%,
100% 100%;
&:focus {
background-size: 100% 100%, 100% 100%;
background-size:
100% 100%,
100% 100%;
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/assets/scss/argon-dashboard/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@
}

.dropdown-item {
transition: background-color $dropdown-transition-time,
transition:
background-color $dropdown-transition-time,
color $dropdown-transition-time;
}
}
Expand Down Expand Up @@ -289,7 +290,10 @@
0% {
opacity: 0;
transform: translate(0, 10px) perspective(200px);
transition: visibility 0.25s, opacity 0.25s, transform 0.25s;
transition:
visibility 0.25s,
opacity 0.25s,
transform 0.25s;
}

100% {
Expand Down
3 changes: 2 additions & 1 deletion src/assets/scss/argon-dashboard/_navbar-vertical.scss
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,8 @@
}

.navbar-main {
transition: box-shadow $transition-base-time ease-in,
transition:
box-shadow $transition-base-time ease-in,
background-color $transition-base-time ease-in;

&.fixed-top {
Expand Down
Loading

0 comments on commit c6ae3df

Please sign in to comment.