Feature/kob 66 angebote stadtweit

frontend/src/core/core.router.ts

@@ -3,49 +3,54 @@ import Router from "vue-router";
 // Add this import at the top of core.router.ts
 import vuetify, { adminTheme, kobitTheme } from "@/core/plugins/vuetify";
 
-import {theMainRoutes} from "@/features/the-main/the-main.routes";
-import {erfahreMehrRoutes} from "@/features/the-additional/the-additional.routes";
+import { theMainRoutes } from "@/features/the-main/the-main.routes";
+import { erfahreMehrRoutes } from "@/features/the-additional/the-additional.routes";
 import {
     conflictPreventionRoutes
 } from "@/features/the-additional/features/the-conflict-prevention/the-conflict-prevention.routes";
-import {downloadsRoutes} from "@/features/the-additional/features/the-downloads/the-downloads.routes";
-import {faqRoutes} from "@/features/the-additional/features/the-faq/the-faq.routes";
-import {glossarRoutes} from "@/features/the-additional/features/the-glossar/the-glossar.routes";
+import { downloadsRoutes } from "@/features/the-additional/features/the-downloads/the-downloads.routes";
+import { faqRoutes } from "@/features/the-additional/features/the-faq/the-faq.routes";
+import { glossarRoutes } from "@/features/the-additional/features/the-glossar/the-glossar.routes";
 import {
     leadershipCooperationRoutes
 } from "@/features/the-additional/features/the-leadership-cooperation/the-leadership-cooperation.routes";
-import {dvFairRoutes} from "@/features/the-additional/features/the-dv-fair/the-dv-fair.routes";
+import { dvFairRoutes } from "@/features/the-additional/features/the-dv-fair/the-dv-fair.routes";
 import {
     escalationStepsRoutes
 } from "@/features/the-additional/features/the-escalation-steps/the-escalation-steps.routes";
 import {
     theAnlaufstellenRoutes
 } from "@/features/the-unterstuetzungsfinder/features/the-contact-points/the-contact-points.routes";
-import {theAngeboteRoutes} from "@/features/the-angebote/the-angebote.routes";
-import {theUnterstuetzungsfinderRoutes} from "@/features/the-unterstuetzungsfinder/the-unterstuetzungsfinder.routes";
+import { theOfferRoutes } from "@/features/the-offers/the-offers.routes";
+import { theUnterstuetzungsfinderRoutes } from "@/features/the-unterstuetzungsfinder/the-unterstuetzungsfinder.routes";
 import {
     theAnlaufstellenDetailsRoutes
 } from "@/features/the-unterstuetzungsfinder/features/the-contact-points/the-contact-points-details.routes";
-import {adminUFinderRoutes} from "@/features/admin/components/u-finder/u-finder.routes";
+import { adminUFinderRoutes } from "@/features/admin/components/u-finder/u-finder.routes";
 
-import {adminRoutes} from "@/features/admin/the-admin-routes";
-import {adminContactPointsRoutes} from "@/features/admin/features/the-contact-points/the-contact-points-routes";
-import {adminExperienceMoreRoutes} from "@/features/admin/features/the-additional/the-additional-overview-routes";
+import { adminRoutes } from "@/features/admin/the-admin-routes";
+import { adminContactPointsRoutes } from "@/features/admin/features/the-contact-points/the-contact-points-routes";
+import { adminAdditionalRoutes } from "@/features/admin/features/the-additional/the-additional-overview-routes";
 import {
     adminConflictPreventionRoutes
-  } from "@/features/admin/features/the-additional/features/the-conflict-prevention/the-conflict-prevention.routes";
-  import {
+} from "@/features/admin/features/the-additional/features/the-conflict-prevention/the-conflict-prevention.routes";
+import {
     adminDownloadsRoutes
-  } from "@/features/admin/features/the-additional/features/the-downloads/the-downloads.routes";
-  import {
+} from "@/features/admin/features/the-additional/features/the-downloads/the-downloads.routes";
+import {
     adminFaqRoutes
-  } from "@/features/admin/features/the-additional/features/the-faq/the-faq.routes";
-  import {
+} from "@/features/admin/features/the-additional/features/the-faq/the-faq.routes";
+import {
     adminGlossarRoutes
-  } from "@/features/admin/features/the-additional/features/the-glossar/the-glossar.routes";
-  import {
+} from "@/features/admin/features/the-additional/features/the-glossar/the-glossar.routes";
+import {
     adminLeadershipCooperationRoutes
-  } from "@/features/admin/features/the-additional/features/the-leadership-cooperation/the-leadership-cooperation.routes";
+} from "@/features/admin/features/the-additional/features/the-leadership-cooperation/the-leadership-cooperation.routes";
+
+import {
+    adminOffersRoutes
+} from "@/features/admin/features/the-offers/the-offers.routes";
+
 
 Vue.use(Router);
 
