diff --git a/resources/views/layout/footer.blade.php b/resources/views/Admin/layout/footer.blade.php similarity index 100% rename from resources/views/layout/footer.blade.php rename to resources/views/Admin/layout/footer.blade.php diff --git a/resources/views/layout/header.blade.php b/resources/views/Admin/layout/header.blade.php similarity index 100% rename from resources/views/layout/header.blade.php rename to resources/views/Admin/layout/header.blade.php diff --git a/resources/views/Admin/layout/main.blade.php b/resources/views/Admin/layout/main.blade.php new file mode 100644 index 00000000..b31cf25c --- /dev/null +++ b/resources/views/Admin/layout/main.blade.php @@ -0,0 +1,106 @@ + + + + + + + + + REKBER + + + + + + + + + + + + + + + + + + + + + + + +
+ @include('Admin.layout.header') +
+ +
+ @include('Admin.layout.sidebar') + @yield('content') +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/layout/sidebar.blade.php b/resources/views/Admin/layout/sidebar.blade.php similarity index 100% rename from resources/views/layout/sidebar.blade.php rename to resources/views/Admin/layout/sidebar.blade.php diff --git a/resources/views/profile/index.blade.php b/resources/views/Admin/profile/index.blade.php similarity index 99% rename from resources/views/profile/index.blade.php rename to resources/views/Admin/profile/index.blade.php index e0634d02..9d9c70c8 100644 --- a/resources/views/profile/index.blade.php +++ b/resources/views/Admin/profile/index.blade.php @@ -1,4 +1,4 @@ -@extends('layout.main') +@extends('Admin.layout.main') @section('content')
diff --git a/resources/views/refund/detail-refund.blade.php b/resources/views/Admin/refund/detail-refund.blade.php similarity index 97% rename from resources/views/refund/detail-refund.blade.php rename to resources/views/Admin/refund/detail-refund.blade.php index 6907b997..27fc4a62 100644 --- a/resources/views/refund/detail-refund.blade.php +++ b/resources/views/Admin/refund/detail-refund.blade.php @@ -1,5 +1,4 @@ -@extends('layout.main') - +@extends('Admin.layout.main') @section('content')
@@ -47,5 +46,5 @@
- @include('refund.next-detail-refund') + @include('Admin.refund.next-detail-refund') @endsection diff --git a/resources/views/refund/history-refund.blade.php b/resources/views/Admin/refund/history-refund.blade.php similarity index 99% rename from resources/views/refund/history-refund.blade.php rename to resources/views/Admin/refund/history-refund.blade.php index 97930212..ab5ab076 100644 --- a/resources/views/refund/history-refund.blade.php +++ b/resources/views/Admin/refund/history-refund.blade.php @@ -1,4 +1,4 @@ -@extends('layout.main') +@extends('Admin.layout.main') @section('content')
diff --git a/resources/views/refund/next-detail-refund.blade.php b/resources/views/Admin/refund/next-detail-refund.blade.php similarity index 100% rename from resources/views/refund/next-detail-refund.blade.php rename to resources/views/Admin/refund/next-detail-refund.blade.php diff --git a/resources/views/transaction/Detail_History_Transaction.blade.php b/resources/views/Admin/transaction/Detail_History_Transaction.blade.php similarity index 100% rename from resources/views/transaction/Detail_History_Transaction.blade.php rename to resources/views/Admin/transaction/Detail_History_Transaction.blade.php diff --git a/resources/views/transaction/History_Transaction.blade.php b/resources/views/Admin/transaction/History_Transaction.blade.php similarity index 98% rename from resources/views/transaction/History_Transaction.blade.php rename to resources/views/Admin/transaction/History_Transaction.blade.php index 8bf88502..7e69c01c 100644 --- a/resources/views/transaction/History_Transaction.blade.php +++ b/resources/views/Admin/transaction/History_Transaction.blade.php @@ -1,4 +1,4 @@ -@extends('layout.main') +@extends('Admin.layout.main') @section('content')
@@ -100,5 +100,5 @@
- @include('transaction.Tracking') + @include('Admin.transaction.Tracking') @endsection diff --git a/resources/views/transaction/Tracking.blade.php b/resources/views/Admin/transaction/Tracking.blade.php similarity index 100% rename from resources/views/transaction/Tracking.blade.php rename to resources/views/Admin/transaction/Tracking.blade.php diff --git a/resources/views/transaction/detail-transaction.blade.php b/resources/views/Admin/transaction/detail-transaction.blade.php similarity index 99% rename from resources/views/transaction/detail-transaction.blade.php rename to resources/views/Admin/transaction/detail-transaction.blade.php index 307ce1cb..dd01c3d3 100644 --- a/resources/views/transaction/detail-transaction.blade.php +++ b/resources/views/Admin/transaction/detail-transaction.blade.php @@ -1,4 +1,4 @@ -@extends('layout.main') +@extends('Admin.layout.main') @section('content')
diff --git a/resources/views/users/detail-user.blade.php b/resources/views/Admin/users/detail-user.blade.php similarity index 99% rename from resources/views/users/detail-user.blade.php rename to resources/views/Admin/users/detail-user.blade.php index 78ca8102..d54e6104 100644 --- a/resources/views/users/detail-user.blade.php +++ b/resources/views/Admin/users/detail-user.blade.php @@ -1,4 +1,4 @@ -@extends('layout.main') +@extends('Admin.layout.main') @section('content')
diff --git a/resources/views/users/list-user.blade.php b/resources/views/Admin/users/list-user.blade.php similarity index 99% rename from resources/views/users/list-user.blade.php rename to resources/views/Admin/users/list-user.blade.php index df9f0019..862a2ed9 100644 --- a/resources/views/users/list-user.blade.php +++ b/resources/views/Admin/users/list-user.blade.php @@ -1,4 +1,4 @@ -@extends('layout.main') +@extends('Admin.layout.main') @section('content')
diff --git a/resources/views/User/index.blade.php b/resources/views/User/index.blade.php new file mode 100644 index 00000000..0e849e84 --- /dev/null +++ b/resources/views/User/index.blade.php @@ -0,0 +1,182 @@ +@extends('User.layout.main') +@section('content') + +
+
+
+
+
+
+
List Transaction - +
+ August + +
+
+
+
+
114
+
Success
+
+
+
12
+
Pending
+
+
+
23
+
Canceled
+
+
+
+
+ +
+
+
+

