Merge branch 'main' into dev
All checks were successful
Website Dev / Entwicklungsumgebung (push) Successful in 13s

This commit is contained in:
2024-09-16 21:47:03 +02:00
55 changed files with 319 additions and 748 deletions

View File

@ -1,86 +0,0 @@
import { EditorProps, MarkdownProps, ImageProps } from "../props.js";
import { Title, DescriptionText, DraftBoolean } from "./widgets.js";
const GanztagCollection = {
name: "ganztagsangebote",
label: "Ganztag",
label_singular: "Arbeitsgemeinschaft",
description:
"Hier kann die Übersicht der Ganztagsangebote bearbeitet werden.",
icon: "group",
folder: "content/ganztagsangebote",
...EditorProps,
filter: {
field: "type",
value: "ganztagsangebote",
},
summary_fields: ["title", "draft", "category", "schedule", "room"],
fields: [
Title(false),
DraftBoolean,
DescriptionText,
{
name: "image",
label: "Titelbild",
default: "/media/ganztagsangebote/image.webp",
...ImageProps,
required: true,
},
{
name: "category",
label: "Themebereich",
hint: "Verwaltet in den Einstellungen",
widget: "relation",
collection: "settings",
file: "data-categories",
value_field: "ganztag.*",
search_fields: ["ganztag.*"],
display_fields: ["ganztag.*"],
required: true,
},
{
name: "duration",
label: "Dauer",
widget: "string",
required: true,
},
{
name: "schedule",
label: "Tag/Stunden",
widget: "string",
required: true,
},
{
name: "class",
label: "Klassenstufen(n)",
widget: "string",
required: true,
},
{
name: "room",
label: "Raum",
widget: "string",
required: true,
},
{
name: "apply_url",
label: "Anmeldelink",
widget: "hidden",
default: "https://moodle.bildung-lsa.de/gcg/mod/choice/view.php?id=828",
},
{
name: "type",
label: "Typ",
widget: "hidden",
default: "ganztagsangebote",
},
{
name: "body",
label: "Inhalt",
required: false,
...MarkdownProps,
},
],
};
export default GanztagCollection;

View File

