Skip to content

Commit 3618429

Browse files
authored
Merge pull request #250 from educorvi/develop
update
2 parents 9506edb + dcde655 commit 3618429

47 files changed

Lines changed: 5916 additions & 7469 deletions

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
node-version: [ 18.x, 20.x, 22.x ]
17+
node-version: [ 20.x, 22.x, 24.x ]
1818
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1919

2020
steps:
@@ -25,7 +25,7 @@ jobs:
2525
node-version: ${{ matrix.node-version }}
2626
cache: 'yarn'
2727
- run: yarn install --immutable
28-
- run: yarn workspaces foreach -Rpt --from timeclicker_client run build
28+
- run: yarn run build
2929
rebase:
3030
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
3131
needs: [ build ]

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ package-lock.json
1717
.rollup.cache
1818
*/dist
1919
*/lib-dist
20+
tsconfig.tsbuildinfo
21+
server/src/generated

.idea/copilot.data.migration.agent.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copilot.data.migration.ask2agent.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dataSources.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/data_source_mapping.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/sqldialects.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:lts-alpine as prebuild
1+
FROM node:lts-alpine AS prebuild
22
WORKDIR /app
33
COPY package.json .
44
COPY yarn.lock .
@@ -9,22 +9,26 @@ COPY .yarn ./.yarn
99
RUN yarn install --immutable
1010
COPY . .
1111

12-
FROM prebuild as buildfrontend
12+
FROM prebuild AS buildfrontend
1313
WORKDIR /app
1414
ENV VITE_API_ENDPOINT=/api/
1515
RUN yarn workspaces foreach -Rpt --from timeclicker_client run build
1616

17-
FROM prebuild as buildbackend
17+
FROM prebuild AS buildbackend
1818
WORKDIR /app/server
1919
RUN yarn run build
2020
RUN yarn prod-install /usr/src/build
2121
RUN cp -r dist /usr/src/build
2222

23-
FROM node:lts-alpine as deploy
23+
FROM node:lts-alpine AS deploy
2424
WORKDIR /app
2525
RUN mkdir client
2626
RUN mkdir server
2727
COPY --from=buildfrontend /app/client/dist client/dist
2828
COPY --from=buildbackend /usr/src/build server
2929
WORKDIR /app/server
30+
31+
RUN chown -R node:node /app
32+
USER node
33+
3034
CMD ["node", "/app/server/dist/src/index.js"]

client/components.d.ts

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
/* eslint-disable */
22
// @ts-nocheck
3+
// biome-ignore lint: disable
4+
// oxlint-disable
5+
// ------
36
// Generated by unplugin-vue-components
47
// Read more: https://github.com/vuejs/core/pull/3399
8+
59
export {}
610

