Skip to content

Commit 4cfa4a3

Browse files
valasekvalasek
committed
Update dependencies, config for cloud version, add 1.4.5 release version
1 parent bb13b72 commit 4cfa4a3

Some content is hidden

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

80 files changed

+712
-544
lines changed

‎LICENSE.md

+1-1

‎build.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REM Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
REM Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
@ECHO OFF
44
set zip="C:\Program Files\7-Zip\7z.exe"

‎build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
2-
# Copyright © 2018-2019 Stanislav Valasek <[email protected]>
2+
# Copyright © 2018-2020 Stanislav Valasek <[email protected]>
33

4-
version="1.4.4"
4+
version="1.4.5"
55
# rem git describe --tags
66

77
if [ "$1" == "cloud" ]; then

‎build/client/dist/css/.gitkepp

Whitespace-only changes.

‎build/client/dist/fonts/.gitkepp

Whitespace-only changes.

‎build/client/dist/js/.gitkeep

Whitespace-only changes.

‎build/client/dist/statics/.gitkepp

Whitespace-only changes.

‎build/client/dist/statics/icons/.gitkepp

Whitespace-only changes.

‎client/package.json

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "timesheet",
3-
"version": "1.4.4",
3+
"version": "1.4.5",
44
"description": "Self-hosted application to manage project reporting",
55
"productName": "Timesheet",
66
"cordovaId": "timesheet.simplesw.net",
@@ -21,31 +21,30 @@
2121
"audit:lighthouse": "lighthouse http://localhost:3000 view --output-path=./test/lighthouse/reports/index.html --config-path=./test/lighthouse/configs/full-config.js"
2222
},
2323
"dependencies": {
24-
"@quasar/extras": "^1.3.2",
25-
"ajv": "^6.10.2",
24+
"quasar": "^1.5.11",
25+
"@quasar/extras": "^1.3.3",
26+
"date-fns": "^2.8.1",
27+
"date-fns-tz": "^1.0.9",
2628
"axios": "^0.19.0",
27-
"chart.js": "^2.8.0",
29+
"chart.js": "^2.9.3",
2830
"chartjs-plugin-datalabels": "^0.7.0",
29-
"date-fns": "^2.2.1",
30-
"date-fns-tz": "^1.0.7",
31-
"quasar": "^1.3.0",
32-
"vue-chartjs": "^3.4.2"
31+
"vue-chartjs": "^3.5.0"
3332
},
3433
"devDependencies": {
35-
"@quasar/app": "^1.2.3",
36-
"@quasar/quasar-app-extension-icon-genie": "^1.1.2",
37-
"@quasar/quasar-app-extension-qenv": "^1.0.0-beta.2",
38-
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.21",
34+
"@quasar/app": "^1.4.3",
35+
"@quasar/quasar-app-extension-icon-genie": "^1.1.3",
36+
"@quasar/quasar-app-extension-qenv": "^1.0.0",
37+
"@quasar/quasar-app-extension-qmarkdown": "^1.0.10",
3938
"@quasar/quasar-app-extension-testing-quality": "^1.0.0-beta.8",
4039
"@vue/eslint-config-standard": "^4.0.0",
41-
"babel-eslint": "^10.0.2",
42-
"cross-env": "^5.2.1",
43-
"cypress": "^3.4.1",
44-
"eslint": "^6.4.0",
45-
"eslint-loader": "^3.0.0",
46-
"eslint-plugin-vue": "^5.2.3",
47-
"strip-ansi": "^5.2.0",
48-
"webpack-bundle-analyzer": "^3.5.0"
40+
"babel-eslint": "^10.0.3",
41+
"cross-env": "^6.0.3",
42+
"cypress": "^3.8.1",
43+
"eslint": "^6.8.0",
44+
"eslint-loader": "^3.0.3",
45+
"eslint-plugin-vue": "^6.1.2",
46+
"strip-ansi": "^6.0.0",
47+
"webpack-bundle-analyzer": "^3.6.0"
4948
},
5049
"engines": {
5150
"node": ">= 8.9.0",

‎client/quasar.conf.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ module.exports = function (ctx) {
6060
directives: [],
6161

6262
// Quasar plugins
63-
plugins: []
63+
plugins: [
64+
'Dialog',
65+
'Loading',
66+
'Notify'
67+
]
6468
},
6569

6670
// https://quasar.dev/quasar-cli/cli-documentation/supporting-ie
@@ -69,7 +73,7 @@ module.exports = function (ctx) {
6973
// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
7074
build: {
7175
scopeHoisting: true,
72-
// vueRouterMode: 'history',
76+
vueRouterMode: 'history',
7377
// showProgress: false,
7478
// gzip: true,
7579
// analyze: true,

‎client/src/api/axiosSettings.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import axios from 'axios'
44

‎client/src/components/ChangeWeek.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<span>

‎client/src/components/Confirm.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-dialog

‎client/src/components/ManagedData.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-table

‎client/src/components/MyFooter.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-footer elevated class="bg-primary text-secondary">

‎client/src/components/RetrieveHoliday.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<span>
@@ -37,7 +37,7 @@ export default {
3737
// ID Indonesia
3838
// US United States
3939
],
40-
year: '2019'
40+
year: '2020'
4141
}
4242
},
4343

@@ -51,7 +51,7 @@ export default {
5151
retrieveHolidays () {
5252
const url = 'https://holidayapi.pl/v1/holidays'
5353
const querystring = '?country=' + this.country + '&year=' + this.year
54-
// curl https://holidayapi.pl/v1/holidays -XGET -d"country=CZ&year=2019"
54+
// curl https://holidayapi.pl/v1/holidays -XGET -d"country=CZ&year=2020"
5555
api.apiClient.get(url + querystring)
5656
.then(response => {
5757
})

‎client/src/components/SelectConsultant.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<!-- <q-select v-model="selectedConsultant" :options="consultants.all" option-name="id" option-label="name"

‎client/src/pages/Administration.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-page padding>

‎client/src/pages/Documentation.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-page padding>

‎client/src/pages/Help.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-page padding>

‎client/src/pages/Holidays.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-page padding>

‎client/src/pages/Home.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-page padding>

‎client/src/pages/Overview.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-page padding>

‎client/src/pages/Report.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright © 2018-2019 Stanislav Valasek <valasek@gmail.com> -->
1+
<!-- Copyright © 2018-2020 Stanislav Valasek <valasek@gmail.com> -->
22

33
<template>
44
<q-page padding>

‎client/src/router/routes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
const routes = [
44
{

‎client/src/statics/app-logo-128x128.png

-322 Bytes

‎client/src/statics/icons/apple-icon-120x120.png

-357 Bytes

‎client/src/statics/icons/apple-icon-152x152.png

-431 Bytes

‎client/src/statics/icons/apple-icon-167x167.png

-591 Bytes

‎client/src/statics/icons/apple-icon-180x180.png

-354 Bytes

‎client/src/statics/icons/favicon-16x16.png

-67 Bytes

‎client/src/statics/icons/favicon-32x32.png

-162 Bytes

‎client/src/statics/icons/favicon-96x96.png

-291 Bytes

‎client/src/statics/icons/favicon.ico

-3 Bytes
Binary file not shown.

‎client/src/statics/icons/icon-128x128.png

-322 Bytes

‎client/src/statics/icons/icon-192x192.png

-640 Bytes

‎client/src/statics/icons/icon-256x256.png

-928 Bytes

‎client/src/statics/icons/icon-384x384.png

-1.54 KB

‎client/src/statics/icons/icon-512x512.png

-1.71 KB

‎client/src/statics/icons/ms-icon-144x144.png

-459 Bytes

‎client/src/store/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import Vue from 'vue'
44
import Vuex from 'vuex'

‎client/src/store/modules/consultants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import api from '../../api/axiosSettings'
44
import { Notify } from 'quasar'

‎client/src/store/modules/context.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22
import { isWithinInterval } from 'date-fns'
33

44
// initial state

‎client/src/store/modules/holidays.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import api from '../../api/axiosSettings'
44
import { Notify } from 'quasar'

‎client/src/store/modules/projects.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import api from '../../api/axiosSettings'
44
import { Notify } from 'quasar'

‎client/src/store/modules/rates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import api from '../../api/axiosSettings'
44
import { Notify } from 'quasar'

‎client/src/store/modules/reportedHours.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import api from '../../api/axiosSettings'
44
import { format, getYear, parseISO } from 'date-fns'

‎client/src/store/modules/settings.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
1+
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
22

33
import api from '../../api/axiosSettings'
44
import { subDays, addDays, startOfWeek, endOfWeek, getMonth, parseISO } from 'date-fns'

0 commit comments

Comments
 (0)