Skip to content

Commit a44c0c6

Browse files
committed
percantik home part 1
2 parents 36c2378 + e5b5491 commit a44c0c6

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

public/images/facebook.png

6.47 KB
Loading

public/images/kuyjalan.png

8.43 KB
Loading

public/images/logo.jpg

78.8 KB
Loading

resources/views/index.blade.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@section('content')
33
<div style="margin-top: 50px;">
44

5+
<<<<<<< HEAD
56
@foreach ($output as $out)
67
<div class="ui centered card">
78
<div class="content">
@@ -12,16 +13,34 @@
1213
</div>
1314
<div class="image" >
1415
<img src="{{asset($out->image) }}">
16+
=======
17+
<p>{{$post->caption}}</p>
18+
<img src="{{ $post->default }}" alt="" srcset="">
19+
<br>
20+
21+
<div class="ui card">
22+
<div class="content">
23+
<div class="right floated meta">14h</div>
24+
<img class="ui avatar image" src="/public/images/logo.jpg"> Elliot
25+
</div>
26+
<div class="image">
27+
<img src="/public/images/logo.jpg">
28+
>>>>>>> e5b5491e17e7197ad9f697df9f0335109406162b
1529
</div>
1630
<div class="content">
1731
<span class="right floated">
1832
<i class="heart outline like icon"></i>
33+
<<<<<<< HEAD
1934
{{$out->like}} likes
35+
=======
36+
17 likes
37+
>>>>>>> e5b5491e17e7197ad9f697df9f0335109406162b
2038
</span>
2139

2240
</div>
2341
<div class="extra content">
2442
<div class="ui large transparent left icon input">
43+
<<<<<<< HEAD
2544

2645
<div class="description">
2746
{{$out->caption}}
@@ -30,6 +49,13 @@
3049
</div>
3150
</div>
3251

52+
=======
53+
<i class="heart outline icon"></i>
54+
<input placeholder="Add Comment..." type="text">
55+
</div>
56+
</div>
57+
</div>
58+
>>>>>>> e5b5491e17e7197ad9f697df9f0335109406162b
3359
@endforeach
3460

3561
</div>

0 commit comments

Comments
 (0)