From a2e16193aa285c79fd5b66aa1b8d29a5a0a44638 Mon Sep 17 00:00:00 2001 From: weichien00 Date: Fri, 23 Jul 2021 23:44:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20resolve=20merge=20issue.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accounts/forms/LogOutFormComponent.vue | 63 +++ .../mixins/accounts/checkEmailHandler.js | 23 + .../registrationCheckEmailValidation.js | 13 + resources/views/layouts/base_login.blade.php | 12 +- .../views/pages/dashboards/admin.blade.php | 461 ++++++++++++++++++ .../views/pages/dashboards/customer.blade.php | 5 + .../views/pages/dashboards/index.blade.php | 5 + resources/views/partials/footer.blade.php | 11 + resources/views/partials/header.blade.php | 90 ++++ 9 files changed, 672 insertions(+), 11 deletions(-) create mode 100644 resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue create mode 100644 resources/assets/vue/general/mixins/accounts/checkEmailHandler.js create mode 100644 resources/assets/vue/general/mixins/accounts/validation/registrationCheckEmailValidation.js create mode 100644 resources/views/pages/dashboards/admin.blade.php create mode 100644 resources/views/pages/dashboards/customer.blade.php create mode 100644 resources/views/pages/dashboards/index.blade.php create mode 100644 resources/views/partials/footer.blade.php create mode 100644 resources/views/partials/header.blade.php diff --git a/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue new file mode 100644 index 00000000..b32d8912 --- /dev/null +++ b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue @@ -0,0 +1,63 @@ + + \ No newline at end of file diff --git a/resources/assets/vue/general/mixins/accounts/checkEmailHandler.js b/resources/assets/vue/general/mixins/accounts/checkEmailHandler.js new file mode 100644 index 00000000..8be23185 --- /dev/null +++ b/resources/assets/vue/general/mixins/accounts/checkEmailHandler.js @@ -0,0 +1,23 @@ +import errorMessageHandler from "../errorMessageHandler"; +import formHandler from "../formHandler"; + +export default { + methods: { + successHandler(response){ + this.formHandler(''); + this.status = { + message:response.message, + error:false + } + }, + errorHandler(error){ + this.formHandler(error.message); + this.status = { + message:"", + error:true + } + } + }, + mixins: [errorMessageHandler, formHandler] + +} \ No newline at end of file diff --git a/resources/assets/vue/general/mixins/accounts/validation/registrationCheckEmailValidation.js b/resources/assets/vue/general/mixins/accounts/validation/registrationCheckEmailValidation.js new file mode 100644 index 00000000..04e80ac2 --- /dev/null +++ b/resources/assets/vue/general/mixins/accounts/validation/registrationCheckEmailValidation.js @@ -0,0 +1,13 @@ +import { required, email } from "vuelidate/lib/validators"; +import checkEmailHandler from '../checkEmailHandler' +export default { + validations: { + parameters: { + email: { + required, + email + }, + } + }, + mixins: [checkEmailHandler] +} \ No newline at end of file diff --git a/resources/views/layouts/base_login.blade.php b/resources/views/layouts/base_login.blade.php index bf877528..b189d212 100644 --- a/resources/views/layouts/base_login.blade.php +++ b/resources/views/layouts/base_login.blade.php @@ -1,15 +1,5 @@ @extends('layouts.base') @section('content') -
- -
+ @yield('inner_content') @endsection \ No newline at end of file diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php new file mode 100644 index 00000000..71944a13 --- /dev/null +++ b/resources/views/pages/dashboards/admin.blade.php @@ -0,0 +1,461 @@ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Payments
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Supplier Bills
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
    +
  • +
    • +
+
+
+
+
+

webarch

+

Today's sales

+
+

+ MYR + 102,967 +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
Purchase CODE #2345 + Qty 1 + + 27 RM +
+
+
+
+
+
+
+
+
+
+
+ {{----}} + {{----}} + {{----}} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Currency Orders
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Payment Proof
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Purchase Orders
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+ Pending Verification +
+
+
+
+ + + +
+
+
+
+
+
+
+
+ Pending Submission +
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1.5810
+
+
+
+
+
- 0.0% +
+
+
+
+
+
+
+
RMB
+
+
+
USD
+
+
+
SGD
+
+
+
+
+
+
+
+
+
+
+
+
+
Customer Verification
+
+
+ +
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/resources/views/pages/dashboards/customer.blade.php b/resources/views/pages/dashboards/customer.blade.php new file mode 100644 index 00000000..c5e842c2 --- /dev/null +++ b/resources/views/pages/dashboards/customer.blade.php @@ -0,0 +1,5 @@ +
+
+ +
+
\ No newline at end of file diff --git a/resources/views/pages/dashboards/index.blade.php b/resources/views/pages/dashboards/index.blade.php new file mode 100644 index 00000000..496640e4 --- /dev/null +++ b/resources/views/pages/dashboards/index.blade.php @@ -0,0 +1,5 @@ +@extends('layouts.base_portal') +@section('inner_content') + @include('pages.dashboards.admin') + @include('pages.dashboards.customer') +@endsection \ No newline at end of file diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php new file mode 100644 index 00000000..0a705893 --- /dev/null +++ b/resources/views/partials/footer.blade.php @@ -0,0 +1,11 @@ + +
+
+
+
+ Copyright © 2021 CIEF IZYIM. All rights reserved. +
+
+
+
+ \ No newline at end of file diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php new file mode 100644 index 00000000..cc2ccd7d --- /dev/null +++ b/resources/views/partials/header.blade.php @@ -0,0 +1,90 @@ +
+
+
+
+
+
+ +
+
+
+
+ {{-- logo --}} +
+
+
+
+
Shipping Management
+
+
+ +
+
+
+
+
+
+
Dashboard
 +
+ {{--
+ +
Payments & Billing
+ +
+
+ +
Transfers
+ +
+
+ +
Urgent List
+ +
+
+
Bank Accounts
 +
--}} +
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
Hi, !
+
+
+
+ +
+
+
+
+
+ {{-- +
+
+ +
+
+ --}} +
+
+ +
+
+
+
+
+
+
+
\ No newline at end of file