@@ -82,16 +87,17 @@ const router = new Router({
         escalationStepsRoutes,
         theAnlaufstellenRoutes,
         theAnlaufstellenDetailsRoutes,
-        theAngeboteRoutes,
+        theOfferRoutes,
         adminRoutes,
         adminContactPointsRoutes,
-        adminExperienceMoreRoutes,
+        adminAdditionalRoutes,
         adminConflictPreventionRoutes,
         adminDownloadsRoutes,
         adminFaqRoutes,
         adminGlossarRoutes,
         adminLeadershipCooperationRoutes,
-        adminUFinderRoutes
+        adminUFinderRoutes,
+        adminOffersRoutes
     ]
 });
 

frontend/src/core/core.store.ts

@@ -55,11 +55,6 @@ import {
     TheErfahreMehrModuleState,
     theErfahreMehrStoreModule
 } from "@/features/the-additional/the-additional-store.module";
-import {
-    THE_ANGEBOTE_MODULE_NAME,
-    TheAngeboteModuleState,
-    theAngeboteStoreModule
-} from "@/features/the-angebote/the-angebote-store.module";
 import {
     THE_DISCLAIMER_MODULE_NAME,
     theDisclaimerStoreModule,
@@ -81,7 +76,6 @@ export interface RootState {
     theDvFairStoreModuleState: TheDvFairStoreModuleState;
     theEscalationStepsStoreModuleState: TheEscalationStepsStoreModuleState;
     theAnlaufstellenStoreState: TheAnlaufstellenStoreState;
-    theAngeboteModuleState: TheAngeboteModuleState;
     theDisclaimerStoreState: TheDisclaimerStoreState;
 }
 
@@ -98,7 +92,6 @@ export default new Vuex.Store<RootState>({
         [THE_CONFLICT_PREVENTION_MODULE_NAME]: theConflictPreventionStoreModule,
         [THE_DOWNLOADS_MODULE_NAME]: theDownloadsStoreModule,
         [THE_ANLAUFSTELLEN_MODULE_NAME]: theAnlaufstellenStoreModule,
-        [THE_ANGEBOTE_MODULE_NAME]: theAngeboteStoreModule,
         [THE_DISCLAIMER_MODULE_NAME]: theDisclaimerStoreModule
     },
     strict: notOnProduction

frontend/src/core/services/downloads/privacypolicy.vue

@@ -1,11 +1,12 @@
 <template>
-  <p>
+  <p class="pt-0 mt-4">
     <v-btn
       v-if="item !== undefined"
       plain
       :href="item.textItemView[0].link"
       :download="item.textItemView[0].header"
       :loading="isLoading"
+      class="pt-0 mt-0"
     >
       Datenschutzhinweis <v-icon>mdi-download</v-icon>
     </v-btn>

frontend/src/core/translations/de-DE.json

@@ -66,10 +66,25 @@
         "addDepartmentHint":"Um ein weiteres Referat hinzuzufügen geben Sie dies ein und drücken Sie bitte <kbd>enter</kbd>."
       }
     },