Total Transaction

+
+
+ 159 +
+
+
+
+
+
+
+ +
+
+ +
+
+
+

Total Refund

+
+
+ 100 +
+
+
+
+
+
+
+ +
+
+ +
+
+
+

Total user

+
+
+ 100
+
+
+
+
+
+
+
+
+

INCOME

+
+
+ +
+
+
+ +
+
+
+

History Transaction

+
+
+
+ Show: + + entries +
+
+
+
+ +
+ +
+
+
+
+
+
+
+ + + + + + + + + + + @foreach ($transaction as $transactions) + + + + + + + + + + @endforeach +
Order IDCustomerSellerTotalDue DateStatusAction
{{ $transactions['orderId'] }}{{ $transactions['customer'] }}{{ $transactions['seller'] }}{{ $transactions['total'] }}{{ $transactions['date'] }} +
{{ $transactions['status'] }}
+ 		+
+ +
+ Details + Tracking + Delete +
+
+
+
+
+
+
+
+
+
+ @include('Admin.transaction.Tracking') +@endsection diff --git a/resources/views/User/layout/footer.blade.php b/resources/views/User/layout/footer.blade.php new file mode 100644 index 00000000..fbbd0cd5 --- /dev/null +++ b/resources/views/User/layout/footer.blade.php @@ -0,0 +1,8 @@ +
+
+ Copyright © 2020
Design By Template +
+
+ +
+
diff --git a/resources/views/User/layout/header.blade.php b/resources/views/User/layout/header.blade.php new file mode 100644 index 00000000..2092a0f2 --- /dev/null +++ b/resources/views/User/layout/header.blade.php @@ -0,0 +1,161 @@ +
+ diff --git a/resources/views/layout/main.blade.php b/resources/views/User/layout/main.blade.php similarity index 96% rename from resources/views/layout/main.blade.php rename to resources/views/User/layout/main.blade.php index b7394d72..d471a94a 100644 --- a/resources/views/layout/main.blade.php +++ b/resources/views/User/layout/main.blade.php @@ -68,16 +68,16 @@
- @include('layout.header') + @include('User.layout.header')
- @include('layout.sidebar') + @include('User.layout.sidebar') @yield('content')
- @include('layout.footer') + @include('User.layout.footer')
diff --git a/resources/views/User/layout/sidebar.blade.php b/resources/views/User/layout/sidebar.blade.php new file mode 100644 index 00000000..0654e1c6 --- /dev/null +++ b/resources/views/User/layout/sidebar.blade.php @@ -0,0 +1,36 @@ +
+ +
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 1425e9e8..08d783d0 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -1,4 +1,4 @@ -@extends('layout.main') +@extends('Admin.layout.main') @section('content')
@@ -178,5 +178,5 @@
- @include('transaction.Tracking') + @include('Admin.transaction.Tracking') @endsection diff --git a/resources/views/transaction/List_Transaction.blade.php b/resources/views/transaction/List_Transaction.blade.php deleted file mode 100644 index 09ca946f..00000000 --- a/resources/views/transaction/List_Transaction.blade.php +++ /dev/null @@ -1,93 +0,0 @@ -@extends('layout.main') - -@section('content') -
-
-
-
-
-

