From 540bb95291c1d31041902d2bf05af8682fa10ec3 Mon Sep 17 00:00:00 2001
From: 1day2die <ownerdennis8@gmail.com>
Date: Fri, 13 Jan 2023 18:41:32 +0100
Subject: [PATCH 1/2] SEO

---
 app/Classes/Settings/System.php               |  4 +++
 database/seeders/Seeds/SettingsSeeder.php     | 15 +++++++++
 .../admin/settings/tabs/system.blade.php      | 32 +++++++++++++++++--
 themes/default/views/layouts/app.blade.php    |  3 ++
 themes/default/views/layouts/main.blade.php   |  3 ++
 5 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php
index 792e2cb3..e278bac4 100644
--- a/app/Classes/Settings/System.php
+++ b/app/Classes/Settings/System.php
@@ -59,6 +59,8 @@ class System
             'motd-enabled' => 'string',
             'usefullinks-enabled' => 'string',
             'motd-message' => 'string|nullable',
+            'seo-title' => 'string|nullable',
+            'seo-description' => 'string|nullable',
         ]);
 
         $validator->after(function ($validator) use ($request) {
@@ -111,6 +113,8 @@ class System
             "SETTINGS::SYSTEM:MOTD_ENABLED" => "motd-enabled",
             "SETTINGS::SYSTEM:MOTD_MESSAGE" => "motd-message",
             "SETTINGS::SYSTEM:USEFULLINKS_ENABLED" => "usefullinks-enabled",
+            "SETTINGS::SYSTEM:SEO_TITLE" => "seo-title",
+            "SETTINGS::SYSTEM:SEO_DESCRIPTION" => "seo-description",
         ];
 
         foreach ($values as $key => $value) {
diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php
index f695483e..a9e5146b 100644
--- a/database/seeders/Seeds/SettingsSeeder.php
+++ b/database/seeders/Seeds/SettingsSeeder.php
@@ -630,5 +630,20 @@ class SettingsSeeder extends Seeder
             'type' => 'text',
             'description' => 'MOTD Message',
         ]);
+        Settings::firstOrCreate([
+            'key' => 'SETTINGS::SYSTEM:SEO_TITLE',
+        ], [
+            'value' => 'Controlpanel.gg',
+            'type' => 'text',
+            'description' => 'The SEO Title',
+        ]);
+
+        Settings::firstOrCreate([
+            'key' => 'SETTINGS::SYSTEM:SEO_DESCRIPTION',
+        ], [
+            'value' => 'Billing software for Pterodactyl Dashboard!',
+            'type' => 'text',
+            'description' => 'SEO Description',
+        ]);
     }
 }
diff --git a/themes/default/views/admin/settings/tabs/system.blade.php b/themes/default/views/admin/settings/tabs/system.blade.php
index 23ed381c..fa983254 100644
--- a/themes/default/views/admin/settings/tabs/system.blade.php
+++ b/themes/default/views/admin/settings/tabs/system.blade.php
@@ -300,7 +300,35 @@
                             class="form-control @error('minimum-credits') is-invalid @enderror" required>
                     </div>
                 </div>
-
+                <div class="row mb-2">
+                    <div class="col text-center">
+                        <h1>{{ __('SEO') }}</h1>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div class="custom-control mb-3 p-0">
+                        <div class="col m-0 p-0 d-flex justify-content-between align-items-center">
+                            <label for="seo-title">{{ __('SEO Title') }}</label>
+                            <i data-toggle="popover" data-trigger="hover" data-html="true"
+                               data-content="{{ __('An SEO title tag must contain your target keyword. This tells both Google and searchers that your web page is relevant to this search query!') }}"
+                               class="fas fa-info-circle"></i>
+                        </div>
+                        <input x-model="seo-title" id="seo-title" name="seo-title"
+                               type="text" value="{{ config('SETTINGS::SYSTEM:SEO_TITLE') }}"
+                               class="form-control @error('seo-title') is-invalid @enderror" required>
+                    </div>
+                    <div class="custom-control mb-3 p-0">
+                        <div class="col m-0 p-0 d-flex justify-content-between align-items-center">
+                            <label for="seo-description">{{ __('SEO Description') }}</label>
+                            <i data-toggle="popover" data-trigger="hover" data-html="true"
+                               data-content="{{ __('The SEO site description represents your homepage. Search engines show this description in search results for your homepage if they dont find content more relevant to a visitors search terms.') }}"
+                               class="fas fa-info-circle"></i>
+                        </div>
+                        <input x-model="seo-description" id="seo-description" name="seo-description"
+                               type="text" value="{{ config('SETTINGS::SYSTEM:SEO_DESCRIPTION') }}"
+                               class="form-control @error('seo-description') is-invalid @enderror" required>
+                    </div>
+                </div>
             </div>
 
 
@@ -454,7 +482,7 @@
     </form>
 </div>
 <script>tinymce.init({selector:'textarea',skin: "oxide-dark",
-        content_css: "dark",branding: false,  height: 200,
+        content_css: "dark",branding: false,  height: 500,
         plugins: ['image','link'],});
 </script>
 
