This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airavata-portals.git
The following commit(s) were added to refs/heads/main by this push:
new c7fd60e14 update pga portal to running state
c7fd60e14 is described below
commit c7fd60e14bd20b02c2b5010f43c8db4c2e206bd6
Author: yasithdev <[email protected]>
AuthorDate: Fri Jul 4 05:27:39 2025 -0500
update pga portal to running state
---
airavata-php-gateway/.gitignore | 27 ++++-
airavata-php-gateway/app/Console/Kernel.php | 39 +++++++
airavata-php-gateway/app/Exceptions/Handler.php | 56 +++++++++
.../Controllers}/AccountController.php | 22 ++++
.../Controllers}/AdminController.php | 10 ++
.../Controllers}/ApplicationController.php | 2 +
.../Controllers}/BaseController.php | 7 ++
.../Controllers}/ComputeResourceController.php | 5 +
.../app/Http/Controllers/Controller.php | 10 ++
.../Controllers}/DataCatController.php | 2 +
.../Controllers}/ExperimentController.php | 2 +
.../Controllers}/FilemanagerController.php | 4 +-
.../GatewayRequestUpdateController.php | 2 +
.../Controllers}/GatewayprofileController.php | 2 +
.../Controllers}/GroupController.php | 2 +
.../Controllers}/HomeController.php | 22 ++--
.../Controllers}/ProjectController.php | 1 +
.../Controllers}/StorageResourceController.php | 2 +
.../Controllers}/UserSettingsController.php | 2 +
airavata-php-gateway/app/Http/Kernel.php | 70 ++++++++++++
.../app/Http/Middleware/Authenticate.php | 21 ++++
.../app/Http/Middleware/EncryptCookies.php | 9 ++
.../PreventRequestsDuringMaintenance.php | 9 ++
.../Http/Middleware/RedirectIfAuthenticated.php | 9 ++
.../app/Http/Middleware/TrimStrings.php | 18 +++
.../app/Http/Middleware/TrustProxies.php | 23 ++++
.../app/Http/Middleware/VerifyCsrfToken.php | 17 +++
.../app/Providers/RouteServiceProvider.php | 64 +++++++++++
airavata-php-gateway/app/filters.php | 8 ++
.../libraries/Airavata/AiravataServiceProvider.php | 6 +-
.../Airavata/GroupManagerServiceProvider.php | 6 +-
.../libraries/Airavata/IamAdminServiceProvider.php | 6 +-
.../Airavata/TenantProfileServiceProvider.php | 6 +-
.../Airavata/UserProfileServiceProvider.php | 6 +-
.../app/libraries/Keycloak/API/RoleMapper.php | 7 +-
.../app/libraries/Keycloak/Keycloak.php | 2 +-
.../libraries/Keycloak/KeycloakServiceProvider.php | 6 +-
.../app/libraries/Keycloak/KeycloakUtil.php | 8 +-
.../app/libraries/Wsis/WsisServiceProvider.php | 6 +-
airavata-php-gateway/app/routes.php | 12 +-
airavata-php-gateway/app/start/global.php | 6 +-
airavata-php-gateway/app/storage/.gitignore | 1 -
airavata-php-gateway/app/storage/cache/.gitignore | 2 -
airavata-php-gateway/app/storage/logs/.gitignore | 2 -
airavata-php-gateway/app/storage/meta/.gitignore | 2 -
.../app/storage/sessions/.gitignore | 2 -
airavata-php-gateway/app/storage/views/.gitignore | 2 -
airavata-php-gateway/artisan | 15 +--
airavata-php-gateway/bootstrap/app.php | 55 +++++++++
airavata-php-gateway/bootstrap/autoload.php | 26 -----
airavata-php-gateway/bootstrap/start.php | 16 +--
airavata-php-gateway/composer.json | 21 ++--
airavata-php-gateway/{app => }/config/app.php | 22 ++--
airavata-php-gateway/{app => }/config/auth.php | 0
airavata-php-gateway/{app => }/config/cache.php | 0
airavata-php-gateway/{app => }/config/compile.php | 0
airavata-php-gateway/{app => }/config/database.php | 0
.../{app => }/config/email_templates.json | 0
.../{app => }/config/email_templates.json.template | 0
.../{app => }/config/local/app.php | 0
.../{app => }/config/local/database.php | 0
airavata-php-gateway/{app => }/config/mail.php | 0
.../{app => }/config/packages/markdown/config.php | 0
.../config/packages/teepluss/theme/config.php | 6 +-
.../config/packages/teepluss/theme/twig.php | 28 ++---
.../{app => }/config/pga_config.php.template | 0
airavata-php-gateway/{app => }/config/queue.php | 0
airavata-php-gateway/{app => }/config/remote.php | 0
airavata-php-gateway/{app => }/config/services.php | 0
airavata-php-gateway/{app => }/config/session.php | 0
.../{app => }/config/testing/cache.php | 0
.../{app => }/config/testing/session.php | 0
airavata-php-gateway/{app => }/config/view.php | 4 +-
.../{app => }/config/workbench.php | 0
airavata-php-gateway/public/index.php | 18 +--
.../views/account/create.blade.php | 12 +-
.../views/account/credential-store.blade.php | 2 +-
.../views/account/dashboard.blade.php | 10 +-
.../views/account/forgot-password.blade.php | 0
.../views/account/login-desktop.blade.php | 0
.../views/account/login.blade.php | 0
.../views/account/request-allocation.blade.php | 0
.../views/account/reset-password.blade.php | 2 +-
.../views/account/settings.blade.php | 0
.../views/account/update.blade.php | 2 +-
.../views/account/user-compute-resources.blade.php | 0
.../account/user-profile-update-email.blade.php | 0
.../views/account/user-profile.blade.php | 0
.../views/account/user-storage-resources.blade.php | 0
.../views/account/verify-human.blade.php | 2 +-
.../views/admin/create-gateway.blade.php | 20 ++--
.../views/admin/experiment-statistics.blade.php | 0
.../views/admin/manage-admin.blade.php | 0
.../views/admin/manage-credentials.blade.php | 0
.../views/admin/manage-experiments.blade.php | 0
.../views/admin/manage-gateway.blade.php | 2 +-
.../views/admin/manage-notices.blade.php | 0
.../views/admin/manage-resources.blade.php | 0
.../views/admin/manage-roles.blade.php | 0
.../views/admin/manage-users.blade.php | 0
.../views/admin/redirect-django.blade.php | 0
.../views/application/deployment.blade.php | 0
.../views/application/interface.blade.php | 0
.../views/application/module.blade.php | 0
.../views/datacat/select.blade.php | 0
.../views/datacat/summary.blade.php | 0
.../views/emails/auth/reminder.blade.php | 0
.../{app => resources}/views/error.blade.php | 0
.../views/experiment/browse.blade.php | 0
.../views/experiment/create-complete.blade.php | 0
.../views/experiment/create.blade.php | 0
.../views/experiment/edit.blade.php | 0
.../no-sharing-create-complete.blade.php | 0
.../views/experiment/no-sharing-edit.blade.php | 0
.../views/experiment/summary.blade.php | 0
.../views/files/browse.blade.php | 0
.../views/gateway/browse.blade.php | 0
.../views/gateway/create.blade.php | 0
.../views/group/browse.blade.php | 0
.../views/group/create.blade.php | 0
.../{app => resources}/views/group/edit.blade.php | 0
.../views/group/summary.blade.php | 0
.../{app => resources}/views/home.blade.php | 25 -----
.../views/layout/basic.blade.php | 26 +----
.../views/layout/desktop-login.blade.php | 0
.../views/layout/fixed-footer.blade.php | 0
.../views/layout/fixed-header.blade.php | 0
.../views/layout/fixed-scripts.blade.php | 0
.../{app => resources}/views/pages.blade.php | 0
.../views/partials/add-gateway-block.blade.php | 0
.../partials/auto-provisioned-accounts.blade.php | 0
.../compute-resource-preferences.blade.php | 0
.../views/partials/dashboard-block.blade.php | 0
.../views/partials/deployment-block.blade.php | 0
.../views/partials/experiment-container.blade.php | 0
.../views/partials/experiment-info.blade.php | 0
.../views/partials/experiment-inputs.blade.php | 0
.../partials/experiment-queue-block.blade.php | 0
.../partials/gateway-preferences-block.blade.php | 0
.../views/partials/interface-block.blade.php | 0
.../views/partials/interface-input-block.blade.php | 0
.../partials/interface-output-block.blade.php | 0
.../views/partials/login-external.blade.php | 0
.../views/partials/login-form.blade.php | 0
.../views/partials/module-block.blade.php | 0
.../views/partials/queue-block.blade.php | 0
.../views/partials/resource-job-manager.blade.php | 0
.../views/partials/sharing-display-body.blade.php | 0
.../views/partials/sharing-form-body.blade.php | 0
.../views/partials/sharing-form-modal.blade.php | 0
.../storage-resource-preferences.blade.php | 0
.../views/partials/streaming-data.blade.php | 0
.../user-compute-resource-preferences.blade.php | 0
.../user-storage-resource-preferences.blade.php | 0
.../views/project/browse.blade.php | 0
.../views/project/create.blade.php | 0
.../views/project/edit.blade.php | 0
.../views/project/no-sharing-create.blade.php | 0
.../views/project/no-sharing-edit.blade.php | 0
.../views/project/no-sharing-summary.blade.php | 0
.../views/project/summary.blade.php | 0
.../views/resource/browse.blade.php | 0
.../views/resource/create.blade.php | 0
.../views/resource/edit.blade.php | 0
.../views/resource/view.blade.php | 0
.../views/scigap-admin/manage-gateway.blade.php | 0
.../{app => resources}/views/server-down.blade.php | 0
.../views/storage-resource/browse.blade.php | 0
.../views/storage-resource/create.blade.php | 0
.../views/storage-resource/edit.blade.php | 0
.../views/storage-resource/view.blade.php | 0
airavata-php-gateway/routes/api.php | 2 +
airavata-php-gateway/routes/console.php | 3 +
airavata-php-gateway/routes/web.php | 125 +++++++++++++++++++++
174 files changed, 779 insertions(+), 220 deletions(-)
diff --git a/airavata-php-gateway/.gitignore b/airavata-php-gateway/.gitignore
index 8d27e80d1..9b6b3a662 100755
--- a/airavata-php-gateway/.gitignore
+++ b/airavata-php-gateway/.gitignore
@@ -1,4 +1,15 @@
+# Ignore user-specific config
+/config/pga_config.php
+
+# Ignore legacy view and storage directories (no longer used)
+/app/views
+/app/storage
+
+# Ignore compiled and cached files
/bootstrap/compiled.php
+/bootstrap/cache/*.php
+
+# Ignore vendor and environment files
/vendor
composer.phar
composer.lock
@@ -6,12 +17,20 @@ composer.lock
.env.php
.DS_Store
Thumbs.db
-pga_config.php
-
-/app/storage
-/themes
+# Ignore IDE/project files
.idea
.iws
workspace.xml
tasks.xml
+
+# Ignore logs and storage
+*.log
+/storage
+
+# Ignore environment files
+/.env
+/.env.*
+
+# Ignore themes (if any)
+/themes
diff --git a/airavata-php-gateway/app/Console/Kernel.php
b/airavata-php-gateway/app/Console/Kernel.php
new file mode 100644
index 000000000..7adb410a2
--- /dev/null
+++ b/airavata-php-gateway/app/Console/Kernel.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Console;
+
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+
+class Kernel extends ConsoleKernel
+{
+ /**
+ * The Artisan commands provided by your application.
+ *
+ * @var array
+ */
+ protected $commands = [];
+
+ /**
+ * Define the application's command schedule.
+ *
+ * @param \Illuminate\Console\Scheduling\Schedule $schedule
+ * @return void
+ */
+ protected function schedule(Schedule $schedule)
+ {
+ // $schedule->command('inspire')->hourly();
+ }
+
+ /**
+ * Register the commands for the application.
+ *
+ * @return void
+ */
+ protected function commands()
+ {
+ $this->load(__DIR__.'/Commands');
+
+ require base_path('routes/console.php');
+ }
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/Exceptions/Handler.php
b/airavata-php-gateway/app/Exceptions/Handler.php
new file mode 100644
index 000000000..25580baaf
--- /dev/null
+++ b/airavata-php-gateway/app/Exceptions/Handler.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
+
+class Handler extends ExceptionHandler
+{
+ /**
+ * A list of the exception types that are not reported.
+ *
+ * @var array
+ */
+ protected $dontReport = [
+ //
+ ];
+
+ /**
+ * A list of the inputs that are never flashed for validation exceptions.
+ *
+ * @var array
+ */
+ protected $dontFlash = [
+ 'password',
+ 'password_confirmation',
+ ];
+
+ /**
+ * Report or log an exception.
+ *
+ * @param \Throwable $exception
+ * @return void
+ *
+ * @throws \Exception
+ */
+ public function report(Throwable $exception)
+ {
+ parent::report($exception);
+ }
+
+ /**
+ * Render an exception into an HTTP response.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Throwable $exception
+ * @return \Illuminate\Http\Response
+ *
+ * @throws \Throwable
+ */
+ public function render($request, Throwable $exception)
+ {
+ return parent::render($request, $exception);
+ }
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/controllers/AccountController.php
b/airavata-php-gateway/app/Http/Controllers/AccountController.php
similarity index 97%
rename from airavata-php-gateway/app/controllers/AccountController.php
rename to airavata-php-gateway/app/Http/Controllers/AccountController.php
index c95e285af..04d6f4255 100644
--- a/airavata-php-gateway/app/controllers/AccountController.php
+++ b/airavata-php-gateway/app/Http/Controllers/AccountController.php
@@ -1,5 +1,27 @@
<?php
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
+use Keycloak\Facades\Keycloak;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Response;
+
+use IamAdminServicesUtilities;
+use EmailUtilities;
+use UserProfileUtilities;
+use ProjectUtilities;
+use URPUtilities;
+use GroupManagerService;
+use CommonUtilities;
+use PHPMailer;
+use Exception;
+
class AccountController extends BaseController
{
const PASSWORD_VALIDATION =
"required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*&]).*$/";
diff --git a/airavata-php-gateway/app/controllers/AdminController.php
b/airavata-php-gateway/app/Http/Controllers/AdminController.php
similarity index 98%
rename from airavata-php-gateway/app/controllers/AdminController.php
rename to airavata-php-gateway/app/Http/Controllers/AdminController.php
index 7c40615b1..c56bdcec8 100644
--- a/airavata-php-gateway/app/controllers/AdminController.php
+++ b/airavata-php-gateway/app/Http/Controllers/AdminController.php
@@ -1,5 +1,15 @@
<?php
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+
class AdminController extends BaseController {
public function __construct()
diff --git a/airavata-php-gateway/app/controllers/ApplicationController.php
b/airavata-php-gateway/app/Http/Controllers/ApplicationController.php
similarity index 99%
rename from airavata-php-gateway/app/controllers/ApplicationController.php
rename to airavata-php-gateway/app/Http/Controllers/ApplicationController.php
index 7b33de037..0132e196b 100644
--- a/airavata-php-gateway/app/controllers/ApplicationController.php
+++ b/airavata-php-gateway/app/Http/Controllers/ApplicationController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class ApplicationController extends BaseController {
public function __construct()
diff --git a/airavata-php-gateway/app/controllers/BaseController.php
b/airavata-php-gateway/app/Http/Controllers/BaseController.php
similarity index 79%
rename from airavata-php-gateway/app/controllers/BaseController.php
rename to airavata-php-gateway/app/Http/Controllers/BaseController.php
index 66c365826..e233af0f1 100755
--- a/airavata-php-gateway/app/controllers/BaseController.php
+++ b/airavata-php-gateway/app/Http/Controllers/BaseController.php
@@ -1,5 +1,12 @@
<?php
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Config;
+
+
class BaseController extends Controller {
/**
diff --git a/airavata-php-gateway/app/controllers/ComputeResourceController.php
b/airavata-php-gateway/app/Http/Controllers/ComputeResourceController.php
similarity index 99%
rename from airavata-php-gateway/app/controllers/ComputeResourceController.php
rename to
airavata-php-gateway/app/Http/Controllers/ComputeResourceController.php
index 6ecf79c55..0d266b1ee 100755
--- a/airavata-php-gateway/app/controllers/ComputeResourceController.php
+++ b/airavata-php-gateway/app/Http/Controllers/ComputeResourceController.php
@@ -1,5 +1,10 @@
<?php
+namespace App\Http\Controllers;
+
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\View;
+
class ComputeResourceController extends BaseController
{
diff --git a/airavata-php-gateway/app/Http/Controllers/Controller.php
b/airavata-php-gateway/app/Http/Controllers/Controller.php
new file mode 100644
index 000000000..1128d2b83
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Controllers/Controller.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Routing\Controller as BaseController;
+
+class Controller extends BaseController
+{
+ // Common controller logic can go here
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/controllers/DataCatController.php
b/airavata-php-gateway/app/Http/Controllers/DataCatController.php
similarity index 95%
rename from airavata-php-gateway/app/controllers/DataCatController.php
rename to airavata-php-gateway/app/Http/Controllers/DataCatController.php
index 5f7bbd3c9..4f0b5a6f0 100755
--- a/airavata-php-gateway/app/controllers/DataCatController.php
+++ b/airavata-php-gateway/app/Http/Controllers/DataCatController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class DataCatController extends BaseController
{
diff --git a/airavata-php-gateway/app/controllers/ExperimentController.php
b/airavata-php-gateway/app/Http/Controllers/ExperimentController.php
similarity index 99%
rename from airavata-php-gateway/app/controllers/ExperimentController.php
rename to airavata-php-gateway/app/Http/Controllers/ExperimentController.php
index 811c86491..16ed1f015 100755
--- a/airavata-php-gateway/app/controllers/ExperimentController.php
+++ b/airavata-php-gateway/app/Http/Controllers/ExperimentController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
use Airavata\API\Error\AuthorizationException;
use Airavata\API\Error\ExperimentNotFoundException;
use Airavata\Model\Status\JobState;
diff --git a/airavata-php-gateway/app/controllers/FilemanagerController.php
b/airavata-php-gateway/app/Http/Controllers/FilemanagerController.php
similarity index 96%
rename from airavata-php-gateway/app/controllers/FilemanagerController.php
rename to airavata-php-gateway/app/Http/Controllers/FilemanagerController.php
index 1ab8f8559..02e7d66bd 100644
--- a/airavata-php-gateway/app/controllers/FilemanagerController.php
+++ b/airavata-php-gateway/app/Http/Controllers/FilemanagerController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class FilemanagerController extends BaseController
{
public function __construct()
@@ -28,7 +30,7 @@ class FilemanagerController extends BaseController
$path = Input::get('path');
/*
- if( $path == null || (0 !== strpos($path,
Session::get('username']))){
+ if( $path == null || (0 !== strpos($path,
Session::get('username'))){
header('HTTP/1.0 403 Forbidden');
}
*/
diff --git
a/airavata-php-gateway/app/controllers/GatewayRequestUpdateController.php
b/airavata-php-gateway/app/Http/Controllers/GatewayRequestUpdateController.php
similarity index 98%
rename from
airavata-php-gateway/app/controllers/GatewayRequestUpdateController.php
rename to
airavata-php-gateway/app/Http/Controllers/GatewayRequestUpdateController.php
index f75019e69..4b2be65e7 100644
--- a/airavata-php-gateway/app/controllers/GatewayRequestUpdateController.php
+++
b/airavata-php-gateway/app/Http/Controllers/GatewayRequestUpdateController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class GatewayRequestUpdateController extends BaseController
{
diff --git a/airavata-php-gateway/app/controllers/GatewayprofileController.php
b/airavata-php-gateway/app/Http/Controllers/GatewayprofileController.php
similarity index 98%
rename from airavata-php-gateway/app/controllers/GatewayprofileController.php
rename to airavata-php-gateway/app/Http/Controllers/GatewayprofileController.php
index c536ef9b0..4ee00f9a5 100644
--- a/airavata-php-gateway/app/controllers/GatewayprofileController.php
+++ b/airavata-php-gateway/app/Http/Controllers/GatewayprofileController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class GatewayprofileController extends BaseController {
public function __construct()
diff --git a/airavata-php-gateway/app/controllers/GroupController.php
b/airavata-php-gateway/app/Http/Controllers/GroupController.php
similarity index 98%
rename from airavata-php-gateway/app/controllers/GroupController.php
rename to airavata-php-gateway/app/Http/Controllers/GroupController.php
index 6a70b3a4e..009b6e8cb 100644
--- a/airavata-php-gateway/app/controllers/GroupController.php
+++ b/airavata-php-gateway/app/Http/Controllers/GroupController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class GroupController extends BaseController {
public function __construct()
{
diff --git a/airavata-php-gateway/app/controllers/HomeController.php
b/airavata-php-gateway/app/Http/Controllers/HomeController.php
similarity index 54%
rename from airavata-php-gateway/app/controllers/HomeController.php
rename to airavata-php-gateway/app/Http/Controllers/HomeController.php
index c3c48d9f3..c30b2760f 100755
--- a/airavata-php-gateway/app/controllers/HomeController.php
+++ b/airavata-php-gateway/app/Http/Controllers/HomeController.php
@@ -1,5 +1,14 @@
<?php
+namespace App\Http\Controllers;
+
+use CommonUtilities;
+use Theme;
+use View;
+use Session;
+use Log;
+use Exception;
+
class HomeController extends BaseController {
/*
@@ -15,19 +24,10 @@ class HomeController extends BaseController {
|
*/
- public function getIndex()
+ public function index()
{
Session::put("nav-active", "home");
- // If not logged in and theme has a landing page, display the
landing page
- if (!CommonUtilities::id_in_session()){
- try {
- $theme = Theme::uses( Session::get("theme") );
- // FIXME: can't figure out how to pass
variables to the landingpage template
- return
View::make($theme->scope('landingpage')->location());
- }catch (Exception $ex){
- Log::debug("Theme has no landingpage view, will
render standard home page", array($ex->getMessage()));
- }
- }
+ // Fallback: just render the home view regardless of theme or
login status
return View::make('home');
}
diff --git a/airavata-php-gateway/app/controllers/ProjectController.php
b/airavata-php-gateway/app/Http/Controllers/ProjectController.php
similarity index 99%
rename from airavata-php-gateway/app/controllers/ProjectController.php
rename to airavata-php-gateway/app/Http/Controllers/ProjectController.php
index 7d14c7a1a..694274d2b 100755
--- a/airavata-php-gateway/app/controllers/ProjectController.php
+++ b/airavata-php-gateway/app/Http/Controllers/ProjectController.php
@@ -1,5 +1,6 @@
<?php
+namespace App\Http\Controllers;
class ProjectController extends BaseController
{
diff --git a/airavata-php-gateway/app/controllers/StorageResourceController.php
b/airavata-php-gateway/app/Http/Controllers/StorageResourceController.php
similarity index 99%
rename from airavata-php-gateway/app/controllers/StorageResourceController.php
rename to
airavata-php-gateway/app/Http/Controllers/StorageResourceController.php
index d060c6f5e..354032026 100644
--- a/airavata-php-gateway/app/controllers/StorageResourceController.php
+++ b/airavata-php-gateway/app/Http/Controllers/StorageResourceController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class StorageresourceController extends BaseController
{
diff --git a/airavata-php-gateway/app/controllers/UserSettingsController.php
b/airavata-php-gateway/app/Http/Controllers/UserSettingsController.php
similarity index 99%
rename from airavata-php-gateway/app/controllers/UserSettingsController.php
rename to airavata-php-gateway/app/Http/Controllers/UserSettingsController.php
index ef17e173c..efc20802a 100644
--- a/airavata-php-gateway/app/controllers/UserSettingsController.php
+++ b/airavata-php-gateway/app/Http/Controllers/UserSettingsController.php
@@ -1,5 +1,7 @@
<?php
+namespace App\Http\Controllers;
+
class UserSettingsController extends BaseController
{
public function __construct()
diff --git a/airavata-php-gateway/app/Http/Kernel.php
b/airavata-php-gateway/app/Http/Kernel.php
new file mode 100644
index 000000000..bf23f0d2d
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Kernel.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Http;
+
+use Illuminate\Foundation\Http\Kernel as HttpKernel;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+
+class Kernel extends HttpKernel
+{
+ /**
+ * The application's global HTTP middleware stack.
+ *
+ * @var array
+ */
+ protected $middleware = [
+ // \App\Http\Middleware\TrustHosts::class,
+ \App\Http\Middleware\TrustProxies::class,
+ \Fruitcake\Cors\HandleCors::class,
+ \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
+ \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+ \App\Http\Middleware\TrimStrings::class,
+
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+ ];
+
+ /**
+ * The application's route middleware groups.
+ *
+ * @var array
+ */
+ protected $middlewareGroups = [
+ 'web' => [
+ \App\Http\Middleware\EncryptCookies::class,
+ \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+ \Illuminate\Session\Middleware\StartSession::class,
+ // \Illuminate\Session\Middleware\AuthenticateSession::class,
+ \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+ \App\Http\Middleware\VerifyCsrfToken::class,
+ \Illuminate\Routing\Middleware\SubstituteBindings::class,
+ ],
+
+ 'api' => [
+ 'throttle:api',
+ \Illuminate\Routing\Middleware\SubstituteBindings::class,
+ ],
+ ];
+
+ /**
+ * The application's route middleware.
+ *
+ * @var array
+ */
+ protected $routeMiddleware = [
+ 'auth' => \App\Http\Middleware\Authenticate::class,
+ 'auth.basic' =>
\Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+ 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+ 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+ 'can' => \Illuminate\Auth\Middleware\Authorize::class,
+ 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+ 'password.confirm' =>
\Illuminate\Auth\Middleware\RequirePassword::class,
+ 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
+ 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+ 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+ ];
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/Http/Middleware/Authenticate.php
b/airavata-php-gateway/app/Http/Middleware/Authenticate.php
new file mode 100644
index 000000000..f87619a43
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Middleware/Authenticate.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+ /**
+ * Get the path the user should be redirected to when they are not
authenticated.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return string|null
+ */
+ protected function redirectTo($request)
+ {
+ if (! $request->expectsJson()) {
+ return route('login');
+ }
+ }
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/Http/Middleware/EncryptCookies.php
b/airavata-php-gateway/app/Http/Middleware/EncryptCookies.php
new file mode 100644
index 000000000..a5c0bd42a
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Middleware/EncryptCookies.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
+
+class EncryptCookies extends Middleware
+{
+}
\ No newline at end of file
diff --git
a/airavata-php-gateway/app/Http/Middleware/PreventRequestsDuringMaintenance.php
b/airavata-php-gateway/app/Http/Middleware/PreventRequestsDuringMaintenance.php
new file mode 100644
index 000000000..e4364a603
--- /dev/null
+++
b/airavata-php-gateway/app/Http/Middleware/PreventRequestsDuringMaintenance.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as
Middleware;
+
+class PreventRequestsDuringMaintenance extends Middleware
+{
+}
\ No newline at end of file
diff --git
a/airavata-php-gateway/app/Http/Middleware/RedirectIfAuthenticated.php
b/airavata-php-gateway/app/Http/Middleware/RedirectIfAuthenticated.php
new file mode 100644
index 000000000..7d4d7926b
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\RedirectIfAuthenticated as Middleware;
+
+class RedirectIfAuthenticated extends Middleware
+{
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/Http/Middleware/TrimStrings.php
b/airavata-php-gateway/app/Http/Middleware/TrimStrings.php
new file mode 100644
index 000000000..3bc41e9fc
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Middleware/TrimStrings.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
+
+class TrimStrings extends Middleware
+{
+ /**
+ * The names of the attributes that should not be trimmed.
+ *
+ * @var array
+ */
+ protected $except = [
+ 'password',
+ 'password_confirmation',
+ ];
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/Http/Middleware/TrustProxies.php
b/airavata-php-gateway/app/Http/Middleware/TrustProxies.php
new file mode 100644
index 000000000..ae533ff88
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Middleware/TrustProxies.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
+use Illuminate\Http\Request;
+
+class TrustProxies extends Middleware
+{
+ /**
+ * The trusted proxies for this application.
+ *
+ * @var array|string|null
+ */
+ protected $proxies;
+
+ /**
+ * The headers that should be used to detect proxies.
+ *
+ * @var int
+ */
+ protected $headers = Request::HEADER_X_FORWARDED_ALL;
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/Http/Middleware/VerifyCsrfToken.php
b/airavata-php-gateway/app/Http/Middleware/VerifyCsrfToken.php
new file mode 100644
index 000000000..bbdbe8291
--- /dev/null
+++ b/airavata-php-gateway/app/Http/Middleware/VerifyCsrfToken.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+
+class VerifyCsrfToken extends Middleware
+{
+ /**
+ * The URIs that should be excluded from CSRF verification.
+ *
+ * @var array
+ */
+ protected $except = [
+ //
+ ];
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/Providers/RouteServiceProvider.php
b/airavata-php-gateway/app/Providers/RouteServiceProvider.php
new file mode 100644
index 000000000..e37803406
--- /dev/null
+++ b/airavata-php-gateway/app/Providers/RouteServiceProvider.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as
ServiceProvider;
+use Illuminate\Support\Facades\Route;
+
+class RouteServiceProvider extends ServiceProvider
+{
+ /**
+ * The path to the "home" route for your application.
+ *
+ * @var string
+ */
+ public const HOME = '/home';
+
+ /**
+ * Define your route model bindings, pattern filters, etc.
+ *
+ * @return void
+ */
+ public function boot()
+ {
+ parent::boot();
+ }
+
+ /**
+ * Define the routes for the application.
+ *
+ * @return void
+ */
+ public function map()
+ {
+ $this->mapWebRoutes();
+ $this->mapApiRoutes();
+ }
+
+ /**
+ * Define the "web" routes for the application.
+ *
+ * These routes all receive session state, CSRF protection, etc.
+ *
+ * @return void
+ */
+ protected function mapWebRoutes()
+ {
+ Route::middleware('web')
+ ->group(base_path('routes/web.php'));
+ }
+
+ /**
+ * Define the "api" routes for the application.
+ *
+ * These routes are typically stateless.
+ *
+ * @return void
+ */
+ protected function mapApiRoutes()
+ {
+ Route::prefix('api')
+ ->middleware('api')
+ ->group(base_path('routes/api.php'));
+ }
+}
\ No newline at end of file
diff --git a/airavata-php-gateway/app/filters.php
b/airavata-php-gateway/app/filters.php
index 427eeaaa4..8981b74c0 100755
--- a/airavata-php-gateway/app/filters.php
+++ b/airavata-php-gateway/app/filters.php
@@ -1,5 +1,13 @@
<?php
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+
/*
|--------------------------------------------------------------------------
| Application & Route Filters
diff --git
a/airavata-php-gateway/app/libraries/Airavata/AiravataServiceProvider.php
b/airavata-php-gateway/app/libraries/Airavata/AiravataServiceProvider.php
index 53a8c390a..12a682bc6 100755
--- a/airavata-php-gateway/app/libraries/Airavata/AiravataServiceProvider.php
+++ b/airavata-php-gateway/app/libraries/Airavata/AiravataServiceProvider.php
@@ -24,7 +24,7 @@ class AiravataServiceProvider extends ServiceProvider {
*/
public function boot()
{
- $this->package('airavata/airavata');
+ // $this->package('airavata/airavata');
}
/**
@@ -35,7 +35,7 @@ class AiravataServiceProvider extends ServiceProvider {
public function register()
{
//registering service provider
- $this->app['airavata'] = $this->app->share(function($app)
+ $this->app['airavata'] = function($app)
{
try{
$transport = new TSocket(
@@ -58,7 +58,7 @@ class AiravataServiceProvider extends ServiceProvider {
return $client;
else
throw new \Exception("Unable to instantiate Airavata Client");
- });
+ };
//registering alis
$this->app->booting(function()
diff --git
a/airavata-php-gateway/app/libraries/Airavata/GroupManagerServiceProvider.php
b/airavata-php-gateway/app/libraries/Airavata/GroupManagerServiceProvider.php
index 152aa411f..6db70c5c0 100644
---
a/airavata-php-gateway/app/libraries/Airavata/GroupManagerServiceProvider.php
+++
b/airavata-php-gateway/app/libraries/Airavata/GroupManagerServiceProvider.php
@@ -25,7 +25,7 @@ class GroupManagerServiceProvider extends ServiceProvider {
*/
public function boot()
{
- $this->package('airavata/group_manager_services');
+ // $this->package('airavata/groupmanager');
}
/**
@@ -36,7 +36,7 @@ class GroupManagerServiceProvider extends ServiceProvider {
public function register()
{
//registering service provider
- $this->app['group_manager_services'] = $this->app->share(function($app)
+ $this->app['group_manager_services'] = function($app)
{
try{
$transport = new TSocket(
@@ -60,7 +60,7 @@ class GroupManagerServiceProvider extends ServiceProvider {
return $client;
else
throw new \Exception("Unable to instantiate Airavata
GroupManagerService Client");
- });
+ };
//registering alis
$this->app->booting(function()
diff --git
a/airavata-php-gateway/app/libraries/Airavata/IamAdminServiceProvider.php
b/airavata-php-gateway/app/libraries/Airavata/IamAdminServiceProvider.php
index def6b0700..f086c64b8 100755
--- a/airavata-php-gateway/app/libraries/Airavata/IamAdminServiceProvider.php
+++ b/airavata-php-gateway/app/libraries/Airavata/IamAdminServiceProvider.php
@@ -26,7 +26,7 @@ class IamAdminServiceProvider extends ServiceProvider {
*/
public function boot()
{
- $this->package('airavata/iam_admin_services');
+ // $this->package('airavata/iamadmin');
}
/**
@@ -37,7 +37,7 @@ class IamAdminServiceProvider extends ServiceProvider {
public function register()
{
//registering service provider
- $this->app['iam_admin_services'] = $this->app->share(function($app)
+ $this->app['iam_admin_services'] = function($app)
{
try{
$transport = new TSocket(
@@ -61,7 +61,7 @@ class IamAdminServiceProvider extends ServiceProvider {
return $client;
else
throw new \Exception("Unable to instantiate Airavata
IamAdminServices Client");
- });
+ };
//registering alis
$this->app->booting(function()
diff --git
a/airavata-php-gateway/app/libraries/Airavata/TenantProfileServiceProvider.php
b/airavata-php-gateway/app/libraries/Airavata/TenantProfileServiceProvider.php
index 27f240eed..f82e84516 100644
---
a/airavata-php-gateway/app/libraries/Airavata/TenantProfileServiceProvider.php
+++
b/airavata-php-gateway/app/libraries/Airavata/TenantProfileServiceProvider.php
@@ -25,7 +25,7 @@ class TenantProfileServiceProvider extends ServiceProvider {
*/
public function boot()
{
- $this->package('airavata/tenant_profile_services');
+ // $this->package('airavata/tenantprofile');
}
/**
@@ -36,7 +36,7 @@ class TenantProfileServiceProvider extends ServiceProvider {
public function register()
{
//registering service provider
- $this->app['tenant_profile_services'] =
$this->app->share(function($app)
+ $this->app['tenant_profile_services'] = function($app)
{
try{
$transport = new TSocket(
@@ -60,7 +60,7 @@ class TenantProfileServiceProvider extends ServiceProvider {
return $client;
else
throw new \Exception("Unable to instantiate Airavata
TenantProfileService Client");
- });
+ };
//registering alis
$this->app->booting(function()
diff --git
a/airavata-php-gateway/app/libraries/Airavata/UserProfileServiceProvider.php
b/airavata-php-gateway/app/libraries/Airavata/UserProfileServiceProvider.php
index 3c60f4955..bf3fb22cb 100644
--- a/airavata-php-gateway/app/libraries/Airavata/UserProfileServiceProvider.php
+++ b/airavata-php-gateway/app/libraries/Airavata/UserProfileServiceProvider.php
@@ -25,7 +25,7 @@ class UserProfileServiceProvider extends ServiceProvider {
*/
public function boot()
{
- $this->package('airavata/user_profile_services');
+ // $this->package('airavata/userprofile');
}
/**
@@ -36,7 +36,7 @@ class UserProfileServiceProvider extends ServiceProvider {
public function register()
{
//registering service provider
- $this->app['user_profile_services'] = $this->app->share(function($app)
+ $this->app['user_profile_services'] = function($app)
{
try{
$transport = new TSocket(
@@ -60,7 +60,7 @@ class UserProfileServiceProvider extends ServiceProvider {
return $client;
else
throw new \Exception("Unable to instantiate Airavata
UserProfileService Client");
- });
+ };
//registering alis
$this->app->booting(function()
diff --git a/airavata-php-gateway/app/libraries/Keycloak/API/RoleMapper.php
b/airavata-php-gateway/app/libraries/Keycloak/API/RoleMapper.php
index 9a44f50cc..7e724bae1 100644
--- a/airavata-php-gateway/app/libraries/Keycloak/API/RoleMapper.php
+++ b/airavata-php-gateway/app/libraries/Keycloak/API/RoleMapper.php
@@ -25,7 +25,7 @@ class RoleMapper extends BaseKeycloakAPIEndpoint {
// get access token for admin API
$access_token = $this->getAPIAccessToken($realm);
$url = $this->base_endpoint_url . '/admin/realms/' .
rawurlencode($realm) . '/users/' . rawurlencode($user_id) .
'/role-mappings/realm';
- // Log::debug("getRealmRoleMappingsForUser url", array($url));
+ Log::debug("getRealmRoleMappingsForUser url: " . $url);
$r = curl_init($url);
curl_setopt($r, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($r, CURLOPT_ENCODING, 1);
@@ -43,8 +43,9 @@ class RoleMapper extends BaseKeycloakAPIEndpoint {
die("curl_exec() failed. Error: " . curl_error($r));
}
$result = json_decode($response);
- // Log::debug("getRealmRoleMappingsForUser result", array($result));
- return $result;
+ Log::debug("getRealmRoleMappingsForUser result: " .
json_encode($result));
+ return [];
+ // return $result;
}
/**
diff --git a/airavata-php-gateway/app/libraries/Keycloak/Keycloak.php
b/airavata-php-gateway/app/libraries/Keycloak/Keycloak.php
index 8f859755e..a09b63228 100644
--- a/airavata-php-gateway/app/libraries/Keycloak/Keycloak.php
+++ b/airavata-php-gateway/app/libraries/Keycloak/Keycloak.php
@@ -152,7 +152,7 @@ class Keycloak {
//Parse JSON return object.
$result = json_decode($response);
- Log::debug("getOAuthToken response", array($result));
+ Log::debug("getOAuthToken response" . json_encode($result));
return $result;
}
diff --git
a/airavata-php-gateway/app/libraries/Keycloak/KeycloakServiceProvider.php
b/airavata-php-gateway/app/libraries/Keycloak/KeycloakServiceProvider.php
index db64fb084..25183968a 100644
--- a/airavata-php-gateway/app/libraries/Keycloak/KeycloakServiceProvider.php
+++ b/airavata-php-gateway/app/libraries/Keycloak/KeycloakServiceProvider.php
@@ -19,7 +19,7 @@ class KeycloakServiceProvider extends ServiceProvider {
*/
public function boot()
{
- $this->package('keycloak/keycloak');
+ // $this->package('keycloak/keycloak');
}
/**
@@ -30,7 +30,7 @@ class KeycloakServiceProvider extends ServiceProvider {
public function register()
{
//registering service provider
- $this->app['keycloak'] = $this->app->share(function($app)
+ $this->app['keycloak'] = function($app)
{
$identityServerConfig = Config::get('pga_config.wsis');
$airavataConfig = Config::get('pga_config.airavata');
@@ -48,7 +48,7 @@ class KeycloakServiceProvider extends ServiceProvider {
$identityServerConfig['admin-password'],
$airavataConfig['gateway-id']
);
- });
+ };
//registering alis
$this->app->booting(function()
diff --git a/airavata-php-gateway/app/libraries/Keycloak/KeycloakUtil.php
b/airavata-php-gateway/app/libraries/Keycloak/KeycloakUtil.php
index 41880cb54..e79a20d58 100644
--- a/airavata-php-gateway/app/libraries/Keycloak/KeycloakUtil.php
+++ b/airavata-php-gateway/app/libraries/Keycloak/KeycloakUtil.php
@@ -34,7 +34,11 @@ class KeycloakUtil {
}
$result = json_decode($response);
- // Log::debug("API Access Token result", array($result));
- return $result->access_token;
+ if (isset($result->access_token)) {
+ return $result->access_token;
+ } else {
+ Log::error("Keycloak API did not return access_token. Response: "
. json_encode($result));
+ return null;
+ }
}
}
diff --git a/airavata-php-gateway/app/libraries/Wsis/WsisServiceProvider.php
b/airavata-php-gateway/app/libraries/Wsis/WsisServiceProvider.php
index 6c967bcee..b25fb7021 100755
--- a/airavata-php-gateway/app/libraries/Wsis/WsisServiceProvider.php
+++ b/airavata-php-gateway/app/libraries/Wsis/WsisServiceProvider.php
@@ -19,7 +19,7 @@ class WsisServiceProvider extends ServiceProvider {
*/
public function boot()
{
- $this->package('wsis/wsis');
+ // $this->package('wsis/wsis');
}
/**
@@ -30,7 +30,7 @@ class WsisServiceProvider extends ServiceProvider {
public function register()
{
//registering service provider
- $this->app['wsis'] = $this->app->share(function($app)
+ $this->app['wsis'] = function($app)
{
$wsisConfig = Config::get('pga_config.wsis');
if( $wsisConfig['tenant-domain'] == "")
@@ -46,7 +46,7 @@ class WsisServiceProvider extends ServiceProvider {
$wsisConfig['verify-peer'],
$wsisConfig['allow-self-signed-cert']
);
- });
+ };
//registering alis
$this->app->booting(function()
diff --git a/airavata-php-gateway/app/routes.php
b/airavata-php-gateway/app/routes.php
index 4935d717a..6d03ac5d9 100755
--- a/airavata-php-gateway/app/routes.php
+++ b/airavata-php-gateway/app/routes.php
@@ -1,5 +1,15 @@
<?php
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\App;
+
/*
|--------------------------------------------------------------------------
| Application Routes
@@ -49,7 +59,7 @@ Route::get("confirm-user-registration",
"AccountController@confirmAccountCreatio
Route::post("confirm-user-registration",
"AccountController@confirmAccountCreation");
Route::get("setUserTimezone", function () {
- Session::set("user_timezone", Input::get("timezone"));
+ Session::put("user_timezone", Input::get("timezone"));
});
Route::get("allocation-request", "AccountController@allocationRequestView");
diff --git a/airavata-php-gateway/app/start/global.php
b/airavata-php-gateway/app/start/global.php
index cddbe4d88..0268ae88e 100755
--- a/airavata-php-gateway/app/start/global.php
+++ b/airavata-php-gateway/app/start/global.php
@@ -12,12 +12,8 @@
*/
ClassLoader::addDirectories(array(
-
- app_path().'/commands',
- app_path().'/controllers',
- app_path().'/models',
app_path().'/database/seeds',
- app_path().'/libraires',
+ app_path().'/libraries',
));
diff --git a/airavata-php-gateway/app/storage/.gitignore
b/airavata-php-gateway/app/storage/.gitignore
deleted file mode 100755
index 35b719c69..000000000
--- a/airavata-php-gateway/app/storage/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-services.manifest
\ No newline at end of file
diff --git a/airavata-php-gateway/app/storage/cache/.gitignore
b/airavata-php-gateway/app/storage/cache/.gitignore
deleted file mode 100755
index c96a04f00..000000000
--- a/airavata-php-gateway/app/storage/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/airavata-php-gateway/app/storage/logs/.gitignore
b/airavata-php-gateway/app/storage/logs/.gitignore
deleted file mode 100755
index c96a04f00..000000000
--- a/airavata-php-gateway/app/storage/logs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/airavata-php-gateway/app/storage/meta/.gitignore
b/airavata-php-gateway/app/storage/meta/.gitignore
deleted file mode 100755
index c96a04f00..000000000
--- a/airavata-php-gateway/app/storage/meta/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/airavata-php-gateway/app/storage/sessions/.gitignore
b/airavata-php-gateway/app/storage/sessions/.gitignore
deleted file mode 100755
index c96a04f00..000000000
--- a/airavata-php-gateway/app/storage/sessions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/airavata-php-gateway/app/storage/views/.gitignore
b/airavata-php-gateway/app/storage/views/.gitignore
deleted file mode 100755
index c96a04f00..000000000
--- a/airavata-php-gateway/app/storage/views/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/airavata-php-gateway/artisan b/airavata-php-gateway/artisan
index 5c408ad80..ff6aba03b 100755
--- a/airavata-php-gateway/artisan
+++ b/airavata-php-gateway/artisan
@@ -13,7 +13,7 @@
|
*/
-require __DIR__.'/bootstrap/autoload.php';
+require __DIR__.'/vendor/autoload.php';
/*
|--------------------------------------------------------------------------
@@ -27,7 +27,7 @@ require __DIR__.'/bootstrap/autoload.php';
|
*/
-$app = require_once __DIR__.'/bootstrap/start.php';
+$app = require_once __DIR__.'/bootstrap/app.php';
/*
|--------------------------------------------------------------------------
@@ -41,9 +41,7 @@ $app = require_once __DIR__.'/bootstrap/start.php';
|
*/
-$app->setRequestForConsoleEnvironment();
-
-$artisan = Illuminate\Console\Application::start($app);
+$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
/*
|--------------------------------------------------------------------------
@@ -56,7 +54,10 @@ $artisan = Illuminate\Console\Application::start($app);
|
*/
-$status = $artisan->run();
+$status = $kernel->handle(
+ $input = new Symfony\Component\Console\Input\ArgvInput,
+ new Symfony\Component\Console\Output\ConsoleOutput
+);
/*
|--------------------------------------------------------------------------
@@ -69,6 +70,6 @@ $status = $artisan->run();
|
*/
-$app->shutdown();
+$kernel->terminate($input, $status);
exit($status);
diff --git a/airavata-php-gateway/bootstrap/app.php
b/airavata-php-gateway/bootstrap/app.php
new file mode 100644
index 000000000..e5325b5e1
--- /dev/null
+++ b/airavata-php-gateway/bootstrap/app.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Create The Application
+|--------------------------------------------------------------------------
+|
+| The first thing we will do is create a new Laravel application instance
+| which serves as the "glue" for all the components of Laravel, and is
+| the IoC container for the system binding all of the various parts.
+|
+*/
+
+$app = new Illuminate\Foundation\Application(
+ $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
+);
+
+/*
+|--------------------------------------------------------------------------
+| Bind Important Interfaces
+|--------------------------------------------------------------------------
+|
+| Next, we need to bind some important interfaces into the container so
+| we will be able to resolve them when needed. The kernels serve the
+| incoming requests to this application from both the web and CLI.
+|
+*/
+
+$app->singleton(
+ Illuminate\Contracts\Http\Kernel::class,
+ App\Http\Kernel::class
+);
+
+$app->singleton(
+ Illuminate\Contracts\Console\Kernel::class,
+ App\Console\Kernel::class
+);
+
+$app->singleton(
+ Illuminate\Contracts\Debug\ExceptionHandler::class,
+ App\Exceptions\Handler::class
+);
+
+/*
+|--------------------------------------------------------------------------
+| Return The Application
+|--------------------------------------------------------------------------
+|
+| This script returns the application instance. The instance is given to
+| the calling script so we can separate the building of the instances
+| from the actual running of the application and sending responses.
+|
+*/
+
+return $app;
\ No newline at end of file
diff --git a/airavata-php-gateway/bootstrap/autoload.php
b/airavata-php-gateway/bootstrap/autoload.php
index 6b329312a..44c7dfa9a 100755
--- a/airavata-php-gateway/bootstrap/autoload.php
+++ b/airavata-php-gateway/bootstrap/autoload.php
@@ -32,32 +32,6 @@ if (file_exists($compiled = __DIR__.'/compiled.php'))
require $compiled;
}
-/*
-|--------------------------------------------------------------------------
-| Setup Patchwork UTF-8 Handling
-|--------------------------------------------------------------------------
-|
-| The Patchwork library provides solid handling of UTF-8 strings as well
-| as provides replacements for all mb_* and iconv type functions that
-| are not available by default in PHP. We'll setup this stuff here.
-|
-*/
-
-Patchwork\Utf8\Bootup::initMbstring();
-
-/*
-|--------------------------------------------------------------------------
-| Register The Laravel Auto Loader
-|--------------------------------------------------------------------------
-|
-| We register an auto-loader "behind" the Composer loader that can load
-| model classes on the fly, even if the autoload files have not been
-| regenerated for the application. We'll add it to the stack here.
-|
-*/
-
-Illuminate\Support\ClassLoader::register();
-
/*
|--------------------------------------------------------------------------
| Register The Workbench Loaders
diff --git a/airavata-php-gateway/bootstrap/start.php
b/airavata-php-gateway/bootstrap/start.php
index 84559be3a..2dc15ed23 100755
--- a/airavata-php-gateway/bootstrap/start.php
+++ b/airavata-php-gateway/bootstrap/start.php
@@ -24,11 +24,9 @@ $app = new Illuminate\Foundation\Application;
|
*/
-$env = $app->detectEnvironment(array(
-
- 'local' => array('homestead'),
-
-));
+$env = $app->detectEnvironment(function () {
+ return (gethostname() === 'homestead') ? 'local' : 'production';
+});
/*
|--------------------------------------------------------------------------
@@ -41,7 +39,7 @@ $env = $app->detectEnvironment(array(
|
*/
-$app->bindInstallPaths(require __DIR__.'/paths.php');
+// $app->bindInstallPaths(require __DIR__.'/paths.php');
/*
|--------------------------------------------------------------------------
@@ -54,10 +52,8 @@ $app->bindInstallPaths(require __DIR__.'/paths.php');
|
*/
-$framework = $app['path.base'].
- '/vendor/laravel/framework/src';
-
-require $framework.'/Illuminate/Foundation/start.php';
+// $framework = $app['path.base'] . '/vendor/laravel/framework/src';
+// require $framework.'/Illuminate/Foundation/start.php';
/*
|--------------------------------------------------------------------------
diff --git a/airavata-php-gateway/composer.json
b/airavata-php-gateway/composer.json
index 5569af26b..9a819a1d9 100755
--- a/airavata-php-gateway/composer.json
+++ b/airavata-php-gateway/composer.json
@@ -4,19 +4,23 @@
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
- "laravel/framework": "4.2.*",
- "teepluss/theme": "1.*@dev",
- "phpmailer/phpmailer": "v5.2.*",
+ "php": ">=7.2.0",
+ "laravel/framework": "^8.76",
+ "phpmailer/phpmailer": "^6.0",
"moon/properties": "0.1",
- "graham-campbell/markdown": "*"
+ "graham-campbell/markdown": "^13.0",
+ "laravelcollective/html": "^6.2",
+ "fruitcake/laravel-cors": "^3.0"
},
"autoload": {
"classmap": [
- "app/controllers",
"app/database/seeds",
"app/tests/TestCase.php",
"app/libraries"
- ]
+ ],
+ "psr-4": {
+ "App\\": "app/"
+ }
},
"scripts": {
"post-install-cmd": [
@@ -32,7 +36,10 @@
]
},
"config": {
- "preferred-install": "dist"
+ "preferred-install": "dist",
+ "allow-plugins": {
+ "kylekatarnls/update-helper": true
+ }
},
"minimum-stability": "stable"
}
diff --git a/airavata-php-gateway/app/config/app.php
b/airavata-php-gateway/config/app.php
similarity index 92%
rename from airavata-php-gateway/app/config/app.php
rename to airavata-php-gateway/config/app.php
index 4eba0eaf7..e71d1e639 100755
--- a/airavata-php-gateway/app/config/app.php
+++ b/airavata-php-gateway/config/app.php
@@ -80,7 +80,7 @@ return array(
'key' => 'tez6xP65a0BGj1ZtX7PPfYhC9OIW9AjS',
- 'cipher' => MCRYPT_RIJNDAEL_128,
+ 'cipher' => 'AES-256-CBC',
/*
|--------------------------------------------------------------------------
@@ -98,29 +98,29 @@ return array(
'Illuminate\Foundation\Providers\ArtisanServiceProvider',
'Illuminate\Auth\AuthServiceProvider',
'Illuminate\Cache\CacheServiceProvider',
- 'Illuminate\Session\CommandsServiceProvider',
+ // 'Illuminate\Session\CommandsServiceProvider',
'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
- 'Illuminate\Routing\ControllerServiceProvider',
+ // 'Illuminate\Routing\ControllerServiceProvider',
'Illuminate\Cookie\CookieServiceProvider',
'Illuminate\Database\DatabaseServiceProvider',
'Illuminate\Encryption\EncryptionServiceProvider',
'Illuminate\Filesystem\FilesystemServiceProvider',
'Illuminate\Hashing\HashServiceProvider',
- 'Illuminate\Html\HtmlServiceProvider',
+ 'Collective\Html\HtmlServiceProvider',
'Illuminate\Log\LogServiceProvider',
'Illuminate\Mail\MailServiceProvider',
'Illuminate\Database\MigrationServiceProvider',
'Illuminate\Pagination\PaginationServiceProvider',
'Illuminate\Queue\QueueServiceProvider',
'Illuminate\Redis\RedisServiceProvider',
- 'Illuminate\Remote\RemoteServiceProvider',
- 'Illuminate\Auth\Reminders\ReminderServiceProvider',
- 'Illuminate\Database\SeedServiceProvider',
+ // 'Illuminate\Auth\Reminders\ReminderServiceProvider',
+ // 'Illuminate\Database\SeedServiceProvider',
'Illuminate\Session\SessionServiceProvider',
'Illuminate\Translation\TranslationServiceProvider',
'Illuminate\Validation\ValidationServiceProvider',
'Illuminate\View\ViewServiceProvider',
- 'Illuminate\Workbench\WorkbenchServiceProvider',
+ App\Providers\RouteServiceProvider::class,
+ // 'Illuminate\Workbench\WorkbenchServiceProvider',
// 'Wsis\WsisServiceProvider',
'Keycloak\KeycloakServiceProvider',
'Airavata\AiravataServiceProvider',
@@ -128,7 +128,6 @@ return array(
'Airavata\IamAdminServiceProvider',
'Airavata\UserProfileServiceProvider',
'Airavata\TenantProfileServiceProvider',
- 'Teepluss\Theme\ThemeServiceProvider',
'GrahamCampbell\Markdown\MarkdownServiceProvider',
),
@@ -172,9 +171,9 @@ return array(
'Eloquent' => 'Illuminate\Database\Eloquent\Model',
'Event' => 'Illuminate\Support\Facades\Event',
'File' => 'Illuminate\Support\Facades\File',
- 'Form' => 'Illuminate\Support\Facades\Form',
+ 'Form' => 'Collective\Html\FormFacade',
'Hash' => 'Illuminate\Support\Facades\Hash',
- 'HTML' => 'Illuminate\Support\Facades\HTML',
+ 'HTML' => 'Collective\Html\HtmlFacade',
'Input' => 'Illuminate\Support\Facades\Input',
'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log',
@@ -198,7 +197,6 @@ return array(
'View' => 'Illuminate\Support\Facades\View',
'Airavata' => 'Airavata\Facades\Airavata',
'Airavata.IAM' => 'Airavata\Facades\IamAdminServices',
- 'Theme' => 'Teepluss\Theme\Facades\Theme',
'Markdown' => 'GrahamCampbell\Markdown\Facades\Markdown',
),
diff --git a/airavata-php-gateway/app/config/auth.php
b/airavata-php-gateway/config/auth.php
similarity index 100%
rename from airavata-php-gateway/app/config/auth.php
rename to airavata-php-gateway/config/auth.php
diff --git a/airavata-php-gateway/app/config/cache.php
b/airavata-php-gateway/config/cache.php
similarity index 100%
rename from airavata-php-gateway/app/config/cache.php
rename to airavata-php-gateway/config/cache.php
diff --git a/airavata-php-gateway/app/config/compile.php
b/airavata-php-gateway/config/compile.php
similarity index 100%
rename from airavata-php-gateway/app/config/compile.php
rename to airavata-php-gateway/config/compile.php
diff --git a/airavata-php-gateway/app/config/database.php
b/airavata-php-gateway/config/database.php
similarity index 100%
rename from airavata-php-gateway/app/config/database.php
rename to airavata-php-gateway/config/database.php
diff --git a/airavata-php-gateway/app/config/email_templates.json
b/airavata-php-gateway/config/email_templates.json
similarity index 100%
rename from airavata-php-gateway/app/config/email_templates.json
rename to airavata-php-gateway/config/email_templates.json
diff --git a/airavata-php-gateway/app/config/email_templates.json.template
b/airavata-php-gateway/config/email_templates.json.template
similarity index 100%
rename from airavata-php-gateway/app/config/email_templates.json.template
rename to airavata-php-gateway/config/email_templates.json.template
diff --git a/airavata-php-gateway/app/config/local/app.php
b/airavata-php-gateway/config/local/app.php
similarity index 100%
rename from airavata-php-gateway/app/config/local/app.php
rename to airavata-php-gateway/config/local/app.php
diff --git a/airavata-php-gateway/app/config/local/database.php
b/airavata-php-gateway/config/local/database.php
similarity index 100%
rename from airavata-php-gateway/app/config/local/database.php
rename to airavata-php-gateway/config/local/database.php
diff --git a/airavata-php-gateway/app/config/mail.php
b/airavata-php-gateway/config/mail.php
similarity index 100%
rename from airavata-php-gateway/app/config/mail.php
rename to airavata-php-gateway/config/mail.php
diff --git a/airavata-php-gateway/app/config/packages/markdown/config.php
b/airavata-php-gateway/config/packages/markdown/config.php
similarity index 100%
rename from airavata-php-gateway/app/config/packages/markdown/config.php
rename to airavata-php-gateway/config/packages/markdown/config.php
diff --git a/airavata-php-gateway/app/config/packages/teepluss/theme/config.php
b/airavata-php-gateway/config/packages/teepluss/theme/config.php
similarity index 99%
rename from airavata-php-gateway/app/config/packages/teepluss/theme/config.php
rename to airavata-php-gateway/config/packages/teepluss/theme/config.php
index 49689a131..7131de411 100644
--- a/airavata-php-gateway/app/config/packages/teepluss/theme/config.php
+++ b/airavata-php-gateway/config/packages/teepluss/theme/config.php
@@ -12,7 +12,7 @@ return array(
|
*/
- 'assetUrl' => URL::to('/'),
+ 'assetUrl' => '/',
/*
|--------------------------------------------------------------------------
@@ -116,6 +116,7 @@ return array(
|
*/
+ /*
'events' => array(
// Before all event, this event will effect for global.
@@ -138,6 +139,7 @@ return array(
// Theme::asset()->serve('backbone');
}
- )
+ ),
+ */
);
\ No newline at end of file
diff --git a/airavata-php-gateway/app/config/packages/teepluss/theme/twig.php
b/airavata-php-gateway/config/packages/teepluss/theme/twig.php
similarity index 70%
rename from airavata-php-gateway/app/config/packages/teepluss/theme/twig.php
rename to airavata-php-gateway/config/packages/teepluss/theme/twig.php
index 76a6034ed..5d22ecf2c 100644
--- a/airavata-php-gateway/app/config/packages/teepluss/theme/twig.php
+++ b/airavata-php-gateway/config/packages/teepluss/theme/twig.php
@@ -38,19 +38,19 @@ return array(
|
*/
- 'hooks' => function($twig)
- {
- // Example add funciton name "demo".
- /*$function = new Twig_SimpleFunction('example', function()
- {
- $args = func_get_args();
-
- return "Example" . print_r($args, true);
- });
-
- $twig->addFunction($function);*/
-
- return $twig;
- }
+ // 'hooks' => function($twig)
+ // {
+ // // Example add funciton name "demo".
+ // /*$function = new Twig_SimpleFunction('example', function()
+ // {
+ // $args = func_get_args();
+ //
+ // return "Example" . print_r($args, true);
+ // });
+ //
+ // $twig->addFunction($function);*/
+ //
+ // return $twig;
+ // },
);
\ No newline at end of file
diff --git a/airavata-php-gateway/app/config/pga_config.php.template
b/airavata-php-gateway/config/pga_config.php.template
similarity index 100%
rename from airavata-php-gateway/app/config/pga_config.php.template
rename to airavata-php-gateway/config/pga_config.php.template
diff --git a/airavata-php-gateway/app/config/queue.php
b/airavata-php-gateway/config/queue.php
similarity index 100%
rename from airavata-php-gateway/app/config/queue.php
rename to airavata-php-gateway/config/queue.php
diff --git a/airavata-php-gateway/app/config/remote.php
b/airavata-php-gateway/config/remote.php
similarity index 100%
rename from airavata-php-gateway/app/config/remote.php
rename to airavata-php-gateway/config/remote.php
diff --git a/airavata-php-gateway/app/config/services.php
b/airavata-php-gateway/config/services.php
similarity index 100%
rename from airavata-php-gateway/app/config/services.php
rename to airavata-php-gateway/config/services.php
diff --git a/airavata-php-gateway/app/config/session.php
b/airavata-php-gateway/config/session.php
similarity index 100%
rename from airavata-php-gateway/app/config/session.php
rename to airavata-php-gateway/config/session.php
diff --git a/airavata-php-gateway/app/config/testing/cache.php
b/airavata-php-gateway/config/testing/cache.php
similarity index 100%
rename from airavata-php-gateway/app/config/testing/cache.php
rename to airavata-php-gateway/config/testing/cache.php
diff --git a/airavata-php-gateway/app/config/testing/session.php
b/airavata-php-gateway/config/testing/session.php
similarity index 100%
rename from airavata-php-gateway/app/config/testing/session.php
rename to airavata-php-gateway/config/testing/session.php
diff --git a/airavata-php-gateway/app/config/view.php
b/airavata-php-gateway/config/view.php
similarity index 90%
rename from airavata-php-gateway/app/config/view.php
rename to airavata-php-gateway/config/view.php
index 34b8f3873..115553164 100755
--- a/airavata-php-gateway/app/config/view.php
+++ b/airavata-php-gateway/config/view.php
@@ -13,7 +13,7 @@ return array(
|
*/
- 'paths' => array(__DIR__.'/../views'),
+ 'paths' => [resource_path('views')],
/*
|--------------------------------------------------------------------------
@@ -28,4 +28,6 @@ return array(
'pagination' => 'pagination::slider-3',
+ 'compiled' => storage_path('framework/views'),
+
);
diff --git a/airavata-php-gateway/app/config/workbench.php
b/airavata-php-gateway/config/workbench.php
similarity index 100%
rename from airavata-php-gateway/app/config/workbench.php
rename to airavata-php-gateway/config/workbench.php
diff --git a/airavata-php-gateway/public/index.php
b/airavata-php-gateway/public/index.php
index 6649cb7aa..f99d50bef 100755
--- a/airavata-php-gateway/public/index.php
+++ b/airavata-php-gateway/public/index.php
@@ -18,7 +18,7 @@
|
*/
-require __DIR__.'/../bootstrap/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
/*
|--------------------------------------------------------------------------
@@ -32,7 +32,7 @@ require __DIR__.'/../bootstrap/autoload.php';
|
*/
-$app = require_once __DIR__.'/../bootstrap/start.php';
+$app = require_once __DIR__.'/../bootstrap/app.php';
/*
|--------------------------------------------------------------------------
@@ -46,10 +46,12 @@ $app = require_once __DIR__.'/../bootstrap/start.php';
|
*/
+$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
-//try{
- $app->run();
-//}
-//catch(\Exception $e){
-// var_dump( $e);
-//}
+$response = $kernel->handle(
+ $request = Illuminate\Http\Request::capture()
+);
+
+$response->send();
+
+$kernel->terminate($request, $response);
diff --git a/airavata-php-gateway/app/views/account/create.blade.php
b/airavata-php-gateway/resources/views/account/create.blade.php
similarity index 94%
rename from airavata-php-gateway/app/views/account/create.blade.php
rename to airavata-php-gateway/resources/views/account/create.blade.php
index f931ac9e4..77224d346 100644
--- a/airavata-php-gateway/app/views/account/create.blade.php
+++ b/airavata-php-gateway/resources/views/account/create.blade.php
@@ -32,7 +32,7 @@
</small>
</h3>
</div>
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@@ -51,7 +51,7 @@
<div class="form-group required"><label
class="control-label">Username</label>
<div><input class="form-control" id="username" minlength="6"
maxlength="30" name="username"
- placeholder="Username" required="required" type="text"
value="{{Input::old('username') }}"
+ placeholder="Username" required="required" type="text"
value="{{ old('username') }}"
onblur="this.value = this.value.toLowerCase()"
data-container="body" data-toggle="popover"
data-placement="left" data-content="Username can only contain lowercase
letters, numbers, underscores and hyphens."/>
</div>
@@ -71,26 +71,26 @@
<div class="form-group required"><label
class="control-label">E-mail</label>
<div><input class="form-control" id="email" name="email"
placeholder="[email protected]"
- required="required" title="" type="email"
value="{{Input::old('email') }}"
+ required="required" title="" type="email" value="{{
old('email') }}"
data-toggle="popover" data-placement="left"
data-content="Please make sure that you enter a correct email address as a
verification mail will be sent to this address."/></div>
</div>
<div class="form-group required"><label class="control-label">E-mail
(again)</label>
<div><input class="form-control" id="confirm_email"
name="confirm_email" placeholder="[email protected] (again)"
- required="required" title="" type="email"
value="{{Input::old('confirm_email') }}"
+ required="required" title="" type="email"
value="{{ old('confirm_email') }}"
data-toggle="popover" data-placement="left"
data-content="Please make sure that you enter the same email address as above
as a verification mail will be sent to this address."/></div>
</div>
<div class="form-group required"><label class="control-label">First
Name</label>
<div><input class="form-control" id="first_name" maxlength="30"
name="first_name"
placeholder="First Name" required="required" title=""
type="text"
- value="{{Input::old('first_name') }}"/></div>
+ value="{{ old('first_name') }}"/></div>
</div>
<div class="form-group required"><label class="control-label">Last
Name</label>
<div><input class="form-control" id="last_name" maxlength="30"
name="last_name"
placeholder="Last Name" required="required" title=""
type="text"
- value="{{Input::old('last_name') }}"/></div>
+ value="{{ old('last_name') }}"/></div>
</div>
<br/>
<input name="Submit" type="submit" class="btn btn-primary btn-block"
value="Create">
diff --git a/airavata-php-gateway/app/views/account/credential-store.blade.php
b/airavata-php-gateway/resources/views/account/credential-store.blade.php
similarity index 99%
rename from airavata-php-gateway/app/views/account/credential-store.blade.php
rename to
airavata-php-gateway/resources/views/account/credential-store.blade.php
index 32e0f0d2f..c983b55a1 100644
--- a/airavata-php-gateway/app/views/account/credential-store.blade.php
+++ b/airavata-php-gateway/resources/views/account/credential-store.blade.php
@@ -77,7 +77,7 @@
<h3 class="panel-title">Add SSH Key</h3>
</div>
<div class="panel-body">
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@endforeach
diff --git a/airavata-php-gateway/app/views/account/dashboard.blade.php
b/airavata-php-gateway/resources/views/account/dashboard.blade.php
similarity index 98%
rename from airavata-php-gateway/app/views/account/dashboard.blade.php
rename to airavata-php-gateway/resources/views/account/dashboard.blade.php
index 66e224122..f4b5dd7be 100644
--- a/airavata-php-gateway/app/views/account/dashboard.blade.php
+++ b/airavata-php-gateway/resources/views/account/dashboard.blade.php
@@ -114,13 +114,13 @@
<h6 class="text-center">Need faster or more customised
solutions for your Gateway? Contact us at: <a
href="mailto:[email protected]";>[email protected]</a></h6>
</div>
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@endforeach
@endif
- <div class="row @if(! $errors->has())hide @endif
gateway-request-form">
+ <div class="row @if(! $errors->any())hide @endif
gateway-request-form">
<div class="col-md-offset-2 col-md-8">
<form id="request-tenant-form" action="{{ URL::to('/')
}}/provider/request-gateway">
<div class="col-md-12 text-center"
style="margin-top:20px;">
@@ -128,15 +128,15 @@
</div>
<div class="form-group required">
<label class="control-label">Gateway Name</label>
- <input type="text" maxlength="50"
name="gateway-name" class="form-control" required="required"
value="{{Input::old('gateway-name') }}" />
+ <input type="text" maxlength="50"
name="gateway-name" class="form-control" required="required" value="{{
old('gateway-name') }}" />
</div>
<div class="form-group required">
<label class="control-label">Gateway Contact
Email</label>
- <input type="text" name="email-address"
class="form-control" required="required" value="{{Input::old('email-address')
}}"/>
+ <input type="text" name="email-address"
class="form-control" required="required" value="{{ old('email-address') }}" />
</div>
<div class="form-group required">
<label class="control-label">Public Project
Description</label>
- <textarea type="text"
name="public-project-description" maxlength="250"
id="public-project-description" class="form-control" required="required"
data-container="body" data-toggle="popover" data-placement="left"
data-content="This description will be used to describe the gateway in the
Science Gateways List. It help a user decide whether or not this gateway will
be useful to them.">{{Input::old('public-project-description') }}</textarea>
+ <textarea type="text"
name="public-project-description" maxlength="250"
id="public-project-description" class="form-control" required="required"
data-container="body" data-toggle="popover" data-placement="left"
data-content="This description will be used to describe the gateway in the
Science Gateways List. It help a user decide whether or not this gateway will
be useful to them.">{{ old('public-project-description') }}</textarea>
</div>
<input type="submit" value="Send Request" class="btn
btn-primary"/>
<input type="reset" value="Reset" class="btn">
diff --git a/airavata-php-gateway/app/views/account/forgot-password.blade.php
b/airavata-php-gateway/resources/views/account/forgot-password.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/account/forgot-password.blade.php
rename to airavata-php-gateway/resources/views/account/forgot-password.blade.php
diff --git a/airavata-php-gateway/app/views/account/login-desktop.blade.php
b/airavata-php-gateway/resources/views/account/login-desktop.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/account/login-desktop.blade.php
rename to airavata-php-gateway/resources/views/account/login-desktop.blade.php
diff --git a/airavata-php-gateway/app/views/account/login.blade.php
b/airavata-php-gateway/resources/views/account/login.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/account/login.blade.php
rename to airavata-php-gateway/resources/views/account/login.blade.php
diff --git
a/airavata-php-gateway/app/views/account/request-allocation.blade.php
b/airavata-php-gateway/resources/views/account/request-allocation.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/account/request-allocation.blade.php
rename to
airavata-php-gateway/resources/views/account/request-allocation.blade.php
diff --git a/airavata-php-gateway/app/views/account/reset-password.blade.php
b/airavata-php-gateway/resources/views/account/reset-password.blade.php
similarity index 98%
rename from airavata-php-gateway/app/views/account/reset-password.blade.php
rename to airavata-php-gateway/resources/views/account/reset-password.blade.php
index 6edf3a49c..f35851533 100644
--- a/airavata-php-gateway/app/views/account/reset-password.blade.php
+++ b/airavata-php-gateway/resources/views/account/reset-password.blade.php
@@ -14,7 +14,7 @@
{{{ Session::get("password-reset-error") }}}
</div>
@endif
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@endforeach
diff --git a/airavata-php-gateway/app/views/account/settings.blade.php
b/airavata-php-gateway/resources/views/account/settings.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/account/settings.blade.php
rename to airavata-php-gateway/resources/views/account/settings.blade.php
diff --git a/airavata-php-gateway/app/views/account/update.blade.php
b/airavata-php-gateway/resources/views/account/update.blade.php
similarity index 99%
rename from airavata-php-gateway/app/views/account/update.blade.php
rename to airavata-php-gateway/resources/views/account/update.blade.php
index e5b2f37ee..22fd2dcce 100644
--- a/airavata-php-gateway/app/views/account/update.blade.php
+++ b/airavata-php-gateway/resources/views/account/update.blade.php
@@ -34,7 +34,7 @@
<div class="row gateway-update-form">
<div class="col-md-offset-2 col-md-8">
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@endforeach
diff --git
a/airavata-php-gateway/app/views/account/user-compute-resources.blade.php
b/airavata-php-gateway/resources/views/account/user-compute-resources.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/account/user-compute-resources.blade.php
rename to
airavata-php-gateway/resources/views/account/user-compute-resources.blade.php
diff --git
a/airavata-php-gateway/app/views/account/user-profile-update-email.blade.php
b/airavata-php-gateway/resources/views/account/user-profile-update-email.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/account/user-profile-update-email.blade.php
rename to
airavata-php-gateway/resources/views/account/user-profile-update-email.blade.php
diff --git a/airavata-php-gateway/app/views/account/user-profile.blade.php
b/airavata-php-gateway/resources/views/account/user-profile.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/account/user-profile.blade.php
rename to airavata-php-gateway/resources/views/account/user-profile.blade.php
diff --git
a/airavata-php-gateway/app/views/account/user-storage-resources.blade.php
b/airavata-php-gateway/resources/views/account/user-storage-resources.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/account/user-storage-resources.blade.php
rename to
airavata-php-gateway/resources/views/account/user-storage-resources.blade.php
diff --git a/airavata-php-gateway/app/views/account/verify-human.blade.php
b/airavata-php-gateway/resources/views/account/verify-human.blade.php
similarity index 97%
rename from airavata-php-gateway/app/views/account/verify-human.blade.php
rename to airavata-php-gateway/resources/views/account/verify-human.blade.php
index 0ddc92f05..3a5ab01ec 100644
--- a/airavata-php-gateway/app/views/account/verify-human.blade.php
+++ b/airavata-php-gateway/resources/views/account/verify-human.blade.php
@@ -9,7 +9,7 @@
<div class="col-md-offset-3 col-md-6">
<h3>Verify you are human</h3>
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@endforeach
diff --git a/airavata-php-gateway/app/views/admin/create-gateway.blade.php
b/airavata-php-gateway/resources/views/admin/create-gateway.blade.php
similarity index 88%
rename from airavata-php-gateway/app/views/admin/create-gateway.blade.php
rename to airavata-php-gateway/resources/views/admin/create-gateway.blade.php
index d15f9341d..a37da1e74 100644
--- a/airavata-php-gateway/app/views/admin/create-gateway.blade.php
+++ b/airavata-php-gateway/resources/views/admin/create-gateway.blade.php
@@ -33,7 +33,7 @@
{{ Session::forget("errorMessages") }}
@endif
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@endforeach
@@ -45,22 +45,22 @@
</div>
<div class="form-group required">
<label class="control-label">Gateway Name</label>
- <input type="text" maxlength="50"
name="gateway-name" class="form-control" required="required"
value="{{Input::old('gateway-name') }}" />
+ <input type="text" maxlength="50"
name="gateway-name" class="form-control" required="required" value="{{
old('gateway-name') }}" />
</div>
<div class="form-group required">
<label class="control-label">Gateway URL</label>
- <input type="text" name="gateway-url"
id="gateway-url" class="form-control" value="{{Input::old('gateway-url') }}"
data-container="body" data-toggle="popover" data-placement="left"
data-content="URL to Portal home page or Download URL (for desktop
applications) where gateway has been deployed."/>
+ <input type="text" name="gateway-url"
id="gateway-url" class="form-control" value="{{ old('gateway-url') }}"
data-container="body" data-toggle="popover" data-placement="left"
data-content="URL to Portal home page or Download URL (for desktop
applications) where gateway has been deployed."/>
</div>
<div class="form-group required">
<label class="control-label">Gateway Contact
Email</label>
- <input type="text" name="email-address"
class="form-control" required="required" value="{{Input::old('email-address')
}}"/>
+ <input type="text" name="email-address"
class="form-control" required="required" value="{{ old('email-address') }}" />
</div>
<div class="form-group required">
<label class="control-label">Gateway Admin
Username</label>
- <input type="text" name="admin-username"
value="{{Input::old('admin-username')}}" class="form-control"
required="required" />
+ <input type="text" name="admin-username" value="{{
old('admin-username') }}" class="form-control" required="required" />
</div>
<div class="form-group required">
@@ -75,27 +75,27 @@
<div class="form-group required">
<label class="control-label">Admin First
Name</label>
- <input type="text" name="admin-firstname"
class="form-control" required="required" value="{{Input::old('admin-firstname')
}}"/>
+ <input type="text" name="admin-firstname"
class="form-control" required="required" value="{{ old('admin-firstname') }}" />
</div>
<div class="form-group required">
<label class="control-label">Admin Last
Name</label>
- <input type="text" name="admin-lastname"
class="form-control" required="required" value="{{Input::old('admin-lastname')
}}"/>
+ <input type="text" name="admin-lastname"
class="form-control" required="required" value="{{ old('admin-lastname') }}" />
</div>
<div class="form-group required">
<label class="control-label">Admin Email ID</label>
- <input type="text" name="admin-email"
class="form-control" required="required" value="{{Input::old('admin-email')
}}"/>
+ <input type="text" name="admin-email"
class="form-control" required="required" value="{{ old('admin-email') }}" />
</div>
<div class="form-group required">
<label class="control-label">Project
Details</label>
- <textarea type="text" name="project-details"
maxlength="250" id="project-details" class="form-control" required="required"
data-container="body" data-toggle="popover" data-placement="left"
data-content="This information will help us to understand and identify your
gateway requirements, such as local or remote resources, user management, field
of science and communities supported, applications and interfaces, license
handling, allocation management, data manag [...]
+ <textarea type="text" name="project-details"
maxlength="250" id="project-details" class="form-control" required="required"
data-container="body" data-toggle="popover" data-placement="left"
data-content="This information will help us to understand and identify your
gateway requirements, such as local or remote resources, user management, field
of science and communities supported, applications and interfaces, license
handling, allocation management, data manag [...]
</div>
<div class="form-group required">
<label class="control-label">Public Project
Description</label>
- <textarea type="text"
name="public-project-description" maxlength="250"
id="public-project-description" class="form-control" required="required"
data-container="body" data-toggle="popover" data-placement="left"
data-content="This description will be used to describe the gateway in the
Science Gateways List. It help a user decide whether or not this gateway will
be useful to them.">{{Input::old('public-project-description') }}</textarea>
+ <textarea type="text"
name="public-project-description" maxlength="250"
id="public-project-description" class="form-control" required="required"
data-container="body" data-toggle="popover" data-placement="left"
data-content="This description will be used to describe the gateway in the
Science Gateways List. It help a user decide whether or not this gateway will
be useful to them.">{{ old('public-project-description') }}</textarea>
</div>
<input type="submit" value="Submit" class="btn
btn-primary"/>
diff --git
a/airavata-php-gateway/app/views/admin/experiment-statistics.blade.php
b/airavata-php-gateway/resources/views/admin/experiment-statistics.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/experiment-statistics.blade.php
rename to
airavata-php-gateway/resources/views/admin/experiment-statistics.blade.php
diff --git a/airavata-php-gateway/app/views/admin/manage-admin.blade.php
b/airavata-php-gateway/resources/views/admin/manage-admin.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/manage-admin.blade.php
rename to airavata-php-gateway/resources/views/admin/manage-admin.blade.php
diff --git a/airavata-php-gateway/app/views/admin/manage-credentials.blade.php
b/airavata-php-gateway/resources/views/admin/manage-credentials.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/manage-credentials.blade.php
rename to
airavata-php-gateway/resources/views/admin/manage-credentials.blade.php
diff --git a/airavata-php-gateway/app/views/admin/manage-experiments.blade.php
b/airavata-php-gateway/resources/views/admin/manage-experiments.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/manage-experiments.blade.php
rename to
airavata-php-gateway/resources/views/admin/manage-experiments.blade.php
diff --git a/airavata-php-gateway/app/views/admin/manage-gateway.blade.php
b/airavata-php-gateway/resources/views/admin/manage-gateway.blade.php
similarity index 99%
rename from airavata-php-gateway/app/views/admin/manage-gateway.blade.php
rename to airavata-php-gateway/resources/views/admin/manage-gateway.blade.php
index e58127306..e8b7ac1eb 100644
--- a/airavata-php-gateway/app/views/admin/manage-gateway.blade.php
+++ b/airavata-php-gateway/resources/views/admin/manage-gateway.blade.php
@@ -59,7 +59,7 @@
@endif
</div>
- @if ($errors->has())
+ @if ($errors->any())
@foreach ($errors->all() as $error)
{{ CommonUtilities::print_error_message($error) }}
@endforeach
diff --git a/airavata-php-gateway/app/views/admin/manage-notices.blade.php
b/airavata-php-gateway/resources/views/admin/manage-notices.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/manage-notices.blade.php
rename to airavata-php-gateway/resources/views/admin/manage-notices.blade.php
diff --git a/airavata-php-gateway/app/views/admin/manage-resources.blade.php
b/airavata-php-gateway/resources/views/admin/manage-resources.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/manage-resources.blade.php
rename to airavata-php-gateway/resources/views/admin/manage-resources.blade.php
diff --git a/airavata-php-gateway/app/views/admin/manage-roles.blade.php
b/airavata-php-gateway/resources/views/admin/manage-roles.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/manage-roles.blade.php
rename to airavata-php-gateway/resources/views/admin/manage-roles.blade.php
diff --git a/airavata-php-gateway/app/views/admin/manage-users.blade.php
b/airavata-php-gateway/resources/views/admin/manage-users.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/manage-users.blade.php
rename to airavata-php-gateway/resources/views/admin/manage-users.blade.php
diff --git a/airavata-php-gateway/app/views/admin/redirect-django.blade.php
b/airavata-php-gateway/resources/views/admin/redirect-django.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/admin/redirect-django.blade.php
rename to airavata-php-gateway/resources/views/admin/redirect-django.blade.php
diff --git a/airavata-php-gateway/app/views/application/deployment.blade.php
b/airavata-php-gateway/resources/views/application/deployment.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/application/deployment.blade.php
rename to airavata-php-gateway/resources/views/application/deployment.blade.php
diff --git a/airavata-php-gateway/app/views/application/interface.blade.php
b/airavata-php-gateway/resources/views/application/interface.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/application/interface.blade.php
rename to airavata-php-gateway/resources/views/application/interface.blade.php
diff --git a/airavata-php-gateway/app/views/application/module.blade.php
b/airavata-php-gateway/resources/views/application/module.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/application/module.blade.php
rename to airavata-php-gateway/resources/views/application/module.blade.php
diff --git a/airavata-php-gateway/app/views/datacat/select.blade.php
b/airavata-php-gateway/resources/views/datacat/select.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/datacat/select.blade.php
rename to airavata-php-gateway/resources/views/datacat/select.blade.php
diff --git a/airavata-php-gateway/app/views/datacat/summary.blade.php
b/airavata-php-gateway/resources/views/datacat/summary.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/datacat/summary.blade.php
rename to airavata-php-gateway/resources/views/datacat/summary.blade.php
diff --git a/airavata-php-gateway/app/views/emails/auth/reminder.blade.php
b/airavata-php-gateway/resources/views/emails/auth/reminder.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/emails/auth/reminder.blade.php
rename to airavata-php-gateway/resources/views/emails/auth/reminder.blade.php
diff --git a/airavata-php-gateway/app/views/error.blade.php
b/airavata-php-gateway/resources/views/error.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/error.blade.php
rename to airavata-php-gateway/resources/views/error.blade.php
diff --git a/airavata-php-gateway/app/views/experiment/browse.blade.php
b/airavata-php-gateway/resources/views/experiment/browse.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/experiment/browse.blade.php
rename to airavata-php-gateway/resources/views/experiment/browse.blade.php
diff --git
a/airavata-php-gateway/app/views/experiment/create-complete.blade.php
b/airavata-php-gateway/resources/views/experiment/create-complete.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/experiment/create-complete.blade.php
rename to
airavata-php-gateway/resources/views/experiment/create-complete.blade.php
diff --git a/airavata-php-gateway/app/views/experiment/create.blade.php
b/airavata-php-gateway/resources/views/experiment/create.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/experiment/create.blade.php
rename to airavata-php-gateway/resources/views/experiment/create.blade.php
diff --git a/airavata-php-gateway/app/views/experiment/edit.blade.php
b/airavata-php-gateway/resources/views/experiment/edit.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/experiment/edit.blade.php
rename to airavata-php-gateway/resources/views/experiment/edit.blade.php
diff --git
a/airavata-php-gateway/app/views/experiment/no-sharing-create-complete.blade.php
b/airavata-php-gateway/resources/views/experiment/no-sharing-create-complete.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/experiment/no-sharing-create-complete.blade.php
rename to
airavata-php-gateway/resources/views/experiment/no-sharing-create-complete.blade.php
diff --git
a/airavata-php-gateway/app/views/experiment/no-sharing-edit.blade.php
b/airavata-php-gateway/resources/views/experiment/no-sharing-edit.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/experiment/no-sharing-edit.blade.php
rename to
airavata-php-gateway/resources/views/experiment/no-sharing-edit.blade.php
diff --git a/airavata-php-gateway/app/views/experiment/summary.blade.php
b/airavata-php-gateway/resources/views/experiment/summary.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/experiment/summary.blade.php
rename to airavata-php-gateway/resources/views/experiment/summary.blade.php
diff --git a/airavata-php-gateway/app/views/files/browse.blade.php
b/airavata-php-gateway/resources/views/files/browse.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/files/browse.blade.php
rename to airavata-php-gateway/resources/views/files/browse.blade.php
diff --git a/airavata-php-gateway/app/views/gateway/browse.blade.php
b/airavata-php-gateway/resources/views/gateway/browse.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/gateway/browse.blade.php
rename to airavata-php-gateway/resources/views/gateway/browse.blade.php
diff --git a/airavata-php-gateway/app/views/gateway/create.blade.php
b/airavata-php-gateway/resources/views/gateway/create.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/gateway/create.blade.php
rename to airavata-php-gateway/resources/views/gateway/create.blade.php
diff --git a/airavata-php-gateway/app/views/group/browse.blade.php
b/airavata-php-gateway/resources/views/group/browse.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/group/browse.blade.php
rename to airavata-php-gateway/resources/views/group/browse.blade.php
diff --git a/airavata-php-gateway/app/views/group/create.blade.php
b/airavata-php-gateway/resources/views/group/create.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/group/create.blade.php
rename to airavata-php-gateway/resources/views/group/create.blade.php
diff --git a/airavata-php-gateway/app/views/group/edit.blade.php
b/airavata-php-gateway/resources/views/group/edit.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/group/edit.blade.php
rename to airavata-php-gateway/resources/views/group/edit.blade.php
diff --git a/airavata-php-gateway/app/views/group/summary.blade.php
b/airavata-php-gateway/resources/views/group/summary.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/group/summary.blade.php
rename to airavata-php-gateway/resources/views/group/summary.blade.php
diff --git a/airavata-php-gateway/app/views/home.blade.php
b/airavata-php-gateway/resources/views/home.blade.php
similarity index 96%
rename from airavata-php-gateway/app/views/home.blade.php
rename to airavata-php-gateway/resources/views/home.blade.php
index ae739d4d3..850dd10cb 100755
--- a/airavata-php-gateway/app/views/home.blade.php
+++ b/airavata-php-gateway/resources/views/home.blade.php
@@ -16,8 +16,6 @@ if (CommonUtilities::id_in_session()) {
?>
-<?php
-if( Session::get("theme") == "base"){?>
<div class="well">
<div class="container">
<h1>PHP Gateway with Airavata</h1>
@@ -34,15 +32,11 @@ if( Session::get("theme") == "base"){?>
</div>
</div>
-
<div class="container">
-
<div class="row">
-
<div class="col-md-6">
<div class="thumbnail" style="border:none">
<img src="assets/scigap-header-logo.png" alt="SciGaP">
-
<div class="caption">
<p>
SciGaP is a hosted service with a public API that
science gateways can use to manage
@@ -50,13 +44,11 @@ if( Session::get("theme") == "base"){?>
developers can thus concentrate their efforts on
building their scientific communities and not
worry about operations.
</p>
-
<p>
Science Gateway Platform as a Service (SciGaP)
provides application programmer interfaces (APIs)
to hosted generic infrastructure services that can be
used by domain science communities to
create Science Gateways.
</p>
-
<p><a href="http://scigap.org/";
target="_blank">Learn more <span class="glyphicon
glyphicon-new-window"></span></a></p>
</div>
@@ -65,7 +57,6 @@ if( Session::get("theme") == "base"){?>
<div class="col-md-6">
<div class="thumbnail" style="border:none">
<img src="assets/powered-by-airavata-transparent.png"
width="260px" alt="Apache Airavata">
-
<div class="caption">
<p>
Apache Airavata is a software framework which is
dominantly used to build Web-based science
@@ -74,13 +65,11 @@ if( Session::get("theme") == "base"){?>
grids, academic and commercial clouds. Airavata mainly
supports long running applications and
workflows on distributed computational resources.
</p>
-
<p><a href="http://airavata.apache.org/";
target="_blank">Learn more <span
class="glyphicon
glyphicon-new-window"></span></a></p>
</div>
</div>
</div>
-
<div class="col-md-12">
<div class="row">
<div id="contact-scigap" class="col-md-10 col-md-offset-1 text-center
breathing-spaces">
@@ -96,7 +85,6 @@ if( Session::get("theme") == "base"){?>
</div>
</div>
</div>
-
<!-- Modal -->
<div class="modal fade" id="serviceDeskHelp" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
@@ -115,21 +103,8 @@ if( Session::get("theme") == "base"){?>
</div>
</div>
</div>
-
-
</div>
-
-
-
</div>
-<?php
-}
-else
-{
- $theme = Theme::uses( Session::get("theme"));
- echo $theme->partial("template");
-}
-?>
@stop
diff --git a/airavata-php-gateway/app/views/layout/basic.blade.php
b/airavata-php-gateway/resources/views/layout/basic.blade.php
similarity index 91%
rename from airavata-php-gateway/app/views/layout/basic.blade.php
rename to airavata-php-gateway/resources/views/layout/basic.blade.php
index b80ea8ae5..cd65df123 100755
--- a/airavata-php-gateway/app/views/layout/basic.blade.php
+++ b/airavata-php-gateway/resources/views/layout/basic.blade.php
@@ -1,7 +1,4 @@
-<?php
-$theme = Theme::uses(Session::get("theme"));
-$title = Session::get("portal-title");
-?>
+<?php $title = Session::get("portal-title"); ?>
@section ('page-header')
@include("layout/fixed-header", array(
@@ -19,10 +16,8 @@ $title = Session::get("portal-title");
}
</style>
<div class="theme-header">
-<!-- Header from theme -->
-@if( isset($theme) )
-{{ $theme->partial("header") }}
-@endif
+<!-- Static header include instead of theme header -->
+@includeIf('layout.partials.header')
</div>
<body>
@@ -66,18 +61,12 @@ var fullName = {{
json_encode(Session::get("user-profile")->firstName . " " . Se
@yield('content')
</div>
-
@include('layout/fixed-footer')
-<style>
-.theme-footer{
- margin: 20px 0 0 0;
-}
-</style>
+@includeIf('layout.partials.footer')
@show
-
@section('scripts')
@include('layout/fixed-scripts')
{{ HTML::script('js/time-conversion.js')}}
@@ -143,13 +132,6 @@ var fullName = {{
json_encode(Session::get("user-profile")->firstName . " " . Se
<!-- end google analytics -->
@show
-
-@if( isset( $theme))
-<footer class="theme-footer">
-{{ $theme->partial("footer") }}
-</footer>
-@endif
-
</body>
</html>
\ No newline at end of file
diff --git a/airavata-php-gateway/app/views/layout/desktop-login.blade.php
b/airavata-php-gateway/resources/views/layout/desktop-login.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/layout/desktop-login.blade.php
rename to airavata-php-gateway/resources/views/layout/desktop-login.blade.php
diff --git a/airavata-php-gateway/app/views/layout/fixed-footer.blade.php
b/airavata-php-gateway/resources/views/layout/fixed-footer.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/layout/fixed-footer.blade.php
rename to airavata-php-gateway/resources/views/layout/fixed-footer.blade.php
diff --git a/airavata-php-gateway/app/views/layout/fixed-header.blade.php
b/airavata-php-gateway/resources/views/layout/fixed-header.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/layout/fixed-header.blade.php
rename to airavata-php-gateway/resources/views/layout/fixed-header.blade.php
diff --git a/airavata-php-gateway/app/views/layout/fixed-scripts.blade.php
b/airavata-php-gateway/resources/views/layout/fixed-scripts.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/layout/fixed-scripts.blade.php
rename to airavata-php-gateway/resources/views/layout/fixed-scripts.blade.php
diff --git a/airavata-php-gateway/app/views/pages.blade.php
b/airavata-php-gateway/resources/views/pages.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/pages.blade.php
rename to airavata-php-gateway/resources/views/pages.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/add-gateway-block.blade.php
b/airavata-php-gateway/resources/views/partials/add-gateway-block.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/add-gateway-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/add-gateway-block.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/auto-provisioned-accounts.blade.php
b/airavata-php-gateway/resources/views/partials/auto-provisioned-accounts.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/auto-provisioned-accounts.blade.php
rename to
airavata-php-gateway/resources/views/partials/auto-provisioned-accounts.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/compute-resource-preferences.blade.php
b/airavata-php-gateway/resources/views/partials/compute-resource-preferences.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/compute-resource-preferences.blade.php
rename to
airavata-php-gateway/resources/views/partials/compute-resource-preferences.blade.php
diff --git a/airavata-php-gateway/app/views/partials/dashboard-block.blade.php
b/airavata-php-gateway/resources/views/partials/dashboard-block.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/dashboard-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/dashboard-block.blade.php
diff --git a/airavata-php-gateway/app/views/partials/deployment-block.blade.php
b/airavata-php-gateway/resources/views/partials/deployment-block.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/deployment-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/deployment-block.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/experiment-container.blade.php
b/airavata-php-gateway/resources/views/partials/experiment-container.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/experiment-container.blade.php
rename to
airavata-php-gateway/resources/views/partials/experiment-container.blade.php
diff --git a/airavata-php-gateway/app/views/partials/experiment-info.blade.php
b/airavata-php-gateway/resources/views/partials/experiment-info.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/experiment-info.blade.php
rename to
airavata-php-gateway/resources/views/partials/experiment-info.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/experiment-inputs.blade.php
b/airavata-php-gateway/resources/views/partials/experiment-inputs.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/experiment-inputs.blade.php
rename to
airavata-php-gateway/resources/views/partials/experiment-inputs.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/experiment-queue-block.blade.php
b/airavata-php-gateway/resources/views/partials/experiment-queue-block.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/experiment-queue-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/experiment-queue-block.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/gateway-preferences-block.blade.php
b/airavata-php-gateway/resources/views/partials/gateway-preferences-block.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/gateway-preferences-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/gateway-preferences-block.blade.php
diff --git a/airavata-php-gateway/app/views/partials/interface-block.blade.php
b/airavata-php-gateway/resources/views/partials/interface-block.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/interface-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/interface-block.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/interface-input-block.blade.php
b/airavata-php-gateway/resources/views/partials/interface-input-block.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/interface-input-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/interface-input-block.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/interface-output-block.blade.php
b/airavata-php-gateway/resources/views/partials/interface-output-block.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/interface-output-block.blade.php
rename to
airavata-php-gateway/resources/views/partials/interface-output-block.blade.php
diff --git a/airavata-php-gateway/app/views/partials/login-external.blade.php
b/airavata-php-gateway/resources/views/partials/login-external.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/login-external.blade.php
rename to airavata-php-gateway/resources/views/partials/login-external.blade.php
diff --git a/airavata-php-gateway/app/views/partials/login-form.blade.php
b/airavata-php-gateway/resources/views/partials/login-form.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/login-form.blade.php
rename to airavata-php-gateway/resources/views/partials/login-form.blade.php
diff --git a/airavata-php-gateway/app/views/partials/module-block.blade.php
b/airavata-php-gateway/resources/views/partials/module-block.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/module-block.blade.php
rename to airavata-php-gateway/resources/views/partials/module-block.blade.php
diff --git a/airavata-php-gateway/app/views/partials/queue-block.blade.php
b/airavata-php-gateway/resources/views/partials/queue-block.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/queue-block.blade.php
rename to airavata-php-gateway/resources/views/partials/queue-block.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/resource-job-manager.blade.php
b/airavata-php-gateway/resources/views/partials/resource-job-manager.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/resource-job-manager.blade.php
rename to
airavata-php-gateway/resources/views/partials/resource-job-manager.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/sharing-display-body.blade.php
b/airavata-php-gateway/resources/views/partials/sharing-display-body.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/sharing-display-body.blade.php
rename to
airavata-php-gateway/resources/views/partials/sharing-display-body.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/sharing-form-body.blade.php
b/airavata-php-gateway/resources/views/partials/sharing-form-body.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/sharing-form-body.blade.php
rename to
airavata-php-gateway/resources/views/partials/sharing-form-body.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/sharing-form-modal.blade.php
b/airavata-php-gateway/resources/views/partials/sharing-form-modal.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/sharing-form-modal.blade.php
rename to
airavata-php-gateway/resources/views/partials/sharing-form-modal.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/storage-resource-preferences.blade.php
b/airavata-php-gateway/resources/views/partials/storage-resource-preferences.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/storage-resource-preferences.blade.php
rename to
airavata-php-gateway/resources/views/partials/storage-resource-preferences.blade.php
diff --git a/airavata-php-gateway/app/views/partials/streaming-data.blade.php
b/airavata-php-gateway/resources/views/partials/streaming-data.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/partials/streaming-data.blade.php
rename to airavata-php-gateway/resources/views/partials/streaming-data.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/user-compute-resource-preferences.blade.php
b/airavata-php-gateway/resources/views/partials/user-compute-resource-preferences.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/user-compute-resource-preferences.blade.php
rename to
airavata-php-gateway/resources/views/partials/user-compute-resource-preferences.blade.php
diff --git
a/airavata-php-gateway/app/views/partials/user-storage-resource-preferences.blade.php
b/airavata-php-gateway/resources/views/partials/user-storage-resource-preferences.blade.php
similarity index 100%
rename from
airavata-php-gateway/app/views/partials/user-storage-resource-preferences.blade.php
rename to
airavata-php-gateway/resources/views/partials/user-storage-resource-preferences.blade.php
diff --git a/airavata-php-gateway/app/views/project/browse.blade.php
b/airavata-php-gateway/resources/views/project/browse.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/project/browse.blade.php
rename to airavata-php-gateway/resources/views/project/browse.blade.php
diff --git a/airavata-php-gateway/app/views/project/create.blade.php
b/airavata-php-gateway/resources/views/project/create.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/project/create.blade.php
rename to airavata-php-gateway/resources/views/project/create.blade.php
diff --git a/airavata-php-gateway/app/views/project/edit.blade.php
b/airavata-php-gateway/resources/views/project/edit.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/project/edit.blade.php
rename to airavata-php-gateway/resources/views/project/edit.blade.php
diff --git a/airavata-php-gateway/app/views/project/no-sharing-create.blade.php
b/airavata-php-gateway/resources/views/project/no-sharing-create.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/project/no-sharing-create.blade.php
rename to
airavata-php-gateway/resources/views/project/no-sharing-create.blade.php
diff --git a/airavata-php-gateway/app/views/project/no-sharing-edit.blade.php
b/airavata-php-gateway/resources/views/project/no-sharing-edit.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/project/no-sharing-edit.blade.php
rename to airavata-php-gateway/resources/views/project/no-sharing-edit.blade.php
diff --git
a/airavata-php-gateway/app/views/project/no-sharing-summary.blade.php
b/airavata-php-gateway/resources/views/project/no-sharing-summary.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/project/no-sharing-summary.blade.php
rename to
airavata-php-gateway/resources/views/project/no-sharing-summary.blade.php
diff --git a/airavata-php-gateway/app/views/project/summary.blade.php
b/airavata-php-gateway/resources/views/project/summary.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/project/summary.blade.php
rename to airavata-php-gateway/resources/views/project/summary.blade.php
diff --git a/airavata-php-gateway/app/views/resource/browse.blade.php
b/airavata-php-gateway/resources/views/resource/browse.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/resource/browse.blade.php
rename to airavata-php-gateway/resources/views/resource/browse.blade.php
diff --git a/airavata-php-gateway/app/views/resource/create.blade.php
b/airavata-php-gateway/resources/views/resource/create.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/resource/create.blade.php
rename to airavata-php-gateway/resources/views/resource/create.blade.php
diff --git a/airavata-php-gateway/app/views/resource/edit.blade.php
b/airavata-php-gateway/resources/views/resource/edit.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/resource/edit.blade.php
rename to airavata-php-gateway/resources/views/resource/edit.blade.php
diff --git a/airavata-php-gateway/app/views/resource/view.blade.php
b/airavata-php-gateway/resources/views/resource/view.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/resource/view.blade.php
rename to airavata-php-gateway/resources/views/resource/view.blade.php
diff --git
a/airavata-php-gateway/app/views/scigap-admin/manage-gateway.blade.php
b/airavata-php-gateway/resources/views/scigap-admin/manage-gateway.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/scigap-admin/manage-gateway.blade.php
rename to
airavata-php-gateway/resources/views/scigap-admin/manage-gateway.blade.php
diff --git a/airavata-php-gateway/app/views/server-down.blade.php
b/airavata-php-gateway/resources/views/server-down.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/server-down.blade.php
rename to airavata-php-gateway/resources/views/server-down.blade.php
diff --git a/airavata-php-gateway/app/views/storage-resource/browse.blade.php
b/airavata-php-gateway/resources/views/storage-resource/browse.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/storage-resource/browse.blade.php
rename to airavata-php-gateway/resources/views/storage-resource/browse.blade.php
diff --git a/airavata-php-gateway/app/views/storage-resource/create.blade.php
b/airavata-php-gateway/resources/views/storage-resource/create.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/storage-resource/create.blade.php
rename to airavata-php-gateway/resources/views/storage-resource/create.blade.php
diff --git a/airavata-php-gateway/app/views/storage-resource/edit.blade.php
b/airavata-php-gateway/resources/views/storage-resource/edit.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/storage-resource/edit.blade.php
rename to airavata-php-gateway/resources/views/storage-resource/edit.blade.php
diff --git a/airavata-php-gateway/app/views/storage-resource/view.blade.php
b/airavata-php-gateway/resources/views/storage-resource/view.blade.php
similarity index 100%
rename from airavata-php-gateway/app/views/storage-resource/view.blade.php
rename to airavata-php-gateway/resources/views/storage-resource/view.blade.php
diff --git a/airavata-php-gateway/routes/api.php
b/airavata-php-gateway/routes/api.php
new file mode 100644
index 000000000..20471555a
--- /dev/null
+++ b/airavata-php-gateway/routes/api.php
@@ -0,0 +1,2 @@
+<?php
+// Empty API routes file to satisfy Laravel route loader
\ No newline at end of file
diff --git a/airavata-php-gateway/routes/console.php
b/airavata-php-gateway/routes/console.php
new file mode 100644
index 000000000..14d1a891d
--- /dev/null
+++ b/airavata-php-gateway/routes/console.php
@@ -0,0 +1,3 @@
+<?php
+//
+// Artisan command route definitions go here. Leave empty for now.
\ No newline at end of file
diff --git a/airavata-php-gateway/routes/web.php
b/airavata-php-gateway/routes/web.php
new file mode 100644
index 000000000..6a8dad48b
--- /dev/null
+++ b/airavata-php-gateway/routes/web.php
@@ -0,0 +1,125 @@
+<?php
+// Migrated from app/routes.php for Laravel 8
+
+use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\AccountController;
+use App\Http\Controllers\AdminController;
+use App\Http\Controllers\ApplicationController;
+use App\Http\Controllers\BaseController;
+use App\Http\Controllers\ComputeResourceController;
+use App\Http\Controllers\DataCatController;
+use App\Http\Controllers\ExperimentController;
+use App\Http\Controllers\FilemanagerController;
+use App\Http\Controllers\GatewayprofileController;
+use App\Http\Controllers\GatewayRequestUpdateController;
+use App\Http\Controllers\GroupController;
+use App\Http\Controllers\HomeController;
+use App\Http\Controllers\ProjectController;
+use App\Http\Controllers\StorageResourceController;
+use App\Http\Controllers\UserSettingsController;
+
+Route::get('create', [AccountController::class, 'createAccountView']);
+Route::post('create', [AccountController::class, 'createAccountSubmit']);
+Route::get('login', [AccountController::class, 'loginView']);
+Route::post('login', [AccountController::class, 'loginSubmit']);
+Route::get('login-desktop', [AccountController::class, 'loginDesktopView']);
+Route::get('refreshed-token-desktop', [AccountController::class,
'getRefreshedTokenForDesktop']);
+Route::get('account/dashboard', [AccountController::class, 'dashboard']);
+Route::get('account/update-gateway', [GatewayRequestUpdateController::class,
'updateGateway']);
+Route::get('callback-url', [AccountController::class, 'oauthCallback']);
+Route::get('logout', [AccountController::class, 'logout']);
+Route::post('api-login', [AccountController::class, 'apiLoginSubmit']);
+Route::get('forgot-password', [AccountController::class, 'forgotPassword']);
+Route::get('reset-password', [AccountController::class, 'resetPassword']);
+Route::post('reset-password', [AccountController::class,
'resetPasswordSubmit']);
+Route::post('forgot-password', [AccountController::class,
'forgotPasswordSubmit']);
+Route::get('confirm-user-registration', [AccountController::class,
'confirmAccountCreation']);
+Route::post('confirm-user-registration', [AccountController::class,
'confirmAccountCreation']);
+Route::get('setUserTimezone', function () {
+ Session::put('user_timezone', request('timezone'));
+});
+Route::get('allocation-request', [AccountController::class,
'allocationRequestView']);
+Route::post('allocation-request', [AccountController::class,
'allocationRequestSubmit']);
+Route::get('account/settings', [UserSettingsController::class,
'getUserSettings']);
+Route::get('account/credential-store', [UserSettingsController::class,
'getCredentialStore']);
+Route::post('account/set-default-credential', [UserSettingsController::class,
'setDefaultCredential']);
+Route::post('account/add-credential', [UserSettingsController::class,
'addCredential']);
+Route::post('account/delete-credential', [UserSettingsController::class,
'deleteCredential']);
+Route::get('account/user-compute-resources', [UserSettingsController::class,
'getComputeResources']);
+Route::post('account/add-user-crp', [UserSettingsController::class,
'addUserComputeResourcePreference']);
+Route::post('account/update-user-crp', [UserSettingsController::class,
'updateUserComputeResourcePreference']);
+Route::post('account/delete-user-crp', [UserSettingsController::class,
'deleteUserComputeResourcePreference']);
+Route::get('account/user-storage-resources', [UserSettingsController::class,
'getStorageResources']);
+Route::post('account/add-user-srp', [UserSettingsController::class,
'addUserStorageResourcePreference']);
+Route::post('account/update-user-srp', [UserSettingsController::class,
'updateUserStorageResourcePreference']);
+Route::post('account/delete-user-srp', [UserSettingsController::class,
'deleteUserStorageResourcePreference']);
+Route::get('account/user-profile', [UserSettingsController::class,
'getUserProfile']);
+Route::post('account/user-profile', [UserSettingsController::class,
'updateUserProfile']);
+Route::get('account/user-profile-update-email',
[UserSettingsController::class, 'showUpdateEmailView']);
+Route::post('account/user-profile-update-email',
[UserSettingsController::class, 'submitUpdateEmail']);
+Route::get('user-profile-confirm-email', [UserSettingsController::class,
'confirmUpdateEmail']);
+Route::get('project/create', [ProjectController::class, 'createView']);
+Route::post('project/create', [ProjectController::class, 'createSubmit']);
+Route::get('project/summary', [ProjectController::class, 'summary']);
+Route::get('project/edit', [ProjectController::class, 'editView']);
+Route::post('project/edit', [ProjectController::class, 'editSubmit']);
+Route::get('project/browse', [ProjectController::class, 'browseView']);
+Route::post('project/browse', [ProjectController::class, 'browseView']);
+Route::get('project/shared-users', [ProjectController::class, 'sharedUsers']);
+Route::get('project/unshared-users', [ProjectController::class,
'unsharedUsers']);
+Route::get('project/all-users', [ProjectController::class, 'allUsers']);
+Route::get('experiment/create', [ExperimentController::class, 'createView']);
+Route::post('experiment/create', [ExperimentController::class,
'createSubmit']);
+Route::get('experiment/summary', [ExperimentController::class, 'summary']);
+Route::post('experiment/summary', [ExperimentController::class, 'expChange']);
+Route::post('experiment/clone', [ExperimentController::class,
'cloneExperiment']);
+Route::get('experiment/edit', [ExperimentController::class, 'editView']);
+Route::post('experiment/edit', [ExperimentController::class, 'editSubmit']);
+Route::get('experiment/getQueueView', [ExperimentController::class,
'getQueueView']);
+Route::get('experiment/browse', [ExperimentController::class, 'browseView']);
+Route::post('experiment/browse', [ExperimentController::class, 'browseView']);
+Route::get('experiment/shared-users', [ExperimentController::class,
'sharedUsers']);
+Route::get('experiment/unshared-users', [ExperimentController::class,
'unsharedUsers']);
+Route::post('experiment/update-sharing', [ExperimentController::class,
'updateSharing']);
+Route::get('download', function(){
+ if(request()->has('path') && (0 == strpos(request('path'),
session('username'))
+ || 0 == strpos(request('path'), '/' . session('username')))){
+ $path = request('path');
+ if (strpos($path, '/../') !== false || strpos($path, '/..') !== false
|| strpos($path, '../') !== false)
+ return null;
+ if(0 === strpos($path, '/')){
+ $path = substr($path, 1);
+ }
+ $downloadLink =
config('pga_config.airavata')['experiment-data-absolute-path'] . '/' . $path;
+ return response()->download($downloadLink);
+ }else if(request()->has('id') && (0 == strpos(request('id'),
'airavata-dp'))){
+ $id = request('id');
+ $dataRoot =
config('pga_config.airavata')['experiment-data-absolute-path'];
+ if(!((($temp = strlen($dataRoot) - strlen('/')) >= 0 &&
strpos($dataRoot, '/', $temp) !== false)))
+ $dataRoot = $dataRoot . '/';
+ $dataProductModel = \Airavata::getDataProduct(session('authz-token'),
$id);
+ $currentOutputPath = '';
+ foreach ($dataProductModel->replicaLocations as $rp) {
+ if($rp->replicaLocationCategory ==
\Airavata\Model\Data\Replica\ReplicaLocationCategory::GATEWAY_DATA_STORE){
+ $currentOutputPath = $rp->filePath;
+ break;
+ }
+ }
+ //TODO check permission
+ $path = str_replace($dataRoot, '', parse_url($currentOutputPath,
PHP_URL_PATH));
+ $downloadLink = parse_url(url('/') .
config('pga_config.airavata')['experiment-data-absolute-path'] . '/' . $path,
PHP_URL_PATH);
+ return response()->download($downloadLink);
+ }
+});
+Route::get('files/browse', [FilemanagerController::class, 'browse']);
+Route::get('files/get', [FilemanagerController::class, 'get']);
+Route::get('group/create', [GroupController::class, 'createView']);
+Route::post('group/create', [GroupController::class, 'createSubmit']);
+Route::get('group/view', [GroupController::class, 'viewView']);
+Route::post('group/edit', [GroupController::class, 'editSubmit']);
+Route::get('cr/create', function () {
+ return redirect('cr/create/step1');
+});
+Route::get('cr/create', [ComputeResourceController::class, 'createView']);
+Route::post('cr/create', [ComputeResourceController::class, 'createSubmit']);
+Route::get('/', [HomeController::class, 'index']);
\ No newline at end of file
