Merge branch 'dev'

src/Configs/app.php

@@ -3,7 +3,7 @@
 use App\Installer\Database\MySqlSetup;
 
 return [
-    'min_php_version' => '7.1.3',
+    'min_php_version' => '7.4',
 
     'repository' => 'https://github.com/HDInnovations/UNIT3D-Community-Edition.git',
 
@@ -54,7 +54,5 @@
     /* API Keys */
     'tmdb-key' => '',
     'omdb-key' => '',
-
-    'fanart-key' => '',
-    'tvdb-key' => '',
+    'igdb-key' => '',
 ];

src/Installer/Nginx/NginxSetup.php

@@ -27,6 +27,7 @@ public function handle()
             "ufw allow 'Nginx Full'",
             "ufw delete allow 'Nginx HTTP'",
             "ufw allow $echo_port",
+            "ufw enable",
             "systemctl restart nginx"
         ]);
 

src/Installer/Server/ServerSetup.php

@@ -129,6 +129,16 @@ protected function apiKeys()
 
         $key = $this->question('OMDB Key', '');
         $this->config->app('omdb-key', $key);
+
+        $this->io->writeln('<fg=magenta>Obtaining an IGDB Key</>:');
+        $this->io->listing([
+            'Visit <fg=cyan>https://api.igdb.com</>',
+            'Create Free Account',
+            'Generate a API Key',
+        ]);
+
+        $key = $this->question('IGDB Key', '');
+        $this->config->app('igdb-key', $key);
     }
 
     protected function mail()
@@ -137,10 +147,10 @@ protected function mail()
         $this->io->writeln('(Used for things like invites, registration, ect.)');
         $this->seperator();
 
-        $this->io->writeln('<fg=blue>/* You will need a provider like torguard. */</>');
-        $this->io->writeln('<fg=cyan>https://torguard.net/anonymous-email.php</>');
+        $this->io->writeln('<fg=blue>/* You will need a provider like sendrid. */</>');
+        $this->io->writeln('<fg=cyan>https://sendgrid.com/pricing/</>');
 
-        $this->io->writeln('Ref: <fg=cyan>https://laravel.com/docs/5.6/mail#introduction</>');
+        $this->io->writeln('Ref: <fg=cyan>https://laravel.com/docs/6.x/mail#introduction</>');
 
         $value = $this->io->choice('Mail Driver', [
             "smtp",

src/Installer/UNIT3D/Unit3dSetup.php

@@ -62,6 +62,7 @@ protected function env()
                 '{{OWNERPASSWORD}}' => $this->config->app('password'),
                 '{{TMDBAPIKEY}}' => $this->config->app('tmdb-key'),
                 '{{OMDBAPIKEY}}' => $this->config->app('omdb-key'),
+                '{{IGDBAPIKEY}}' => $this->config->app('igdb-key'),
                 '{{MAILDRIVER}}' => $this->config->app('mail_driver'),
                 '{{MAILHOST}}' => $this->config->app('mail_host'),
                 '{{MAILPORT}}' => $this->config->app('mail_port'),

src/Resources/.env.stub

@@ -38,3 +38,4 @@ DEFAULT_OWNER_PASSWORD={{OWNERPASSWORD}}
 
 TMDB_API_KEY={{TMDBAPIKEY}}
 OMDB_API_KEY={{OMDBAPIKEY}}
+IGDB_TOKEN={{IGDBAPIKEY}}

src/Resources/intro.stub

@@ -1,12 +1,19 @@
     <fg=cyan>
-      _    _   _   _   _____   _______   ____    _____
-     | |  | | | \ | | |_   _| |__   __| |___ \  |  __ \
-     | |  | | |  \| |   | |      | |      __) | | |  | |
-     | |  | | | . ` |   | |      | |     |__ <  | |  | |
-     | |__| | | |\  |  _| |_     | |     ___) | | |__| |
-      \____/  |_| \_| |_____|    |_|    |____/  |_____/ </>
+                                                ██╗   ██╗███╗   ██╗██╗████████╗██████╗ ██████╗
+                                                ██║   ██║████╗  ██║██║╚══██╔══╝╚════██╗██╔══██╗
+                                                ██║   ██║██╔██╗ ██║██║   ██║    █████╔╝██║  ██║
+                                                ██║   ██║██║╚██╗██║██║   ██║    ╚═══██╗██║  ██║
+                                                ╚██████╔╝██║ ╚████║██║   ██║   ██████╔╝██████╔╝
+                                                 ╚═════╝ ╚═╝  ╚═══╝╚═╝   ╚═╝   ╚═════╝ ╚═════╝
 
-                      <fg=magenta>INSTALLER v1.0-beta</>
+     ██████╗ ██████╗ ███╗   ███╗███╗   ███╗██╗   ██╗███╗   ██╗██╗████████╗██╗   ██╗    ███████╗██████╗ ██╗████████╗██╗ ██████╗ ███╗   ██╗
+    ██╔════╝██╔═══██╗████╗ ████║████╗ ████║██║   ██║████╗  ██║██║╚══██╔══╝╚██╗ ██╔╝    ██╔════╝██╔══██╗██║╚══██╔══╝██║██╔═══██╗████╗  ██║
+    ██║     ██║   ██║██╔████╔██║██╔████╔██║██║   ██║██╔██╗ ██║██║   ██║    ╚████╔╝     █████╗  ██║  ██║██║   ██║   ██║██║   ██║██╔██╗ ██║
+    ██║     ██║   ██║██║╚██╔╝██║██║╚██╔╝██║██║   ██║██║╚██╗██║██║   ██║     ╚██╔╝      ██╔══╝  ██║  ██║██║   ██║   ██║██║   ██║██║╚██╗██║
+    ╚██████╗╚██████╔╝██║ ╚═╝ ██║██║ ╚═╝ ██║╚██████╔╝██║ ╚████║██║   ██║      ██║       ███████╗██████╔╝██║   ██║   ██║╚██████╔╝██║ ╚████║
+     ╚═════╝ ╚═════╝ ╚═╝     ╚═╝╚═╝     ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚═╝   ╚═╝      ╚═╝       ╚══════╝╚═════╝ ╚═╝   ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝
+
+    </>
 
     *-----------------------------------------------*
     |                                               |

src/Resources/ubuntu/nginx/default.site

@@ -30,10 +30,6 @@ server {
     location /index.php {
        return 301 {{FQDN}};
     }
-
-    if ($host = www.{{FQDN}}) {
-        return 301 {{FQDN}}$request_uri;
-    }
 
     location ~* ^.*(\.(?:git|svn|htaccess|github))$ {
         return 403;

ubuntu.sh

@@ -47,7 +47,7 @@ add_pkgs() {
     # PHP
     echo -e "\n$Cyan Installing PHP ... $Color_Off"
 
-    apt-get install -qq curl debconf-utils php-pear php7.3-curl php7.3-dev php7.3-gd php7.3-mbstring php7.3-zip php7.3-mysql php7.3-xml php7.3-fpm php7.3-intl php7.3-bcmath > /dev/null
+    apt-get install -qq curl debconf-utils php-pear php7.4-curl php7.4-dev php7.4-gd php7.4-mbstring php7.4-zip php7.4-mysql php7.4-xml php7.4-fpm php7.4-intl php7.4-bcmath > /dev/null
     check $? "Installing PHP Failed!"
 
     echo -e "$IGreen OK $Color_Off"