Skip to content

Commit a8a6002

Browse files
insannurjamaninsannurjaman
authored
Merge branch 'master' into master
2 parents a44c0c6 + 0804ab6 commit a8a6002

File tree

8 files changed

+217
-70
lines changed

8 files changed

+217
-70
lines changed

‎app/Http/Controllers/ProfileController.php‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,28 @@
33
namespace App\Http\Controllers;
44

55
use Illuminate\Http\Request;
6-
6+
use Illuminate\Support\Facades\DB;
7+
use Illuminate\Support\Facades\Auth;
78
class ProfileController extends Controller
89
{
910
public function index(){
10-
return view('profile');
11+
if (Auth::user())
12+
{
13+
$name=Auth::user()->name;
14+
$user=DB::table('users')
15+
->join('posts', 'users.id', '=', 'posts.user_id')
16+
->join('tempat_wisatas', 'tempat_wisatas.id', '=', 'posts.wisata_id')
17+
->join('kategoris','kategoris.id','=','tempat_wisatas.id_kategori')
18+
->join('kotas','kotas.id','=','tempat_wisatas.id_kota')
19+
->select('users.*','posts.*','kategoris.*','kotas.*','tempat_wisatas.*')
20+
->where('users.name','=',$name)
21+
->get();
22+
23+
$count=DB::table('users')
24+
->join('posts', 'users.id', '=', 'posts.user_id')
25+
->where('users.name','=',$name)
26+
->count();
27+
return view('profile', compact('user','count'));
28+
}
1129
}
1230
}

‎database/factories/UserFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'name' => $faker->name,
1919
'email' => $faker->unique()->safeEmail,
2020
'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
21-
'point' => $faker->randomNumber,
21+
// 'point' => $faker->randomNumber,
2222
'remember_token' => str_random(10),
2323
];
2424
});

‎database/migrations/2014_10_12_000000_create_users_table.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function up()
1818
$table->string('name');
1919
$table->string('email')->unique();
2020
$table->string('password');
21-
$table->integer('point')->default(0);
21+
//$table->integer('point')->default(0);
2222
$table->rememberToken();
2323
$table->timestamps();
2424
});

‎public/images/foto.jpg‎

16.6 KB
Loading

