Merge pull request #866 from LinkStackOrg/beta

Beta

Author: JulianPrieber

Diff for: README.md

@@ -205,6 +205,8 @@ Before updating, the updater will create a backup. Your instance won’t save mo
 
 If you switched your database to MySQL, your database will not be included in the backup.
 
+The updater may fail without throwing an error and just remain on the current version if there are unmet dependencies. This could include not having the correct version of the dependencies (eg. having php-sqlite3 pointing to php8.3-sqlite3, while LinkStack uses PHP 8.2 and needs php8.2-sqlite3). To troubleshoot, update manually and check the errors thown by the instance when accessing the website, as well as the PHP version reported.
+
 <a name="Discord"></a>
 ## Discord
 

Diff for: app/Http/Controllers/UserController.php

@@ -753,29 +753,46 @@ public function editTheme(request $request)
 
         if (!empty($zipfile) && Auth::user()->role == 'admin') {
 
-            $zipfile->move(base_path('/themes'), "temp.zip");
+            $themesPath = base_path('themes');
+            $tmpPath = base_path() . '/themes/temp.zip';
+            $zipfile->move($themesPath, "temp.zip");
 
             $zip = new ZipArchive;
-            $zip->open(base_path() . '/themes/temp.zip');
-            $zip->extractTo(base_path() . '/themes');
+            $zip->open($tmpPath);
+            $zip->extractTo($themesPath);
             $zip->close();
-            unlink(base_path() . '/themes/temp.zip');
+            unlink($tmpPath);
 
             // Removes version numbers from folder.
 
-            $folder = base_path('themes');
             $regex = '/[0-9.-]/';
-            $files = scandir($folder);
+            $files = scandir($themesPath);
+            $files = array_diff($files, array('.', '..'));
 
             foreach ($files as $file) {
+
                 $basename = basename($file);
+                $filePath = $themesPath . '/' . $basename;
+
+                if (!is_dir($filePath)) {
+                        
+                    try {
+                        File::delete($filePath);
+                    } catch (exception $e) {}
+
+                }
+
                 if (preg_match($regex, $basename)) {
+
                     $newBasename = preg_replace($regex, '', $basename);
-                    $newPath = $folder . '/' . $newBasename;
-                    File::copyDirectory($file, $newPath);
-                    File::deleteDirectory($file);
+                    $newPath = $themesPath . '/' . $newBasename;
+                    File::copyDirectory($filePath, $newPath);
+                    File::deleteDirectory($filePath);
+
                 }
+
             }
+
         }
 
 

Diff for: assets/external-dependencies/fontawesome.css

@@ -1113,12 +1113,21 @@ button.button-scribd{
 
 /* Trakt */
 .button.button-trakt {
-  color: #ffffff;
-  background-color: #ed1d24;
-}
-.button.button-trakt:hover,
-.button.button-trakt:focus {
-  filter: brightness(90%);
+  color: white;
+  background: radial-gradient(
+    farthest-corner at 0% 100%, 
+    rgb(245, 6, 19) 0%, 
+    rgb(225, 20, 60) 10%, 
+    rgb(207, 32, 97) 18%, 
+    rgb(192, 43, 129) 27%, 
+    rgb(180, 51, 154) 36%, 
+    rgb(170, 57, 173) 47%, 
+    rgb(164, 62, 187) 58%, 
+    rgb(160, 65, 195) 73%, 
+    rgb(159, 66, 198) 100%
+    );
+  background-size: 400% 200%;
+  background-position: left bottom;
 }
 
 /* Trello */
@@ -1299,3 +1308,22 @@ button.button-scribd{
 .button.button-linkstack:focus {
   filter: brightness(90%);
 }
+/* Xbox */
+.button.button-xbox {
+  color: #FFFFFF;
+  background-color:  #0e7a0d
+  ;
+}
+.button.button-xbox:hover,
+.button.button-xbox:focus {
+  filter: brightness(90%);
+}
+/* Threads */
+.button.button-threads {
+  color: #FFFFFF;
+  background-color:  #000000;
+}
+.button.button-threads:hover,
+.button.button-threads:focus {
+  filter: brightness(90%);
+}

Diff for: assets/external-dependencies/fontawesome.js

@@ -11,7 +11,6 @@
 $middleName = $data->middle_name;
 $lastName = $data->last_name;
 $suffix = $data->suffix;
-$nickname = $data->nickname;
 $organization = $data->organization;
 $vtitle = $data->vtitle;
 $role = $data->role;

Diff for: assets/linkstack/css/brands.css

@@ -13,7 +13,7 @@ function handleLinkType($request, $linkType) {
 
     // Extract the necessary data from the request
     $data = $request->only([
-        'prefix', 'first_name', 'middle_name', 'last_name', 'suffix', 'nickname',
+        'prefix', 'first_name', 'middle_name', 'last_name', 'suffix',
         'organization', 'vtitle', 'role', 'work_url', 'email', 'work_email',
         'home_phone', 'work_phone', 'cell_phone', 'home_address_label', 'home_address_street',
         'home_address_city', 'home_address_state', 'home_address_zip', 'home_address_country',

Diff for: assets/linkstack/icons/threads.svg

@@ -938,6 +938,21 @@ public function run()
                 "mb" => false,
             ],
 
+            [
+                "name" => "xbox",
+                "alt" => "Xbox",
+                "exclude" => false,
+                "group" => "default",
+                "mb" => false,
+            ],
+
+            [
+                "name" => "threads",
+                "alt" => "Threads",
+                "exclude" => false,
+                "group" => "default",
+                "mb" => false,
+            ],
         ];
 
         Button::insert($buttons);