711
/* prettier-ignore */
@@ -24,12 +28,10 @@ declare module 'vue' {
2428
BDropdownItemButton: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownItemButton']
2529
BDropdownText: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownText']
2630
BForm: typeof import('bootstrap-vue-next/components/BForm')['BForm']
27-
BFormCheckbox: typeof import('bootstrap-vue-next/components/BFormCheckbox')['BFormCheckbox']
2831
BFormGroup: typeof import('bootstrap-vue-next/components/BFormGroup')['BFormGroup']
2932
BFormInput: typeof import('bootstrap-vue-next/components/BFormInput')['BFormInput']
3033
BFormInvalidFeedback: typeof import('bootstrap-vue-next/components/BForm')['BFormInvalidFeedback']
3134
BFormSelect: typeof import('bootstrap-vue-next/components/BFormSelect')['BFormSelect']
32-
BFormSelectOption: typeof import('bootstrap-vue-next/components/BFormSelect')['BFormSelectOption']
3335
BFormTag: typeof import('bootstrap-vue-next/components/BFormTags')['BFormTag']
3436
BFormTags: typeof import('bootstrap-vue-next/components/BFormTags')['BFormTags']
3537
BFormTextarea: typeof import('bootstrap-vue-next/components/BFormTextarea')['BFormTextarea']
@@ -44,32 +46,19 @@ declare module 'vue' {
4446
BNavItemDropdown: typeof import('bootstrap-vue-next/components/BNav')['BNavItemDropdown']
4547
BRow: typeof import('bootstrap-vue-next/components/BContainer')['BRow']
4648
BSpinner: typeof import('bootstrap-vue-next/components/BSpinner')['BSpinner']
47-
BTab: typeof import('bootstrap-vue-next/components/BTabs')['BTab']
4849
BTable: typeof import('bootstrap-vue-next/components/BTable')['BTable']
49-
BTableSimple: typeof import('bootstrap-vue-next/components/BTable')['BTableSimple']
50-
BTabs: typeof import('bootstrap-vue-next/components/BTabs')['BTabs']
51-
BTbody: typeof import('bootstrap-vue-next/components/BTable')['BTbody']
52-
BTd: typeof import('bootstrap-vue-next/components/BTable')['BTd']
53-
BTh: typeof import('bootstrap-vue-next/components/BTable')['BTh']
54-
BThead: typeof import('bootstrap-vue-next/components/BTable')['BThead']
5550
BToastOrchestrator: typeof import('bootstrap-vue-next/components/BToast')['BToastOrchestrator']
56-
BTr: typeof import('bootstrap-vue-next/components/BTable')['BTr']
5751
ClockSolid: typeof import('./src/components/icons/clock-solid.vue')['default']
58-
ContractEntryModal: typeof import('./src/components/ContractEntryModal.vue')['default']
5952
CustomSpinner: typeof import('./src/components/CustomSpinner.vue')['default']
60-
HoursEntryModal: typeof import('./src/components/HoursEntryModal.vue')['default']
6153
IBiTagFill: typeof import('~icons/bi/tag-fill')['default']
62-
IBiTrash3: typeof import('~icons/bi/trash3')['default']
6354
NavTopBar: typeof import('./src/components/NavTopBar.vue')['default']
6455
OrgaActivities: typeof import('./src/components/Orga/OrgaActivities.vue')['default']
65-
OrgaContractData: typeof import('./src/components/Orga/OrgaContractData.vue')['default']
66-
OrgaTimeBalance: typeof import('./src/components/Orga/OrgaTimeBalance.vue')['default']
6756
Overview: typeof import('./src/components/Overview.vue')['default']
6857
RouterLink: typeof import('vue-router')['RouterLink']
6958
RouterView: typeof import('vue-router')['RouterView']
7059
TagDropdown: typeof import('./src/components/tagDropdown.vue')['default']
7160
}
72-
export interface ComponentCustomProperties {
61+
export interface GlobalDirectives {
7362
vBModal: typeof import('bootstrap-vue-next/directives/BModal')['vBModal']
7463
}
7564
}

client/package.json

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,58 @@
1414
"generateIcons": "yarn dlx vue-pwa-asset-generator --no-manifest -a src/assets/appIcon.png -o public/icons -b \"#FFFFFF\""
1515
},
1616
"dependencies": {
17-
"@educorvi/vue-json-form": "3.0.0-beta.9",
18-
"@tsconfig/node-lts": "^22.0.2",
19-
"axios": "^1.11.0",
20-
"bootstrap": "^5.3.7",
21-
"bootstrap-vue-next": "^0.27.0",
22-
"bootswatch": "^5.3.7",
17+
"@educorvi/vue-json-form": "3.0.0",
18+
"@tsconfig/node-lts": "^22.0.4",
19+
"axios": "^1.13.2",
20+
"bootstrap": "^5.3.8",
21+
"bootstrap-vue-next": "^0.42.0",
22+
"bootswatch": "^5.3.8",
2323
"file-saver": "^2.0.5",
24-
"humanize-duration": "^3.33.0",
25-
"keycloak-js": "^26.2.0",
26-
"pinia": "^3.0.3",
24+
"humanize-duration": "^3.33.2",
25+
"keycloak-js": "^26.2.2",
26+
"pinia": "^3.0.4",
2727
"showdown": "^2.1.0",
28-
"swagger-ui": "^5.27.1",
29-
"swagger-ui-dist": "^5.27.1",
28+
"swagger-ui": "^5.31.0",
29+
"swagger-ui-dist": "^5.31.0",
3030
"timeclicker_server": "workspace:^",
31-
"vue": "^3.5.18",
32-
"vue-i18n": "^11.1.11",
33-
"vue-router": "^4.5.1"
31+
"vue": "^3.5.27",
32+
"vue-i18n": "^11.2.8",
33+
"vue-router": "^4.6.4"
3434
},
3535
"devDependencies": {
36-
"@iconify-json/bi": "^1.1.23",
36+
"@iconify-json/bi": "^1.2.7",
3737
"@rollup/plugin-url": "^8.0.2",
38-
"@rushstack/eslint-patch": "^1.10.2",
38+
"@rushstack/eslint-patch": "^1.15.0",
3939
"@semantic-release/changelog": "^6.0.3",
40-
"@semantic-release/commit-analyzer": "^13.0.0",
41-
"@semantic-release/github": "^10.1.7",
42-
"@semantic-release/release-notes-generator": "^14.0.1",
43-
"@types/file-saver": "^2.0.6",
40+
"@semantic-release/commit-analyzer": "^13.0.1",
41+
"@semantic-release/github": "^10.3.5",
42+
"@semantic-release/release-notes-generator": "^14.1.0",
43+
"@types/file-saver": "^2.0.7",
4444
"@types/humanize-duration": "^3.27.4",
45-
"@types/node": "^18.17.7",
45+
"@types/node": "^18.19.130",
4646
"@types/showdown": "^2.0.6",
47-
"@types/swagger-ui": "^3.52.0",
48-
"@types/swagger-ui-dist": "^3.30.1",
49-
"@vitejs/plugin-vue": "^4.5.2",
50-
"@vue/compiler-sfc": "^3.4.26",
47+
"@types/swagger-ui": "^3.52.4",
48+
"@types/swagger-ui-dist": "^3.30.6",
49+
"@vitejs/plugin-vue": "^4.6.2",
50+
"@vue/compiler-sfc": "^3.5.26",
5151
"@vue/eslint-config-prettier": "^8.0.0",
5252
"@vue/eslint-config-typescript": "^11.0.3",
5353
"@vue/tsconfig": "^0.4.0",
54-
"eslint": "^8.57.0",
55-
"eslint-plugin-vue": "^9.25.0",
56-
"license-downloader": "^1.3.0",
57-
"license-report": "^6.7.1",
54+
"eslint": "^8.57.1",
55+
"eslint-plugin-vue": "^9.33.0",
56+
"license-downloader": "^1.3.3",
57+
"license-report": "^6.8.1",
5858
"npm-run-all": "^4.1.5",
59-
"prettier": "^3.2.5",
60-
"sass": "^1.76.0",
61-
"semantic-release": "^24.1.0",
59+
"prettier": "^3.8.1",
60+
"sass": "^1.97.3",
61+
"semantic-release": "^24.2.9",
6262
"semantic-release-monorepo": "^8.0.2",
6363
"semantic-release-yarn": "^3.0.2",
6464
"typescript": "~5.4.5",
65-
"unplugin-icons": "^0.19.0",
66-
"unplugin-vue-components": "^0.27.2",
67-
"vite": "^7.0.6",
68-
"vite-plugin-pwa": "^0.20.0",
69-
"vue-tsc": "~1.8.27"
65+
"unplugin-icons": "^23.0.1",
66+
"unplugin-vue-components": "^31.0.0",
67+
"vite": "^7.3.1",
68+
"vite-plugin-pwa": "^1.2.0",
69+
"vue-tsc": "~3.2.2"
7070
}
7171
}

0 commit comments

Comments
 (0)