Skip to content

Commit

Permalink
Update dependencies, config for cloud version, add 1.4.5 release version
Browse files Browse the repository at this point in the history
  • Loading branch information
valasek committed Jan 3, 2020
1 parent bb13b72 commit 4cfa4a3
Show file tree
Hide file tree
Showing 80 changed files with 712 additions and 544 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Copyright (c) 2018-2019, Stanislav Valasek <[email protected]>
Copyright (c) 2018-2020, Stanislav Valasek <[email protected]>

Free for education and non-commertial usage. Pay for the commertial usage of the application to support further development and maintenance via [PayPal](https://www.paypal.com/paypalme2/StanislavValasek).
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REM Copyright © 2018-2019 Stanislav Valasek <[email protected]>
REM Copyright © 2018-2020 Stanislav Valasek <[email protected]>

@ECHO OFF
set zip="C:\Program Files\7-Zip\7z.exe"
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright © 2018-2019 Stanislav Valasek <[email protected]>
# Copyright © 2018-2020 Stanislav Valasek <[email protected]>

version="1.4.4"
version="1.4.5"
# rem git describe --tags

if [ "$1" == "cloud" ]; then
Expand Down
Empty file removed build/client/dist/css/.gitkepp
Empty file.
Empty file removed build/client/dist/fonts/.gitkepp
Empty file.
Empty file removed build/client/dist/js/.gitkeep
Empty file.
Empty file removed build/client/dist/statics/.gitkepp
Empty file.
Empty file.
39 changes: 19 additions & 20 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "timesheet",
"version": "1.4.4",
"version": "1.4.5",
"description": "Self-hosted application to manage project reporting",
"productName": "Timesheet",
"cordovaId": "timesheet.simplesw.net",
Expand All @@ -21,31 +21,30 @@
"audit:lighthouse": "lighthouse http://localhost:3000 view --output-path=./test/lighthouse/reports/index.html --config-path=./test/lighthouse/configs/full-config.js"
},
"dependencies": {
"@quasar/extras": "^1.3.2",
"ajv": "^6.10.2",
"quasar": "^1.5.11",
"@quasar/extras": "^1.3.3",
"date-fns": "^2.8.1",
"date-fns-tz": "^1.0.9",
"axios": "^0.19.0",
"chart.js": "^2.8.0",
"chart.js": "^2.9.3",
"chartjs-plugin-datalabels": "^0.7.0",
"date-fns": "^2.2.1",
"date-fns-tz": "^1.0.7",
"quasar": "^1.3.0",
"vue-chartjs": "^3.4.2"
"vue-chartjs": "^3.5.0"
},
"devDependencies": {
"@quasar/app": "^1.2.3",
"@quasar/quasar-app-extension-icon-genie": "^1.1.2",
"@quasar/quasar-app-extension-qenv": "^1.0.0-beta.2",
"@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.21",
"@quasar/app": "^1.4.3",
"@quasar/quasar-app-extension-icon-genie": "^1.1.3",
"@quasar/quasar-app-extension-qenv": "^1.0.0",
"@quasar/quasar-app-extension-qmarkdown": "^1.0.10",
"@quasar/quasar-app-extension-testing-quality": "^1.0.0-beta.8",
"@vue/eslint-config-standard": "^4.0.0",
"babel-eslint": "^10.0.2",
"cross-env": "^5.2.1",
"cypress": "^3.4.1",
"eslint": "^6.4.0",
"eslint-loader": "^3.0.0",
"eslint-plugin-vue": "^5.2.3",
"strip-ansi": "^5.2.0",
"webpack-bundle-analyzer": "^3.5.0"
"babel-eslint": "^10.0.3",
"cross-env": "^6.0.3",
"cypress": "^3.8.1",
"eslint": "^6.8.0",
"eslint-loader": "^3.0.3",
"eslint-plugin-vue": "^6.1.2",
"strip-ansi": "^6.0.0",
"webpack-bundle-analyzer": "^3.6.0"
},
"engines": {
"node": ">= 8.9.0",
Expand Down
8 changes: 6 additions & 2 deletions client/quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ module.exports = function (ctx) {
directives: [],

// Quasar plugins
plugins: []
plugins: [
'Dialog',
'Loading',
'Notify'
]
},

// https://quasar.dev/quasar-cli/cli-documentation/supporting-ie
Expand All @@ -69,7 +73,7 @@ module.exports = function (ctx) {
// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
build: {
scopeHoisting: true,
// vueRouterMode: 'history',
vueRouterMode: 'history',
// showProgress: false,
// gzip: true,
// analyze: true,
Expand Down
2 changes: 1 addition & 1 deletion client/src/api/axiosSettings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import axios from 'axios'

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ChangeWeek.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<span>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Confirm.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-dialog
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ManagedData.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-table
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/MyFooter.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-footer elevated class="bg-primary text-secondary">
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/RetrieveHoliday.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<span>
Expand Down Expand Up @@ -37,7 +37,7 @@ export default {
// ID Indonesia
// US United States
],
year: '2019'
year: '2020'
}
},
Expand All @@ -51,7 +51,7 @@ export default {
retrieveHolidays () {
const url = 'https://holidayapi.pl/v1/holidays'
const querystring = '?country=' + this.country + '&year=' + this.year
// curl https://holidayapi.pl/v1/holidays -XGET -d"country=CZ&year=2019"
// curl https://holidayapi.pl/v1/holidays -XGET -d"country=CZ&year=2020"
api.apiClient.get(url + querystring)
.then(response => {
})
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/SelectConsultant.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<!-- <q-select v-model="selectedConsultant" :options="consultants.all" option-name="id" option-label="name"
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Administration.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-page padding>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Documentation.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-page padding>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Help.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-page padding>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Holidays.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-page padding>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Home.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-page padding>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Overview.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-page padding>
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Report.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright © 2018-2019 Stanislav Valasek <[email protected]> -->
<!-- Copyright © 2018-2020 Stanislav Valasek <[email protected]> -->

<template>
<q-page padding>
Expand Down
2 changes: 1 addition & 1 deletion client/src/router/routes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

const routes = [
{
Expand Down
Binary file modified client/src/statics/app-logo-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/apple-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/apple-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/apple-icon-167x167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/apple-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/favicon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/favicon.ico
Binary file not shown.
Binary file modified client/src/statics/icons/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/icon-384x384.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/icon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/statics/icons/ms-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/src/store/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import Vue from 'vue'
import Vuex from 'vuex'
Expand Down
2 changes: 1 addition & 1 deletion client/src/store/modules/consultants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import api from '../../api/axiosSettings'
import { Notify } from 'quasar'
Expand Down
2 changes: 1 addition & 1 deletion client/src/store/modules/context.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>
import { isWithinInterval } from 'date-fns'

// initial state
Expand Down
2 changes: 1 addition & 1 deletion client/src/store/modules/holidays.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import api from '../../api/axiosSettings'
import { Notify } from 'quasar'
Expand Down
2 changes: 1 addition & 1 deletion client/src/store/modules/projects.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import api from '../../api/axiosSettings'
import { Notify } from 'quasar'
Expand Down
2 changes: 1 addition & 1 deletion client/src/store/modules/rates.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import api from '../../api/axiosSettings'
import { Notify } from 'quasar'
Expand Down
2 changes: 1 addition & 1 deletion client/src/store/modules/reportedHours.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import api from '../../api/axiosSettings'
import { format, getYear, parseISO } from 'date-fns'
Expand Down
2 changes: 1 addition & 1 deletion client/src/store/modules/settings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2018-2019 Stanislav Valasek <[email protected]>
// Copyright © 2018-2020 Stanislav Valasek <[email protected]>

import api from '../../api/axiosSettings'
import { subDays, addDays, startOfWeek, endOfWeek, getMonth, parseISO } from 'date-fns'
Expand Down
Loading

0 comments on commit 4cfa4a3

Please sign in to comment.