评论功能基本完成

This commit is contained in:
yafeilee 2014-03-30 22:14:59 +08:00
parent 152e300268
commit cfdcf69742
20 changed files with 120 additions and 50 deletions

View File

@ -23,6 +23,7 @@ gem "mini_magick"
gem 'carrierwave-mongoid'
gem 'html_truncator'
gem 'nokogiri'
gem 'angularjs-rails'
group :development do
gem 'quiet_assets'

View File

@ -0,0 +1,10 @@
#= require angular
#= require angular-resource
#= require_self
#= require_tree ./angularjs
@app = angular.module('app', [])
@app.config(["$httpProvider", (provider) ->
provider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
])

View File

@ -0,0 +1,25 @@
@app.controller 'CommentsController', ($scope, $http, $location, $timeout)->
url = $location.absUrl() + "/comments"
$http.get(url).success (data)->
console.log data
$scope.comments = data
$scope.publish_success = null
$scope.submit = ->
comment = { content: $scope.content, name: $scope.name, email: $scope.email }
$http.post(url, comment)
.success (res)->
if res.success
$scope.publish_success = true
$scope.content = ''
$scope.comments.unshift(res.data)
else
$scope.publish_success = false
$timeout ->
$scope.publish_success = null
, 3*1000
.error (data)->
alert(data)

View File

@ -1,6 +1,7 @@
//= require jquery
//= require jquery_ujs
//= require foundation
//= require angularjs
//= require 'jquery.html5-fileupload'
//= require_tree .

View File

@ -1,10 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
$(document).ready ->
$('.pagination').click ->
l = window.location.pathname
page = $(this).attr('data-page')
window.location= l + "?page=#{page}"
false

View File

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

View File

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

View File

@ -48,3 +48,11 @@
border-bottom: 1px dashed #8a8a8a;
}
}
.comment-success {
color: #66FAB5;
}
.comment-fail {
color: #FF7A7A;
}

View File

@ -0,0 +1,37 @@
class CommentsController < ApplicationController
layout false
helper_method :format_time
def index
@post = Post.find( params[:blog_id] )
res = @post.comments.desc(:created_at).collect { |comment| build_json(comment) }
render :json => res
end
def create
@post = Post.find( params[:blog_id] )
comment = Comment.new(comment_params)
comment.post = @post
if comment.save
render :json=> { success: true, data: build_json(comment) }
else
render :json=> { success: false }
end
end
private
def comment_params
params.permit(:content, :name, :email)
end
def format_time(time)
time.strftime("%Y-%m-%d %H:%M")
end
def build_json(comment)
{
content: comment.content,
name: comment.name,
'created_at' => format_time(comment.created_at)
}
end
end

View File

@ -1,5 +0,0 @@
module BlogsHelper
def format_time(time)
time.strftime("%Y-%m-%d %H:%M")
end
end

View File

@ -1,2 +0,0 @@
module HomeHelper
end

View File

@ -1,2 +0,0 @@
module PhotosHelper
end

View File

@ -11,4 +11,5 @@ class Comment
validates :name, presence: true
validates :email, confirmation: true,:format => /@/
validates :content, presence: true
validates_presence_of :post_id
end

View File

@ -1,18 +1,21 @@
.row
.small-12.large-12.columns
= text_area_tag(:content, nil, placeholder: '发表你的看法')
.row
.small-12.large-6.columns
= text_field_tag(:name, nil, placeholder: '你的名字')
= text_field_tag(:email, nil, placeholder: '你的邮箱')
button 发表
.comment-diag
p.name
| WinDy •
span.created-at 2014-2-12 13:00
p.comment-content 写的好!!
p.name
| WinDy •
span.created-at 2014-2-12 13:00
p.comment-content 写的好!!
.row ng-app="app" ng-controller="CommentsController"
.small-12.large-8.columns
form
.row
.small-12.large-12.columns
= text_area_tag(:content, nil, placeholder: '发表你的看法', 'ng-model'=> 'content')
.row
.small-12.large-6.columns
= text_field_tag(:name, nil, placeholder: '你的名字', 'ng-model'=> 'name')
= text_field_tag(:email, nil, placeholder: '你的邮箱', 'ng-model'=> 'email', 'ng-pattern'=>"/@/", 'ng-required'=>"true")
button ng-click="submit()" ng-disabled="form.$invalid" 发表
p.comment-success ng-show="publish_success" 发布成功
p.comment-fail ng-show="publish_success == false" 发布失败
.comment-diag
.comment-wrapper ng-repeat=" comment in comments "
p.name
|{{ comment.name + " • " }}
span.created-at
|{{ comment.created_at }}
p.comment-content
|{{ comment.content }}

View File

@ -2,9 +2,7 @@
.small-12.large-8.columns
= render partial: "post", :locals=> { :post=> @post }
.comment-field
.row
.small-12.large-8.columns
= render partial: 'comment', locals: { comments: @comments }
= render partial: 'comment', locals: { comments: @comments, post: @post }
.row
.small-12.large-8.columns
- if @prev

View File

@ -0,0 +1,2 @@
h1 Comments#create
p Find me in app/views/comments/create.html.slim

View File

@ -0,0 +1,2 @@
h1 Comments#index
p Find me in app/views/comments/index.html.slim

View File

@ -4,8 +4,10 @@ WBlog::Application.routes.draw do
collection do
get :rss
end
resources :comments, only: [:index, :create]
end
resources :archives
# photos
resources :photos, :only=>[:create]

View File

@ -0,0 +1,5 @@
require 'spec_helper'
describe CommentsController do
end

View File

@ -2,13 +2,13 @@ require 'spec_helper'
describe Comment do
it 'test comment' do
a = Comment.new(name: '1',content: '2432423',email: '22@.com')
a = Comment.new(name: '1',content: '2432423',email: '22@.com', post_id: 1)
a.save.should == true
b = Comment.new(content: '2432ddd423',email: '22@.com')
b = Comment.new(content: '2432ddd423',email: '22@.com', post_id: 1)
b.save.should == false
b = Comment.new(name: '2', email: '22@.com')
b = Comment.new(name: '2', email: '22@.com', post_id: 1)
b.save.should == false
b = Comment.new(name: '2', content: '2432ddd423',email: '22.com')
b = Comment.new(name: '2', content: '2432ddd423',email: '22.com', post_id: 1)
b.save.should == false
end
end