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",
value: "author",
},
view_filters: {
filters: [
view_filters: [
{
name: "active",
label: "aktiv",
field: "active",
pattern: true,
},
{
name: "inactive",
label: "inaktiv",
field: "active",
pattern: false,
},
{
name: "simplified",
label: "einfach",
field: "simplified",
pattern: true,
},
{
name: "extended",
label: "erweitert",
field: "simplified",
pattern: false,
},
],
},
view_groups: {
default: "active",
groups: [
view_groups: [
{
name: "simplified",
label: "vereinfacht",
field: "simplified",
},
{
name: "active",
label: "aktiv",
field: "active",
},
],
},
summary_fields: ["title", "active", "simplified", "body"],
fields: [
{

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

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

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

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

@ -9,12 +9,12 @@
/>
<link
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>
</head>
<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">
import config from "../../admin/config/schulchronik.js";
// imports