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

Commit

Permalink
Merge pull request #282 from Dino-Kupinic/develop
Browse files Browse the repository at this point in the history
v0.16.2
  • Loading branch information
Dino-Kupinic authored Jun 19, 2024
2 parents 95cc214 + ddb7a90 commit 5a2d985
Show file tree
Hide file tree
Showing 9 changed files with 247 additions and 148 deletions.
56 changes: 28 additions & 28 deletions backend/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/src/Controller/YearController.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public function getYear(YearService $yearsService, int $id): Response
* )
* )
*/
#[Route(path: "/year/{year}", name: "index", methods: ["GET"])]
#[Route(path: "/year/{year}", name: "byYear", methods: ["GET"])]
public function getYearByYear(YearService $yearsService, int $year): Response
{
$context = (new ObjectNormalizerContextBuilder())
Expand Down
41 changes: 41 additions & 0 deletions frontend/components/modals/GenericCreateModal.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<script setup lang="ts">
defineProps<{
title: string
}>()
const model = defineModel<boolean>()
defineEmits(["create"])
</script>

<template>
<UModal v-model="model" class="bg-opacity-0">
<UCard>
<template #header>
<ModalHeader
color="green"
:title="title"
icon="i-heroicons-plus-circle"
/>
</template>
<slot />
<template #footer>
<div class="flex w-full justify-end space-x-2">
<UButton
color="green"
icon="heroicons:plus-20-solid"
@click="$emit('create')"
>
{{ $t("actions.create") }}
</UButton>
<UButton
color="gray"
icon="i-heroicons-x-mark-20-solid"
@click="model = false"
>
{{ $t("actions.cancel") }}
</UButton>
</div>
</template>
</UCard>
</UModal>
</template>
1 change: 0 additions & 1 deletion frontend/components/modals/GenericEditModal.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
defineProps<{
title: string
itemTitle: string | null
}>()
const model = defineModel<boolean>()
Expand Down
20 changes: 20 additions & 0 deletions frontend/locales/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,25 @@
"title": "Bücherübersicht",
"subtitle": "Wählen Sie Bücher zum Bestellen aus",
"searchForBooks": "Nach Büchern suchen...",
"createOrder": {
"title": "Buch bestellen",
"class": {
"title": "Klasse",
"placeholder": "Wählen Sie eine Klasse"
},
"repetents": {
"title": "Repetenten",
"placeholder": "Wählen Sie eine Option",
"with": "Mit",
"without": "Ohne",
"only": "Nur"
},
"teacherCopy": "Lehrerkopie",
"includeTeacherCopy": "Inkludieren",
"includeDescription": "Bestellen Sie zusätzliche Kopien für den Lehrer",
"successDescription": "Das Buch wurde erfolgreich bestellt.",
"failureDescription": "Beim Bestellen des Buches ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut."
},
"updateOrder": {
"title": "Buch bearbeiten",
"successDescription": "Das Buch wurde erfolgreich bearbeitet.",
Expand Down Expand Up @@ -124,6 +143,7 @@
"results": "Ergebnissen"
},
"actions": {
"create": "Erstellen",
"edit": "Bearbeiten",
"info": "Info",
"delete": "Löschen",
Expand Down
20 changes: 20 additions & 0 deletions frontend/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,25 @@
"title": "Book Overview",
"subtitle": "Choose books to order",
"searchForBooks": "Search for books...",
"createOrder": {
"title": "Ordering a book",
"class": {
"title": "Class",
"placeholder": "Select a class"
},
"repetents": {
"title": "Repetents",
"placeholder": "Select repetent option",
"with": "With",
"without": "Without",
"only": "Only"
},
"teacherCopy": "Teacher Copy",
"includeTeacherCopy": "Include",
"includeDescription": "Get an extra copy for the teacher",
"successDescription": "The order was successfully created.",
"failureDescription": "An error occurred while creating the order. Please try again."
},
"updateOrder": {
"title": "Update Book",
"successDescription": "The book was successfully updated.",
Expand Down Expand Up @@ -124,6 +143,7 @@
"results": "Results"
},
"actions": {
"create": "Create",
"edit": "Edit",
"info": "Info",
"delete": "Delete",
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nuxt-app",
"private": true,
"type": "module",
"version": "0.16.0",
"version": "0.16.2",
"scripts": {
"build": "nuxt build",
"dev": "nuxt dev",
Expand Down
Loading

0 comments on commit 5a2d985

Please sign in to comment.