From ac61a4c3ad60d6bb851b42796e3a8a936d3723e3 Mon Sep 17 00:00:00 2001 From: Pinga <121483313+getpinga@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:52:44 +0200 Subject: [PATCH] Updated the profile page --- cp/app/Controllers/ProfileController.php | 119 ++--------- .../views/admin/profile/invoices.twig | 112 ----------- .../views/admin/profile/notifications.twig | 112 ----------- cp/resources/views/admin/profile/plans.twig | 189 ------------------ cp/resources/views/admin/profile/profile.twig | 69 +++---- .../views/admin/profile/security.twig | 112 ----------- cp/routes/web.php | 4 - 7 files changed, 45 insertions(+), 672 deletions(-) delete mode 100644 cp/resources/views/admin/profile/invoices.twig delete mode 100644 cp/resources/views/admin/profile/notifications.twig delete mode 100644 cp/resources/views/admin/profile/plans.twig delete mode 100644 cp/resources/views/admin/profile/security.twig diff --git a/cp/app/Controllers/ProfileController.php b/cp/app/Controllers/ProfileController.php index 2ec78f4..51d5e3e 100644 --- a/cp/app/Controllers/ProfileController.php +++ b/cp/app/Controllers/ProfileController.php @@ -2,111 +2,30 @@ namespace App\Controllers; -use App\Models\User; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Container\ContainerInterface; class ProfileController extends Controller { - public function profile(Request $request, Response $response) - { - $username = $_SESSION['auth_username']; - $email = $_SESSION['auth_email']; - $status = $_SESSION['auth_status']; - if ($status == 0) { - $status = "Confirmed"; - } else { - $status = "Unknown"; - } - $roles = $_SESSION['auth_roles']; - if ($roles == 0) { - $role = "Admin"; - } else { - $role = "Unknown"; - } - + public function profile(Request $request, Response $response) + { + $username = $_SESSION['auth_username']; + $email = $_SESSION['auth_email']; + $status = $_SESSION['auth_status']; + if ($status == 0) { + $status = "Confirmed"; + } else { + $status = "Unknown"; + } + $roles = $_SESSION['auth_roles']; + if ($roles == 0) { + $role = "Admin"; + } else { + $role = "Unknown"; + } + return view($response,'admin/profile/profile.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role]); - } - - public function notifications(Request $request, Response $response) - { - $username = $_SESSION['auth_username']; - $email = $_SESSION['auth_email']; - $status = $_SESSION['auth_status']; - if ($status == 0) { - $status = "Confirmed"; - } else { - $status = "Unknown"; - } - $roles = $_SESSION['auth_roles']; - if ($roles == 0) { - $role = "Admin"; - } else { - $role = "Unknown"; - } - - return view($response,'admin/profile/notifications.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role]); - } - - public function security(Request $request, Response $response) - { - $username = $_SESSION['auth_username']; - $email = $_SESSION['auth_email']; - $status = $_SESSION['auth_status']; - if ($status == 0) { - $status = "Confirmed"; - } else { - $status = "Unknown"; - } - $roles = $_SESSION['auth_roles']; - if ($roles == 0) { - $role = "Admin"; - } else { - $role = "Unknown"; - } - - return view($response,'admin/profile/security.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role]); - } - - public function plans(Request $request, Response $response) - { - $username = $_SESSION['auth_username']; - $email = $_SESSION['auth_email']; - $status = $_SESSION['auth_status']; - if ($status == 0) { - $status = "Confirmed"; - } else { - $status = "Unknown"; - } - $roles = $_SESSION['auth_roles']; - if ($roles == 0) { - $role = "Admin"; - } else { - $role = "Unknown"; - } - - return view($response,'admin/profile/plans.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role]); - } - - public function invoices(Request $request, Response $response) - { - $username = $_SESSION['auth_username']; - $email = $_SESSION['auth_email']; - $status = $_SESSION['auth_status']; - if ($status == 0) { - $status = "Confirmed"; - } else { - $status = "Unknown"; - } - $roles = $_SESSION['auth_roles']; - if ($roles == 0) { - $role = "Admin"; - } else { - $role = "Unknown"; - } - - return view($response,'admin/profile/invoices.twig',['email' => $email, 'username' => $username, 'status' => $status, 'role' => $role]); - } + } -} +} \ No newline at end of file diff --git a/cp/resources/views/admin/profile/invoices.twig b/cp/resources/views/admin/profile/invoices.twig deleted file mode 100644 index 7d87972..0000000 --- a/cp/resources/views/admin/profile/invoices.twig +++ /dev/null @@ -1,112 +0,0 @@ -{% extends "layouts/app.twig" %} - -{% block title %}Invoices{% endblock %} - -{% block content %} -
- -
-
-
-
- -
- Overview -
-

