Merge branch 'release/1.1.2'

Author: andy3471

.gitignore

@@ -11,3 +11,4 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 /.vagrant
+/public/images/logo_override.png

app/Console/Commands/DemoModeRefresh.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class DemoModeRefresh extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'demo:refresh';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Refresh Database if the site is in demo mode';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if (config('app.demo_mode')) { 
+            $this->call('migrate:fresh', ['--seed' => true]);
+        };
+    }
+}

app/Console/Kernel.php

@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
+        $schedule->command('demo:refresh')->daily();
     }
 
     /**

app/Http/Controllers/GamesController.php

@@ -40,9 +40,18 @@ public function show($id)
             ->with('platform', 'createduser')
             ->get();
 
+        $dlcCount = DB::table('dlcs')
+            ->distinct()
+            ->selectRaw('dlcs.id, dlcs.name, concat("/", dlcs.image) as image, concat("/games/dlc/", dlcs.id) as url')
+            ->join('keys', 'keys.dlc_id', '=', 'dlcs.id')
+            ->where('keys.owned_user_id', '=', null)
+            ->where('keys.removed', '=', '0')
+            ->where('keys.game_id', '=', $id)
+            ->count();
+
         $dlcurl = "/games/dlc/get/" . $id;
 
-        return view('games.show')->withGame($game)->withKeys($keys)->withDlcurl($dlcurl);
+        return view('games.show')->withGame($game)->withKeys($keys)->withDlcurl($dlcurl)->withDlcCount($dlcCount);
     }
 
     public function edit($id)

database/seeds/UsersTableSeeder.php

@@ -14,8 +14,9 @@ public function run()
     {
         factory(App\User::class)->make([
             'email' => '[email protected]',
-            'admin' => '1'
-        ]);
+            'admin' => '1',
+            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'
+        ])->save();
 
         factory(App\User::class, 20)->create();
     }

package-lock.json

@@ -24,6 +24,7 @@
         "vue-template-compiler": "^2.6.11"
     },
     "dependencies": {
+        "andyh-autocomplete": "^1.0.2",
         "vue-infinite-loading": "^2.4.4"
     }
 }