HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-07-16 09:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into 'main'

Browse Source 
Development

See merge request htwk-software/htwkalender!95
This commit is contained in:
Elmar Kresse
2025-01-06 15:42:25 +00:00
parent 897ba2e7a4 8e040cade6
commit 7a2277194a
10 changed files with 2396 additions and 1602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -159,10 +159,6 @@ build-data-manager-image:
- image
variables:
IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-data-manager"
DOCKER_HOST: tcp://docker:2376
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_TLS_VERIFY: 1
DOCKER_CERT_PATH: "/certs/client"
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
@ -182,10 +178,6 @@ build-ical-image:
- image
variables:
IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-ical"
DOCKER_HOST: tcp://docker:2376
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_TLS_VERIFY: 1
DOCKER_CERT_PATH: "/certs/client"
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
@ -205,10 +197,6 @@ build-frontend-image:
- image
variables:
IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-frontend"
DOCKER_HOST: tcp://docker:2376
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_TLS_VERIFY: 1
DOCKER_CERT_PATH: "/certs/client"
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- cd ./frontend

2
frontend/.eslintrc.cjs
View File

@ -10,5 +10,5 @@ module.exports = {
"@vue/typescript/recommended",
],
parserOptions: {},
rules: {},
rules: { 'vue/multi-word-component-names': 0 },
};

11
frontend/eslint.config.mjs Normal file
View File

@ -0,0 +1,11 @@
import pluginVue from "eslint-plugin-vue";
import vueTsEslintConfig from "@vue/eslint-config-typescript";
export default [
...pluginVue.configs["flat/essential"],
...vueTsEslintConfig(),
{
files: ["**/*.ts", "**/*.tsx", "**/*.vue", "**/*.js"],
rules: { 'vue/multi-word-component-names': 0 },
}
]

3903
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

54
frontend/package.json
View File

@ -7,8 +7,8 @@
"dev": "vite",
"build": "vue-tsc && vite-ssg build",
"preview": "vite preview",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
"lint-no-fix": "eslint --ext .js,.vue --ignore-path .gitignore src",
"lint": "eslint --ignore-pattern .gitignore --fix src",
"lint-no-fix": "eslint --ignore-pattern .gitignore src",
"format": "prettier . --write",
"test": "vitest"
},
@ -18,40 +18,40 @@
"@fullcalendar/interaction": "^6.1.15",
"@fullcalendar/timegrid": "^6.1.15",
"@fullcalendar/vue3": "^6.1.15",
"@tanstack/vue-query": "^5.62.2",
"@unhead/ssr": "^1.11.13",
"@vueuse/core": "^10.11.1",
"@tanstack/vue-query": "^5.62.12",
"@unhead/ssr": "^1.11.14",
"@vueuse/core": "^12.3.0",
"country-flag-emoji-polyfill": "^0.1.8",
"pinia": "^2.2.8",
"pinia": "^2.3.0",
"primeflex": "^3.3.1",
"primeicons": "^6.0.1",
"primevue": "^3.53.0",
"primeicons": "^7.0.0",
"primevue": "^3.53.1",
"source-sans": "^3.46.0",
"vue": "^3.4.11",
"vue-i18n": "^10.0.5"
"vue": "^3.5.13",
"vue-i18n": "^11.0.1"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-node-resolve": "^16.0.0",
"@rollup/plugin-terser": "^0.4.4",
"@tanstack/vue-query-devtools": "^5.62.2",
"@types/node": "^20.17.9",
"@unhead/vue": "^1.11.13",
"@tanstack/vue-query-devtools": "^5.62.12",
"@types/node": "^22.10.5",
"@unhead/vue": "^1.11.14",
"@vitejs/plugin-vue": "^5.2.1",
"@vue/eslint-config-typescript": "^12.0.0",
"eslint": "^8.57.1",
"@vue/eslint-config-typescript": "^14.2.0",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-vue": "^9.32.0",
"prettier": "3.2.1",
"sass": "^1.81.1",
"sass-loader": "^13.3.3",
"terser": "^5.36.0",
"typescript": "5.6.3",
"vite": "^5.4.11",
"vite-plugin-vue-devtools": "^7.6.7",
"vite-ssg": "^0.23.8",
"vite-ssg-sitemap": "^0.7.1",
"vitest": "^1.6.0",
"prettier": "3.4.2",
"sass": "^1.83.1",
"sass-loader": "^16.0.4",
"terser": "^5.37.0",
"typescript": "5.7.2",
"vite": "^6.0.7",
"vite-plugin-vue-devtools": "^7.6.8",
"vite-ssg": "^0.24.3",
"vite-ssg-sitemap": "^0.8.1",
"vitest": "^2.1.8",
"vue-router": "^4.5.0",
"vue-tsc": "^2.1.6"
"vue-tsc": "^2.2.0"
}
}

2
frontend/src/i18n/index.ts
View File

@ -37,11 +37,13 @@ function setup() {
}
// Sets the active locale.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
function setLocale(newLocale: any) {
_i18n.global.locale = newLocale;
setDocumentAttributesFor(newLocale);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
function setDocumentAttributesFor(locale: any) {
const htmlElement = document.querySelector("html");

3
frontend/src/main.ts
View File

@ -115,9 +115,12 @@ export const createApp = ViteSSG(
app.use(PrimeVue);
app.component("Avatar", Avatar);
app.component("Badge", Badge);
// eslint-disable-next-line vue/no-reserved-component-names
app.component("Button", Button);
// eslint-disable-next-line vue/no-reserved-component-names
app.component("Menu", Menu);
app.component("Menubar", Menubar);
// eslint-disable-next-line vue/no-reserved-component-names
app.component("Dialog", Dialog);
app.component("Dropdown", Dropdown);
app.component("InputText", InputText);

4
frontend/src/view/DynamicPage.vue
View File

@ -17,7 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<script lang="ts" setup>
import { computed, useSlots } from "vue";
import { computed, SetupContext, useSlots } from "vue";
defineProps<{
hideContent: boolean;
@ -44,7 +44,7 @@ defineProps<{
};
}>();
const slots = useSlots();
const slots: SetupContext["slots"] = useSlots();
const hasSlot = (name: string) => {
return !!slots[name];
};

3
frontend/src/view/edit/EditCalendar.vue
View File

@ -56,13 +56,14 @@ function extractToken(token: string): string {
function loadCalendar(): void {
try {
token.value = extractToken(token.value);
} catch (e) {
} catch (error) {
toast.add({
severity: "error",
summary: t("editCalendarView.error"),
detail: t("editCalendarView.invalidToken"),
life: 3000,
});
console.error(error);
return;
}

4
frontend/vite.config.ts
View File

@ -20,9 +20,9 @@ import { fileURLToPath } from "node:url";
import resolve from "@rollup/plugin-node-resolve";
import { resolve as pathResolver } from "path";
import terser from "@rollup/plugin-terser";
import ViteSSGOptions from "vite-ssg";
import generateSitemap from "vite-ssg-sitemap";
import vueDevTools from "vite-plugin-vue-devtools";
import { ViteSSGOptions } from "vite-ssg";
const hostname = "https://cal.htwk-leipzig.de";
@ -45,7 +45,7 @@ export default defineConfig({
".scss",
],
},
ssgOptions: {
ssgOptions: <ViteSSGOptions>{
script: "async",
formatting: "minify",
format: "esm",