Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/v1.1.0 #2

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
legacy-peer-deps=true
auto-install-peers=true
strict-peer-dependencies=false
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
## Change Log
## Change Log

### [1.1.0] 2023-06-23

- Update dependencies and devDependencies
- Migrate from `node-sass` to `sass`
- Fix installation issue when running `npm i`

### [1.0.0] 2021-07-23
- Original Release

- Original Release
30 changes: 17 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [Muse Vue Ant Design Dashboard](http://demos.creative-tim.com/muse-vue-ant-design-dashboard?ref=readme-sud) [![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/muse-vue-ant-design-dashboard&text=Check%20Muse%20Vue%20Ant%20Design%20made%20by%20@CreativeTim%20#webdesign%20#dashboard%20#antdesign%20#vue%20https://www.creative-tim.com/product/muse-vue-ant-design-dashboard)

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

![Image](https://s3.amazonaws.com/creativetim_bucket/products/494/thumb/opt_md_ant_thumbnail.jpg)

Expand Down Expand Up @@ -44,24 +44,25 @@ Let us know your thoughts below. And good luck with development!

## Table of Contents

* [Versions](#versions)
* [Demo](#demo)
* [Quick Start](#quick-start)
* [Documentation](#documentation)
* [File Structure](#file-structure)
* [Browser Support](#browser-support)
* [Resources](#resources)
* [Reporting Issues](#reporting-issues)
* [Technical Support or Questions](#technical-support-or-questions)
* [Licensing](#licensing)
* [Useful Links](#useful-links)
- [Versions](#versions)
- [Demo](#demo)
- [Quick Start](#quick-start)
- [Documentation](#documentation)
- [File Structure](#file-structure)
- [Browser Support](#browser-support)
- [Resources](#resources)
- [Reporting Issues](#reporting-issues)
- [Technical Support or Questions](#technical-support-or-questions)
- [Licensing](#licensing)
- [Useful Links](#useful-links)

## Versions

[<img src="https://s3.amazonaws.com/creativetim_bucket/github/html.png" width="60" height="60" />](https://www.creative-tim.com/product/muse-vue-ant-design-dashboard?ref=readme-sud)

| HTML |
| --- |
| ---- |

| [![Muse Vue Ant Design Dashboard](https://s3.amazonaws.com/creativetim_bucket/products/494/thumb/opt_md_ant_thumbnail.jpg)](http://demos.creative-tim.com/muse-vue-ant-design-dashboard?ref=readme-sud)

## Demo
Expand All @@ -84,6 +85,7 @@ Quick start options:
2. Navigate to the root / directory and run npm install to install our local dependencies.

## Documentation

The documentation for the Muse Vue Ant Design Dashboard is hosted at our [website](http://demos.creative-tim.com/muse-vue-ant-design-dashboard/documentation?ref=readme-sud).

### What's included
Expand Down Expand Up @@ -199,6 +201,7 @@ At present, we officially aim to support the last two versions of the following
<img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/chrome.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/firefox.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/edge.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/safari.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/opera.png" width="64" height="64">

## Resources

- [Live Preview](https://demos.creative-tim.com/muse-vue-ant-design-dashboard?ref=readme-sud)
- [Download Page](https://www.creative-tim.com/product/muse-vue-ant-design-dashboard?ref=readme-sud)
- Documentation is [here](https://demos.creative-tim.com/muse-vue-ant-design-dashboard/documentation?ref=readme-sud)
Expand All @@ -207,6 +210,7 @@ At present, we officially aim to support the last two versions of the following
- Issues: [Github Issues Page](https://github.com/creativetimofficial/muse-vue-ant-design-dashboard/issues)

## Reporting Issues

We use GitHub Issues as the official bug tracker for the Muse Vue Ant Design Dashboard. Here are some advices for our users that want to report an issue:

1. Make sure that you are using the latest version of the Muse Vue Ant Design Dashboard. Check the CHANGELOG from your dashboard on our [website](https://www.creative-tim.com/product/muse-vue-ant-design-dashboard?ref=readme-sud).
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "muse-vue-ant-design-dashboard",
"version": "1.0.0",
"version": "1.1.0",
"description": "A user-friendly, open source and beautiful dashboard based on Ant Design Vue.",
"main": "src/main.js",
"homepage": "https://demos.creative-tim.com/muse-ant-design-dashboard/",
Expand All @@ -13,19 +13,19 @@
"dev": "npm run serve"
},
"dependencies": {
"ant-design-vue": "1.7.6",
"chart.js": "3.4.1",
"core-js": "3.15.2",
"vue": "2.6.14",
"vue-github-buttons": "^3.1.0",
"vue-router": "3.5.2"
"ant-design-vue": "1.7.8",
"chart.js": "4.3.0",
"core-js": "3.31.0",
"vue": "2.7.14",
"vue-github-buttons": "3.1.0",
"vue-router": "3.6.5"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.5.13",
"@vue/cli-plugin-router": "4.5.13",
"@vue/cli-service": "4.5.13",
"node-sass": "6.0.1",
"sass-loader": "^10",
"vue-template-compiler": "2.6.14"
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-router": "5.0.8",
"@vue/cli-service": "5.0.8",
"sass": "1.63.6",
"sass-loader": "13.3.2",
"vue-template-compiler": "2.7.14"
}
}
27 changes: 17 additions & 10 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!--
=========================================================
Muse - Vue Ant Design Dashboard - v1.0.0
Muse - Vue Ant Design Dashboard - v1.1.0
=========================================================

Product Page: https://www.creative-tim.com/product/vue-ant-design-dashboard
Copyright 2021 Creative Tim (https://www.creative-tim.com)
Copyright 2023 Creative Tim (https://www.creative-tim.com)
Coded by Creative Tim

=========================================================
Expand All @@ -14,18 +14,25 @@
<!DOCTYPE html>
<html lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" type="image/png" href="<%= BASE_URL %>favicon.png">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700;800&display=swap" rel="stylesheet">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" type="image/png" href="<%= BASE_URL %>favicon.png" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700;800&display=swap"
rel="stylesheet"
/>
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
<strong
>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
properly without JavaScript enabled. Please enable it to
continue.</strong
>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
Expand Down
164 changes: 94 additions & 70 deletions src/components/Cards/CardProjectTable.vue
Original file line number Diff line number Diff line change
@@ -1,77 +1,101 @@
<template>

<!-- Projects Table Card -->
<a-card :bordered="false" class="header-solid h-full" :bodyStyle="{padding: 0,}">
<template #title>
<a-row type="flex" align="middle">
<a-col :span="24" :md="12">
<h6>Projects</h6>
<p>done this month <span class="text-primary">+40%</span></p>
</a-col>
<a-col :span="24" :md="12" style="display: flex; align-items: center; justify-content: flex-end">
<a-radio-group v-model="projectHeaderBtns" size="small">
<a-radio-button value="all">ALL</a-radio-button>
<a-radio-button value="online">ONLINE</a-radio-button>
<a-radio-button value="stores">STORES</a-radio-button>
</a-radio-group>
</a-col>
</a-row>
</template>
<a-table :columns="columns" :data-source="data" :pagination="false">
<!-- Projects Table Card -->
<a-card
:bordered="false"
class="header-solid h-full"
:bodyStyle="{ padding: 0 }"
>
<template #title>
<a-row type="flex" align="middle">
<a-col :span="24" :md="12">
<h6>Projects</h6>
<p>done this month <span class="text-primary">+40%</span></p>
</a-col>
<a-col
:span="24"
:md="12"
style="display: flex; align-items: center; justify-content: flex-end"
>
<a-radio-group v-model="projectHeaderBtns" size="small">
<a-radio-button value="all">ALL</a-radio-button>
<a-radio-button value="online">ONLINE</a-radio-button>
<a-radio-button value="stores">STORES</a-radio-button>
</a-radio-group>
</a-col>
</a-row>
</template>
<a-table :columns="columns" :data-source="data" :pagination="false">
<a-space
slot="members"
slot-scope="members"
:size="-12"
class="avatar-chips"
>
<template v-for="member in members">
<a-avatar v-if="member" :key="member" size="small" :src="member" />
</template>
</a-space>

<a-space slot="members" slot-scope="members" :size="-12" class="avatar-chips">
<template v-for="member in members">
<a-avatar :key="member" size="small" :src="member" />
</template>
</a-space>
<template slot="company" slot-scope="company">
<h6 class="m-0">
<img :src="company.logo" width="25" class="mr-10" />
{{ company.name }}
</h6>
</template>

<template slot="company" slot-scope="company">
<h6 class="m-0">
<img :src="company.logo" width="25" class="mr-10">
{{ company.name }}
</h6>
</template>

<template slot="completion" slot-scope="completion">
<span class="font-bold text-muted text-sm">{{ completion.label ? completion.label : completion }}</span>
<a-progress :percent="completion.value ? completion.value : completion" :show-info="false" size="small" :status="completion.status ? completion.status : 'normal'" />
</template>

</a-table>

<div class="table-upload-btn">
<a-button type="dashed" block>
<svg width="16" height="16" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 17C3 16.4477 3.44772 16 4 16H16C16.5523 16 17 16.4477 17 17C17 17.5523 16.5523 18 16 18H4C3.44772 18 3 17.5523 3 17ZM6.29289 6.70711C5.90237 6.31658 5.90237 5.68342 6.29289 5.29289L9.29289 2.29289C9.48043 2.10536 9.73478 2 10 2C10.2652 2 10.5196 2.10536 10.7071 2.29289L13.7071 5.29289C14.0976 5.68342 14.0976 6.31658 13.7071 6.70711C13.3166 7.09763 12.6834 7.09763 12.2929 6.70711L11 5.41421L11 13C11 13.5523 10.5523 14 10 14C9.44771 14 9 13.5523 9 13L9 5.41421L7.70711 6.70711C7.31658 7.09763 6.68342 7.09763 6.29289 6.70711Z" fill="#111827"/>
</svg>
Upload New Project
</a-button>
</div>
</a-card>
<!-- / Projects Table Card -->
<template slot="completion" slot-scope="completion">
<span class="font-bold text-muted text-sm">{{
completion.label ? completion.label : completion
}}</span>
<a-progress
:percent="completion.value ? completion.value : completion"
:show-info="false"
size="small"
:status="completion.status ? completion.status : 'normal'"
/>
</template>
</a-table>

<div class="table-upload-btn">
<a-button type="dashed" block>
<svg
width="16"
height="16"
viewBox="0 0 20 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M3 17C3 16.4477 3.44772 16 4 16H16C16.5523 16 17 16.4477 17 17C17 17.5523 16.5523 18 16 18H4C3.44772 18 3 17.5523 3 17ZM6.29289 6.70711C5.90237 6.31658 5.90237 5.68342 6.29289 5.29289L9.29289 2.29289C9.48043 2.10536 9.73478 2 10 2C10.2652 2 10.5196 2.10536 10.7071 2.29289L13.7071 5.29289C14.0976 5.68342 14.0976 6.31658 13.7071 6.70711C13.3166 7.09763 12.6834 7.09763 12.2929 6.70711L11 5.41421L11 13C11 13.5523 10.5523 14 10 14C9.44771 14 9 13.5523 9 13L9 5.41421L7.70711 6.70711C7.31658 7.09763 6.68342 7.09763 6.29289 6.70711Z"
fill="#111827"
/>
</svg>
Upload New Project
</a-button>
</div>
</a-card>
<!-- / Projects Table Card -->
</template>

<script>

export default ({
props: {
data: {
type: Array,
default: () => [],
},
columns: {
type: Array,
default: () => [],
},
},
data() {
return {

// Active button for the "Projects" table's card header radio button group.
projectHeaderBtns: 'all',
}
},
})

</script>
export default {
props: {
data: {
type: Array,
default: () => [],
},
columns: {
type: Array,
default: () => [],
},
},
data() {
return {
// Active button for the "Projects" table's card header radio button group.
projectHeaderBtns: "all",
};
},
};
</script>
Loading