diff --git a/app/Http/Controllers/admin/AddonController.php b/app/Http/Controllers/admin/AddonController.php index cfc20ee..82980e4 100644 --- a/app/Http/Controllers/admin/AddonController.php +++ b/app/Http/Controllers/admin/AddonController.php @@ -24,13 +24,13 @@ class AddonController extends Controller ); $title = 'List Add-On'; - return view('admin.addon.index', compact('addOns', 'title')); + return view('administrator.pages.addon.index', compact('addOns', 'title')); } public function create() { $title = 'Add new addon'; - return view('admin.addon.add', compact('title')); + return view('administrator.pages.addon.add', compact('title')); } public function store(AddOnRequest $request) @@ -58,7 +58,7 @@ class AddonController extends Controller $title = 'Edit Addon'; - return view('admin.addon.edit', compact('title', 'addon')); + return view('administrator.pages.addon.edit', compact('title', 'addon')); } public function update(int $id = 0, AddOnRequest $request) { diff --git a/app/Http/Controllers/admin/CouponController.php b/app/Http/Controllers/admin/CouponController.php index 013ca0d..a1dd0b1 100644 --- a/app/Http/Controllers/admin/CouponController.php +++ b/app/Http/Controllers/admin/CouponController.php @@ -26,13 +26,13 @@ class CouponController extends Controller $coupons = $this->discountRepository->filter($request->merge(['page' => $request->query('page') ?? 1])->all()); - return view("admin.coupon.index", compact('title', 'coupons')); + return view("administrator.pages.coupon.index", compact('title', 'coupons')); } public function create() { $title = "Create new Coupon"; - return view("admin.coupon.add", compact('title')); + return view("administrator.pages.coupon.add", compact('title')); } public function store(CouponRequest $request) { @@ -77,7 +77,7 @@ class CouponController extends Controller $title = "Edit coupon #" . $coupon->code; - return view("admin.coupon.edit", compact('title', 'coupon')); + return view("administrator.pages.coupon.edit", compact('title', 'coupon')); } public function update(int $id = 0, CouponRequest $request) diff --git a/app/Http/Controllers/admin/CustomerController.php b/app/Http/Controllers/admin/CustomerController.php index ce5b035..bcf549d 100644 --- a/app/Http/Controllers/admin/CustomerController.php +++ b/app/Http/Controllers/admin/CustomerController.php @@ -57,7 +57,7 @@ class CustomerController extends Controller $title = 'View All Customer'; - return view('admin.customer.index', compact('customers', 'title')); + return view('administrator.pages.customer.index', compact('customers', 'title')); } //Validate userid @@ -122,7 +122,7 @@ class CustomerController extends Controller $title = "#" . $customer->id . " " . $customer->firstname . " " . $customer->lastname; - return view("admin.customer.info", compact('customer', 'title', 'userid')); + return view("administrator.pages.customer.info", compact('customer', 'title', 'userid')); } protected function validateUserid() @@ -157,7 +157,7 @@ class CustomerController extends Controller } $title = "#" . $customer->id . " " . $customer->firstname . " " . $customer->lastname; - return view("admin.customer.profile", compact('customer', 'title', 'userid')); + return view("administrator.pages.customer.profile", compact('customer', 'title', 'userid')); } /** @@ -309,7 +309,7 @@ class CustomerController extends Controller $title = "#" . $customer->id . " " . $customer->firstname . " " . $customer->lastname; return view( - 'admin.customer.product', + 'administrator.pages.customer.product', compact( 'title', 'userid', @@ -430,7 +430,7 @@ class CustomerController extends Controller $title = "#" . $customer->id . " " . $customer->firstname . " " . $customer->lastname; - return view('admin.customer.domain', compact('userid', 'title', 'domains')); + return view('administrator.pages.customer.domain', compact('userid', 'title', 'domains')); } /** @@ -463,7 +463,7 @@ class CustomerController extends Controller $title = "#" . $customer->id . " " . $customer->firstname . " " . $customer->lastname; - return view('admin.customer.invoice', compact('userid', 'title', 'invoices')); + return view('administrator.pages.customer.invoice', compact('userid', 'title', 'invoices')); } /** @@ -492,7 +492,7 @@ class CustomerController extends Controller $title = "#" . $customer->id . " " . $customer->firstname . " " . $customer->lastname; - return view('admin.customer.transaction', compact('userid', 'title', 'transactions')); + return view('administrator.pages.customer.transaction', compact('userid', 'title', 'transactions')); } /** @@ -526,7 +526,7 @@ class CustomerController extends Controller return view("emails.render", compact('title', 'template')); } } - return view('admin.customer.mail', compact('userid', 'title', 'emails')); + return view('administrator.pages.customer.mail', compact('userid', 'title', 'emails')); } /** @@ -552,7 +552,7 @@ class CustomerController extends Controller $title = "#" . $customer->id . " " . $customer->firstname . " " . $customer->lastname; - return view('admin.customer.log', compact('userid', 'title', 'logs')); + return view('administrator.pages.customer.log', compact('userid', 'title', 'logs')); } /** @@ -589,7 +589,7 @@ class CustomerController extends Controller */ public function create() { - return view('admin.customer.add', ['title' => 'Thêm Customer']); + return view('administrator.pages.customer.add', ['title' => 'Thêm Customer']); } @@ -661,7 +661,7 @@ class CustomerController extends Controller return redirect()->route('customer.index')->withErrors('No data found for this user'); } $title = "Add Pay for Customer"; - return view('admin.customer.addPay', compact('title', 'userid')); + return view('administrator.pages.customer.addPay', compact('title', 'userid')); } public function addPayStore(AddPayRequest $request) diff --git a/app/Http/Controllers/admin/DomainController.php b/app/Http/Controllers/admin/DomainController.php index 5cbbb34..e7032e6 100644 --- a/app/Http/Controllers/admin/DomainController.php +++ b/app/Http/Controllers/admin/DomainController.php @@ -26,7 +26,7 @@ class DomainController extends Controller ['type'] ); $title = "List All Domain"; - return view("admin.product.domain.index",compact('domain','title')); + return view("administrator.pages.product.domain.index", compact('domain', 'title')); } //import domain from file excel diff --git a/app/Http/Controllers/admin/GroupController.php b/app/Http/Controllers/admin/GroupController.php index 78fc643..6c7c8a1 100644 --- a/app/Http/Controllers/admin/GroupController.php +++ b/app/Http/Controllers/admin/GroupController.php @@ -43,7 +43,7 @@ class GroupController extends Controller public function addGroupInformation() { $title = 'Add New Product Group'; - return view('admin.product.group', compact('title')); + return view('administrator.pages.product.group', compact('title')); } /** @@ -94,7 +94,7 @@ class GroupController extends Controller $title = 'Action Group'; - return view("admin.product.group", compact('title', 'type', 'group', 'group_id')); + return view("administrator.pages.product.group", compact('title', 'type', 'group', 'group_id')); } diff --git a/app/Http/Controllers/admin/InvoiceController.php b/app/Http/Controllers/admin/InvoiceController.php index 9473c6f..958e609 100644 --- a/app/Http/Controllers/admin/InvoiceController.php +++ b/app/Http/Controllers/admin/InvoiceController.php @@ -28,7 +28,7 @@ class InvoiceController extends Controller ); $title = 'List all invoices'; - return view('admin.invoice.index', compact('title', 'invoices')); + return view('administrator.pages.invoice.index', compact('title', 'invoices')); } public function edit(int $id = 0) @@ -41,7 +41,7 @@ class InvoiceController extends Controller $title = "View invoice #" . $id; - return view("admin.invoice.edit", compact('title', 'invoice')); + return view("administrator.pages.invoice.edit", compact('title', 'invoice')); } public function update(InvoiceRequest $request, int $id = 0) @@ -94,6 +94,6 @@ class InvoiceController extends Controller return back()->withErrors($error->getMessage()); } - return redirect()->route('admin.invoice.index')->with('success', 'Invoice deleted successfully'); + return redirect()->route('administrator.pages.invoice.index')->with('success', 'Invoice deleted successfully'); } } diff --git a/app/Http/Controllers/admin/LoginController.php b/app/Http/Controllers/admin/LoginController.php index 9705a34..ba7a2c4 100644 --- a/app/Http/Controllers/admin/LoginController.php +++ b/app/Http/Controllers/admin/LoginController.php @@ -13,7 +13,7 @@ class LoginController extends Controller // public function index() { - return view("administrator.pages.auth.login"); + return view("administrator.pages.s.auth.login"); } public function store(Request $request) { diff --git a/app/Http/Controllers/admin/MainController.php b/app/Http/Controllers/admin/MainController.php index 9b9a389..72020e6 100644 --- a/app/Http/Controllers/admin/MainController.php +++ b/app/Http/Controllers/admin/MainController.php @@ -147,7 +147,7 @@ class MainController extends Controller ); $title = 'System Activity Log'; - return view('administrator.pages.log', compact('title', 'logs')); + return view('administrator.pages.s.log', compact('title', 'logs')); } public function ClearCache() diff --git a/app/Http/Controllers/admin/MenuController.php b/app/Http/Controllers/admin/MenuController.php index ec3a0b4..65cd5cd 100644 --- a/app/Http/Controllers/admin/MenuController.php +++ b/app/Http/Controllers/admin/MenuController.php @@ -44,7 +44,7 @@ class MenuController extends Controller ); $title = 'List Menu'; - return view('admin.menu.index', compact('menuOptions', 'title')); + return view('administrator.pages.menu.index', compact('menuOptions', 'title')); } public function create() @@ -53,7 +53,7 @@ class MenuController extends Controller $menus = $this->menuRepository->getTree(); $parentMenuOptions = $this->buildMenuOptions($menus); - return view('admin.menu.add', compact('title', 'parentMenuOptions')); + return view('administrator.pages.menu.add', compact('title', 'parentMenuOptions')); } public function store(MenuRequest $request) @@ -87,7 +87,7 @@ class MenuController extends Controller $title = 'Edit Menu'; - return view('admin.menu.edit', compact('title', 'menu', 'parentMenuOptions')); + return view('administrator.pages.menu.edit', compact('title', 'menu', 'parentMenuOptions')); } public function update(int $id = 0, MenuRequest $request) diff --git a/app/Http/Controllers/admin/ModuleDNSController.php b/app/Http/Controllers/admin/ModuleDNSController.php index 1619677..bef0595 100644 --- a/app/Http/Controllers/admin/ModuleDNSController.php +++ b/app/Http/Controllers/admin/ModuleDNSController.php @@ -31,7 +31,7 @@ class ModuleDNSController extends Controller ] ); $title = 'List all server dns'; - return view('admin.module.dns.index', compact('modules', 'title')); + return view('administrator.pages.module.dns.index', compact('modules', 'title')); } public function import(Request $request) { @@ -67,7 +67,7 @@ class ModuleDNSController extends Controller public function create() { $title = 'Add new server dns'; - return view('admin.module.dns.add', compact('title')); + return view('administrator.pages.module.dns.add', compact('title')); } public function store(CreateDNSRequest $request) { @@ -94,7 +94,7 @@ class ModuleDNSController extends Controller $server = $this->dnsServerRepository->find($id); if (! $server) return back()->withErrors('Can\'t find server by id ' . $server); $title = 'View server dns information'; - return view('admin.module.dns.edit', compact('title', 'server')); + return view('administrator.pages.module.dns.edit', compact('title', 'server')); } public function update(UpdateDNSRequest $request, int $id = 0) { diff --git a/app/Http/Controllers/admin/ModuleHostingController.php b/app/Http/Controllers/admin/ModuleHostingController.php index e798df3..c68ea56 100644 --- a/app/Http/Controllers/admin/ModuleHostingController.php +++ b/app/Http/Controllers/admin/ModuleHostingController.php @@ -26,7 +26,7 @@ class ModuleHostingController extends Controller ] ); $title = 'List all server hosting'; - return view('admin.module.hosting.index', compact('modules', 'title')); + return view('administrator.pages.module.hosting.index', compact('modules', 'title')); } public function import(Request $request) { @@ -65,7 +65,7 @@ class ModuleHostingController extends Controller public function create() { $title = 'Add new server hosting'; - return view('admin.module.hosting.add', compact('title')); + return view('administrator.pages.module.hosting.add', compact('title')); } public function store(CreateHostingRequest $request) { @@ -92,7 +92,7 @@ class ModuleHostingController extends Controller $server = $this->hostingServerRepository->find($id); if (! $server) return back()->withErrors('Can\'t find server by id ' . $id); $title = 'View server hosting information'; - return view('admin.module.hosting.edit', compact('title', 'server')); + return view('administrator.pages.module.hosting.edit', compact('title', 'server')); } public function update(UpdateHostingRequest $request, int $id = 0) { diff --git a/app/Http/Controllers/admin/ModuleIPPoolController.php b/app/Http/Controllers/admin/ModuleIPPoolController.php index d46bbb1..acb94eb 100644 --- a/app/Http/Controllers/admin/ModuleIPPoolController.php +++ b/app/Http/Controllers/admin/ModuleIPPoolController.php @@ -22,7 +22,7 @@ class ModuleIPPoolController extends Controller ] ); $title = 'List all server ip pool'; - return view('admin.module.ippool.index', compact('modules', 'title')); + return view('administrator.pages.module.ippool.index', compact('modules', 'title')); } public function create() @@ -33,7 +33,7 @@ class ModuleIPPoolController extends Controller 'page' => 1 ] ); - return view('admin.module.ippool.add', compact('title', 'moduleNetworks')); + return view('administrator.pages.module.ippool.add', compact('title', 'moduleNetworks')); } public function store(Request $request) @@ -61,7 +61,7 @@ class ModuleIPPoolController extends Controller ] ); $title = 'Edit server ip pool'; - return view('admin.module.ippool.edit', ['module' => $module, 'title' => $title, 'moduleNetworks' => $moduleNetworks]); + return view('administrator.pages.module.ippool.edit', ['module' => $module, 'title' => $title, 'moduleNetworks' => $moduleNetworks]); } public function update(Request $request, int $id = 0) diff --git a/app/Http/Controllers/admin/ModulevCenterController.php b/app/Http/Controllers/admin/ModulevCenterController.php index 61b909f..8af1f4f 100644 --- a/app/Http/Controllers/admin/ModulevCenterController.php +++ b/app/Http/Controllers/admin/ModulevCenterController.php @@ -33,7 +33,7 @@ class ModulevCenterController extends Controller ] ); $title = 'List all vCenter'; - return view('admin.module.vcenter.index', compact('modules', 'title')); + return view('administrator.pages.module.vcenter.index', compact('modules', 'title')); } public function import(Request $request) { @@ -73,7 +73,7 @@ class ModulevCenterController extends Controller public function create() { $title = 'Add new vCenter'; - return view('admin.module.vcenter.add', compact('title')); + return view('administrator.pages.module.vcenter.add', compact('title')); } public function store(CreatevCenterRequest $request) { @@ -100,7 +100,7 @@ class ModulevCenterController extends Controller $server = $this->vCenterRepository->find($id); if (! $server) return back()->withErrors('Can\'t find server by id ' . $id); $title = 'View vCenter information'; - return view('admin.module.vcenter.edit', compact('title', 'server')); + return view('administrator.pages.module.vcenter.edit', compact('title', 'server')); } public function update(UpdatevCenterRequest $request, int $id = 0) { diff --git a/app/Http/Controllers/admin/OrderController.php b/app/Http/Controllers/admin/OrderController.php index 90cca23..a2870af 100644 --- a/app/Http/Controllers/admin/OrderController.php +++ b/app/Http/Controllers/admin/OrderController.php @@ -59,7 +59,7 @@ class OrderController extends Controller $title = 'List all orders'; - return view('admin.order.index', compact('title', 'orders')); + return view('administrator.pages.order.index', compact('title', 'orders')); } // Tính billing @@ -254,7 +254,7 @@ class OrderController extends Controller DB::rollBack(); return back()->withErrors($error->getMessage()); } - return redirect()->route('admin.order.edit', ['id' => $order]); + return redirect()->route('administrator.pages.order.edit', ['id' => $order]); } @@ -266,7 +266,7 @@ class OrderController extends Controller $discount = Discount::select('id', 'code', 'save', 'type')->where('status', 1)->get(); $type = Type::select('id', 'name')->where('status', 1)->get(); - return view('admin.order.add', compact('title', 'customer', 'payment', 'discount', 'type')); + return view('administrator.pages.order.add', compact('title', 'customer', 'payment', 'discount', 'type')); } public function edit(int $id = 0) @@ -274,7 +274,7 @@ class OrderController extends Controller $order = $this->orderRepository->findWithRelationships($id, ['orderItem', 'user', 'customer.invoiceItem.type', 'payment', 'discount', 'invoice.invoiceItem']); if (!$order) { - return redirect()->route('admin.order.index')->withErrors('Can\'t find a order by order id #' . $id); + return redirect()->route('administrator.pages.order.index')->withErrors('Can\'t find a order by order id #' . $id); } $title = 'View Manage Order'; @@ -283,7 +283,7 @@ class OrderController extends Controller $item->status = $this->invoiceItemRepository->findServiceStatus($item->relid, $item->type_id); return $item; }); - return view('admin.order.edit', compact('title', 'order')); + return view('administrator.pages.order.edit', compact('title', 'order')); } public function update(int $id, UpdateOrderRequest $request) @@ -291,7 +291,7 @@ class OrderController extends Controller $order = $this->orderRepository->findWithRelationships($id, ['invoice', 'orderItem']); if (!$order) { - return redirect()->route('admin.order.index')->withErrors('Invalid request'); + return redirect()->route('administrator.pages.order.index')->withErrors('Invalid request'); } $status = match ($request->action) { diff --git a/app/Http/Controllers/admin/PaymentController.php b/app/Http/Controllers/admin/PaymentController.php index d3e8758..4cf64bd 100644 --- a/app/Http/Controllers/admin/PaymentController.php +++ b/app/Http/Controllers/admin/PaymentController.php @@ -21,14 +21,14 @@ class PaymentController extends Controller ); $title = 'List Payment'; - return view('admin.payment.index', compact('payments', 'title')); + return view('administrator.pages.payment.index', compact('payments', 'title')); } public function create() { $title = 'Add new Payment Method'; - return view('admin.payment.add', compact('title')); + return view('administrator.pages.payment.add', compact('title')); } public function store(PaymentRequest $request) @@ -55,7 +55,7 @@ class PaymentController extends Controller } $title = 'Edit Payment Method'; - return view('admin.payment.edit', compact('title', 'payment')); + return view('administrator.pages.payment.edit', compact('title', 'payment')); } public function update(int $id = 0, PaymentRequest $request) { diff --git a/app/Http/Controllers/admin/PostController.php b/app/Http/Controllers/admin/PostController.php index d85754a..fcf90a1 100644 --- a/app/Http/Controllers/admin/PostController.php +++ b/app/Http/Controllers/admin/PostController.php @@ -20,13 +20,13 @@ class PostController extends Controller $title = 'Posts'; $posts = $this->postRepository->filter($request->merge(['page' => $request->get('page') ?? 1])->all()); - return view('admin.post.index', compact('title', 'posts')); + return view('administrator.pages.post.index', compact('title', 'posts')); } public function create() { $title = 'Add new Post'; - return view('admin.post.add', compact('title')); + return view('administrator.pages.post.add', compact('title')); } public function store(PostRequest $request) @@ -59,7 +59,7 @@ class PostController extends Controller } $title = 'Edit Post'; - return view('admin.post.edit', compact('title', 'post')); + return view('administrator.pages.post.edit', compact('title', 'post')); } public function update(int $id = 0,PostRequest $request) diff --git a/app/Http/Controllers/admin/ProductController.php b/app/Http/Controllers/admin/ProductController.php index 6b2eaaf..edff89a 100644 --- a/app/Http/Controllers/admin/ProductController.php +++ b/app/Http/Controllers/admin/ProductController.php @@ -44,7 +44,7 @@ class ProductController extends Controller $title = "List All Product"; - return view('admin.product.index', compact('title', 'groups')); + return view('administrator.pages.product.index', compact('title', 'groups')); } public function create(Request $request) @@ -54,7 +54,7 @@ class ProductController extends Controller $group = $this->groupRepository->getAll(); $type = $this->typeRepository->getAll(); if ($step === 1) { - return view("admin.product.first", compact('group', 'type', 'title')); + return view("administrator.pages.product.first", compact('group', 'type', 'title')); } $validator = Validator::make($request->except('_token'), [ @@ -72,10 +72,10 @@ class ProductController extends Controller $view = null; $view = match ((int) $type_id) { - 1 => "admin.product.addon", - 2 => "admin.product.domain.add", - 3 => "admin.product.hosting", - 4 => "admin.product.vps" + 1 => "administrator.pages.product.addon", + 2 => "administrator.pages.product.domain.add", + 3 => "administrator.pages.product.hosting", + 4 => "administrator.pages.product.vps" }; // Thêm dữ liệu OS cho VPS @@ -189,10 +189,10 @@ class ProductController extends Controller $group = $this->groupRepository->getAll(); $type = $this->typeRepository->getAll(); $view = match ((int) $type_id) { - 1 => "admin.product.addon", - 2 => "admin.product.domain.add", - 3 => "admin.product.hosting", - 4 => "admin.product.vps" + 1 => "administrator.pages.product.addon", + 2 => "administrator.pages.product.domain.add", + 3 => "administrator.pages.product.hosting", + 4 => "administrator.pages.product.vps" }; $repository = match ((int) $type_id) { 1 => $this->addonRepository, diff --git a/app/Http/Controllers/admin/RolesController.php b/app/Http/Controllers/admin/RolesController.php index 12a29c8..25a2b5c 100644 --- a/app/Http/Controllers/admin/RolesController.php +++ b/app/Http/Controllers/admin/RolesController.php @@ -18,7 +18,7 @@ class RolesController extends Controller $roles = Role::get(); $title = 'Administrator Role'; - return view('admin.role.index',compact('roles','title')); + return view('administrator.pages.role.index', compact('roles', 'title')); } public function create() { @@ -26,7 +26,7 @@ class RolesController extends Controller $title = 'Add new administrator role'; - return view('admin.role.add',compact('permission','title')); + return view('administrator.pages.role.add', compact('permission', 'title')); } public function store(Request $request) { @@ -72,7 +72,7 @@ class RolesController extends Controller $title = 'Edit administrator role'; - return view('admin.role.edit',compact('permission','title','role')); + return view('administrator.pages.role.edit', compact('permission', 'title', 'role')); } public function update(Request $request, $id = 0) diff --git a/app/Http/Controllers/admin/SettingController.php b/app/Http/Controllers/admin/SettingController.php index a01cd1a..c0c1d02 100644 --- a/app/Http/Controllers/admin/SettingController.php +++ b/app/Http/Controllers/admin/SettingController.php @@ -23,14 +23,14 @@ class SettingController extends Controller { $title = 'General Setting'; - return view('admin.setting', compact('title')); + return view('administrator.pages.setting', compact('title')); } public function smtp() { $title = 'SMTP Setting'; - return view('admin.smtp', compact('title')); + return view('administrator.pages.smtp', compact('title')); } public function store(Request $request) diff --git a/app/Http/Controllers/admin/SupportController.php b/app/Http/Controllers/admin/SupportController.php index c4d6665..d2da05b 100644 --- a/app/Http/Controllers/admin/SupportController.php +++ b/app/Http/Controllers/admin/SupportController.php @@ -23,7 +23,7 @@ class SupportController extends Controller $tickets = $this->ticketRepository->filter($request->merge(['page' => $request->get('1') ?? 1])->all()); $title = "All Support Ticket"; - return view('admin.support.index', compact('title', 'tickets')); + return view('administrator.pages.support.index', compact('title', 'tickets')); } public function edit(int $ticket_num = 0) @@ -40,7 +40,7 @@ class SupportController extends Controller $title = "Ticket #" . $ticket_num; - return view("admin.support.view", compact('title', 'ticket')); + return view("administrator.pages.support.view", compact('title', 'ticket')); } public function reply(int $id = 0, TicketReplyRequest $request) diff --git a/app/Http/Controllers/admin/TaskController.php b/app/Http/Controllers/admin/TaskController.php index 373763f..c87cf6e 100644 --- a/app/Http/Controllers/admin/TaskController.php +++ b/app/Http/Controllers/admin/TaskController.php @@ -155,7 +155,7 @@ class TaskController extends Controller } $title = 'View Console for VirtualMachine #' . $request->{'vmware-id'}; - return view('admin.customer.console', compact('title', 'product')); + return view('administrator.pages.customer.console', compact('title', 'product')); } public function Action(Request $request) diff --git a/app/Http/Controllers/admin/TemplateController.php b/app/Http/Controllers/admin/TemplateController.php index 3924c63..ea0279e 100644 --- a/app/Http/Controllers/admin/TemplateController.php +++ b/app/Http/Controllers/admin/TemplateController.php @@ -17,7 +17,7 @@ class TemplateController extends Controller $template = Template::with('Type')->orderBy('type_id')->simplePaginate(20); $title = "List email template"; - return view('admin.template.index', compact('template', 'title')); + return view('administrator.pages.template.index', compact('template', 'title')); } public function create() @@ -26,7 +26,7 @@ class TemplateController extends Controller $type = Type::select('name', 'id')->get(); - return view('admin.template.add', compact('title', 'type')); + return view('administrator.pages.template.add', compact('title', 'type')); } public function store(Request $request) @@ -72,7 +72,7 @@ class TemplateController extends Controller $type = Type::select('name', 'id')->get(); - return view('admin.template.edit', compact('title', 'type', 'template')); + return view('administrator.pages.template.edit', compact('title', 'type', 'template')); } public function update(Request $request) { diff --git a/app/Http/Controllers/admin/UserController.php b/app/Http/Controllers/admin/UserController.php index ea07ae1..1d9474e 100644 --- a/app/Http/Controllers/admin/UserController.php +++ b/app/Http/Controllers/admin/UserController.php @@ -19,7 +19,7 @@ class UserController extends Controller $title = 'Administrators'; $users = User::with('roles')->paginate(15); - return view('admin.user.index', compact('title', 'users')); + return view('administrator.pages.user.index', compact('title', 'users')); } public function store(Request $request) @@ -96,7 +96,7 @@ class UserController extends Controller DB::rollBack(); return back()->withErrors($exception->getMessage()); } - return redirect()->route('admin.user.index')->with('success', 'New account added successfully'); + return redirect()->route('administrator.pages.user.index')->with('success', 'New account added successfully'); } public function create() @@ -104,7 +104,7 @@ class UserController extends Controller $roles = Role::select('name')->get(); $title = "Add new Administrator"; - return view('admin.user.add', compact('roles', 'title')); + return view('administrator.pages.user.add', compact('roles', 'title')); } @@ -128,7 +128,7 @@ class UserController extends Controller $roles = Role::select('name')->get(); $title = 'Edit admin information'; - return view('admin.user.edit', compact('user', 'title', 'roles')); + return view('administrator.pages.user.edit', compact('user', 'title', 'roles')); } public function update(Request $request) diff --git a/app/Http/Controllers/admin/package/IPMapping.php b/app/Http/Controllers/admin/package/IPMapping.php index bdac1ca..df1a347 100644 --- a/app/Http/Controllers/admin/package/IPMapping.php +++ b/app/Http/Controllers/admin/package/IPMapping.php @@ -29,14 +29,14 @@ class IPMapping extends Controller ); $title = 'List All IP Address'; - return view('admin.package.ipaddress.index', compact('listIP', 'title')); + return view('administrator.pages.package.ipaddress.index', compact('listIP', 'title')); } public function create() { $title = 'Add new IP Address'; - return view('admin.package.ipaddress.add', compact('title')); + return view('administrator.pages.package.ipaddress.add', compact('title')); } public function store(IPRequest $request) @@ -109,7 +109,7 @@ class IPMapping extends Controller $title = "View IP Address"; - return view('admin.package.ipaddress.edit', compact('title', 'ipaddress')); + return view('administrator.pages.package.ipaddress.edit', compact('title', 'ipaddress')); } public function update(int $id = 0, IPRequest $request) diff --git a/app/Http/Controllers/admin/package/Network.php b/app/Http/Controllers/admin/package/Network.php index 4d0036e..928d8e1 100644 --- a/app/Http/Controllers/admin/package/Network.php +++ b/app/Http/Controllers/admin/package/Network.php @@ -43,7 +43,7 @@ class Network extends Controller { $title = 'Add Network'; - return view('administrator.pages.package.network.add', compact('title')); + return view('administrator.pages.s.package.network.add', compact('title')); } public function store(NetworkRequest $request) { diff --git a/app/Http/Controllers/admin/vm/VirtualMachineController.php b/app/Http/Controllers/admin/vm/VirtualMachineController.php index a47798e..3f095fa 100644 --- a/app/Http/Controllers/admin/vm/VirtualMachineController.php +++ b/app/Http/Controllers/admin/vm/VirtualMachineController.php @@ -8,31 +8,31 @@ class VirtualMachineController extends Controller { public function index() { - return view('admin.package.vm.index'); + return view('administrator.pages.package.vm.index'); } public function create() { - return view('admin.package.vm.add'); + return view('administrator.pages.package.vm.add'); } public function store(Request $request) { - return view('admin.package.vm.index'); + return view('administrator.pages.package.vm.index'); } public function edit($id) { - return view('admin.package.vm.edit'); + return view('administrator.pages.package.vm.edit'); } public function update(Request $request, $id) { - return view('admin.package.vm.index'); + return view('administrator.pages.package.vm.index'); } public function destroy($id) { - return view('admin.package.vm.index'); + return view('administrator.pages.package.vm.index'); } } \ No newline at end of file diff --git a/config/admin-sidebar.php b/config/admin-sidebar.php index ad8bed6..17a471d 100644 --- a/config/admin-sidebar.php +++ b/config/admin-sidebar.php @@ -42,9 +42,9 @@ return [ 'type' => 'group', 'title' => 'Manager Admin', 'icon' => 'users', - 'active' => ['admin.user.*', 'role.*'], + 'active' => ['administrator.pages.user.*', 'role.*'], 'children' => [ - ['title' => 'List Admin', 'route' => 'admin.user.index', 'active' => ['admin.user.*']], + ['title' => 'List Admin', 'route' => 'administrator.pages.user.index', 'active' => ['administrator.pages.user.*']], ['title' => 'Administrator Roles', 'route' => 'role.index', 'active' => ['role.*']], ], ], @@ -73,26 +73,26 @@ return [ 'type' => 'group', 'title' => 'Orders', 'icon' => 'shopping-cart', - 'active' => ['admin.order.*'], + 'active' => ['administrator.pages.order.*'], 'children' => [ - ['title' => 'View All Orders', 'route' => 'admin.order.index', 'active' => ['admin.order.index'], 'params' => []], - ['title' => 'Pending Orders', 'route' => 'admin.order.index', 'active' => [], 'params' => ['status' => 'pending']], - ['title' => 'Processing Orders', 'route' => 'admin.order.index', 'active' => [], 'params' => ['status' => 'processing']], - ['title' => 'Active Orders', 'route' => 'admin.order.index', 'active' => [], 'params' => ['status' => 'active']], - ['title' => 'Cancel Orders', 'route' => 'admin.order.index', 'active' => [], 'params' => ['status' => 'cancel']], - ['title' => 'Add New Orders', 'route' => 'admin.order.create', 'active' => ['admin.order.create']], + ['title' => 'View All Orders', 'route' => 'administrator.pages.order.index', 'active' => ['administrator.pages.order.index'], 'params' => []], + ['title' => 'Pending Orders', 'route' => 'administrator.pages.order.index', 'active' => [], 'params' => ['status' => 'pending']], + ['title' => 'Processing Orders', 'route' => 'administrator.pages.order.index', 'active' => [], 'params' => ['status' => 'processing']], + ['title' => 'Active Orders', 'route' => 'administrator.pages.order.index', 'active' => [], 'params' => ['status' => 'active']], + ['title' => 'Cancel Orders', 'route' => 'administrator.pages.order.index', 'active' => [], 'params' => ['status' => 'cancel']], + ['title' => 'Add New Orders', 'route' => 'administrator.pages.order.create', 'active' => ['administrator.pages.order.create']], ], ], [ 'type' => 'group', 'title' => 'Invoices', 'icon' => 'file-text', - 'active' => ['admin.invoice.*'], + 'active' => ['administrator.pages.invoice.*'], 'children' => [ - ['title' => 'View All Invoice', 'route' => 'admin.invoice.index', 'active' => ['admin.invoice.index'], 'params' => []], - ['title' => 'Pending Invoice', 'route' => 'admin.invoice.index', 'active' => [], 'params' => ['status' => 'unpaid']], - ['title' => 'Paid Invoice', 'route' => 'admin.invoice.index', 'active' => [], 'params' => ['status' => 'active']], - ['title' => 'Cancel Invoice', 'route' => 'admin.invoice.index', 'active' => [], 'params' => ['status' => 'cancel']], + ['title' => 'View All Invoice', 'route' => 'administrator.pages.invoice.index', 'active' => ['administrator.pages.invoice.index'], 'params' => []], + ['title' => 'Pending Invoice', 'route' => 'administrator.pages.invoice.index', 'active' => [], 'params' => ['status' => 'unpaid']], + ['title' => 'Paid Invoice', 'route' => 'administrator.pages.invoice.index', 'active' => [], 'params' => ['status' => 'active']], + ['title' => 'Cancel Invoice', 'route' => 'administrator.pages.invoice.index', 'active' => [], 'params' => ['status' => 'cancel']], ], ], [ diff --git a/config/sidebar.php b/config/sidebar.php index e2f382a..c65d1b2 100644 --- a/config/sidebar.php +++ b/config/sidebar.php @@ -84,7 +84,7 @@ return [ 'children' => [ [ 'title' => 'List Admin', - 'route' => 'admin.user.index', + 'route' => 'administrator.pages.user.index', 'icon' => 'fas fa-users', ], [ @@ -137,36 +137,36 @@ return [ 'children' => [ [ 'title' => 'View All Orders', - 'route' => 'admin.order.index', + 'route' => 'administrator.pages.order.index', 'icon' => 'fas fa-shopping-cart', ], [ 'title' => 'Pending Orders', - 'route' => 'admin.order.index', + 'route' => 'administrator.pages.order.index', 'params' => ['status' => 'pending'], 'icon' => 'fas fa-shopping-cart', ], [ 'title' => 'Processing Orders', - 'route' => 'admin.order.index', + 'route' => 'administrator.pages.order.index', 'params' => ['status' => 'processing'], 'icon' => 'fas fa-cogs', ], [ 'title' => 'Active Orders', - 'route' => 'admin.order.index', + 'route' => 'administrator.pages.order.index', 'params' => ['status' => 'active'], 'icon' => 'fas fa-shopping-cart', ], [ 'title' => 'Cancel Orders', - 'route' => 'admin.order.index', + 'route' => 'administrator.pages.order.index', 'params' => ['status' => 'cancel'], 'icon' => 'fas fa-shopping-cart', ], [ 'title' => 'Add New Orders', - 'route' => 'admin.order.create', + 'route' => 'administrator.pages.order.create', 'icon' => 'fas fa-cart-plus', ], ], @@ -177,24 +177,24 @@ return [ 'children' => [ [ 'title' => 'View All Invoice', - 'route' => 'admin.invoice.index', + 'route' => 'administrator.pages.invoice.index', 'icon' => 'fas fa-file-invoice', ], [ 'title' => 'Pending Invoice', - 'route' => 'admin.invoice.index', + 'route' => 'administrator.pages.invoice.index', 'params' => ['status' => 'unpaid'], 'icon' => 'fas fa-file-invoice', ], [ 'title' => 'Paid Invoice', - 'route' => 'admin.invoice.index', + 'route' => 'administrator.pages.invoice.index', 'params' => ['status' => 'active'], 'icon' => 'fas fa-file-invoice', ], [ 'title' => 'Cancel Invoice', - 'route' => 'admin.invoice.index', + 'route' => 'administrator.pages.invoice.index', 'params' => ['status' => 'cancel'], 'icon' => 'fas fa-file-invoice', ], diff --git a/resources/views/administrator/home.blade.php b/resources/views/administrator/home.blade.php index e1a5e69..d379eda 100644 --- a/resources/views/administrator/home.blade.php +++ b/resources/views/administrator/home.blade.php @@ -29,7 +29,7 @@
Pending Orders
@@ -53,7 +53,7 @@
Invoices Pending
@@ -172,7 +172,7 @@
@if (count($orders) > 0) @foreach ($orders as $item) -
diff --git a/resources/views/administrator/pages/addon/edit.blade.php b/resources/views/administrator/pages/addon/edit.blade.php index c1e2a20..4f4614d 100644 --- a/resources/views/administrator/pages/addon/edit.blade.php +++ b/resources/views/administrator/pages/addon/edit.blade.php @@ -1,4 +1,4 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content")
diff --git a/resources/views/administrator/pages/addon/index.blade.php b/resources/views/administrator/pages/addon/index.blade.php index 6fb78f1..0ea7eb3 100644 --- a/resources/views/administrator/pages/addon/index.blade.php +++ b/resources/views/administrator/pages/addon/index.blade.php @@ -1,4 +1,4 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content")
diff --git a/resources/views/administrator/pages/coupon/add.blade.php b/resources/views/administrator/pages/coupon/add.blade.php index b251cef..7e7c5aa 100644 --- a/resources/views/administrator/pages/coupon/add.blade.php +++ b/resources/views/administrator/pages/coupon/add.blade.php @@ -1,4 +1,4 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("add coupon"))
diff --git a/resources/views/administrator/pages/coupon/edit.blade.php b/resources/views/administrator/pages/coupon/edit.blade.php index a740464..64f7c92 100644 --- a/resources/views/administrator/pages/coupon/edit.blade.php +++ b/resources/views/administrator/pages/coupon/edit.blade.php @@ -1,4 +1,4 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("add coupon"))
diff --git a/resources/views/administrator/pages/coupon/index.blade.php b/resources/views/administrator/pages/coupon/index.blade.php index e9ec5f9..010ca70 100644 --- a/resources/views/administrator/pages/coupon/index.blade.php +++ b/resources/views/administrator/pages/coupon/index.blade.php @@ -1,5 +1,5 @@ @php use App\Http\Helpers\Helper; @endphp -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can('manager coupon'))
diff --git a/resources/views/administrator/pages/customer/add.blade.php b/resources/views/administrator/pages/customer/add.blade.php index 0e002a4..3a2851d 100644 --- a/resources/views/administrator/pages/customer/add.blade.php +++ b/resources/views/administrator/pages/customer/add.blade.php @@ -1,4 +1,4 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("add customer"))
diff --git a/resources/views/administrator/pages/customer/addPay.blade.php b/resources/views/administrator/pages/customer/addPay.blade.php index 9c33f68..15326c3 100644 --- a/resources/views/administrator/pages/customer/addPay.blade.php +++ b/resources/views/administrator/pages/customer/addPay.blade.php @@ -1,9 +1,9 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("edit customer"))
- @include("admin.block.nav") + @include("administrator.pages.block.nav")
diff --git a/resources/views/administrator/pages/customer/console.blade.php b/resources/views/administrator/pages/customer/console.blade.php index b4730bd..ed20ea7 100644 --- a/resources/views/administrator/pages/customer/console.blade.php +++ b/resources/views/administrator/pages/customer/console.blade.php @@ -1,4 +1,4 @@ -@extends('admin.main') +@extends('administrator.layout.master') @push('style') diff --git a/resources/views/administrator/pages/customer/domain.blade.php b/resources/views/administrator/pages/customer/domain.blade.php index 2af4728..96c587f 100644 --- a/resources/views/administrator/pages/customer/domain.blade.php +++ b/resources/views/administrator/pages/customer/domain.blade.php @@ -1,9 +1,9 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("edit customer")) -@include('admin.customer.form.scripts.vps') +@include('administrator.pages.customer.form.scripts.vps') diff --git a/resources/views/administrator/pages/customer/index.blade.php b/resources/views/administrator/pages/customer/index.blade.php index 0844a2b..e7e00ca 100644 --- a/resources/views/administrator/pages/customer/index.blade.php +++ b/resources/views/administrator/pages/customer/index.blade.php @@ -1,4 +1,4 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("manager customer"))
diff --git a/resources/views/administrator/pages/customer/info.blade.php b/resources/views/administrator/pages/customer/info.blade.php index f919cc1..e04bdd6 100644 --- a/resources/views/administrator/pages/customer/info.blade.php +++ b/resources/views/administrator/pages/customer/info.blade.php @@ -1,9 +1,9 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("edit customer"))
- @include("admin.block.nav") + @include("administrator.pages.block.nav")
diff --git a/resources/views/administrator/pages/customer/invoice.blade.php b/resources/views/administrator/pages/customer/invoice.blade.php index 1d094b7..846ca7a 100644 --- a/resources/views/administrator/pages/customer/invoice.blade.php +++ b/resources/views/administrator/pages/customer/invoice.blade.php @@ -1,9 +1,9 @@ -@extends('admin.main') +@extends('administrator.layout.master') @section('content') @if (auth()->guard('admins')->user()->can('edit customer'))
- @include('admin.block.nav') + @include('administrator.pages.block.nav')
@@ -31,7 +31,7 @@
{{ $item->id }} + href="{{ route('administrator.pages.invoice.edit', ['id' => $item->id]) }}">{{ $item->id }} @time($item->date) diff --git a/resources/views/administrator/pages/customer/log.blade.php b/resources/views/administrator/pages/customer/log.blade.php index 1840f08..70c6466 100644 --- a/resources/views/administrator/pages/customer/log.blade.php +++ b/resources/views/administrator/pages/customer/log.blade.php @@ -1,9 +1,9 @@ -@extends('admin.main') +@extends('administrator.layout.master') @section('content') @if (auth()->guard('admins')->user()->can('edit customer'))
- @include('admin.block.nav') + @include('administrator.pages.block.nav')
diff --git a/resources/views/administrator/pages/customer/mail.blade.php b/resources/views/administrator/pages/customer/mail.blade.php index 2febd23..760c6c9 100644 --- a/resources/views/administrator/pages/customer/mail.blade.php +++ b/resources/views/administrator/pages/customer/mail.blade.php @@ -1,9 +1,9 @@ -@extends('admin.main') +@extends('administrator.layout.master') @section('content') @if (auth()->guard('admins')->user()->can('edit customer'))
- @include('admin.block.nav') + @include('administrator.pages.block.nav')
diff --git a/resources/views/administrator/pages/customer/product.blade.php b/resources/views/administrator/pages/customer/product.blade.php index 02e6c0c..7060923 100644 --- a/resources/views/administrator/pages/customer/product.blade.php +++ b/resources/views/administrator/pages/customer/product.blade.php @@ -1,19 +1,19 @@ -@extends("admin.main") +@extends("administrator.layout.master") @section("content") @if(auth()->guard('admins')->user()->can("edit customer"))
- @include("admin.block.nav") + @include("administrator.pages.block.nav")
@if($allService->count()) - @include("admin.customer.action.selector") + @include("administrator.pages.customer.action.selector") @if((int) $type === 3) - @include("admin.customer.form.hosting") + @include("administrator.pages.customer.form.hosting") @endif @if((int) $type === 4) - @include("admin.customer.form.vps") + @include("administrator.pages.customer.form.vps") @endif @else
diff --git a/resources/views/administrator/pages/invoice/edit.blade.php b/resources/views/administrator/pages/invoice/edit.blade.php index bf43095..8d95abf 100644 --- a/resources/views/administrator/pages/invoice/edit.blade.php +++ b/resources/views/administrator/pages/invoice/edit.blade.php @@ -1,4 +1,4 @@ -@extends('admin.main') +@extends('administrator.layout.master') @section('styles')