From f907bacdd0383c98ff9b21d0a09fcac5a0920908 Mon Sep 17 00:00:00 2001
From: Saeed Vaziry <mr.saeedvaziry@gmail.com>
Date: Thu, 14 Mar 2024 21:18:59 +0100
Subject: [PATCH] refactoring leftovers

---
 app/Exceptions/BackupFileException.php        |  9 -------
 app/Exceptions/CannotDeployKey.php            | 10 -------
 app/Exceptions/ComposerInstallFailed.php      | 10 -------
 app/Exceptions/ErrorUpdatingRedirects.php     | 10 -------
 app/Exceptions/FailedToInstallWordpress.php   | 10 -------
 app/Exceptions/ProcessFailed.php              | 10 -------
 app/Models/BackupFile.php                     |  2 +-
 app/SSH/OS/OS.php                             |  4 ---
 .../commands/cronjobs/update-cron-jobs.sh     |  7 -----
 .../commands/installation/install-nodejs.sh   |  5 ----
 .../phpmyadmin/create-phpmyadmin-vhost.sh     | 17 ------------
 .../phpmyadmin/delete-phpmyadmin-vhost.sh     | 11 --------
 .../phpmyadmin/download-phpmyadmin.sh         | 21 ---------------
 resources/commands/service/restart-service.sh |  3 ---
 resources/commands/service/service-status.sh  |  1 -
 resources/commands/service/start-service.sh   |  3 ---
 resources/commands/service/stop-service.sh    |  3 ---
 resources/commands/ssl/install-certbot.sh     |  1 -
 resources/commands/system/delete-ssh-key.sh   |  1 -
 resources/commands/wordpress/install.sh       | 27 -------------------
 .../partials/create-backup-modal.blade.php    | 21 +++++++++------
 .../partials/connect-provider.blade.php       | 13 ++++++++-
 22 files changed, 26 insertions(+), 173 deletions(-)
 delete mode 100644 app/Exceptions/BackupFileException.php
 delete mode 100755 app/Exceptions/CannotDeployKey.php
 delete mode 100644 app/Exceptions/ComposerInstallFailed.php
 delete mode 100644 app/Exceptions/ErrorUpdatingRedirects.php
 delete mode 100644 app/Exceptions/FailedToInstallWordpress.php
 delete mode 100644 app/Exceptions/ProcessFailed.php
 delete mode 100755 resources/commands/cronjobs/update-cron-jobs.sh
 delete mode 100755 resources/commands/installation/install-nodejs.sh
 delete mode 100644 resources/commands/phpmyadmin/create-phpmyadmin-vhost.sh
 delete mode 100644 resources/commands/phpmyadmin/delete-phpmyadmin-vhost.sh
 delete mode 100644 resources/commands/phpmyadmin/download-phpmyadmin.sh
 delete mode 100644 resources/commands/service/restart-service.sh
 delete mode 100755 resources/commands/service/service-status.sh
 delete mode 100644 resources/commands/service/start-service.sh
 delete mode 100644 resources/commands/service/stop-service.sh
 delete mode 100755 resources/commands/ssl/install-certbot.sh
 delete mode 100644 resources/commands/system/delete-ssh-key.sh
 delete mode 100644 resources/commands/wordpress/install.sh

diff --git a/app/Exceptions/BackupFileException.php b/app/Exceptions/BackupFileException.php
deleted file mode 100644
index 4a8753c..0000000
--- a/app/Exceptions/BackupFileException.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class BackupFileException extends Exception
-{
-}
diff --git a/app/Exceptions/CannotDeployKey.php b/app/Exceptions/CannotDeployKey.php
deleted file mode 100755
index 4580c0d..0000000
--- a/app/Exceptions/CannotDeployKey.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class CannotDeployKey extends Exception
-{
-    //
-}
diff --git a/app/Exceptions/ComposerInstallFailed.php b/app/Exceptions/ComposerInstallFailed.php
deleted file mode 100644
index ecfca9b..0000000
--- a/app/Exceptions/ComposerInstallFailed.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ComposerInstallFailed extends Exception
-{
-    //
-}
diff --git a/app/Exceptions/ErrorUpdatingRedirects.php b/app/Exceptions/ErrorUpdatingRedirects.php
deleted file mode 100644
index 3fe9164..0000000
--- a/app/Exceptions/ErrorUpdatingRedirects.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ErrorUpdatingRedirects extends Exception
-{
-    //
-}
diff --git a/app/Exceptions/FailedToInstallWordpress.php b/app/Exceptions/FailedToInstallWordpress.php
deleted file mode 100644
index bbec122..0000000
--- a/app/Exceptions/FailedToInstallWordpress.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class FailedToInstallWordpress extends Exception
-{
-    //
-}
diff --git a/app/Exceptions/ProcessFailed.php b/app/Exceptions/ProcessFailed.php
deleted file mode 100644
index 0863605..0000000
--- a/app/Exceptions/ProcessFailed.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class ProcessFailed extends Exception
-{
-    //
-}
diff --git a/app/Models/BackupFile.php b/app/Models/BackupFile.php
index 926a99f..ea6ba66 100644
--- a/app/Models/BackupFile.php
+++ b/app/Models/BackupFile.php
@@ -72,6 +72,6 @@ public function path(): string
 
     public function storagePath(): string
     {
-        return '/'.$this->name.'.zip';
+        return '/'.$this->backup->database->name.'/'.$this->name.'.zip';
     }
 }
