From 0f62546dd0e22d3898d488ee354b455aae75ab15 Mon Sep 17 00:00:00 2001
From: HolgerHatGarKeineNode <fsociety.mkv@pm.me>
Date: Mon, 27 Feb 2023 15:48:44 +0100
Subject: [PATCH] fix comment box

---
 .../Livewire/Library/Form/LibraryItemForm.php |  1 +
 composer.lock                                 | 22 ++++-----
 resources/views/layouts/app.blade.php         | 47 +------------------
 resources/views/layouts/guest.blade.php       | 47 +------------------
 resources/views/layouts/styles.blade.php      | 43 +++++++++++++++++
 .../form/bitcoin-event-form.blade.php         |  1 +
 .../form/content-creator-form.blade.php       |  2 +
 .../library/form/library-item-form.blade.php  |  3 ++
 .../news/form/news-article-form.blade.php     |  2 +
 9 files changed, 67 insertions(+), 101 deletions(-)
 create mode 100644 resources/views/layouts/styles.blade.php

diff --git a/app/Http/Livewire/Library/Form/LibraryItemForm.php b/app/Http/Livewire/Library/Form/LibraryItemForm.php
index e9ef8dd8..d60b59d2 100644
--- a/app/Http/Livewire/Library/Form/LibraryItemForm.php
+++ b/app/Http/Livewire/Library/Form/LibraryItemForm.php
@@ -72,6 +72,7 @@ class LibraryItemForm extends Component
             $this->libraryItem = new LibraryItem([
                 'approved'  => true,
                 'read_time' => 1,
+                'value' => '',
             ]);
             if ($this->lecturer) {
                 $this->library = Library::query()
diff --git a/composer.lock b/composer.lock
index 0e8333a9..0a6319e0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -14617,16 +14617,16 @@
         },
         {
             "name": "laravel-lang/lang",
-            "version": "12.18.3",
+            "version": "12.18.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Laravel-Lang/lang.git",
-                "reference": "b7f80e78e9555895f1a94db9a3bf311c98942bff"
+                "reference": "b224d7f29fb792c2e816de270c930d8a77d25249"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/b7f80e78e9555895f1a94db9a3bf311c98942bff",
-                "reference": "b7f80e78e9555895f1a94db9a3bf311c98942bff",
+                "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/b224d7f29fb792c2e816de270c930d8a77d25249",
+                "reference": "b224d7f29fb792c2e816de270c930d8a77d25249",
                 "shasum": ""
             },
             "require": {
@@ -14679,7 +14679,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-02-23T16:22:56+00:00"
+            "time": "2023-02-27T13:39:16+00:00"
         },
         {
             "name": "laravel-lang/publisher",
@@ -15565,16 +15565,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.3",
+            "version": "9.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555"
+                "reference": "9125ee085b6d95e78277dc07aa1f46f9e0607b8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7b1615e3e887d6c719121c6d4a44b0ab9645555",
-                "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9125ee085b6d95e78277dc07aa1f46f9e0607b8d",
+                "reference": "9125ee085b6d95e78277dc07aa1f46f9e0607b8d",
                 "shasum": ""
             },
             "require": {
@@ -15647,7 +15647,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.3"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.4"
             },
             "funding": [
                 {
@@ -15663,7 +15663,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-04T13:37:15+00:00"
+            "time": "2023-02-27T13:06:37+00:00"
         },
         {
             "name": "sebastian/cli-parser",
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 2eb9bd66..b69d0d32 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -35,7 +35,6 @@
     <script src="{{ asset('dist/leaflet-heatmap.js') }}"></script>
     <script src="{{ asset('dist/leaflet-providers.js') }}"></script>
     <wireui:scripts />
-    <x-comments::scripts/>
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     <!-- Styles -->
     <link rel="stylesheet" href="{{ asset('vendor/jvector/jquery-jvectormap-2.0.5.css') }}" type="text/css"
@@ -44,49 +43,7 @@
     <x-comments::styles/>
     <x-embed-styles />
     @livewireStyles
-    <style>
-      .comments {
-        --comments-color-background: rgb(34, 34, 34);
-        --comments-color-background: rgb(34, 34, 34);
-        --comments-color-background-nested: rgb(34, 34, 34);
-        --comments-color-background-paper: rgb(55, 51, 51);
-        --comments-color-background-info: rgb(104, 89, 214);
-
-        --comments-color-reaction: rgb(59, 59, 59);
-        --comments-color-reaction-hover: rgb(65, 63, 63);
-        --comments-color-reacted: rgba(67, 56, 202, 0.25);
-        --comments-color-reacted-hover: rgba(67, 56, 202, 0.5);
-
-        --comments-color-border: rgb(221, 221, 221);
-
-        --comments-color-text: white;
-        --comments-color-text-dimmed: rgb(164, 164, 164);
-        --comments-color-text-inverse: white;
-
-        --comments-color-accent: rgba(67, 56, 202);
-        --comments-color-accent-hover: rgba(67, 56, 202, 0.75);
-
-        --comments-color-danger: rgb(225, 29, 72);
-        --comments-color-danger-hover: rgb(225, 29, 72, 0.75);
-
-        --comments-color-success: rgb(10, 200, 134);
-        --comments-color-success-hover: rgb(10, 200, 134, 0.75);
-
-        --comments-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
-      }
-
-      .comments-button {
-        background-color: #F7931A !important;
-      }
-
-      .leaflet-pane {
-          z-index: 0 !important;
-      }
-
-      [x-cloak] {
-        display: none !important;
-      }
-    </style>
+    @include('layouts.styles')
 </head>
 <body class="font-sans antialiased bg-21gray dark">
 <x-notifications z-index="z-[99999]" blur="md" align="center"/>
@@ -107,6 +64,6 @@
 @livewireScripts
 <!-- ProductLift SDK - Include it only once -->
 <script defer src="https://bitcoin.productlift.dev/widgets_sdk"></script>
-<script src="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js"></script>
+<x-comments::scripts/>
 </body>
 </html>
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
index c2252c93..309d44eb 100644
--- a/resources/views/layouts/guest.blade.php
+++ b/resources/views/layouts/guest.blade.php
@@ -36,55 +36,12 @@
     <script src="{{ asset('dist/leaflet-heatmap.js') }}"></script>
     <script src="{{ asset('dist/leaflet-providers.js') }}"></script>
     <wireui:scripts/>
-    <x-comments::scripts/>
     <x-embed-styles />
     @vite(['resources/css/app.css', 'resources/js/app.js'])
     <!-- Styles -->
     <x-comments::styles/>
     @livewireStyles
-    <style>
-        .comments {
-            --comments-color-background: rgb(34, 34, 34);
-            --comments-color-background: rgb(34, 34, 34);
-            --comments-color-background-nested: rgb(34, 34, 34);
-            --comments-color-background-paper: rgb(55, 51, 51);
-            --comments-color-background-info: rgb(104, 89, 214);
-
-            --comments-color-reaction: rgb(59, 59, 59);
-            --comments-color-reaction-hover: rgb(65, 63, 63);
-            --comments-color-reacted: rgba(67, 56, 202, 0.25);
-            --comments-color-reacted-hover: rgba(67, 56, 202, 0.5);
-
-            --comments-color-border: rgb(221, 221, 221);
-
-            --comments-color-text: white;
-            --comments-color-text-dimmed: rgb(164, 164, 164);
-            --comments-color-text-inverse: white;
-
-            --comments-color-accent: rgba(67, 56, 202);
-            --comments-color-accent-hover: rgba(67, 56, 202, 0.75);
-
-            --comments-color-danger: rgb(225, 29, 72);
-            --comments-color-danger-hover: rgb(225, 29, 72, 0.75);
-
-            --comments-color-success: rgb(10, 200, 134);
-            --comments-color-success-hover: rgb(10, 200, 134, 0.75);
-
-            --comments-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
-        }
-
-        .comments-button {
-            background-color: #F7931A !important;
-        }
-
-        .leaflet-pane {
-            z-index: 0 !important;
-        }
-
-        [x-cloak] {
-            display: none !important;
-        }
-    </style>
+    @include('layouts.styles')
 </head>
 <body class="font-sans antialiased bg-21gray dark">
 <x-notifications z-index="z-[99999]" blur="md" align="center"/>
@@ -105,6 +62,6 @@
 @livewireScripts
 <!-- ProductLift SDK - Include it only once -->
 <script defer src="https://bitcoin.productlift.dev/widgets_sdk"></script>
-<script src="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js"></script>
+<x-comments::scripts/>
 </body>
 </html>
diff --git a/resources/views/layouts/styles.blade.php b/resources/views/layouts/styles.blade.php
new file mode 100644
index 00000000..8d2d4c7b
--- /dev/null
+++ b/resources/views/layouts/styles.blade.php
@@ -0,0 +1,43 @@
+<style>
+    .comments {
+        --comments-color-background: rgb(34, 34, 34);
+        --comments-color-background: rgb(34, 34, 34);
+        --comments-color-background-nested: rgb(34, 34, 34);
+        --comments-color-background-paper: rgb(55, 51, 51);
+        --comments-color-background-info: rgb(104, 89, 214);
+
+        --comments-color-reaction: rgb(59, 59, 59);
+        --comments-color-reaction-hover: rgb(65, 63, 63);
+        --comments-color-reacted: rgba(67, 56, 202, 0.25);
+        --comments-color-reacted-hover: rgba(67, 56, 202, 0.5);
+
+        --comments-color-border: rgb(221, 221, 221);
+
+        --comments-color-text: white;
+        --comments-color-text-dimmed: rgb(164, 164, 164);
+        --comments-color-text-inverse: white;
+
+        --comments-color-accent: rgba(67, 56, 202);
+        --comments-color-accent-hover: rgba(67, 56, 202, 0.75);
+
+        --comments-color-danger: rgb(225, 29, 72);
+        --comments-color-danger-hover: rgb(225, 29, 72, 0.75);
+
+        --comments-color-success: rgb(10, 200, 134);
+        --comments-color-success-hover: rgb(10, 200, 134, 0.75);
+
+        --comments-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+    }
+
+    .comments-button {
+        background-color: #F7931A !important;
+    }
+
+    .leaflet-pane {
+        z-index: 0 !important;
+    }
+
+    [x-cloak] {
+        display: none !important;
+    }
+</style>
diff --git a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php
index 26145a5e..1498841d 100644
--- a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php
+++ b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php
@@ -143,4 +143,5 @@
         </form>
     </div>
 
+    <script src="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js"></script>
 </div>
diff --git a/resources/views/livewire/content-creator/form/content-creator-form.blade.php b/resources/views/livewire/content-creator/form/content-creator-form.blade.php
index 19079565..4d631e56 100644
--- a/resources/views/livewire/content-creator/form/content-creator-form.blade.php
+++ b/resources/views/livewire/content-creator/form/content-creator-form.blade.php
@@ -95,4 +95,6 @@
             </div>
         </form>
     </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js"></script>
 </div>
diff --git a/resources/views/livewire/library/form/library-item-form.blade.php b/resources/views/livewire/library/form/library-item-form.blade.php
index a2b40d77..559ae08f 100644
--- a/resources/views/livewire/library/form/library-item-form.blade.php
+++ b/resources/views/livewire/library/form/library-item-form.blade.php
@@ -1,6 +1,7 @@
 <div>
     {{-- HEADER --}}
     <livewire:frontend.header :country="null"/>
+
     <div class="container p-4 mx-auto bg-21gray my-2">
 
         <div class="pb-5 flex flex-row justify-between">
@@ -179,4 +180,6 @@
             </div>
         </form>
     </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js"></script>
 </div>
diff --git a/resources/views/livewire/news/form/news-article-form.blade.php b/resources/views/livewire/news/form/news-article-form.blade.php
index 88576156..23cfc625 100644
--- a/resources/views/livewire/news/form/news-article-form.blade.php
+++ b/resources/views/livewire/news/form/news-article-form.blade.php
@@ -138,4 +138,6 @@
         </form>
 
     </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/easymde/dist/easymde.min.js"></script>
 </div>