From 3e2bf7a1cc0ca3ce7954720bd9f702d299d43054 Mon Sep 17 00:00:00 2001
From: Eric Ouyang <contact@ericouyang.com>
Date: Fri, 7 Nov 2014 14:54:43 -0500
Subject: [PATCH 1/7] update completed example

---
 .../2014_11_07_155735_create_posts_table.php  |  2 +-
 app/models/Comment.php                        |  1 +
 app/models/Post.php                           | 14 +++++++++++
 app/routes.php                                | 16 ++++++-------
 app/views/blog/partials/post.blade.php        |  5 ++--
 app/views/blog/view.blade.php                 | 24 ++++++++++++-------
 6 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/app/database/migrations/2014_11_07_155735_create_posts_table.php b/app/database/migrations/2014_11_07_155735_create_posts_table.php
index 36dd8d9..df38eb8 100644
--- a/app/database/migrations/2014_11_07_155735_create_posts_table.php
+++ b/app/database/migrations/2014_11_07_155735_create_posts_table.php
@@ -28,7 +28,7 @@ public function up()
    */
   public function down()
   {
-    Schema::drop('users');
+    Schema::drop('posts');
   }
 
 }
diff --git a/app/models/Comment.php b/app/models/Comment.php
index 434ae92..94e4be7 100644
--- a/app/models/Comment.php
+++ b/app/models/Comment.php
@@ -2,6 +2,7 @@
 
 class Comment extends Eloquent {
 
+  // many-to-one relationship with the Post model
   public function post()
   {
       return $this->belongsTo('Post');
diff --git a/app/models/Post.php b/app/models/Post.php
index 26aa602..e2b0d4f 100644
--- a/app/models/Post.php
+++ b/app/models/Post.php
@@ -2,14 +2,28 @@
 
 class Post extends Eloquent {
 
+  // one-to-many relationship with the Comment model
   public function comments()
   {
       return $this->hasMany('Comment');
   }
 
+  // helper function to get the URL of a post
   public function getURL()
   {
     return URL::action('viewPost', array('id' => $this->id));
   }
 
+  // helper function to get a string of the number of comments
+  public function getNumCommentsStr()
+  {
+    $num = $this->comments()->count();
+
+    if ($num == 1)
+    {
+      return '1 comment';
+    }
+
+    return $num . ' comments';
+  }
 }
diff --git a/app/routes.php b/app/routes.php
index 7a9c042..ca72451 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -15,21 +15,21 @@
 
 // routes for the blog
 Route::get('/post/new', array(
-	'as' => 'newPost',
-	'uses' => 'BlogController@newPost'
+  'as' => 'newPost',
+  'uses' => 'BlogController@newPost'
 ));
 
 Route::post('/post/new', array(
-	'as' => 'createPost',
-	'uses' => 'BlogController@createPost'
+  'as' => 'createPost',
+  'uses' => 'BlogController@createPost'
 ));
 
 Route::get('/post/{id}', array(
-	'as' => 'viewPost',
-	'uses' => 'BlogController@viewPost'
+  'as' => 'viewPost',
+  'uses' => 'BlogController@viewPost'
 ));
 
 Route::post('/post/{id}/comment', array(
-	'as' => 'createComment',
-	'uses' => 'BlogController@createComment'
+  'as' => 'createComment',
+  'uses' => 'BlogController@createComment'
 ));
diff --git a/app/views/blog/partials/post.blade.php b/app/views/blog/partials/post.blade.php
index 814a2d3..125a457 100644
--- a/app/views/blog/partials/post.blade.php
+++ b/app/views/blog/partials/post.blade.php
@@ -13,7 +13,8 @@
       {{ str_limit($post->content, 430) }}
     @endif
   </div>
-  <footer>
-    <p class="text-muted">Posted {{ $post->created_at->diffForHumans() }}</p>
+  <footer class="text-muted">
+    <p>Posted {{ $post->created_at->diffForHumans() }}</p>
+    <p><a href="{{ $post->getURL(); }}#comments">{{ $post->getNumCommentsStr() }}</a></p>
   </footer>
 </article>
diff --git a/app/views/blog/view.blade.php b/app/views/blog/view.blade.php
index a9d6249..2b8c8db 100644
--- a/app/views/blog/view.blade.php
+++ b/app/views/blog/view.blade.php
@@ -3,16 +3,22 @@
 
   <hr />
 
-  <section>
-    <h3 class="page-title">Comments</h3>
-    @foreach ($post->comments as $comment)
-      <div class="comment">
-        <p><strong>{{ $comment->name }} says...</strong></p>
-        <blockquote>{{ $comment->content }}</blockquote>
-      </div>
-    @endforeach
+  <section id="comments">
+    <h3 class="title">Comments</h3>
+    @if (count($post->comments) === 0)
+      <p>No comments yet on this post.</p>
+    @else
+      @foreach ($post->comments as $comment)
+        <div class="comment">
+          <p><strong>{{ $comment->name }} says...</strong></p>
+          <blockquote>{{ $comment->content }}</blockquote>
+        </div>
+      @endforeach
+    @endif
+  </section>
 
-    <p class="lead">Add a comment</p>
+  <section>
+    <h3 class="title">Add a comment</h3>
     <form action="{{ URL::route('createComment', array('id' => $post->id)) }}" method="post">
       <div class="form-group">
         <input name="name" class="form-control" type="text" placeholder="Your name" />

From 6ad62cd37ca35d5e55926d0fa55c9d29b742e593 Mon Sep 17 00:00:00 2001
From: Eric Ouyang <contact@ericouyang.com>
Date: Fri, 7 Nov 2014 14:54:51 -0500
Subject: [PATCH 2/7] tweak css

---
 public/css/style.css | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index f72a66c..fb03081 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1,5 +1,6 @@
+/* General style tweaks */
 body {
-  padding: 50px 0;
+  padding-top: 50px;
 }
 
 @media (min-width: 768px) {
@@ -20,6 +21,15 @@ h1 a:hover {
   text-decoration: none;
 }
 
+section {
+  margin-bottom: 50px;
+}
+
+section .title {
+  margin-bottom: 20px;
+}
+
+/* Post specific styling */
 article, .comment {
   margin-bottom: 50px;
 }
@@ -28,8 +38,12 @@ article header {
   padding-bottom: 10px;
 }
 
+article header h1 {
+  font-size: 26px;
+}
+
 article footer {
-  padding: 10px 0;
+  padding-top: 20px;
 }
 
 article .content {

From 927313038c6adf17d161a8505a5476844d2d0604 Mon Sep 17 00:00:00 2001
From: Eric Ouyang <contact@ericouyang.com>
Date: Fri, 7 Nov 2014 17:19:12 -0500
Subject: [PATCH 3/7] fix indentation

---
 app/controllers/BlogController.php            | 113 +++++++++---------
 .../2014_11_07_155735_create_posts_table.php  |   8 +-
 ...014_11_07_170248_create_comments_table.php |  16 +--
 app/models/Comment.php                        |   2 +-
 app/models/Post.php                           |   2 +-
 5 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/app/controllers/BlogController.php b/app/controllers/BlogController.php
index 421be11..114b662 100644
--- a/app/controllers/BlogController.php
+++ b/app/controllers/BlogController.php
@@ -2,60 +2,61 @@
 
 class BlogController extends BaseController {
 
-    // set this controller's layout
-    protected $layout = 'layouts.master';
-
-    public function index()
-    {
-        $this->layout->content = View::make('blog.index', array(
-          'posts' => Post::all()
-        ));
-    }
-
-    // display a blog post creation form
-    public function newPost()
-    {
-        $this->layout->content = View::make('blog.new');
-    }
-
-    // create a post that has been POSTed to the server
-    public function createPost()
-    {
-      // get the post
-      $post = new Post();
-      $post->title = Input::get('title');
-      $post->content = nl2br(Input::get('content'));
-      $post->save();
-
-      return Redirect::route('viewPost', array('id' => $post->id));
-    }
-
-    // view a post by id
-    public function viewPost($id)
-    {
-      // get the post
-      $post = Post::findOrFail($id);
-
-      $this->layout->content = View::make('blog.view', array(
-        'post' => $post
-      ));
-    }
-
-    // create a comment for a given post
-    public function createComment($id)
-    {
-      // get the post that the user commented on
-      $post = Post::findOrFail($id);
-
-      // create a new comment
-      $comment = new Comment();
-      $comment->name = Input::get('name');
-      $comment->content = nl2br(Input::get('content'));
-
-      // save the comment with a relation to the post
-      $post->comments()->save($comment);
-
-      // go back to the post
-      return Redirect::route('viewPost', array('id' => $post->id));
-    }
+  // set this controller's layout
+  protected $layout = 'layouts.master';
+
+  // homepage controller
+  public function index()
+  {
+    $this->layout->content = View::make('blog.index', array(
+      'posts' => Post::all()
+    ));
+  }
+
+  // display a blog post creation form
+  public function newPost()
+  {
+    $this->layout->content = View::make('blog.new');
+  }
+
+  // create a post that has been POSTed to the server
+  public function createPost()
+  {
+    // get the post
+    $post = new Post();
+    $post->title = Input::get('title');
+    $post->content = nl2br(Input::get('content'));
+    $post->save();
+
+    return Redirect::route('viewPost', array('id' => $post->id));
+  }
+
+  // view a post by id
+  public function viewPost($id)
+  {
+    // get the post
+    $post = Post::findOrFail($id);
+
+    $this->layout->content = View::make('blog.view', array(
+      'post' => $post
+    ));
+  }
+
+  // create a comment for a given post
+  public function createComment($id)
+  {
+    // get the post that the user commented on
+    $post = Post::findOrFail($id);
+
+    // create a new comment
+    $comment = new Comment();
+    $comment->name = Input::get('name');
+    $comment->content = nl2br(Input::get('content'));
+
+    // save the comment with a relation to the post
+    $post->comments()->save($comment);
+
+    // go back to the post
+    return Redirect::route('viewPost', array('id' => $post->id));
+  }
 }
diff --git a/app/database/migrations/2014_11_07_155735_create_posts_table.php b/app/database/migrations/2014_11_07_155735_create_posts_table.php
index df38eb8..814f87b 100644
--- a/app/database/migrations/2014_11_07_155735_create_posts_table.php
+++ b/app/database/migrations/2014_11_07_155735_create_posts_table.php
@@ -14,10 +14,10 @@ public function up()
   {
     Schema::create('posts', function($table)
     {
-        $table->increments('id');
-        $table->string('title');
-        $table->text('content');
-        $table->timestamps();
+      $table->increments('id');
+      $table->string('title');
+      $table->text('content');
+      $table->timestamps();
     });
   }
 
diff --git a/app/database/migrations/2014_11_07_170248_create_comments_table.php b/app/database/migrations/2014_11_07_170248_create_comments_table.php
index a386328..0a88a33 100644
--- a/app/database/migrations/2014_11_07_170248_create_comments_table.php
+++ b/app/database/migrations/2014_11_07_170248_create_comments_table.php
@@ -14,14 +14,14 @@ public function up()
   {
     Schema::create('comments', function($table)
     {
-        $table->increments('id');
-        $table->string('name');
-        $table->text('content');
-        $table->integer('post_id')->unsigned();
-        $table->foreign('post_id')
-              ->references('id')->on('posts')
-              ->onDelete('cascade');
-        $table->timestamps();
+      $table->increments('id');
+      $table->string('name');
+      $table->text('content');
+      $table->integer('post_id')->unsigned();
+      $table->foreign('post_id')
+            ->references('id')->on('posts')
+            ->onDelete('cascade');
+      $table->timestamps();
     });
   }
 
diff --git a/app/models/Comment.php b/app/models/Comment.php
index 94e4be7..65c7827 100644
--- a/app/models/Comment.php
+++ b/app/models/Comment.php
@@ -5,7 +5,7 @@ class Comment extends Eloquent {
   // many-to-one relationship with the Post model
   public function post()
   {
-      return $this->belongsTo('Post');
+    return $this->belongsTo('Post');
   }
 
 }
diff --git a/app/models/Post.php b/app/models/Post.php
index e2b0d4f..ec76430 100644
--- a/app/models/Post.php
+++ b/app/models/Post.php
@@ -5,7 +5,7 @@ class Post extends Eloquent {
   // one-to-many relationship with the Comment model
   public function comments()
   {
-      return $this->hasMany('Comment');
+    return $this->hasMany('Comment');
   }
 
   // helper function to get the URL of a post

From f70bfed970aa96af78cc0c7603466d7e03c68d70 Mon Sep 17 00:00:00 2001
From: Eric Ouyang <contact@ericouyang.com>
Date: Fri, 7 Nov 2014 17:38:16 -0500
Subject: [PATCH 4/7] add example instructions

---
 readme.md | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/readme.md b/readme.md
index 40ea7ee..9c4dc4d 100644
--- a/readme.md
+++ b/readme.md
@@ -1,25 +1,34 @@
-## Laravel PHP Framework
+## Blog50
 
-[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework)
-[![Total Downloads](https://poser.pugx.org/laravel/framework/downloads.svg)](https://packagist.org/packages/laravel/framework)
-[![Latest Stable Version](https://poser.pugx.org/laravel/framework/v/stable.svg)](https://packagist.org/packages/laravel/framework)
-[![Latest Unstable Version](https://poser.pugx.org/laravel/framework/v/unstable.svg)](https://packagist.org/packages/laravel/framework)
-[![License](https://poser.pugx.org/laravel/framework/license.svg)](https://packagist.org/packages/laravel/framework)
+This is a simple Laravel app for a blog website to demonstrate key features of this web framework
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, and caching.
+It is recommended that you run this example on the CS50 Appliance
 
-Laravel aims to make the development process a pleasing one for the developer without sacrificing application functionality. Happy developers make the best code. To this end, we've attempted to combine the very best of what we have seen in other web frameworks, including frameworks implemented in other languages, such as Ruby on Rails, ASP.NET MVC, and Sinatra.
+### Setup
 
-Laravel is accessible, yet powerful, providing powerful tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked.
+1. Install composer (for dependency management)
 
-## Official Documentation
+`curl -sS https://getcomposer.org/installer | php`
+`sudo mv composer.phar /usr/local/bin/composer`
 
-Documentation for the entire framework can be found on the [Laravel website](http://laravel.com/docs).
+2. Download the repository.
 
-### Contributing To Laravel
+Distribution code: `git clone https://github.com/ericouyang/blog50.git`
 
-**All issues and pull requests should be filed on the [laravel/framework](http://github.com/laravel/framework) repository.**
+Completed example: `git clone -b completed https://github.com/ericouyang/blog50.git`
 
-### License
+3. Navigate into the new `blog50` folder and install dependencies
 
-The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
+`composer install`
+
+4. If you're running the completed example, you need to create the database called `blog50` and then run
+
+`php artisan migrate`
+
+5. Run the server using
+
+`php artisan serve`
+
+6. Go to this in your browser
+
+`http://localhost:8000`

From 18330675b7173885ccbf5b4bd5d984a7186c68b8 Mon Sep 17 00:00:00 2001
From: Eric Ouyang <contact@ericouyang.com>
Date: Fri, 7 Nov 2014 17:39:03 -0500
Subject: [PATCH 5/7] update readme

---
 readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/readme.md b/readme.md
index 9c4dc4d..b326bfa 100644
--- a/readme.md
+++ b/readme.md
@@ -2,6 +2,8 @@
 
 This is a simple Laravel app for a blog website to demonstrate key features of this web framework
 
+Companion slides:
+
 It is recommended that you run this example on the CS50 Appliance
 
 ### Setup
@@ -9,6 +11,7 @@ It is recommended that you run this example on the CS50 Appliance
 1. Install composer (for dependency management)
 
 `curl -sS https://getcomposer.org/installer | php`
+
 `sudo mv composer.phar /usr/local/bin/composer`
 
 2. Download the repository.

From 1a192a77d33a12a2840cd821990452fd3c69a366 Mon Sep 17 00:00:00 2001
From: Eric Ouyang <contact@ericouyang.com>
Date: Fri, 7 Nov 2014 17:40:59 -0500
Subject: [PATCH 6/7] add slides link

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index b326bfa..7d22083 100644
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,7 @@
 
 This is a simple Laravel app for a blog website to demonstrate key features of this web framework
 
-Companion slides:
+Companion slides: https://www.dropbox.com/s/nmi8sryhnl8voqo/eouyang_cs50_laravel-seminar_slides.pdf?dl=0
 
 It is recommended that you run this example on the CS50 Appliance
 

From fa8523316f9febed1728751f0182983134538693 Mon Sep 17 00:00:00 2001
From: Eric Ouyang <contact@ericouyang.com>
Date: Fri, 7 Nov 2014 17:45:15 -0500
Subject: [PATCH 7/7] remove extra file

---
 CONTRIBUTING.md | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 6a780c4..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Contribution Guidelines
-
-Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!