diff --git a/app/SSH/OS/OS.php b/app/SSH/OS/OS.php
index 228fd6c..fe0befb 100644
--- a/app/SSH/OS/OS.php
+++ b/app/SSH/OS/OS.php
@@ -63,10 +63,6 @@ public function deploySSHKey(string $key): void
 
     public function deleteSSHKey(string $key): void
     {
-        info($this->getScript('delete-ssh-key.sh', [
-            'key' => $key,
-            'user' => $this->server->getSshUser(),
-        ]));
         $this->server->ssh()->exec(
             $this->getScript('delete-ssh-key.sh', [
                 'key' => $key,
diff --git a/resources/commands/cronjobs/update-cron-jobs.sh b/resources/commands/cronjobs/update-cron-jobs.sh
deleted file mode 100755
index aea5170..0000000
--- a/resources/commands/cronjobs/update-cron-jobs.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if ! echo '__data__' | sudo -u __user__ crontab -; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! sudo -u __user__ crontab -l; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
diff --git a/resources/commands/installation/install-nodejs.sh b/resources/commands/installation/install-nodejs.sh
deleted file mode 100755
index 9a230da..0000000
--- a/resources/commands/installation/install-nodejs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash -;
-
-sudo DEBIAN_FRONTEND=noninteractive apt update
-
-sudo DEBIAN_FRONTEND=noninteractive apt install nodejs -y
diff --git a/resources/commands/phpmyadmin/create-phpmyadmin-vhost.sh b/resources/commands/phpmyadmin/create-phpmyadmin-vhost.sh
deleted file mode 100644
index 704d8ea..0000000
--- a/resources/commands/phpmyadmin/create-phpmyadmin-vhost.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-if ! sudo chown -R 755 /home/vito/phpmyadmin; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! echo '__vhost__' | sudo tee /etc/nginx/sites-available/phpmyadmin; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! sudo ln -s /etc/nginx/sites-available/phpmyadmin /etc/nginx/sites-enabled/; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! sudo service nginx restart; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-echo "PHPMyAdmin vhost created"
diff --git a/resources/commands/phpmyadmin/delete-phpmyadmin-vhost.sh b/resources/commands/phpmyadmin/delete-phpmyadmin-vhost.sh
deleted file mode 100644
index 21aa844..0000000
--- a/resources/commands/phpmyadmin/delete-phpmyadmin-vhost.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-sudo rm -rf __path__
-
-sudo rm /etc/nginx/sites-available/phpmyadmin
-
-sudo rm /etc/nginx/sites-enabled/phpmyadmin
-
-if ! sudo service nginx restart; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-echo "PHPMyAdmin deleted"
diff --git a/resources/commands/phpmyadmin/download-phpmyadmin.sh b/resources/commands/phpmyadmin/download-phpmyadmin.sh
deleted file mode 100644
index 492fbc3..0000000
--- a/resources/commands/phpmyadmin/download-phpmyadmin.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-sudo rm -rf phpmyadmin
-
-if ! wget https://files.phpmyadmin.net/phpMyAdmin/5.1.2/phpMyAdmin-5.1.2-all-languages.zip; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! unzip phpMyAdmin-5.1.2-all-languages.zip; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! rm -rf phpMyAdmin-5.1.2-all-languages.zip; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! mv phpMyAdmin-5.1.2-all-languages phpmyadmin; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! mv phpmyadmin/config.sample.inc.php phpmyadmin/config.inc.php; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
diff --git a/resources/commands/service/restart-service.sh b/resources/commands/service/restart-service.sh
deleted file mode 100644
index d54efec..0000000
--- a/resources/commands/service/restart-service.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-sudo service __service__ restart
-
-sudo service __service__ status | cat
diff --git a/resources/commands/service/service-status.sh b/resources/commands/service/service-status.sh
deleted file mode 100755
index fce6f4f..0000000
--- a/resources/commands/service/service-status.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo service __service__ status | cat
diff --git a/resources/commands/service/start-service.sh b/resources/commands/service/start-service.sh
deleted file mode 100644
index e9d8531..0000000
--- a/resources/commands/service/start-service.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-sudo service __service__ start
-
-sudo service __service__ status | cat
diff --git a/resources/commands/service/stop-service.sh b/resources/commands/service/stop-service.sh
deleted file mode 100644
index 1b7db27..0000000
--- a/resources/commands/service/stop-service.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-sudo service __service__ stop
-
-sudo service __service__ status | cat
diff --git a/resources/commands/ssl/install-certbot.sh b/resources/commands/ssl/install-certbot.sh
deleted file mode 100755
index 2ddaa43..0000000
--- a/resources/commands/ssl/install-certbot.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo DEBIAN_FRONTEND=noninteractive apt install certbot python3-certbot-nginx -y
diff --git a/resources/commands/system/delete-ssh-key.sh b/resources/commands/system/delete-ssh-key.sh
deleted file mode 100644
index e28ecf1..0000000
--- a/resources/commands/system/delete-ssh-key.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo sed -i 's/__key__//g' ~/.ssh/authorized_keys
diff --git a/resources/commands/wordpress/install.sh b/resources/commands/wordpress/install.sh
deleted file mode 100644
index 0321d66..0000000
--- a/resources/commands/wordpress/install.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-if ! curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! chmod +x wp-cli.phar; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! sudo mv wp-cli.phar /usr/local/bin/wp; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-rm -rf __path__
-
-if ! wp --path=__path__ core download; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! wp --path=__path__ core config --dbname='__db_name__' --dbuser='__db_user__' --dbpass='__db_pass__' --dbhost='__db_host__' --dbprefix='__db_prefix__'; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-if ! wp --path=__path__ core install --url='http://__domain__' --title="__title__" --admin_user='__username__' --admin_password="__password__" --admin_email='__email__'; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
-
-print "Wordpress installed!"
diff --git a/resources/views/databases/partials/create-backup-modal.blade.php b/resources/views/databases/partials/create-backup-modal.blade.php
index 310edac..45e148a 100644
--- a/resources/views/databases/partials/create-backup-modal.blade.php
+++ b/resources/views/databases/partials/create-backup-modal.blade.php
@@ -32,14 +32,19 @@ class="p-6"
 
         <div class="mt-6">
             <x-input-label for="backup_storage" :value="__('Storage')" />
-            <x-select-input id="backup_storage" name="backup_storage" class="mt-1 w-full">
-                <option value="" selected disabled>{{ __("Select") }}</option>
-                @foreach (auth()->user()->storageProviders as $st)
-                    <option value="{{ $st->id }}" @if(old('backup_storage') == $st->id) selected @endif>
-                        {{ $st->profile }} - {{ $st->provider }}
-                    </option>
-                @endforeach
-            </x-select-input>
+            <div class="mt-1 flex items-center">
+                <x-select-input id="backup_storage" name="backup_storage" class="mt-1 w-full">
+                    <option value="" selected disabled>{{ __("Select") }}</option>
+                    @foreach (auth()->user()->storageProviders as $st)
+                        <option value="{{ $st->id }}" @if(old('backup_storage') == $st->id) selected @endif>
+                            {{ $st->profile }} - {{ $st->provider }}
+                        </option>
+                    @endforeach
+                </x-select-input>
+                <x-secondary-button :href="route('storage-providers')" class="ml-2 flex-none">
+                    Connect
+                </x-secondary-button>
+            </div>
             @error("backup_storage")
                 <x-input-error class="mt-2" :messages="$message" />
             @enderror
diff --git a/resources/views/settings/storage-providers/partials/connect-provider.blade.php b/resources/views/settings/storage-providers/partials/connect-provider.blade.php
index 17afd38..81241c1 100644
--- a/resources/views/settings/storage-providers/partials/connect-provider.blade.php
+++ b/resources/views/settings/storage-providers/partials/connect-provider.blade.php
@@ -5,7 +5,7 @@
 
     <x-modal name="connect-provider">
         @php
-            $oldProvider = old("provider", request()->input("provider") ?? "");
+            $oldProvider = old("provider", request()->input("provider") ?? "dropbox");
         @endphp
 
         <form
@@ -33,6 +33,9 @@ class="p-6"
                         @if ($p !== "custom")
                             <option value="{{ $p }}" @if($oldProvider === $p) selected @endif>
                                 {{ $p }}
+                                @if ($p === "ftp")
+                                    (Beta)
+                                @endif
                             </option>
                         @endif
                     @endforeach
@@ -56,6 +59,14 @@ class="p-6"
                 @error("token")
                     <x-input-error class="mt-2" :messages="$message" />
                 @enderror
+
+                <a
+                    class="mt-1 text-primary-500"
+                    href="https://dropbox.tech/developers/generate-an-access-token-for-your-own-account"
+                    target="_blank"
+                >
+                    How to generate?
+                </a>
             </div>
 
             <div x-show="provider === 'ftp'" class="mt-6">