From af170d20dc3a2e8f1eee0296baa4ac071e2ffae5 Mon Sep 17 00:00:00 2001 From: Jullian Chavez Date: Tue, 14 Mar 2017 13:10:29 -0700 Subject: [PATCH 1/5] Adding home controller --- controllers/Home.php | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/controllers/Home.php b/controllers/Home.php index 139f6cfe..8f255e1b 100644 --- a/controllers/Home.php +++ b/controllers/Home.php @@ -3,9 +3,33 @@ namespace Latchel; use Controller; +use Post; +use User; +use Comment; class HomeController extends Controller{ public function index(){ - return view('template'); + $posts = $this->getPosts('home'); + + return view('template', ['posts' = $posts]); + } + + public static function getPosts($slug){ + $posts = Post::where('slug', '=', $slug)->get(); + + foreach($posts as &$post){ + $post->user = User::find($post->user_id); + } + + foreach($posts as &$post){ + $post->comments = Comment::where('post_id', '=', $post->post_id)->get(); + + foreach($post->comments as &$comment){ + $comment->user = User::find($comment->user_id); + } + } + + return $posts; } + } \ No newline at end of file From 74d080fb0b2dfbf77ac0a4a67beba4013e52c053 Mon Sep 17 00:00:00 2001 From: Jullian Chavez Date: Tue, 14 Mar 2017 13:20:26 -0700 Subject: [PATCH 2/5] Adding blade template changes --- public/template.blade.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/public/template.blade.php b/public/template.blade.php index c58124ea..17cb7925 100644 --- a/public/template.blade.php +++ b/public/template.blade.php @@ -12,6 +12,17 @@ +
+ +
+ + + html?> + + +
+ +
From 15eadeebcd32cfa0bea47f634b2fb60a471e81ee Mon Sep 17 00:00:00 2001 From: Jullian Chavez Date: Tue, 14 Mar 2017 13:22:15 -0700 Subject: [PATCH 3/5] Adding angular directive for content post --- public/assets/js/app.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 2c56c50f..00423b21 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -1 +1,23 @@ -angular.module('CodeReviewApp', []); \ No newline at end of file +angular.module('CodeReviewApp', []) + .directive('post', [function(){ + return { + restrict: 'A', + replace: true, + transclude: true, + template: '' + + '
{{username}}
' + + '
' + + '', + scope: { + postid: '@', + username: '@' + }, + controller: ['$scope', function($scope){ + $scope.collapsed = true; + + $scope.toggleCollapse = function(){ + $scope.collapsed = !$scope.collapsed; + }; + }] + } + }]); From ffa264ef35928f0ba6cccb93ed7087c182a7d48f Mon Sep 17 00:00:00 2001 From: Jullian Chavez Date: Tue, 14 Mar 2017 13:23:08 -0700 Subject: [PATCH 4/5] Adding SCSS for post directive --- public/assets/scss/app.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/public/assets/scss/app.scss b/public/assets/scss/app.scss index e69de29b..fb76b79f 100644 --- a/public/assets/scss/app.scss +++ b/public/assets/scss/app.scss @@ -0,0 +1,10 @@ +.post{ + max-height: 10000px; + overflow: hidden; + border: 1px solid $light-grey; + border-radius: 4px; + + &--collapsed{ + max-height: 0px; + } +} From 5488b86e6b178da5a55b830c102764cd6b5e2da2 Mon Sep 17 00:00:00 2001 From: Jullian Chavez Date: Tue, 14 Mar 2017 15:39:42 -0700 Subject: [PATCH 5/5] Adding transition for post collapse --- public/assets/scss/app.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/scss/app.scss b/public/assets/scss/app.scss index fb76b79f..7bdb7f8f 100644 --- a/public/assets/scss/app.scss +++ b/public/assets/scss/app.scss @@ -1,7 +1,7 @@ .post{ - max-height: 10000px; + transition: max-height 0.4s; + max-height: none; overflow: hidden; - border: 1px solid $light-grey; border-radius: 4px; &--collapsed{