cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

registration ui fixes, and clean up header menu and footer

Browse Source
This commit is contained in:
omair saleh
2021-08-02 12:08:30 +08:00
parent ea9955c269
commit dfbfd04d31
15 changed files with 356 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
+4 -2
View File
@@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\RoleTypes;
use App\Models\Company;
use App\Models\CompanyModule;
use App\Models\User;
use Illuminate\Http\JsonResponse;
@@ -96,23 +97,24 @@ class CreateCustomerLogic extends AbstractControllerLogic
* @return JsonResponse
* @throws \App\Classes\Exceptions\AccessForbiddenException
* @throws \App\Classes\Exceptions\AccessUnauthorisedException
* @throws \App\Classes\Exceptions\InternalServerErrorException
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\RequestValidationException
*/
public function logic(Request $request): JsonResponse
{
/** @var User $user */
$user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
$user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
/** @var Company $company */
$company = $this->createCompanyProcessor->execute($request, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION);
$this->createContactProcessor->execute($request, $company);
/** @var CompanyModule $companyModule */
$companyModule = $this->createCompanyModuleProcessor->execute($company, $request->input('business_type'));
$Object = new EmploymentObject($companyModule, $user);
$this->assignEmployeeProcessor->execute($Object);
//$this->assignSegmentProcessor->execute($company);
app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php
+1
View File
@@ -55,6 +55,7 @@ class GeneratesAuthenticationToken {
/** @var Company $companyModule */
$companyModule = $user->companyModule()->first();
$order = $companyModule->orders->count();
$claims = [
app/Http/Controllers/Accounts/CreateCustomerController.php
+1 -1
View File
@@ -10,7 +10,7 @@ class CreateCustomerController
{
/**
* @param Request $request
* @param CreateCustomerLogic $logic
* @param CreateCustomerLogic $createCustomerLogic
* @return JsonResponse
*/
public function create(Request $request, CreateCustomerLogic $createCustomerLogic): JsonResponse
composer.json
+1 -1
View File
@@ -5,7 +5,7 @@
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"php": "^7.3",
"ext-fileinfo": "^7.3",
"ext-json": "^1.7",
"barryvdh/laravel-dompdf": "^0.9.0",
resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
+1 -1
View File
@@ -31,7 +31,7 @@
<div class="row m-t-15">
<div class="col text-center">
<div class="col">
<p>New Customer? <strong class=" m-b-0 pointer" @click="$store.dispatch('toggleSection', {name: 'registrationSection', status: true})">Create Account</strong></p>
<p>New Customer? <strong class=" m-b-0 pointer" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: true})">Create Account</strong></p>
</div>
</div>
</div>
resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+17 -17
View File
File diff suppressed because one or more lines are too long
resources/views/layouts/base.blade.php
+1 -1
View File
@@ -3,7 +3,7 @@
<head>
@include('vendor/head')
</head>
<body class="horizontal-menu horizontal-app-menu bg-master-lightest overflow-hidden">
<body class="horizontal-menu horizontal-app-menu bg-white overflow-hidden">
<div id="app" style="min-height: 100%;">
@yield('content')
</div>
resources/views/layouts/base_login.blade.php
+88 -1
View File
@@ -1,5 +1,92 @@
@extends('layouts.base')
@section('content')
@yield('inner_content')
<div class="fluid-container h-100">
<div class="row h-100">
<div class="col bg-white no-padding h-100">
<div class="row h-100 align-items-center justify-content-center">
<div class="col h-100">
<div class="page-container">
<div class="page-content-wrapper p-t-50 p-b-50 h-100">
<div class="row no-margin align-items-center justify-content-center h-100">
<div class="col">
<div class="content p-t-0 overflow-hidden">
@yield('inner_content')
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col d-none d-md-inline h-100 bg-info-primary-gradient" >
<div class="row h-100 align-items-center justify-content-center">
<div class="absolute hint-text dotted-grid" style="width: 250px; height: 142px; bottom: 0; right: 0; "></div>
<div class="absolute hint-text dotted-grid" style="width: 200px; height: 135px; top: 140px; left: 100px;"></div>
<div class="col-7">
<div class="carousel slide" data-ride="carousel">
<div class="carousel-inner">
<div class="row align-items-center justify-content-center">
<div class="col">
<div class="carousel-item active">
<div class="row">
<div class="col bg-white">
<div class="row justify-content-center">
<div class="col-8">
<img class="w-100" src="https://image.freepik.com/free-vector/transportation-parcel-carton-box-container-qr-code-closed-parcel-box-package-paper-box-package-service_257312-49.jpg" alt="">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col text-center text-white">
<h5 class="bold text-white">SKU-Level Accountability</h5>
<p class="fs-12">We make your business goals our own, working directly with your team. Our platform tracks shipment level activity and communication to give you complete accountability, across every stage of your supply chain down to the individual SKU.</p>
</div>
</div>
</div>
<div class="carousel-item">
<div class="row">
<div class="col bg-white">
<div class="row justify-content-center">
<div class="col-8">
<img class="w-100" src="https://image.freepik.com/free-vector/transportation-parcel-carton-box-container-qr-code-closed-parcel-box-package-paper-box-package-service_257312-49.jpg" alt="">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col text-center text-white">
<h5 class="bold text-white">SKU-Level Accountability</h5>
<p class="fs-12">We make your business goals our own, working directly with your team. Our platform tracks shipment level activity and communication to give you complete accountability, across every stage of your supply chain down to the individual SKU.</p>
</div>
</div>
</div>
<div class="carousel-item">
<div class="row">
<div class="col bg-white">
<div class="row justify-content-center">
<div class="col-8">
<img class="w-100" src="https://image.freepik.com/free-vector/transportation-parcel-carton-box-container-qr-code-closed-parcel-box-package-paper-box-package-service_257312-49.jpg" alt="">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col text-center text-white">
<h5 class="bold text-white">SKU-Level Accountability</h5>
<p class="fs-12">We make your business goals our own, working directly with your team. Our platform tracks shipment level activity and communication to give you complete accountability, across every stage of your supply chain down to the individual SKU.</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
resources/views/layouts/base_portal.blade.php
+19 -8
View File
@@ -1,15 +1,25 @@
@extends('layouts.base')
@section('content')
@include('partials.header')
@include('partials.menu')
<div class="page-container">
<div class="page-content-wrapper p-b-50" style="padding-top: 70px;">
<div class="content pt-md-auto pt-4">
<div class="container-fluid p-l-30 p-r-30 container-fixed-lg">
<div class="row no-margin">
<div class="col">
@yield('inner_content')
<div class="page-content-wrapper h-100">
<div class="row no-margin h-100">
<div class="col no-padding">
<div class="content no-padding overflow-hidden h-100">
<div class="container-fluid no-padding h-100">
<div class="row h-100 no-margin">
<div class="col-3 bg-master-lightest" >
@include('partials.menu')
</div>
<div class="col">
@include('partials.header')
<div class="row no-margin">
<div class="col">
@yield('inner_content')
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -17,4 +27,5 @@
@include('partials.footer')
</div>
</div>
@endsection
resources/views/pages/accounts/login.blade.php
+15 -87
View File
@@ -1,15 +1,15 @@
@extends('layouts.base_login')
@section('inner_content')
<div class="row h-100" v-show="!$store.getters.isShowing('registrationSection')">
<div class="col bg-white">
<div class="row h-100 no-margin align-items-center justify-content-center">
<div class="col-12 col-md-8" v-show="!$store.getters.isShowing('registrationForm')">
<div class="row m-b-30">
<div class="col-5">
<img class="w-75" src="https://www.izyim.com/images/logo.png" alt="">
</div>
</div>
<div class="row h-100 no-margin align-items-center justify-content-center">
<div class="col-10">
<div class="row m-b-50">
<div class="col-6 col-md-3 p-l-0">
<img class="w-100" src="https://www.izyim.com/images/logo.png" alt="">
</div>
</div>
<div class="row" v-show="!$store.getters.isShowing('registrationForm')">
<div class="col">
<div class="row" v-show="!$store.getters.isShowing('forgetPassword')">
<div class="col">
<loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
@@ -56,88 +56,16 @@
</div>
</div>
</div>
</div>
<div class="col h-100 bg-info-primary-gradient" >
<div class="row h-100 align-items-center justify-content-center">
<div class="absolute hint-text dotted-grid" style="width: 250px; height: 142px; bottom: 0; right: 0; "></div>
<div class="absolute hint-text dotted-grid" style="width: 200px; height: 135px; top: 140px; left: 100px;"></div>
<div class="col-7">
<div class="carousel slide" data-ride="carousel">
<div class="carousel-inner">
<div class="row align-items-center justify-content-center">
<div class="col">
<div class="carousel-item active">
<div class="row">
<div class="col bg-white">
<div class="row justify-content-center">
<div class="col-8">
<img class="w-100" src="https://image.freepik.com/free-vector/transportation-parcel-carton-box-container-qr-code-closed-parcel-box-package-paper-box-package-service_257312-49.jpg" alt="">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col text-center text-white">
<h5 class="bold text-white">SKU-Level Accountability</h5>
<p class="fs-12">We make your business goals our own, working directly with your team. Our platform tracks shipment level activity and communication to give you complete accountability, across every stage of your supply chain down to the individual SKU.</p>
</div>
</div>
</div>
<div class="carousel-item">
<div class="row">
<div class="col bg-white">
<div class="row justify-content-center">
<div class="col-8">
<img class="w-100" src="https://image.freepik.com/free-vector/transportation-parcel-carton-box-container-qr-code-closed-parcel-box-package-paper-box-package-service_257312-49.jpg" alt="">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col text-center text-white">
<h5 class="bold text-white">SKU-Level Accountability</h5>
<p class="fs-12">We make your business goals our own, working directly with your team. Our platform tracks shipment level activity and communication to give you complete accountability, across every stage of your supply chain down to the individual SKU.</p>
</div>
</div>
</div>
<div class="carousel-item">
<div class="row">
<div class="col bg-white">
<div class="row justify-content-center">
<div class="col-8">
<img class="w-100" src="https://image.freepik.com/free-vector/transportation-parcel-carton-box-container-qr-code-closed-parcel-box-package-paper-box-package-service_257312-49.jpg" alt="">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col text-center text-white">
<h5 class="bold text-white">SKU-Level Accountability</h5>
<p class="fs-12">We make your business goals our own, working directly with your team. Our platform tracks shipment level activity and communication to give you complete accountability, across every stage of your supply chain down to the individual SKU.</p>
</div>
</div>
</div>
</div>
</div>
<div class="row" v-show="$store.getters.isShowing('registrationForm')">
<div class="col">
<loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('registrationSection')"></loading-component>
<div class="row justify-content-center" v-show="!$store.getters.isLoading('registrationSection')">
<div class="col">
<registration-form-component section="registrationSection"></registration-form-component>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row h-100" v-show="$store.getters.isShowing('registrationSection')">
<div class="col">
<div class="row h-100 no-margin align-items-center justify-content-center">
<div class="col-12 col-md-8">
<loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
<div class="row justify-content-center" v-show="!$store.getters.isLoading('loginSection')">
<div class="col-8">
<registration-section-component section="loginSection"></registration-section-component>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
resources/views/pages/dashboards/index.blade.php
+89 -2
View File
@@ -1,5 +1,92 @@
@extends('layouts.base_portal')
@section('inner_content')
@include('pages.dashboards.admin')
@include('pages.dashboards.customer')
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
<h1>TEWTASE</h1>
@endsection
resources/views/partials/footer.blade.php
+1 -1
View File
@@ -1,5 +1,5 @@
<!-- START COPYRIGHT -->
<div class="footer bg-white">
<div class="bg-white b-t b-grey fixed-bottom">
<div class="container-fluid">
<div class="row no-margin">
<div class="col p-l-0 p-t-20 p-b-20 sm-text-center">
resources/views/partials/header.blade.php
+10 -12
View File
@@ -1,12 +1,10 @@
<div class="d-flex flex-column align-items-end navbar navbar-dark bg-light flex-md-nowrap p-0 shadow">
<button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-toggle="collapse"
data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<ul class="navbar-nav px-3">
<li class="nav-item text-nowrap">
<log-out-form-component></log-out-form-component>
</li>
</ul>
</div>
<div class="row bg-white b-b b-grey align-items-center justify-content-center">
<div class="col p-l-50 p-r-50">
<div class="row align-items-center justify-content-center">
<div class="col"></div>
<div class="col-auto">
<log-out-form-component></log-out-form-component>
</div>
</div>
</div>
</div>
resources/views/partials/menu.blade.php
+107 -11
View File
File diff suppressed because one or more lines are too long
routes/account.php
+1 -3
View File
@@ -4,9 +4,7 @@ use Illuminate\Support\Facades\Route;
Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account.'], function () {
Route::group(['prefix' => 'registration', 'as' => 'registration.'], function () {
Route::post('/registration', 'CreateCustomerController@create')->name('register');
});
Route::post('/registration', 'CreateCustomerController@create')->name('registration.register');
Route::group(['prefix' => 'authentication', 'as' => 'authentication.'], function () {
Route::group(['prefix' => 'login', 'as' => 'authenticate.'], function () {