Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

Commit 5a2d985

Browse files
authored
Merge pull request #282 from Dino-Kupinic/develop
v0.16.2
2 parents 95cc214 + ddb7a90 commit 5a2d985

File tree

9 files changed

+247
-148
lines changed

9 files changed

+247
-148
lines changed

backend/composer.lock

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

backend/src/Controller/YearController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function getYear(YearService $yearsService, int $id): Response
163163
* )
164164
* )
165165
*/
166-
#[Route(path: "/year/{year}", name: "index", methods: ["GET"])]
166+
#[Route(path: "/year/{year}", name: "byYear", methods: ["GET"])]
167167
public function getYearByYear(YearService $yearsService, int $year): Response
168168
{
169169
$context = (new ObjectNormalizerContextBuilder())
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<script setup lang="ts">
2+
defineProps<{
3+
title: string
4+
}>()
5+
6+
const model = defineModel<boolean>()
7+
defineEmits(["create"])
8+
</script>
9+
10+
<template>
11+
<UModal v-model="model" class="bg-opacity-0">
12+
<UCard>
13+
<template #header>
14+
<ModalHeader
15+
color="green"
16+
:title="title"
17+
icon="i-heroicons-plus-circle"
18+
/>
19+
</template>
20+
<slot />
21+
<template #footer>
22+
<div class="flex w-full justify-end space-x-2">
23+
<UButton
24+
color="green"
25+
icon="heroicons:plus-20-solid"
26+
@click="$emit('create')"
27+
>
28+
{{ $t("actions.create") }}
29+
</UButton>
30+
<UButton
31+
color="gray"
32+
icon="i-heroicons-x-mark-20-solid"
33+
@click="model = false"
34+
>
35+
{{ $t("actions.cancel") }}
36+
</UButton>
37+
</div>
38+
</template>
39+
</UCard>
40+
</UModal>
41+
</template>

frontend/components/modals/GenericEditModal.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<script setup lang="ts">
22
defineProps<{
33
title: string
4-
itemTitle: string | null
54
}>()
65
76
const model = defineModel<boolean>()

frontend/locales/de-DE.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,25 @@
6262
"title": "Bücherübersicht",
6363
"subtitle": "Wählen Sie Bücher zum Bestellen aus",
6464
"searchForBooks": "Nach Büchern suchen...",
65+
"createOrder": {
66+
"title": "Buch bestellen",
67+
"class": {
68+
"title": "Klasse",
69+
"placeholder": "Wählen Sie eine Klasse"
70+
},
71+
"repetents": {
72+
"title": "Repetenten",
73+
"placeholder": "Wählen Sie eine Option",
74+
"with": "Mit",
75+
"without": "Ohne",
76+
"only": "Nur"
77+
},
78+
"teacherCopy": "Lehrerkopie",
79+
"includeTeacherCopy": "Inkludieren",
80+
"includeDescription": "Bestellen Sie zusätzliche Kopien für den Lehrer",
81+
"successDescription": "Das Buch wurde erfolgreich bestellt.",
82+
"failureDescription": "Beim Bestellen des Buches ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut."
83+
},
6584
"updateOrder": {
6685
"title": "Buch bearbeiten",
6786
"successDescription": "Das Buch wurde erfolgreich bearbeitet.",
@@ -124,6 +143,7 @@
124143
"results": "Ergebnissen"
125144
},
126145
"actions": {
146+
"create": "Erstellen",
127147
"edit": "Bearbeiten",
128148
"info": "Info",
129149
"delete": "Löschen",

frontend/locales/en-US.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,25 @@
6262
"title": "Book Overview",
6363
"subtitle": "Choose books to order",
6464
"searchForBooks": "Search for books...",
65+
"createOrder": {
66+
"title": "Ordering a book",
67+
"class": {
68+
"title": "Class",
69+
"placeholder": "Select a class"
70+
},
71+
"repetents": {
72+
"title": "Repetents",
73+
"placeholder": "Select repetent option",
74+
"with": "With",
75+
"without": "Without",
76+
"only": "Only"
77+
},
78+
"teacherCopy": "Teacher Copy",
79+
"includeTeacherCopy": "Include",
80+
"includeDescription": "Get an extra copy for the teacher",
81+
"successDescription": "The order was successfully created.",
82+
"failureDescription": "An error occurred while creating the order. Please try again."
83+
},
6584
"updateOrder": {
6685
"title": "Update Book",
6786
"successDescription": "The book was successfully updated.",
@@ -124,6 +143,7 @@
124143
"results": "Results"
125144
},
126145
"actions": {
146+
"create": "Create",
127147
"edit": "Edit",
128148
"info": "Info",
129149
"delete": "Delete",

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nuxt-app",
33
"private": true,
44
"type": "module",
5-
"version": "0.16.0",
5+
"version": "0.16.2",
66
"scripts": {
77
"build": "nuxt build",
88
"dev": "nuxt dev",

0 commit comments

Comments
 (0)