diff --git a/themes/default/views/layouts/app.blade.php b/themes/default/views/layouts/app.blade.php
index ea967596..72e98779 100644
--- a/themes/default/views/layouts/app.blade.php
+++ b/themes/default/views/layouts/app.blade.php
@@ -4,6 +4,9 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="{{ config('SETTINGS::SYSTEM:SEO_TITLE') }}" property="og:title">
+    <meta content="{{ config('SETTINGS::SYSTEM:SEO_DESCRIPTION') }}" property="og:description">
+    <meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
 
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
diff --git a/themes/default/views/layouts/main.blade.php b/themes/default/views/layouts/main.blade.php
index 6217cff4..b708b198 100644
--- a/themes/default/views/layouts/main.blade.php
+++ b/themes/default/views/layouts/main.blade.php
@@ -6,6 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta content="{{ config('SETTINGS::SYSTEM:SEO_TITLE') }}" property="og:title">
+    <meta content="{{ config('SETTINGS::SYSTEM:SEO_DESCRIPTION') }}" property="og:description">
+    <meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
     <title>{{ config('app.name', 'Laravel') }}</title>
     <link rel="icon"
         href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('favicon.ico') }}"

From bfa24facf9b13516279ec94cee731e69aa2017a2 Mon Sep 17 00:00:00 2001
From: 1day2die <ownerdennis8@gmail.com>
Date: Fri, 13 Jan 2023 18:57:35 +0100
Subject: [PATCH 2/2] Update Notification on Overview

---
 app/Console/Commands/GetGithubVersion.php     | 43 +++++++++++++++++++
 app/Console/Kernel.php                        |  1 +
 .../views/admin/overview/index.blade.php      | 15 +++++--
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 app/Console/Commands/GetGithubVersion.php

diff --git a/app/Console/Commands/GetGithubVersion.php b/app/Console/Commands/GetGithubVersion.php
new file mode 100644
index 00000000..31e93625
--- /dev/null
+++ b/app/Console/Commands/GetGithubVersion.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+
+class GetGithubVersion extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'cp:versioncheck:get';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Get the latest Version from Github';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        try{
+            $latestVersion = Http::get('https://api.github.com/repos/controlpanel-gg/dashboard/tags')->json()[0]['name'];
+            Storage::disk('local')->put('latestVersion', $latestVersion);
+        } catch (Exception $e) {
+            Storage::disk('local')->put('latestVersion', "unknown");
+            Log::error($e);
+        }
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 2121d32f..5f081211 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -17,6 +17,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('credits:charge')->hourly();
+        $schedule->command('cp:versioncheck:get')->daily();
 
         //log cronjob activity
         $schedule->call(function () {
diff --git a/themes/default/views/admin/overview/index.blade.php b/themes/default/views/admin/overview/index.blade.php
index 7bf2664a..20fef894 100644
--- a/themes/default/views/admin/overview/index.blade.php
+++ b/themes/default/views/admin/overview/index.blade.php
@@ -8,6 +8,7 @@
                 <div class="col-sm-6">
                     <h1>{{__('Admin Overview')}}</h1>
                 </div>
+
                 <div class="col-sm-6">
                     <ol class="breadcrumb float-sm-right">
                         <li class="breadcrumb-item"><a href="{{route('home')}}">{{__('Dashboard')}}</a></li>
@@ -17,6 +18,14 @@
                 </div>
             </div>
         </div>
+        @if(Storage::get('latestVersion') && config("app.version") < Storage::get('latestVersion'))
+            <div class="alert alert-danger" role="alert">
+                <b><i class="fas fa-shield-alt"></i> {{__("Version Outdated:")}}</b></br>
+                {{__("You are running on")}} v{{config("app.version")}}-{{config("BRANCHNAME")}}.
+                    {{__("The latest Version is")}} v{{Storage::get('latestVersion')}}</br>
+                <a href="https://controlpanel.gg/docs/Installation/updating">{{__("Consider updating now")}}</a>
+            </div>
+        @endif
     </section>
     <!-- END CONTENT HEADER -->
 
@@ -171,7 +180,7 @@
                                     </tr>
                                     </thead>
                                     <tbody>
-                                        
+
                                         @foreach($tickets as $ticket_id => $ticket)
                                             <tr>
                                                 <td><a class="text-info"  href="{{route('moderator.ticket.show', ['ticket_id' => $ticket_id])}}">#{{$ticket_id}} - {{$ticket->title}}</td>
@@ -180,7 +189,7 @@
                                                 <td>{{$ticket->last_updated}}</td>
                                             </tr>
                                         @endforeach
-                                        
+
                                     </tbody>
                                 </table>
                             @endif
@@ -323,7 +332,7 @@
                                     <hr style="width: 100%; height:1px; border-width:0; background-color:#6c757d; margin-top: -16px">
                                 </div>
                             </div>
-                            
+
                         </div>
                     </div>
                     <div class="card">