Skip to content

Commit

Permalink
Update Quasar, golang, fix date update issue and dark mode
Browse files Browse the repository at this point in the history
  • Loading branch information
valasek committed Apr 8, 2020
1 parent 4cfa4a3 commit b83d851
Show file tree
Hide file tree
Showing 32 changed files with 1,316 additions and 561 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Here's a couple of areas that need some love:
- [Gorm](https://github.com/jinzhu/gorm) (with [PostgreSQL](https://www.postgresql.org/) or [MySQL](https://www.mysql.com/) persistence)
- [Logrus](https://github.com/sirupsen/logrus), [Cobra](https://github.com/spf13/cobra), [Viper](https://github.com/spf13/viper), [Now](https://github.com/jinzhu/now), [lumberjackrus](https://github.com/orandin/lumberjackrus), [Cron](https://github.com/robfig/cron)

## JS Frontend
## JavaScript Frontend

- [Vue.js](https://vuejs.org/) spa client with webpack
- [Quasar](https://quasar.dev/)
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright © 2018-2020 Stanislav Valasek <[email protected]>

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

if [ "$1" == "cloud" ]; then
Expand Down
14 changes: 7 additions & 7 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "timesheet",
"version": "1.4.5",
"version": "1.4.6",
"description": "Self-hosted application to manage project reporting",
"productName": "Timesheet",
"cordovaId": "timesheet.simplesw.net",
Expand All @@ -21,20 +21,20 @@
"audit:lighthouse": "lighthouse http://localhost:3000 view --output-path=./test/lighthouse/reports/index.html --config-path=./test/lighthouse/configs/full-config.js"
},
"dependencies": {
"quasar": "^1.5.11",
"@quasar/extras": "^1.3.3",
"date-fns": "^2.8.1",
"date-fns-tz": "^1.0.9",
"@quasar/extras": "^1.6.1",
"axios": "^0.19.0",
"chart.js": "^2.9.3",
"chartjs-plugin-datalabels": "^0.7.0",
"date-fns": "^2.8.1",
"date-fns-tz": "^1.0.9",
"quasar": "^1.9.13",
"vue-chartjs": "^3.5.0"
},
"devDependencies": {
"@quasar/app": "^1.4.3",
"@quasar/app": "^1.6.1",
"@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-qmarkdown": "^1.0.24",
"@quasar/quasar-app-extension-testing-quality": "^1.0.0-beta.8",
"@vue/eslint-config-standard": "^4.0.0",
"babel-eslint": "^10.0.3",
Expand Down
2 changes: 1 addition & 1 deletion client/quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = function (ctx) {
all: 'auto',

config: {
dark: 'auto', // or Boolean true/false
dark: 'false', // or Boolean true/false
brand: {
primary: '#5fc3ad',
secondary: '#2d3092',
Expand Down
1 change: 0 additions & 1 deletion client/src/layouts/MyLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ export default {
return this.$q.dark.isActive
},
set (val) {
this.darkIcon = 'brightness_high'
this.$q.dark.set(val)
}
},
Expand Down
7 changes: 2 additions & 5 deletions client/src/pages/Report.vue
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,7 @@ export default {
}
this.$store.dispatch('reportedHours/updateAttributeValue', payloadRate)
},
confirmDiffrentWeek (d) {
return Promise.new(this.$refs.confirm.open('Please confirm', 'You selected ' + format(parseISO(d), 'iiii, MMM do', Intl.DateTimeFormat().resolvedOptions().timeZone) + '. The record will be moved to another week. Continue?', 'agree', { color: 'bg-warning' }))
},
onUpdateDate (newValue) {
async onUpdateDate (newValue) {
this.$nextTick(function () {
this.$refs.qDateProxy.hide()
})
Expand All @@ -385,7 +382,7 @@ export default {
if (isWithinInterval(parseISO(newValue.date), { start: this.dateFrom, end: this.dateTo })) {
this.$store.dispatch('reportedHours/updateAttributeValue', payload)
} else {
if (this.confirmDiffrentWeek(newValue.date)) {
if (await this.$refs.confirm.open('Please confirm', 'You selected ' + format(parseISO(newValue.date), 'iiii, MMM do', Intl.DateTimeFormat().resolvedOptions().timeZone) + '. The record will be moved to another week. Continue?', 'agree', { color: 'bg-warning' })) {
this.$store.dispatch('reportedHours/updateAttributeValue', payload)
this.$store.dispatch('settings/jumpToWeek', parseISO(newValue.date))
}
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/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.
9 changes: 9 additions & 0 deletions client/src/store/store-flag.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// THIS FEATURE-FLAG FILE IS AUTOGENERATED,
// REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING
import "quasar/dist/types/feature-flag";

declare module "quasar/dist/types/feature-flag" {
interface QuasarFeatureFlags {
store: true;
}
}
Loading

0 comments on commit b83d851

Please sign in to comment.