+    "offers": {
+      "texts": {
+        "addNewTitle": "Hinzufügen",
+        "addNewDescription": "Fügen Sie eine neues Angebot hinzu.",
+        "addDepartment": "Referat",
+        "addContact": "Kontakt hinzufügen",
+        "addLink": "Link hinzufügen",
+        "addFile": "Datei hinzufügen",
+        "edit": "Bearbeiten Sie eine bestehende Anlaufstelle.",
+        "cancel": "Abbrechen",
+        "save": "Speichern",
+        "markdownHint": "Die Beschreibung kann mittels Markdown (Empfehlung) oder HTML designed werden. Das Ergebnis sehen Sie in dem Feld daneben. Über diesen Link können Sie sich die verschiedenen Möglichkeiten von Markdown ansehen: ",
+        "addDepartmentHint":"Um ein weiteres Referat hinzuzufügen geben Sie dies ein und drücken Sie bitte <kbd>enter</kbd>."
+      }
+    },
     "contentItems": {
       "texts": {
         "addNewTitle": "Hinzufügen",
-        "addNewDescription": "Fügen Sie eine neue Anlaufstelle hinzu.",
+        "addNewDescription": "Fügen Sie eine neuen Artikel hinzu.",
         "addContact": "Kontakt hinzufügen",
         "addLink": "Link hinzufügen",
         "addFile": "Datei hinzufügen",

frontend/src/features/admin/components/middleware/useGetAdminUserInfoText.ts

@@ -15,7 +15,7 @@ const mapAdminInfoToText = (adminInfo: AdminUserInfo): AdminTextInfo => {
 }
 
 export const useGetAdminUserInfoText = () =>
-    useQuery<AdminTextInfo>(['adminInfo'],
+    useQuery<AdminTextInfo>(['adminInfoText'],
         () => getAdminUserInfo().then(mapAdminInfoToText)
     );
 

frontend/src/features/admin/features/the-additional/commons/AddTextItemDialog.vue

@@ -21,6 +21,7 @@
                 <v-col cols="12">
                   <v-text-field
                     v-model="addedItem.header"
+                    color="secondary"
                     :label="headerLabel"
                     :rules="[headerRule]"
                     max-file-name-input-length="250"
@@ -32,6 +33,7 @@
                 <v-col cols="12">
                   <v-textarea
                     v-model="addedItem.entry"
+                    color="secondary"
                     :label="entryLabel"
                     :rules="[entryRule]"
                     max-file-name-input-length="1500"
@@ -89,9 +91,9 @@
 </template>
 
 <script lang="ts">
 import { defineComponent, watch, PropType, computed, ref, onMounted, getCurrentInstance } from "vue";
 import { TextItem } from "@/features/commons/types/Item";
 import { VDialog, VCard, VCardTitle, VCardText, VCardActions, VSpacer, VBtn, VCol, VContainer, VFileInput, VForm, VIcon, VRow, VSnackbar, VTextarea, VTextField } from "vuetify/lib";
 import { useCreateNewTextItem } from "../features/middelware/useTextItem";
 import { useRouter } from "vue-router/composables";
 import ErrorHandler from "@/features/commons/components/ErrorHandler.vue";

frontend/src/features/admin/features/the-additional/commons/DeleteTextItemDialog.vue

@@ -22,7 +22,7 @@
             <v-icon>mdi-cancel</v-icon> Abbruch
           </v-btn>
           <v-btn
-            color="green darken-1 white--text"
+            color="error"
             @click="deleteItem"
           >
             <v-icon>mdi-delete</v-icon> Löschen
@@ -33,7 +33,7 @@
     <v-snackbar
       v-model="isSnackbarActive"
       :timeout="SNACKBAR_TIMEOUT"
-      color="green darken-1"
+      color="error"
       bottom
     >
       <p class="pa-0 ma-0">

frontend/src/features/admin/features/the-additional/commons/EditTextItemDialog.vue

@@ -21,6 +21,7 @@
                 <v-col cols="12">
                   <v-text-field
                     v-model="editedItem.header"
+                    color="secondary"
                     :label="headerLabel"
                     :rules="[headerRule]"
                     max-file-name-input-length="250"
@@ -32,6 +33,7 @@
                 <v-col cols="12">
                   <v-textarea
                     v-model="editedItem.entry"
+                    color="secondary"
                     :label="entryLabel"
                     :rules="[entryRule]"
                     max-file-name-input-length="1500"

frontend/src/features/admin/features/the-additional/commons/TextList.vue

@@ -59,7 +59,7 @@
                 <v-icon>mdi-pencil</v-icon> Bearbeiten
               </v-btn>
               <v-btn
-                color="green darken-1 ml-2 white--text"
+                color="error ml-2"
                 @click="openDeleteDialog(item)"
               >
                 <v-icon>mdi-delete</v-icon> Löschen

frontend/src/features/admin/features/the-additional/features/api/TextItemManipulationClient.ts

@@ -62,8 +62,12 @@ export const putTextItem = async (id: string, pageType: string, textItem: TextIt
 }
 
 export const deleteTextItem = async (id: string, pageType: string, link: string) => {
-    const deleteOldFile = `/s3/delete?link=${encodeURIComponent(link.toString())}`;
-    await httpDeleteS3File(deleteOldFile);
-    const url = `/additional/${pageType}/text-item/${id}?link=${encodeURIComponent(link)}`;
+
+    if(link){
+        const deleteOldFile = `/s3/delete?link=${encodeURIComponent(link.toString())}`;
+        await httpDeleteS3File(deleteOldFile);
+    }
+
+    const url = `/additional/${pageType}/text-item/${id}`;
     return httpDeleteJson(url);
 }