Compare commits
No commits in common. "0b09d098fd3b41f58419d107b652ffe097638781" and "7210eae52cf7c10c22392b1e068f9b917a5c8127" have entirely different histories.
0b09d098fd
...
7210eae52c
4
server/package-lock.json
generated
4
server/package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti-svr",
|
"name": "ifms-pti-svr",
|
||||||
"version": "3.8.5",
|
"version": "3.8.4",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ifms-pti-svr",
|
"name": "ifms-pti-svr",
|
||||||
"version": "3.8.5",
|
"version": "3.8.4",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@prisma/client": "^5.7.1",
|
"@prisma/client": "^5.7.1",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti-svr",
|
"name": "ifms-pti-svr",
|
||||||
"version": "3.8.5",
|
"version": "3.8.4",
|
||||||
"description": "Servidor do Portal de TI do IFMS",
|
"description": "Servidor do Portal de TI do IFMS",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"prisma": {
|
"prisma": {
|
||||||
|
|
22
web/package-lock.json
generated
22
web/package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti",
|
"name": "ifms-pti",
|
||||||
"version": "3.8.5",
|
"version": "3.8.4",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ifms-pti",
|
"name": "ifms-pti",
|
||||||
"version": "3.8.5",
|
"version": "3.8.4",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mdi/font": "^7.3.67",
|
"@mdi/font": "^7.3.67",
|
||||||
"apollo-link-ws": "^1.0.20",
|
"apollo-link-ws": "^1.0.20",
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
"validator": "^13.7.0",
|
"validator": "^13.7.0",
|
||||||
"vue": "^2.7.15",
|
"vue": "^2.7.15",
|
||||||
"vue-apollo": "^3.1.1",
|
"vue-apollo": "^3.1.1",
|
||||||
"vue-chartjs": "^5.3.0",
|
"vue-chartjs": "^4.1.2",
|
||||||
"vue-json-pretty": "^1.9.3",
|
"vue-json-pretty": "^1.9.3",
|
||||||
"vue-router": "^3.6.5",
|
"vue-router": "^3.6.5",
|
||||||
"vue-the-mask": "^0.11.1",
|
"vue-the-mask": "^0.11.1",
|
||||||
|
@ -20752,12 +20752,12 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue-chartjs": {
|
"node_modules/vue-chartjs": {
|
||||||
"version": "5.3.0",
|
"version": "4.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-4.1.2.tgz",
|
||||||
"integrity": "sha512-8XqX0JU8vFZ+WA2/knz4z3ThClduni2Nm0BMe2u0mXgTfd9pXrmJ07QBI+WAij5P/aPmPMX54HCE1seWL37ZdQ==",
|
"integrity": "sha512-QSggYjeFv/L4jFSBQpX8NzrAvX0B+Ha6nDgxkTG8tEXxYOOTwKI4phRLe+B4f+REnkmg7hgPY24R0cixZJyXBg==",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"chart.js": "^4.1.1",
|
"chart.js": "^3.7.0",
|
||||||
"vue": "^3.0.0-0 || ^2.7.0"
|
"vue": "^3.0.0-0 || ^2.6.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue-cli-plugin-apollo": {
|
"node_modules/vue-cli-plugin-apollo": {
|
||||||
|
@ -37989,9 +37989,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vue-chartjs": {
|
"vue-chartjs": {
|
||||||
"version": "5.3.0",
|
"version": "4.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-4.1.2.tgz",
|
||||||
"integrity": "sha512-8XqX0JU8vFZ+WA2/knz4z3ThClduni2Nm0BMe2u0mXgTfd9pXrmJ07QBI+WAij5P/aPmPMX54HCE1seWL37ZdQ==",
|
"integrity": "sha512-QSggYjeFv/L4jFSBQpX8NzrAvX0B+Ha6nDgxkTG8tEXxYOOTwKI4phRLe+B4f+REnkmg7hgPY24R0cixZJyXBg==",
|
||||||
"requires": {}
|
"requires": {}
|
||||||
},
|
},
|
||||||
"vue-cli-plugin-apollo": {
|
"vue-cli-plugin-apollo": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti",
|
"name": "ifms-pti",
|
||||||
"version": "3.8.5",
|
"version": "3.8.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "vue-cli-service serve",
|
"serve": "vue-cli-service serve",
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
"validator": "^13.7.0",
|
"validator": "^13.7.0",
|
||||||
"vue": "^2.7.15",
|
"vue": "^2.7.15",
|
||||||
"vue-apollo": "^3.1.1",
|
"vue-apollo": "^3.1.1",
|
||||||
"vue-chartjs": "^5.3.0",
|
"vue-chartjs": "^4.1.2",
|
||||||
"vue-json-pretty": "^1.9.3",
|
"vue-json-pretty": "^1.9.3",
|
||||||
"vue-router": "^3.6.5",
|
"vue-router": "^3.6.5",
|
||||||
"vue-the-mask": "^0.11.1",
|
"vue-the-mask": "^0.11.1",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<LineChart
|
<LineChart
|
||||||
:options="chartOptions"
|
:chart-options="chartOptions"
|
||||||
:data="chartData"
|
:chart-data="chartData"
|
||||||
:chart-id="chartId"
|
:chart-id="chartId"
|
||||||
:dataset-id-key="datasetIdKey"
|
:dataset-id-key="datasetIdKey"
|
||||||
:plugins="plugins"
|
:plugins="plugins"
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { Line as LineChart } from 'vue-chartjs'
|
import { Line as LineChart } from 'vue-chartjs/legacy'
|
||||||
import colors from 'vuetify/lib/util/colors'
|
import colors from 'vuetify/lib/util/colors'
|
||||||
|
|
||||||
import { Chart as ChartJS, registerables } from 'chart.js'
|
import { Chart as ChartJS, registerables } from 'chart.js'
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<LineChart
|
<LineChart
|
||||||
v-if="stats"
|
v-if="stats"
|
||||||
:options="chartOptions"
|
:chart-options="chartOptions"
|
||||||
:data="chartData"
|
:chart-data="chartData"
|
||||||
:chart-id="chartId"
|
:chart-id="chartId"
|
||||||
:dataset-id-key="datasetIdKey"
|
:dataset-id-key="datasetIdKey"
|
||||||
:plugins="plugins"
|
:plugins="plugins"
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { Line as LineChart } from 'vue-chartjs'
|
import { Line as LineChart } from 'vue-chartjs/legacy'
|
||||||
import 'chartjs-adapter-date-fns'
|
import 'chartjs-adapter-date-fns'
|
||||||
import colors from 'vuetify/lib/util/colors'
|
import colors from 'vuetify/lib/util/colors'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user