Merge branch 'devel'

2024-09-08 13:36:22 +02:00 · 2024-09-01 21:14:05 +02:00 · 2024-09-01 18:51:33 +02:00 · 2024-09-01 18:48:26 +02:00 · 2024-09-01 18:18:18 +02:00 · 2024-09-01 12:54:12 +02:00
6 changed files with 20 additions and 15 deletions
--- a/.air.toml
+++ b/.air.toml
@ -14,7 +14,6 @@ args_bin = [
    "-log tmp/cpolis.log",
    "-pdfs tmp/pdfs",
    "-pics tmp/pics",
-    "-port 8080",
    "-rss tmp/orientexpress_alle.rss",
    "-title 'Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt'",
    "-web web",
--- a/web/static/css/input.css
+++ b/web/static/css/input.css
@ -52,7 +52,7 @@ textarea {
 }

 .editor-toolbar {
-    @apply border border-slate-200 dark:border-slate-800
+    @apply border border-slate-200
 }

 .editor-toolbar.fullscreen {
--- a/web/templates/current-articles.html
+++ b/web/templates/current-articles.html
@ -7,7 +7,7 @@
            <h3>Aktuelle Artikel</h3>
            <div class="flex flex-col gap-4">
                {{range .}}
-                <div class="border border-slate-200 dark:border-slate-800 px-2 py-1 rounded-md">
+                <div class="border px-2 py-1 rounded-md">
                    <h1 class="font-bold text-2xl">{{.Title}}</h1>
                    <p>{{.Description}}</p>
                </div>
@ -16,15 +16,21 @@
        </div>

        <div>
-            <h3>Titelseite</h3>
-            <div class="grid grid-cols-2 gap-4 items-center">
-                <input class="h-full" name="issue-title" placeholder="Titel" type="text" />
+            <h3>Cover</h3>
+            <div class="flex">
                <label class="btn text-center" for="image-upload">Bild hochladen</label>
                <input class="hidden" id="image-upload" name="issue-image" type="file" required
                    hx-post="/issue/upload-image" />
            </div>
        </div>

+        <div>
+            <h3>Titel</h3>
+            <div class="flex flex-col gap-y-1">
+                <input name="issue-title" type="text" />
+            </div>
+        </div>
+
        <div>
            <h3>Über diese Ausgabe</h3>
            <div>
--- a/web/templates/index.html
+++ b/web/templates/index.html
@ -38,7 +38,7 @@
            &copy; 2024 Jason Streifling. Alle Rechte vorbehalten.
        </p>
        <p>
-            v0.9.1 - <strong>Hinweis:</strong> Diese Software befindet sich noch in der Entwicklung und kann Fehler
+            v0.9.0 - <strong>Hinweis:</strong> Diese Software befindet sich noch in der Entwicklung und kann Fehler
            enthalten.
        </p>
    </footer>
--- a/web/templates/to-be-deleted.html
+++ b/web/templates/to-be-deleted.html
@ -3,24 +3,24 @@

 <div>
    <span>Titel</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        {{.Title}}
    </div>

    <span>Beschreibung</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        {{.Description}}
    </div>

    <span>Artikel</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        <div class="prose">
            {{.Content}}
        </div>
    </div>

    <span>Tags</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        {{range .Tags}}
        {{.Name}}
        <br>
--- a/web/templates/to-be-published.html
+++ b/web/templates/to-be-published.html
@ -3,24 +3,24 @@

 <div>
    <span>Titel</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        {{.Article.Title}}
    </div>

    <span>Beschreibung</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        {{.Article.Description}}
    </div>

    <span>Artikel</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        <div class="prose">
            {{.Content}}
        </div>
    </div>

    <span>Tags</span>
-    <div class="bg-white border border-slate-200 dark:border-slate-800 mb-3 px-2 py-2 rounded-md w-full">
+    <div class="bg-white border mb-3 px-2 py-2 rounded-md w-full">
        {{if .Article.IsInIssue}}
        <span>Orient Express</span>
        <br>
Author	SHA1	Message	Date
Jason Streifling	5b1f20c5bc	Merge branch 'devel'	2024-09-08 13:36:22 +02:00
Jason Streifling	d0c566f8df	Merge branch 'devel'	2024-09-01 21:14:05 +02:00
Jason Streifling	5e586aa49a	Merge branch 'devel'	2024-09-01 18:51:33 +02:00
Jason Streifling	66b2743d3d	Merge branch 'devel'	2024-09-01 18:48:26 +02:00
Jason Streifling	3723b2b5e6	Merge branch 'devel'	2024-09-01 18:18:18 +02:00
Jason Streifling	ce788bfd50	Merge branch 'devel'	2024-09-01 12:54:12 +02:00
Jason Streifling	230a6278cc	Merge branch 'devel'	2024-09-01 12:49:30 +02:00
Jason Streifling	42d6e0c198	Merge branch 'devel'	2024-08-31 12:17:41 +02:00
Jason Streifling	e1af2979af	Merge branch 'devel'	2024-08-31 11:27:15 +02:00
Jason Streifling	f6dedc6f10	Merge branch 'devel'	2024-08-31 01:43:53 +02:00
Jason Streifling	cdf0a49550	Merge branch 'devel'	2024-08-31 01:38:28 +02:00
Jason Streifling	c3c0650210	Merge branch 'devel'	2024-08-31 01:00:55 +02:00
Jason Streifling	d077f700d8	Merge branch 'devel'	2024-08-31 00:36:48 +02:00
Jason Streifling	ec752b1c66	Merge branch 'devel'	2024-08-30 23:43:12 +02:00
Jason Streifling	46aef4f12f	Merge branch 'devel'	2024-08-25 10:51:35 +02:00
Jason Streifling	1b29e328cf	Merge branch 'devel'	2024-08-25 06:38:55 +02:00
Jason Streifling	e50cb819f3	Merge branch 'devel'	2024-08-23 21:45:30 +02:00
Jason Streifling	c32e38ca10	Merge branch 'devel'	2024-08-23 20:57:11 +02:00
Jason Streifling	d7c8c7a43a	Merge branch 'devel'	2024-08-18 17:31:00 +02:00
Jason Streifling	1cd3edc90c	Merge branch 'devel'	2024-08-18 12:06:29 +02:00
Jason Streifling	0e768c9f61	Merge branch 'devel'	2024-08-08 21:27:07 +02:00
Jason Streifling	1fcd775cc5	Merge branch 'devel'	2024-08-08 21:14:24 +02:00
Jason Streifling	203a1ed147	Implemented EasyMDE	2024-08-08 21:13:25 +02:00
Jason Streifling	ef1914ee5c	Implemented article preview	2024-08-08 21:13:25 +02:00
Jason Streifling	084b101e31	Register f.ArticlePreviewHtmlData in init()	2024-08-08 21:13:25 +02:00
Jason Streifling	b2db128aa9	Shorten lines by referencing frontend as f and backend as b	2024-08-08 21:13:25 +02:00
Jason Streifling	081e880fb6	Change structure of code tor frontend and backend one	2024-08-08 21:13:25 +02:00