Skip to content
Merged
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ postgres-data
docker-compose.env
package-lock.json
.rollup.cache
*/dist
*/lib-dist
14 changes: 7 additions & 7 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
"generateIcons": "yarn dlx vue-pwa-asset-generator --no-manifest -a src/assets/appIcon.png -o public/icons -b \"#FFFFFF\""
},
"dependencies": {
"@educorvi/vue-json-form": "3.0.0-alpha.6",
"@educorvi/vue-json-form": "3.0.0-beta.3",
"@tsconfig/node-lts": "^18.12.5",
"axios": "^1.7.9",
"axios": "^1.8.2",
"bootstrap": "^5.3.3",
"bootstrap-vue-next": "^0.26.21",
"bootstrap-vue-next": "^0.27.0",
"bootswatch": "^4.6.2",
"file-saver": "^2.0.5",
"humanize-duration": "^3.32.1",
"keycloak-js": "^20.0.5",
"keycloak-js": "^26.2.0",
"pinia": "^2.3.0",
"showdown": "^2.1.0",
"swagger-ui": "^5.18.2",
"swagger-ui-dist": "^5.18.2",
"swagger-ui": "^5.20.0",
"swagger-ui-dist": "^5.20.0",
"timeclicker_server": "workspace:^",
"vue": "^3.5.13",
"vue-i18n": "^9.14.2",
"vue-i18n": "^9.14.3",
"vue-router": "^4.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ let keycloak: Keycloak;
} else {
kcStore.setAuthenticated(authState.unauthenticated);
}
});
}).catch(console.error);
})();

function login() {
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/ContractEntryModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
getContractEntryJsonSchema,
getContractEntryUiSchema,
} from '@/formSchemas/ContractEntry';
import { VueJsonForm } from '@educorvi/vue-json-form';
import { type SubmitOptions, VueJsonForm } from '@educorvi/vue-json-form';
import axios from 'axios';
import { UiError, useErrorStore } from '@/stores/error';

Expand All @@ -50,7 +50,7 @@ const emit = defineEmits<{
(e: 'on-submit'): void;
}>();

function saveContract(data: Record<string, any>) {
async function saveContract(data: Record<string, any>, _customSubmitOptions: SubmitOptions, _evt: SubmitEvent) {
const contractData: saveContractDataParams = {
hoursPerWeek: data.hoursPerWeek,
daysPerWeek: data.daysPerWeek,
Expand Down
2 changes: 0 additions & 2 deletions client/vite.config.d.ts

This file was deleted.

8 changes: 4 additions & 4 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@
"typescript": "^5.4.5"
},
"dependencies": {
"axios": "^1.7.9",
"compression": "^1.7.5",
"axios": "^1.8.2",
"compression": "^1.8.0",
"cors": "^2.8.5",
"express": "^4.21.2",
"express-rate-limit": "^6.11.1",
"keycloak-backend": "^5.0.0",
"luxon": "^3.5.0",
"pg": "^8.13.1",
"pg": "^8.13.3",
"reflect-metadata": "^0.2.2",
"swagger-ui-express": "^4.6.3",
"tslog": "^4.9.3",
"tsoa": "^5.1.1",
"typeorm": "^0.3.20",
"typeorm-extension": "^3.6.3"
"typeorm-extension": "^3.7.0"
}
}
Loading
Loading