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

Merge branch 'new-signup' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development

Browse Source
This commit is contained in:
edmondlang
2022-04-30 21:08:29 +08:00
parent 3329028860 cd7ee3afb3
commit fee73f7708
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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: 'registrationForm', status: true})">Create Account</strong></p>
<p>New Customer? <strong class=" m-b-0 pointer"><a class="text-master" :href="route('signup')">Create Account</a></strong></p>
</div>
</div>
</div>
resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+2 -2
View File
@@ -156,14 +156,14 @@
</div>
<div class="row">
<div class="col-auto">
<button type="button" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none" @click="$store.dispatch('toggleSection', {name: 'registrationForm', status: false})">
<a :href="route('login')" class="btn btn-sm p-t-10 p-b-10 btn-default bg-master-lighter b-rad-none">
<div class="row align-items-center">
<div class="col-auto p-r-10">
<i class="fa fa-angle-left fs-16" style="margin-top: 1px;"></i>
</div>
<div class="col p-l-5">I already have an account</div>
</div>
</button>
</a>
</div>
<div class="col text-right">
<button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-primary b-rad-none p-r-30" @click="changeStep('next')">
resources/assets/vue/general/mixins/guards.js
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ export default {
(this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = [7, 8].includes(this.$store.getters.getCompanyModuleType) ? this.route('last_mile_delivery.dashboard') : this.route('dashboard') : '';
},
isProtectedRoute(){
const unprotectedRoutes = [this.route('login'), this.route('account.email.verification'), this.route('company.claim'), this.route('last_mile_delivery.login')];
const unprotectedRoutes = [this.route('login'), this.route('signup'), this.route('account.email.verification'), this.route('company.claim'), this.route('last_mile_delivery.login')];
if(window.location.href.indexOf(this.route('company.claim')) === 0) {
return false;
}
resources/views/pages/accounts/sign_up.blade.php
+24
View File
@@ -0,0 +1,24 @@
{{-- seperate signup page form login page for marketing crm --}}
@extends('layouts.base_login')
@section('inner_content')
<div class="row h-100 no-margin align-items-center justify-content-center">
<div class="col col-md-10">
<div class="row m-b-50">
<div class="col-8 col-md-6">
<img class="w-100" src="{{asset('images/cief-izyim-logo.png')}}" alt="">
</div>
</div>
<div class="row">
<div class="col">
<loading-component style="height: 350px;" key="1" color="primary" v-show="$store.getters.isLoading('loginSection')"></loading-component>
<div class="row justify-content-center">
<div class="col">
<registration-form-component section="loginSection"></registration-form-component>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
routes/web.php
+5
View File
@@ -59,6 +59,11 @@ Route::get('', function () {
return view('pages.accounts.login');
})->name('login');
Route::get('/signup', function () {
return view('pages.accounts.sign_up');
})->name('signup');
Route::group(['prefix' => 'swagger'], function () {
Route::get('/', function () {
return view('swagger.index');