@ -241,7 +241,46 @@ const IndexPagesCollection = {
name: "ganztagsangebote-index",
label: "Unser Ganztagsbereich",
file: "content/ganztagsangebote/_index.md",
fields: [Title(false), DescriptionText],
fields: [
Title(false),
DescriptionText,
{
name: "tiles",
label: "Ganztagsangebote",
hint: "Die Vorschau zeigt nur die Karten, NICHT die Inhalte.",
widget: "list",
required: false,
collapsed: true,
fields: [
Title(false),
{
name: "image",
label: "Titelbild",
default: "/media/ganztagsangebote/image.webp",
...ImageProps,
required: true,
},
{
name: "category",
label: "Themebereich",
hint: "Verwaltet in den Einstellungen",
widget: "relation",
collection: "settings",
file: "data-categories",
value_field: "ganztag.*",
search_fields: ["ganztag.*"],
display_fields: ["ganztag.*"],
required: true,
},
{
name: "content",
label: "Inhalt",
required: false,
...MarkdownProps,
},
],
},
],
},
{
name: "projektwoche-index",

View File

@ -4,7 +4,6 @@ import PagesCollection from "./pages.js";
import AuthorCollection from "./author.js";
import BlogCollection from "./blog.js";
import FormsCollection from "./forms.js";
import GanztagCollection from "./ganztag.js";
import WettbewerbeCollection from "./wettbewerbe.js";
import BegabteCollection from "./begabte.js";
import ProjektwocheCollection from "./projektwoche.js";
@ -23,7 +22,6 @@ export {
AuthorCollection,
BlogCollection,
FormsCollection,
GanztagCollection,
WettbewerbeCollection,
BegabteCollection,
ProjektwocheCollection,

View File

@ -376,15 +376,6 @@ const SettingsCollection = {
required: true,
},
Title(false),
{
name: "paginate",
label: "Anzahl der Seitenelemente",
widget: "number",
value_type: "int",
min: 1,
step: 1,
required: true,
},
{
name: "summaryLength",
label: "Länge von Zusammenfassungen (Zeichenanzahl)",

View File

@ -12,7 +12,7 @@ const StatsCollection = {
{
name: "abiturdurchschnitte",
label: "Abiturdurchschnitte",
file: "static/data/abiturdurchschnitte.json",
file: "assets/data/abiturdurchschnitte.json",
fields: [
{
name: "abiturdurchschnitte",
@ -43,7 +43,7 @@ const StatsCollection = {
{
name: "schuelerzahlen",
label: "Schülerzahlen",
file: "static/data/schuelerzahlen.json",
file: "assets/data/schuelerzahlen.json",
fields: [
{
name: "schuelerzahlen",

View File

@ -8,7 +8,6 @@ import {
ChronikjahreCollection,
ChronikseitenCollection,
FormsCollection,
GanztagCollection,
IndexPagesCollection,
PagesCollection,
ProjektwocheCollection,
@ -64,7 +63,6 @@ const config = {
AuthorCollection,
BlogCollection,
FormsCollection,
GanztagCollection,
WettbewerbeCollection,
BegabteCollection,
ProjektwocheCollection,

View File

@ -22,7 +22,6 @@
AboutPreview,
BlogPreview,
ContestPreview,
GanztagPreview,
PagePreview,
EventPreview,
AnmeldungPreview,
@ -64,7 +63,6 @@
CMS.registerPreviewTemplate("about-index", AboutPreview);
CMS.registerPreviewTemplate("blog", BlogPreview);
CMS.registerPreviewTemplate("wettbewerbe", ContestPreview);
CMS.registerPreviewTemplate("ganztagsangebote", GanztagPreview);
CMS.registerPreviewTemplate("kontakt", KontaktPreview);
CMS.registerPreviewTemplate("termine", EventPreview);
CMS.registerPreviewTemplate("anmeldung-index", AnmeldungPreview);
@ -75,7 +73,7 @@
CMS.registerPreviewTemplate("forms", FormsPreview);
CMS.registerPreviewTemplate("cantorpreis", CantorpreisPreview);
CMS.registerPreviewTemplate("begabte", ContestPreview);
["projektwoche", "superhaufen"].forEach((page) =>
["projektwoche", "superhaufen", "ganztagsangebote-index"].forEach((page) =>
CMS.registerPreviewTemplate(page, ProjektwochePreview)
);
["abiturienten", "cantorfora"].forEach((page) =>
@ -85,7 +83,6 @@
"blog-index",
"cantorpreis-index",
"forms-index",
"ganztagsangebote-index",
"wettbewerbe-index",
"begabte-index",
"abiturienten-index",
@ -134,7 +131,6 @@
"blog",
"cantorpreis",
"pages",
"ganztagsangebote",
"wettbewerbe",
"begabte",
"projektwoche",

View File

@ -1,111 +0,0 @@
import {
Container,
ContentJustify,
PageHeader,
Section,
} from "./components/index.js";
const GanztagPreview = ({
widgetFor,
entry,
fields,
collection,
}) => {
const imageField = useMemo(() => {
return fields.find((field) => field.name === "image");
}, [fields]);
const imageUrl = useMediaAsset(
entry.data.image,
collection,
imageField,
entry
);
return [
PageHeader(entry),
Section(
Container([
h("img", { className: "img-fluid w-100 mb-4", src: imageUrl }),
h("h2", {}, entry.data.title),
h(
"div",
{ className: "row mb-4" },
h(
"div",
{ className: "col-lg-3 col-sm-6 mb-3 mb-sm-0" },
h(
"div",
{ className: "d-flex align-items-center" },
h("i", {
className:
"mdi mdi-calendar-today-outline text-primary icon-md me-2",
}),
h(
"div",
{ className: "text-start" },
h("h6", { className: "mb-0 text-uppercase" }, "Zeit"),
h("p", { className: "mb-0" }, entry.data.schedule)
)
)
),
h(
"div",
{ className: "col-lg-3 col-sm-6 mb-3 mb-sm-0" },
h(
"div",
{ className: "d-flex align-items-center" },
h("i", {
className: "mdi mdi-timer-sand text-primary icon-md me-2",
}),
h(
"div",
{ className: "text-start" },
h("h6", { className: "mb-0 text-uppercase" }, "Dauer"),
h("p", { className: "mb-0" }, entry.data.duration)
)
)
),
h(
"div",
{ className: "col-lg-3 col-sm-6 mb-3 mb-sm-0" },
h(
"div",
{ className: "d-flex align-items-center" },
h("i", {
className: "mdi mdi-crowd text-primary icon-md me-2",
}),
h(
"div",
{ className: "text-start" },
h("h6", { className: "mb-0 text-uppercase" }, "Klassen"),
h("p", { className: "mb-0" }, entry.data.class)
)
)
),
h(
"div",
{ className: "col-lg-3 col-sm-6 mb-3 mb-sm-0" },
h(
"div",
{ className: "d-flex align-items-center" },
h("i", {
className:
"mdi mdi-map-marker-radius-outline text-primary icon-md me-2",
}),
h(
"div",
{ className: "text-start" },
h("h6", { className: "mb-0 text-uppercase" }, "Raum"),
h("p", { className: "mb-0" }, entry.data.room)
)
)
)
),
h("hr", { className: "mb-4" }),
ContentJustify(widgetFor("body")),
])
),
];
};
export default GanztagPreview;

View File

@ -1,7 +1,6 @@
import AboutPreview from "./about-preview.js";
import BlogPreview from "./blog-preview.js";
import ContestPreview from "./contest-preview.js";
import GanztagPreview from "./ganztag-preview.js";
import PagePreview from "./page-preview.js";
import EventPreview from "./event-preview.js";
import AnmeldungPreview from "./anmeldung-preview.js";
@ -22,7 +21,6 @@ export {
AboutPreview,
BlogPreview,
ContestPreview,
GanztagPreview,
PagePreview,
EventPreview,
AnmeldungPreview,

View File

@ -1,11 +1,7 @@
import {
Container,
ContentJustify,
PageHeader,
Row,
} from "./components/index.js";
import { Container, ContentJustify, PageHeader, Row } from "./components/index.js";
const ProjektwochePreview = ({ widgetsFor, widgetFor, entry }) => {
const ProjektwochePreview = ({ widgetsFor, widgetFor, entry, collection, fields }) => {
const imageField = useMemo(() => fields.find((field) => field.name === "image"), [fields]);
return [
PageHeader(entry),
h(
@ -23,30 +19,27 @@ const ProjektwochePreview = ({ widgetsFor, widgetFor, entry }) => {
{
className: "card border-primary rounded-0 hover-shadow mb-4",
},
h(
"div",
{
className: "container fb-tile-color",
style: { backgroundColor: tile.data.bg_color },
},
h("i", {
className: (tile.data.icon ?? "") + " fb-tile-icon",
style: { color: tile.data.font_color },
})
),
tile.data.image && tile.data.image != "" && tile.data.image != "/media/image.webp"
? h("img", {
className: "card-img-top rounded-0",
src: useMediaAsset(tile.data.image, collection, imageField, entry),
})
: h(
"div",
{
className: "container fb-tile-color",
style: { backgroundColor: tile.data.bg_color },
},
h("i", {
className: (tile.data.icon ?? "") + " fb-tile-icon",
style: { color: tile.data.font_color },
})
),
h(
"div",
{ className: "card-body" },
h(
"h4",
{ className: "card-title text-truncate" },
tile.data.title
),
h(
"button",
{ type: "button", className: "btn btn-primary btn-sm" },
"Mehr anzeigen"
)
h("h4", { className: "card-title text-truncate" }, tile.data.title),
h("button", { type: "button", className: "btn btn-primary btn-sm" }, "Mehr anzeigen")
)
)
)

View File

@ -1,128 +0,0 @@
{
"abiturdurchschnitte": [
{
"jahr": 1992,
"schnitt": 1.4
},
{
"jahr": 1993,
"schnitt": 1.5
},
{
"jahr": 1994,
"schnitt": 1.5
},
{
"jahr": 1995,
"schnitt": 1.7
},
{
"jahr": 1996,
"schnitt": 1.7
},
{
"jahr": 1997,
"schnitt": 1.7
},
{
"jahr": 1998,
"schnitt": 2
},
{
"jahr": 2000,
"schnitt": 2.1
},
{
"jahr": 2002,
"schnitt": 1.9
},
{
"jahr": 2003,
"schnitt": 1.8
},
{
"jahr": 2004,
"schnitt": 1.9
},
{
"jahr": 2005,
"schnitt": 1.8
},
{
"jahr": 2006,
"schnitt": 1.7
},
{
"jahr": 2007,
"schnitt": 1.8
},
{
"jahr": 2008,
"schnitt": 1.9
},
{
"jahr": 2009,
"schnitt": 1.7
},
{
"jahr": 2010,
"schnitt": 1.9
},
{
"jahr": 2011,
"schnitt": 2.25
},
{
"jahr": 2012,
"schnitt": 2.09
},
{
"jahr": 2013,
"schnitt": 1.96
},
{
"jahr": 2014,
"schnitt": 1.9
},
{
"jahr": 2015,
"schnitt": 2.02
},
{
"jahr": 2016,
"schnitt": 2
},
{
"jahr": 2017,
"schnitt": 1.91
},
{
"jahr": 2018,
"schnitt": 1.9
},
{
"jahr": 2019,
"schnitt": 1.8
},
{
"jahr": 2020,
"schnitt": 1.9
},
{
"jahr": 2021,
"schnitt": 1.81
},
{
"jahr": 2022,
"schnitt": 1.74
},
{
"jahr": 2023,
"schnitt": 1.9
},
{
"jahr": 2024,
"schnitt": 1.65
}
]
}

View File

@ -1,184 +0,0 @@
{
"schuelerzahlen": [
{
"year": 1988,
"all": 54,
"girls": 11
},
{
"year": 1989,
"all": 101,
"girls": 14
},
{
"year": 1990,
"all": 173,
"girls": 36
},
{
"year": 1991,
"all": 340,
"girls": 70
},
{
"year": 1992,
"all": 397,
"girls": 99
},
{
"year": 1992,
"all": 446,
"girls": 122
},
{
"year": 1994,
"all": 501,
"girls": 133
},
{
"year": 1995,
"all": 523,
"girls": 149
},
{
"year": 1996,
"all": 555,
"girls": 162
},
{
"year": 1997,
"all": 551,
"girls": 163
},
{
"year": 1998,
"all": 526,
"girls": 152
},
{
"year": 1999,
"all": 581,
"girls": 177
},
{
"year": 2000,
"all": 540,
"girls": 168
},
{
"year": 2001,
"all": 595,
"girls": 179
},
{
"year": 2002,
"all": 587,
"girls": 176
},
{
"year": 2003,
"all": 605,
"girls": 186
},
{
"year": 2004,
"all": 618,
"girls": 183
},
{
"year": 2005,
"all": 604,
"girls": 182
},
{
"year": 2006,
"all": 594,
"girls": 175
},
{
"year": 2007,
"all": 519,
"girls": 139
},
{
"year": 2008,
"all": 509,
"girls": 136
},
{
"year": 2009,
"all": 513,
"girls": 135
},
{
"year": 2010,
"all": 509,
"girls": 137
},
{
"year": 2011,
"all": 514,
"girls": 139
},
{
"year": 2012,
"all": 504,
"girls": 132
},
{
"year": 2013,
"all": 524,
"girls": 127
},
{
"year": 2014,
"all": 536,
"girls": 137
},
{
"year": 2015,
"all": 525,
"girls": 139
},
{
"year": 2016,
"all": 527,
"girls": 138
},
{
"year": 2017,
"all": 522,
"girls": 135
},
{
"year": 2018,
"all": 531,
"girls": 138
},
{
"year": 2019,
"all": 537,
"girls": 141
},
{
"year": 2020,
"all": 535,
"girls": 150
},
{
"year": 2021,
"all": 531,
"girls": 145
},
{
"year": 2022,
"all": 535,
"girls": 137
},
{
"year": 2023,
"all": 534,
"girls": 141
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 KiB