- Profile -

-
-
-
-
- -
-
-
-
-
-
-

Settings

-
- My Account - Notifications - Security - Plans - Invoices -
-
-
-
-
-
- {{ csrf.field | raw }} -

Invoices

-

Profile Details

-
-
-
User Name
-
{{ username }}
-
-
-
Email
-
{{ email }}
-
-
-
Status
- {{ status }} -
-
-
Role
- {{ role }} -
-
-

Change Password

-
-
-
Old Password
- - {% if errors.old_password %} - {{ errors.old_password | first }} - {% endif %} -
-
-
New Password
- - {% if errors.new_password %} - {{ errors.new_password | first }} - {% endif %} -
-
-
-
-
- - Back - - -
-
- -
-
-
-
-
-
- - -{% endblock %} diff --git a/cp/resources/views/admin/profile/notifications.twig b/cp/resources/views/admin/profile/notifications.twig deleted file mode 100644 index d501b4a..0000000 --- a/cp/resources/views/admin/profile/notifications.twig +++ /dev/null @@ -1,112 +0,0 @@ -{% extends "layouts/app.twig" %} - -{% block title %}Notifications{% endblock %} - -{% block content %} -
- -
-
-
-
- -
- Overview -
-

- Profile -

-
-
-
-
- -
-
-
-
-
-
-

Settings

-
- My Account - Notifications - Security - Plans - Invoices -
-
-
-
-
-
- {{ csrf.field | raw }} -

Notifications

-

Profile Details

-
-
-
User Name
-
{{ username }}
-
-
-
Email
-
{{ email }}
-
-
-
Status
- {{ status }} -
-
-
Role
- {{ role }} -
-
-

Change Password

-
-
-
Old Password
- - {% if errors.old_password %} - {{ errors.old_password | first }} - {% endif %} -
-
-
New Password
- - {% if errors.new_password %} - {{ errors.new_password | first }} - {% endif %} -
-
-
-
-
- - Back - - -
-
- -
-
-
-
-
-
- - -{% endblock %} diff --git a/cp/resources/views/admin/profile/plans.twig b/cp/resources/views/admin/profile/plans.twig deleted file mode 100644 index 1a8024c..0000000 --- a/cp/resources/views/admin/profile/plans.twig +++ /dev/null @@ -1,189 +0,0 @@ -{% extends "layouts/app.twig" %} - -{% block title %}Plans{% endblock %} - -{% block content %} -
- -
-
-
-
- -
- Overview -
-

- Profile -

-
-
-
-
- -
-
-
-
-
-
-

Settings

-
- My Account - Notifications - Security - Plans - Invoices -
-
-
-
-
-

Plans

-

This workspace’s Basic Plan is set to $34 per month and will renew on June 19, 2022.

-
-
-
-
-
Free
-
$0
-
    -
  • 3 Users
    • -
  • - - - Sharing Tools -
    • -
  • - - - Design Tools -
    • -
  • - - - Private Messages -
    • -
  • - - - Twitter API -
    • -
-
- Choose plan -
-
-
-
-
-
-
- - -
-
-
Premium
-
$49
-
    -
  • 10 Users
    • -
  • - - - Sharing Tools -
    • -
  • - - - Design Tools -
    • -
  • - - - Private Messages -
    • -
  • - - - Twitter API -
    • -
-
- Choose plan -
-
-
-
-
-
-
-
Enterprise
-
$99
-
    -
  • 100 Users
    • -
  • - - - Sharing Tools -
    • -
  • - - - Design Tools -
    • -
  • - - - Private Messages -
    • -
  • - - - Twitter API -
    • -
-
- Choose plan -
-
-
-
-
-
-
-
-
-

