From 86bb50cc4764e2e3aa7f1502e5435b9657cba233 Mon Sep 17 00:00:00 2001 From: Joshua Perry <45966243+jpez-development@users.noreply.github.com> Date: Sun, 5 Feb 2023 15:36:11 +0000 Subject: [PATCH] user creation portal --- jobs/Routes.php | 2 +- jobs/controllers/Portal.php | 77 ++++++++++++++++++++++++++++------- templates/portal.html.php | 1 + templates/user_add.html.php | 23 +++++++++++ templates/user_table.html.php | 23 +++++++++++ todo | 4 +- 6 files changed, 113 insertions(+), 17 deletions(-) create mode 100644 templates/user_add.html.php create mode 100644 templates/user_table.html.php diff --git a/jobs/Routes.php b/jobs/Routes.php index a7675d1..c98cf43 100644 --- a/jobs/Routes.php +++ b/jobs/Routes.php @@ -8,7 +8,7 @@ class Routes extends \CSY2028\Routes { $this->setDbTables(); $this->controllers = [ "jobs" => new \jobs\controllers\Jobs($this->databaseTables["jobs"], $this->databaseTables["categories"], $this->databaseTables["applicants"]), - "portal" => new \jobs\controllers\Portal($this->databaseTables["categories"], $this->databaseTables["jobs"], $this->databaseTables["applicants"]), + "portal" => new \jobs\controllers\Portal($this->databaseTables["categories"], $this->databaseTables["jobs"], $this->databaseTables["applicants"], $this->databaseTables['users']), "user" => new \jobs\controllers\User($this->databaseTables["users"], $this->databaseTables["categories"]) ]; $this->loginControllers = [ diff --git a/jobs/controllers/Portal.php b/jobs/controllers/Portal.php index c092234..1baf6f0 100644 --- a/jobs/controllers/Portal.php +++ b/jobs/controllers/Portal.php @@ -4,12 +4,14 @@ class Portal { private $catsTable; private $jobsTable; private $appsTable; + private $usersTable; private $vars; - public function __construct(\jobs\JobDatabaseTable $catsTable, \jobs\JobDatabaseTable $jobsTable, \jobs\JobDatabaseTable $appsTable) { + public function __construct(\jobs\JobDatabaseTable $catsTable, \jobs\JobDatabaseTable $jobsTable, \jobs\JobDatabaseTable $appsTable, \jobs\JobDatabaseTable $usersTable) { $this->catsTable = $catsTable; $this->jobsTable = $jobsTable; $this->appsTable = $appsTable; + $this->usersTable = $usersTable; $this->vars['cats'] = $this->catsTable->findAll(); $this->vars['table'] = 'job_table.html.php'; } @@ -63,18 +65,19 @@ class Portal { } return $this->categories(); } + if (isset($_POST['user_id'])) { + if($_POST['user_type'] == 'client') { + $this->usersTable->delete('id', $_POST['user_id']); + $jobs = $this->jobsTable->find(['clientId'], ['value0' => $_POST['user_id']]); + foreach ($jobs as $job) { + $this->jobsTable->delete('id', $job->id); + } + return $this->users(); + } + } } } - public function secondHomeSubmit() { - - $this->vars['response'] = 'Update successful'; - return ['template' => 'response.html.php', - 'title' => 'Jo\'s Jobs- Success', - 'vars' => $this->vars - ]; - } - public function categories() { if ($_SESSION['userType'] == 'admin') { $this->vars['table'] = 'category_table.html.php'; @@ -95,8 +98,54 @@ class Portal { 'vars' => $this->vars]; } - public function edit() { //TODO: finish this function - + public function users() { + if ($_SESSION['userType'] == 'admin') { + $this->vars['table'] = 'user_table.html.php'; + $this->vars['users'] = $this->usersTable->findAll(); + return ['template' => 'portal.html.php', + 'title' => 'Jo\'s Jobs- Users', + 'vars' => $this->vars + ]; + } + } + + public function addUser() { + if ($_SESSION['userType'] == 'admin') { + if (isset($_GET['user_id'])) { + $this->vars['user'] = $this->usersTable->find(['id'], ['value0' => $_GET['user_id']])[0]; + $this->vars['update'] = true; + } + else { + $this->vars['update'] = false; + } + return ['template' => 'user_add.html.php', + 'title' => 'Jo\'s Jobs- Edit user', + 'vars' => $this->vars + ]; + } + } + + public function addUserSubmit() { + if ($_SESSION['userType'] == 'admin') { + $record = [ + 'username' => $_POST['username'], + 'password' => password_hash($_POST['password'], PASSWORD_DEFAULT), + 'userType' => $_POST['type'] + ]; + if ($_POST['submit'] == 'Update') { + $record['id'] = $_POST['user_id']; + $this->vars['response'] = 'User Updated Successfully'; + } + else { + $this->vars['response'] = 'User Created Successfully'; + } + $this->usersTable->save($record); + return [ + 'template' => 'response.html.php', + 'title' => 'Jo\'s Jobs- Edit user', + 'vars' => $this->vars + ]; + } } public function addJob() { @@ -110,7 +159,7 @@ class Portal { $this->vars['update'] = false; } return ['template' => 'job_add.html.php', - 'title' => 'Jo\'s Jobs- Add Job', + 'title' => 'Jo\'s Jobs- Edit Job', 'vars' => $this->vars ]; } @@ -158,7 +207,7 @@ class Portal { $this->vars['update'] = false; } return ['template' => 'category_add.html.php', - 'title' => 'Jo\'s Jobs- Add Category', + 'title' => 'Jo\'s Jobs- Edit Category', 'vars' => $this->vars ]; } diff --git a/templates/portal.html.php b/templates/portal.html.php index f2aefb0..0ebd361 100644 --- a/templates/portal.html.php +++ b/templates/portal.html.php @@ -4,6 +4,7 @@
  • Jobs
  • Categories
    • +
  • Users
    • diff --git a/templates/user_add.html.php b/templates/user_add.html.php new file mode 100644 index 0000000..895d521 --- /dev/null +++ b/templates/user_add.html.php @@ -0,0 +1,23 @@ +
    +
    + + + + + + + + + + + + + + + + + + +
    +
    \ No newline at end of file diff --git a/templates/user_table.html.php b/templates/user_table.html.php new file mode 100644 index 0000000..8f8d173 --- /dev/null +++ b/templates/user_table.html.php @@ -0,0 +1,23 @@ +

    Users

    +Add new user + + + + + + + + + + + + + + + + +
    UsernameUser Type  
    username?>Edit
    + + + +
    \ No newline at end of file diff --git a/todo b/todo index 5ca7ca8..6807a3b 100644 --- a/todo +++ b/todo @@ -14,8 +14,8 @@ Assignment 2: - Fix Adding categories @done - Archive jobs instead of delete @done - Relist archived jobs with new closing date @done - - Add admin user control to admin portal - - User accounts made in admin portal + - Add admin user control to admin portal @done + - User accounts made in admin portal @done - Client user accounts @done - restricted admin panel @done - add and archive jobs @done