Sync dev with master #253

Manually merged
Denys Konovalov merged 157 commits from master into dev 2023-12-24 14:26:06 +01:00
8 changed files with 48 additions and 98 deletions
Showing only changes of commit d94cc5b584 - Show all commits

@ -19,49 +19,38 @@ const AuthorCollection = {
field: "type", field: "type",
value: "author", value: "author",
}, },
view_filters: { view_filters: [
filters: [ {
{ label: "aktiv",
name: "active", field: "active",
label: "aktiv", pattern: true,
field: "active", },
pattern: true, {
}, label: "inaktiv",
{ field: "active",
name: "inactive", pattern: false,
label: "inaktiv", },
field: "active", {
pattern: false, label: "einfach",
}, field: "simplified",
{ pattern: true,
name: "simplified", },
label: "einfach", {
field: "simplified", label: "erweitert",
pattern: true, field: "simplified",
}, pattern: false,
{ },
name: "extended", ],
label: "erweitert", view_groups: [
field: "simplified", {
pattern: false, label: "vereinfacht",
}, field: "simplified",
], },
}, {
view_groups: { label: "aktiv",
default: "active", field: "active",
groups: [ },
{ ],
name: "simplified",
label: "vereinfacht",
field: "simplified",
},
{
name: "active",
label: "aktiv",
field: "active",
},
],
},
summary_fields: ["title", "active", "simplified", "body"], summary_fields: ["title", "active", "simplified", "body"],
fields: [ fields: [
{ {

@ -24,16 +24,12 @@ const BlogCollection = {
field: "type", field: "type",
value: "post", value: "post",
}, },
view_groups: { view_groups: [
default: "draft", {
groups: [ label: "Entwurf",
{ field: "draft",
name: "draft", },
label: "Entwurf", ],
field: "draft",
},
],
},
sortable_fields: { sortable_fields: {
fields: ["date", "title"], fields: ["date", "title"],
default: { default: {

@ -19,6 +19,12 @@ const CantorforaCollection = {
frame: true, frame: true,
size: "half", size: "half",
}, },
view_groups: [
{
label: "Entwürfe",
field: "draft",
},
],
summary_fields: ["title", "draft", "description"], summary_fields: ["title", "draft", "description"],
sortable_fields: { sortable_fields: {
fields: ["index", "title"], fields: ["index", "title"],

@ -17,7 +17,6 @@ import {
SuperhaufenCollection, SuperhaufenCollection,
WettbewerbeCollection, WettbewerbeCollection,
} from "./collections/index.js"; } from "./collections/index.js";
import { GCGThemeDark, GCGThemeLight } from "./themes.js";
const config = { const config = {
backend: { backend: {
@ -49,13 +48,6 @@ const config = {
clean_accents: true, clean_accents: true,
sanitize_replacement: "-", sanitize_replacement: "-",
}, },
theme: {
include_built_in_themes: false,
themes: [
GCGThemeDark,
GCGThemeLight
]
},
collections: [ collections: [
SettingsCollection, SettingsCollection,
IndexPagesCollection, IndexPagesCollection,

@ -7,7 +7,6 @@ import {
StatsCollection, StatsCollection,
SuperhaufenCollection, SuperhaufenCollection,
} from "./collections/index.js"; } from "./collections/index.js";
import { GCGThemeDark, GCGThemeLight } from "./themes.js";
const config = { const config = {
backend: { backend: {
@ -39,13 +38,6 @@ const config = {
clean_accents: true, clean_accents: true,
sanitize_replacement: "-", sanitize_replacement: "-",
}, },
theme: {
include_built_in_themes: false,
themes: [
GCGThemeDark,
GCGThemeLight
]
},
collections: [ collections: [
ChronikjahreCollection, ChronikjahreCollection,
SuperhaufenCollection, SuperhaufenCollection,

@ -1,25 +0,0 @@
const GCGThemeDark = {
name: "GCG.Dark",
extends: "dark",
primary: {
main: "#ffbc3b",
contrastColor: "#4b4b4b",
},
background: {
main: "#1a1a37",
dark: "#13132d",
},
};
const GCGThemeLight = {
name: "GCG.Light",
extends: "light",
primary: {
main: "#1a1a37",
},
background: {
dark: "#f1f3f5",
},
};
export { GCGThemeDark, GCGThemeLight };

@ -9,12 +9,12 @@
/> />
<link <link
rel="stylesheet" rel="stylesheet"
href="https://unpkg.com/@staticcms/app@next/dist/main.css" href="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/main.css"
/> />
<title>Static CMS</title> <title>Static CMS</title>
</head> </head>
<body> <body>
<script src="https://unpkg.com/@staticcms/app@next/dist/static-cms-app.js"></script> <script src="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/static-cms-app.js"></script>
<script type="module"> <script type="module">
import config from "./config/index.js"; import config from "./config/index.js";
// imports // imports

@ -9,12 +9,12 @@
/> />
<link <link
rel="stylesheet" rel="stylesheet"
href="https://unpkg.com/@staticcms/app@next/dist/main.css" href="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/main.css"
/> />
<title>Chronikverwaltung</title> <title>Chronikverwaltung</title>
</head> </head>
<body> <body>
<script src="https://unpkg.com/@staticcms/app@next/dist/static-cms-app.js"></script> <script src="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/static-cms-app.js"></script>
<script type="module"> <script type="module">
import config from "../../admin/config/schulchronik.js"; import config from "../../admin/config/schulchronik.js";
// imports // imports