Skip to content

Commit

Permalink
Merge pull request #5732 from manuelmeister/feature/print-overviews
Browse files Browse the repository at this point in the history
Refactor story page to summary page
  • Loading branch information
manuelmeister authored Sep 12, 2024
2 parents 6843677 + 6520178 commit b1312a8
Show file tree
Hide file tree
Showing 37 changed files with 641 additions and 1,127 deletions.
18 changes: 13 additions & 5 deletions common/locales/de.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"components": {
"story": {
"storyDay": {
"noStory": "Die Blöcke an diesem Tag enthalten keinen roten Faden."
"summary": {
"summaryDay": {
"noContent": "Die Blöcke an diesem Tag enthalten keine '{contentType}' Inhalte."
}
}
},
Expand Down Expand Up @@ -244,6 +244,9 @@
"shortScheduleEntryDescription": "Tag\u202f{dayNumber} {startTime}"
},
"print": {
"config": {
"periods": "Lagerabschnitt(e)"
},
"cover": {
"title": "Titelseite"
},
Expand All @@ -259,8 +262,13 @@
"program": {
"title": "Detailprogramm"
},
"story": {
"title": "Roter Faden"
"summary": {
"safetyConsiderations": {
"title": "Sicherheitsüberlegungen"
},
"storycontext": {
"title": "Roter Faden"
}
},
"toc": {
"title": "Inhaltsverzeichnis"
Expand Down
18 changes: 13 additions & 5 deletions common/locales/en.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"components": {
"story": {
"storyDay": {
"noStory": "The activities on this day do not contain any story content."
"summary": {
"summaryDay": {
"noContent": "The activities on this day do not contain any {contentType} content."
}
}
},
Expand Down Expand Up @@ -251,6 +251,9 @@
"shortScheduleEntryDescription": "day {dayNumber} {startTime}"
},
"print": {
"config": {
"periods": "Period(s)"
},
"cover": {
"title": "Cover page"
},
Expand All @@ -266,8 +269,13 @@
"program": {
"title": "Program"
},
"story": {
"title": "Storyline"
"summary": {
"safetyConsiderations": {
"title": "Safety considerations"
},
"storycontext": {
"title": "Story"
}
},
"toc": {
"title": "Table of contents"
Expand Down
18 changes: 13 additions & 5 deletions common/locales/fr.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"components": {
"story": {
"storyDay": {
"noStory": "Aucun file rouge trouvé ce jour-là..."
"summary": {
"summaryDay": {
"noContent": "Aucun {contentType} trouvé ce jour-là..."
}
}
},
Expand Down Expand Up @@ -231,6 +231,9 @@
}
},
"print": {
"config": {
"periods": "Période(s) du camp"
},
"cover": {
"title": "Page de couverture"
},
Expand All @@ -246,8 +249,13 @@
"program": {
"title": "Programme"
},
"story": {
"title": "Histoire"
"summary": {
"safetyConsiderations": {
"title": "Considérations de sécurité"
},
"storycontext": {
"title": "Histoire"
}
},
"toc": {
"title": "Table des matières"
Expand Down
18 changes: 13 additions & 5 deletions common/locales/it.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"components": {
"story": {
"storyDay": {
"noStory": "Nessun contenuto di storia trovato in questo giorno..."
"summary": {
"summaryDay": {
"noContent": "Nessun contenuto '{contentType}' trovato in questo giorno..."
}
}
},
Expand Down Expand Up @@ -221,6 +221,9 @@
}
},
"print": {
"config": {
"periods": "Sezione/i portante/i"
},
"cover": {
"title": "Pagina di copertina"
},
Expand All @@ -230,8 +233,13 @@
"program": {
"title": "Programma"
},
"story": {
"title": "Trama"
"summary": {
"safetyConsiderations": {
"title": "Considerazioni sulla sicurezza"
},
"storycontext": {
"title": "Storia"
}
},
"toc": {
"title": "Indice dei contenuti"
Expand Down
2 changes: 1 addition & 1 deletion frontend/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default [
'error',
{
ignoreKeysRegex:
'^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|story|toc))\\..+',
'^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|config|summary|toc))\\..+',
translationKeyPropRegex: '[a-zA-Z0-9]-i18n-key$',
},
],
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/components/print/PrintConfigurator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ import PrintPreviewNuxt from './print-nuxt/PrintPreviewNuxt.vue'
import Draggable from 'vuedraggable'
import CoverConfig from './config/CoverConfig.vue'
import PicassoConfig from './config/PicassoConfig.vue'
import StoryConfig from './config/StoryConfig.vue'
import SummaryConfig from './config/SummaryConfig.vue'
import ProgramConfig from './config/ProgramConfig.vue'
import ActivityConfig from './config/ActivityConfig.vue'
import TocConfig from './config/TocConfig.vue'
Expand All @@ -112,6 +112,8 @@ import { getEnv } from '@/environment.js'
import cloneDeep from 'lodash/cloneDeep'
import VueI18n from '../../plugins/i18n/index.js'
import repairConfig from './repairPrintConfig.js'
import StoryConfig from '@/components/print/config/StoryConfig.vue'
import SafetyConsiderationsConfig from '@/components/print/config/SafetyConsiderationsConfig.vue'
import campShortTitle from '@/common/helpers/campShortTitle.js'
export default {
Expand All @@ -126,7 +128,7 @@ export default {
PrintPreviewNuxt,
CoverConfig,
PicassoConfig,
StoryConfig,
SummaryConfig,
ProgramConfig,
ActivityConfig,
TocConfig,
Expand All @@ -143,6 +145,7 @@ export default {
Cover: CoverConfig,
Picasso: PicassoConfig,
Story: StoryConfig,
SafetyConsiderations: SafetyConsiderationsConfig,
Program: ProgramConfig,
Activity: ActivityConfig,
Toc: TocConfig,
Expand Down Expand Up @@ -209,6 +212,7 @@ export default {
type: 'Story',
options: {
periods: [period._meta.self],
contentType: 'Storycontext',
},
})
contents.push({
Expand Down
Loading

0 comments on commit b1312a8

Please sign in to comment.