List Transaction

-
-
-
- Show: - - entries -
-
-
-
- -
- -
-
-
-
-
-
-
- - - - - - - - - - - @foreach ($transaction as $transactions) - - - - - - - - - - @endforeach -
Order IDCustomerSellerTotalDue DateStatusAction
{{ $transactions['orderId'] }}{{ $transactions['customer'] }}{{ $transactions['seller'] }}{{ $transactions['total'] }}{{ $transactions['date'] }} -
{{ $transactions['status'] }}
- 		- - -
-
-
-
- -
-
-
-
-
-
-
-
-
-@endsection diff --git a/routes/web.php b/routes/web.php index 151e6f9c..435abea5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -22,55 +22,63 @@ Route::get('/', function () { ]); }); Route::get('/detail_transaction', function () { - return view('transaction/detail-transaction',[ + return view('Admin/transaction/detail-transaction',[ 'name'=>'Jilhan Haura', // "transaction"=> transaction::allTransactions() ]); }); Route::get('/history_transaction', function () { - return view('transaction/History_Transaction',[ + return view('Admin/transaction/History_Transaction',[ 'name'=>'Jilhan Haura', "transaction"=> transaction::allTransactions() ]); }); Route::get('/tracking_transaction', function () { - return view('transaction/Tracking',[ + return view('Admin/transaction/Tracking',[ 'name'=>'Jilhan Haura', "detail_transaction"=> transaction::allDetailTransactions() ]); }); Route::get('/history_refund', function () { - return view('refund/history-refund',[ + return view('Admin/refund/history-refund',[ 'name'=>'Jilhan Haura', "history_refund" => Refund::HistoryRefund() ]); }); Route::get('/detail_refund',function() { - return view('refund/detail-refund',[ + return view('Admin/refund/detail-refund',[ 'name'=>'Jilhan Haura', "detail_refund"=> Refund::DetailRefund() ]); }); Route::get('/next_detail_refund',function() { - return view('refund/next-detail-refund',[ + return view('Admin/refund/next-detail-refund',[ 'name'=>"Jilhan Haura" ]); }); Route::get('/list_user',function() { - return view('users/list-user',[ + return view('Admin/users/list-user',[ 'name'=>"Jilhan Haura", "list_users" => Users::listUsers() ]); }); Route::get('/detail-user',function() { - return view('users/detail-user',[ + return view('Admin/users/detail-user',[ 'name'=>"Jilhan Haura", // "list_users" => Users::listUsers() ]); }); Route::get('/profile',function() { - return view('profile/index',[ + return view('Admin/profile/index',[ 'name'=>"Jilhan Haura", // "list_users" => Users::listUsers() ]); -}); \ No newline at end of file +}); + + +Route::get('/User', function () { + return view('User/index',[ + 'name'=>'Jilhan Haura', + "transaction"=>transaction::allTransactions() + ]); +});