Enterprise-ready. Reach out for a custom quote.

-

Tabler is designed to work great for large enterprises. Take a look at our feature comparison.

-
-
- - Book a demo - -
-
-
-
-
-
-
-
-
-
-
-
-
- - -{% endblock %} diff --git a/cp/resources/views/admin/profile/profile.twig b/cp/resources/views/admin/profile/profile.twig index d3c270c..28f58b2 100644 --- a/cp/resources/views/admin/profile/profile.twig +++ b/cp/resources/views/admin/profile/profile.twig @@ -1,6 +1,6 @@ {% extends "layouts/app.twig" %} -{% block title %}Profile{% endblock %} +{% block title %}{{ __('My Profile') }}{% endblock %} {% block content %}
@@ -11,10 +11,10 @@
- Overview + {{ __('Overview') }}

- Profile + {{ __('My Profile') }}

@@ -24,74 +24,57 @@
-
-
-

Settings

-
- My Account - Notifications - Security - Plans - Invoices -
-
-
-
-
-
- {{ csrf.field | raw }} -

My Account

-

Profile Details

+ + {{ csrf.field | raw }} +
{{ __('Details') }}
-
User Name
-
{{ username }}
+
{{ __('User Name') }}
+
{{ username }}
-
Email
-
{{ email }}
+
{{ __('Email') }}
+
{{ email }}
-
Status
- {{ status }} +
{{ __('Status') }}
+ {{ status }}
-
Role
- {{ role }} +
{{ __('Role') }}
+ {{ role }}
-

Change Password

+

{{ __('Change Password') }}

-
Old Password
+
{{ __('Old Password') }}
- {% if errors.old_password %} - {{ errors.old_password | first }} - {% endif %} + {% if errors.old_password %} + {{ errors.old_password | first }} + {% endif %}
-
New Password
+
{{ __('New Password') }}
- {% if errors.new_password %} - {{ errors.new_password | first }} - {% endif %} + {% if errors.new_password %} + {{ errors.new_password | first }} + {% endif %}
- Back + {{ __('Back') }}
- -
-
+
diff --git a/cp/resources/views/admin/profile/security.twig b/cp/resources/views/admin/profile/security.twig deleted file mode 100644 index 38bd042..0000000 --- a/cp/resources/views/admin/profile/security.twig +++ /dev/null @@ -1,112 +0,0 @@ -{% extends "layouts/app.twig" %} - -{% block title %}Security{% endblock %} - -{% block content %} -
- -
-
-
-
- -
- Overview -
-

- Profile -

-
-
-
-
- -
-
-
-
-
-
-

Settings

-
- My Account - Notifications - Security - Plans - Invoices -
-
-
-
-
-
- {{ csrf.field | raw }} -

Security

-

Profile Details

-
-
-
User Name
-
{{ username }}
-
-
-
Email
-
{{ email }}
-
-
-
Status
- {{ status }} -
-
-
Role
- {{ role }} -
-
-

Change Password

-
-
-
Old Password
- - {% if errors.old_password %} - {{ errors.old_password | first }} - {% endif %} -
-
-
New Password
- - {% if errors.new_password %} - {{ errors.new_password | first }} - {% endif %} -
-
-
-
-
- - Back - - -
-
- -
-
-
-
-
-
- - -{% endblock %} diff --git a/cp/routes/web.php b/cp/routes/web.php index 200ea15..f2676b6 100644 --- a/cp/routes/web.php +++ b/cp/routes/web.php @@ -80,10 +80,6 @@ $app->group('', function ($route) { $route->get('/support/media', SupportController::class .':mediakit')->setName('mediakit'); $route->get('/profile', ProfileController::class .':profile')->setName('profile'); - $route->get('/profile/notifications', ProfileController::class .':notifications')->setName('notifications'); - $route->get('/profile/security', ProfileController::class .':security')->setName('security'); - $route->get('/profile/plans', ProfileController::class .':plans')->setName('plans'); - $route->get('/profile/invoices', ProfileController::class .':invoices')->setName('invoices'); $route->get('/mode', HomeController::class .':mode')->setName('mode'); $route->get('/lang', HomeController::class .':lang')->setName('lang'); $route->get('/avatar', HomeController::class .':avatar')->setName('avatar');