‎resources/views/layouts/app.blade.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
background : #4831af;
3030
position : fixed;
3131
width : 100%;
32+
3233
z-index:3;
3334
}
3435
.red.navbar-brand{
@@ -95,10 +96,13 @@
9596

9697
<i class="sign out alternate icon"></i> {{ __('Logout') }}
9798
</a>
99+
98100
<a class="dropdown-item" href="{{ route('logout') }}"
99101
onclick="event.preventDefault();
100102
document.getElementById('logout-form').submit();">
101103
<i class="user icon"></i> {{ __('Profile') }}
104+
<a class="dropdown-item" href="{{ url('/profile') }}">
105+
102106
</a>
103107

104108
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">

‎resources/views/profile.blade.php‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
5+
<title></title>
6+
</head>
7+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.3.1/semantic.css">
8+
<scrip src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.3.1/semantic.js"/>
9+
<body>
10+
<div class="ui grid" style="margin-top: 43px">
11+
12+
<div class="four wide column" style="background-color: white">
13+
14+
<div class="ui centered card">
15+
<div class="image">
16+
<img src="/images/foto.jpg">
17+
</div>
18+
<div class="content">
19+
<a class="header">{{ Auth::user()->name }}</a>
20+
21+
<div class="post">
22+
<div class="ui blue button">
23+
<i class="pointing icon"></i> Point
24+
</div>
25+
<a class="ui basic left pointing blue label">
26+
{{$count}}
27+
</a>
28+
</div>
29+
<div class="post">
30+
<div class="ui button">
31+
<i class="pointing icon"></i> Post
32+
</div>
33+
<a class="ui basic left pointing blue label">
34+
{{$count}}
35+
</a>
36+
</div>
37+
38+
</div>
39+
</div>
40+
41+
</div>
42+
43+
44+
<div class="twelve wide column" style="background-color: grey">
45+
46+
<div class="ui centered card" style="width: 600px">
47+
<div class="content">
48+
<div class="right floated meta">14h</div>
49+
<img class="ui avatar image" src="/images/avatar/large/elliot.jpg"> Elliot
50+
</div>
51+
<div class="image">
52+
<img>
53+
</div>
54+
<div class="content">
55+
<span class="right floated">
56+
<i class="heart outline like icon"></i>
57+
17 likes
58+
</span>
59+
<i class="comment icon"></i>
60+
3 comments
61+
</div>
62+
<div class="extra content">
63+
<div class="ui large transparent left icon input">
64+
<i class="heart outline icon"></i>
65+
<input type="text" placeholder="Add Comment...">
66+
</div>
67+
</div>
68+
</div>
69+
70+
<div class="ui centered card" style="width: 600px">
71+
<div class="content">
72+
<div class="right floated meta">14h</div>
73+
<img class="ui avatar image" src="/images/avatar/large/elliot.jpg"> Elliot
74+
</div>
75+
<div class="image">
76+
<img>
77+
</div>
78+
<div class="content">
79+
<span class="right floated">
80+
<i class="heart outline like icon"></i>
81+
17 likes
82+
</span>
83+
<i class="comment icon"></i>
84+
3 comments
85+
</div>
86+
<div class="extra content">
87+
<div class="ui large transparent left icon input">
88+
<i class="heart outline icon"></i>
89+
<input type="text" placeholder="Add Comment...">
90+
</div>
91+
</div>
92+
</div>
93+
<div class="ui centered card" style="width: 600px">
94+
<div class="content">
95+
<div class="right floated meta">14h</div>
96+
<img class="ui avatar image" src="/images/avatar/large/elliot.jpg"> Elliot
97+
</div>
98+
<div class="image">
99+
<img>
100+
</div>
101+
<div class="content">
102+
<span class="right floated">
103+
<i class="heart outline like icon"></i>
104+
17 likes
105+
</span>
106+
<i class="comment icon"></i>
107+
3 comments
108+
</div>
109+
<div class="extra content">
110+
<div class="ui large transparent left icon input">
111+
<i class="heart outline icon"></i>
112+
<input type="text" placeholder="Add Comment...">
113+
</div>
114+
</div>
115+
</div>
116+
<div class="ui centered card" style="width: 600px">
117+
<div class="content">
118+
<div class="right floated meta">14h</div>
119+
<img class="ui avatar image" src="/images/avatar/large/elliot.jpg"> Elliot
120+
</div>
121+
<div class="image">
122+
<img>
123+
</div>
124+
<div class="content">
125+
<span class="right floated">
126+
<i class="heart outline like icon"></i>
127+
17 likes
128+
</span>
129+
<i class="comment icon"></i>
130+
3 comments
131+
</div>
132+
<div class="extra content">
133+
<div class="ui large transparent left icon input">
134+
<i class="heart outline icon"></i>
135+
<input type="text" placeholder="Add Comment...">
136+
</div>
137+
</div>
138+
</div>
139+
140+
@foreach ($user as $out)
141+
<div class="ui centered card">
142+
<div class="content">
143+
<span class="floated meta">{{$out->nama_tempat_wisata}}</span>
144+
<div class="right floated meta">{{$out->nama_kota}}</div>
145+
<br>
146+
<img class="ui avatar image" src="{{asset($out->image) }}"> {{$out->name }}
147+
</div>
148+
<div class="image" >
149+
<img src="{{asset($out->image) }}">
150+
</div>
151+
<div class="content">
152+
<span class="right floated">
153+
<i class="heart outline like icon"></i>
154+
{{$out->like}} likes
155+
</span>
156+
157+
</div>
158+
<div class="extra content">
159+
<div class="ui large transparent left icon input">
160+
161+
<div class="description">
162+
{{$out->caption}}
163+
</div>
164+
</div>
165+
</div>
166+
</div>
167+
168+
@endforeach
169+
170+
171+
172+
</div>
173+
174+
175+
176+
</body>
177+
178+
179+
</html>
180+
@endsection

resources/views/layouts/profile.blade.php renamed to resources/views/profile.blade.php~HEAD

Lines changed: 10 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,10 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
5-
<title></title>
6-
</head>
1+
@extends('layouts.app')
2+
@section('content')
73
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.3.1/semantic.css">
84
<scrip src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.3.1/semantic.js"/>
95
<body style="background-color: #CFCCCC">
106
<div class="ui grid container">
11-
<div class="sixteen wide column" style="background-color: #D0B9B9">
12-
<h1 style="font-family: courier">KUY JALAN</h1>
13-
</div>
14-
<div class="sixteen wide column" style="background-color: #EEDEDE">
15-
<div class="ui secondary menu">
16-
<a class="active item">
17-
Profile
18-
</a>
19-
<a class="item">
20-
Messages
21-
</a>
22-
<a class="item">
23-
Friends
24-
</a>
25-
<div class="right menu">
26-
<div class="item">
27-
<div class="ui icon input">
28-
<input type="text" placeholder="Search...">
29-
<i class="search link icon"></i>
30-
</div>
31-
</div>
32-
<a class="ui item">
33-
Logout
34-
</a>
35-
</div>
36-
</div>
37-
</div>
7+
388
<div class="sixteen wide column">
399
<div class="ui items">
4010
<div class="item">
@@ -55,40 +25,15 @@
5525
</a>
5626
</div>
5727

58-
<button class="ui green button">Follow</button>
59-
</div>
60-
<div class="detail">
61-
<div class="ui left labeled button" tabindex="0">
62-
<a class="ui basic right pointing label">
63-
198
64-
</a>
65-
<div class="ui button">
66-
Post
28+
<div class="post">
29+
<div class="ui button">
30+
<i class="pointing icon"></i> Post
6731
</div>
68-
</div>
69-
<div class="ui left labeled button" tabindex="0">
70-
<a class="ui basic right pointing label">
71-
2,048
72-
</a>
73-
<div class="ui button">
74-
Followers
75-
</div>
76-
</div>
77-
<div class="ui left labeled button" tabindex="0">
78-
<a class="ui basic right pointing label">
79-
1,098
32+
<a class="ui basic left pointing blue label">
33+
189
8034
</a>
81-
<div class="ui button">
82-
Following
83-
</div>
8435
</div>
85-
</div>
86-
<div class="description">
87-
<p></p>
88-
</div>
89-
</div>
90-
</div>
91-
</div>
36+
9237
</div>
9338
<div class="sixteen wide column">
9439
<div class="ui three stackable cards">
@@ -127,4 +72,4 @@
12772
<div class="sixteen wide column"></div>
12873
</div>
12974
</body>
130-
</html>
75+
@endsection

‎routes/web.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
Auth::routes();
2020
Route::get('/home', 'HomeController@index')->name('home');
21-
Route::get('/profile', 'PostController@index');
21+
Route::get('/profile', 'ProfileController@index');
2222
Route::get('/comment', 'CommentController@index');
2323

2424
Auth::routes();

0 commit comments

Comments
 (0)