From 1b5112bcf6be671793c07107e92d61d199005fb9 Mon Sep 17 00:00:00 2001
From: NiraRamadhani <13516018@std.stei.itb.ac.id>
Date: Sun, 10 Feb 2019 16:38:27 +0700
Subject: [PATCH] color scheme done
---
.../Controllers/UserPegawaiController.php | 40 +++++++++++++++++++
database/seeds/UsersTableSeeder.php | 1 +
public/js/app.js | 12 ++++--
resources/assets/js/components/AdminPage.vue | 2 +-
.../views/layout-profile/master.blade.php | 5 ++-
routes/api.php | 1 +
6 files changed, 54 insertions(+), 7 deletions(-)
create mode 100644 app/Http/Controllers/UserPegawaiController.php
diff --git a/app/Http/Controllers/UserPegawaiController.php b/app/Http/Controllers/UserPegawaiController.php
new file mode 100644
index 0000000..a940b11
--- /dev/null
+++ b/app/Http/Controllers/UserPegawaiController.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\APIBaseController as APIBaseController;
+use App\User;
+use App\Pegawai;
+use Carbon\Carbon;
+use Excel;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Storage;
+use Intervention\Image\ImageManagerStatic as Image;
+use Validator;
+
+
+class UserPegawaiController extends APIBaseController
+{
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function show($id)
+ {
+ $post = userpegawai::find($id);
+
+ if (is_null($post)) {
+ return $this->sendError('User not found.');
+ }
+
+
+ return $this->sendResponse($post->toArray(), 'User retrieved successfully.');
+ }
+
+}
\ No newline at end of file
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
index 9a89a52..717be66 100644
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeds/UsersTableSeeder.php
@@ -15,5 +15,6 @@ class UsersTableSeeder extends Seeder
factory(App\Admin::class, 10)->create();
factory(App\PMO::class, 10)->create();
factory(App\Pegawai::class, 80)->create();
+ factory(App\userpegawai::class, 80)->create();
}
}
diff --git a/public/js/app.js b/public/js/app.js
index 6b40658..0e550ec 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -68541,7 +68541,8 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
title: 'Data User',
columns: [],
rows: [],
- dataUser: []
+ dataUser: [],
+ dataPegawai: []
};
},
@@ -68551,16 +68552,19 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
var url = '/pages/admin/adduser';
window.location.href = url;
}
+
},
created: function created() {
var _this = this;
- __WEBPACK_IMPORTED_MODULE_0_axios___default.a.get('/api/user').then(function (response) {
- _this.dataUser = response.data.data;
+ axios.all([axios.get('/api/user'), axios.get('/api/pegawai')])
+ .then(axios.spread(function (response1, response2) {
+ _this.dataUser = response1.data.data;
+ _this.dataPegawai = response2.data.data;
_this.columns = _this.$options.dataUserColumns;
_this.rows = _this.dataUser;
- }).catch(function (e) {
+ })).catch(function (e) {
_this.errors.push(e);
});
}
diff --git a/resources/assets/js/components/AdminPage.vue b/resources/assets/js/components/AdminPage.vue
index 9f3668d..e273b68 100644
--- a/resources/assets/js/components/AdminPage.vue
+++ b/resources/assets/js/components/AdminPage.vue
@@ -52,7 +52,7 @@
},
created: function() {
- axios.get('/api/user')
+ axios.get('/api/userpegawai')
.then(response => {
this.dataUser = response.data.data;
this.columns = this.$options.dataUserColumns;
diff --git a/resources/views/layout-profile/master.blade.php b/resources/views/layout-profile/master.blade.php
index 338ddb3..6b71c83 100644
--- a/resources/views/layout-profile/master.blade.php
+++ b/resources/views/layout-profile/master.blade.php
@@ -8,11 +8,12 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Profile Page</title>
- <link href="/css/profile.css" rel="stylesheet">
- <link href="/css/app.css" rel="stylesheet">
+
<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css"
integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
+ <link href="/css/profile.css" rel="stylesheet">
+ <link href="/css/app.css" rel="stylesheet">
{{-- icon --}}
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" integrity="sha384-+d0P83n9kaQMCwj8F4RJB66tzIwOKmrdb46+porD/OvrJ+37WqIM7UoBtwHO6Nlg" crossorigin="anonymous">
diff --git a/routes/api.php b/routes/api.php
index b2ada0e..ccad17d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -49,3 +49,4 @@ Route::resource('riwayat', 'RiwayatController');
Route::resource('sertifikat', 'SertifikatController');
+Route::resource('userpegawai', 'UserPegawaiController');
\ No newline at end of file
--
GitLab