notee 0.3.5 → 0.3.6

data/app/controllers/notee/categories_controller.rb

@@ -11,7 +11,6 @@ module Notee
     end
 
     def show
-      p @category
       render json: { status: 'success', category: @category}
     end
 

data/app/controllers/notee/comments_controller.rb

@@ -0,0 +1,29 @@
+require_dependency "notee/application_controller"
+
+module Notee
+  class CommentsController < ApplicationController
+
+    def show
+      @comments = Comment.where(post_id: params[:id]);
+      render json: { status: 'success', comments: @comments}
+    end
+
+    # POST /comments
+    def create
+      @comment = Comment.new(comment_params)
+
+      if @comment.save
+        render json: { status: 'success'}
+      else
+        render json: { status: 'failed'}
+      end
+    end
+
+    private
+
+      # Only allow a trusted parameter "white list" through.
+      def comment_params
+        params.require(:comment).permit(:post_id, :content, :name, :email)
+      end
+  end
+end

data/app/controllers/notee/posts_controller.rb

@@ -54,7 +54,7 @@ module Notee
 
       # Only allow a trusted parameter "white list" through.
       def post_params
-        params.require(:post).permit(:title, :content, :slug, :status, :category_id, :thumbnail_id, :published_at, :seo_keyword, :seo_description)
+        params.require(:post).permit(:title, :content, :slug, :status, :category_id, :thumbnail_id, :published_at, :seo_keyword, :seo_description, :secret_published_password)
       end
   end
 end

data/app/helpers/notee/comments_helper.rb

@@ -0,0 +1,4 @@
+module Notee
+  module CommentsHelper
+  end
+end

data/app/models/notee/comment.rb

@@ -0,0 +1,6 @@
+module Notee
+  class Comment < ApplicationRecord
+    validates :post_id, presence: true
+    validates :content, presence: true
+  end
+end

data/app/views/notee/partials/_comment_box.html.erb

@@ -0,0 +1,130 @@
+<div class="notee_comment_box">
+  <comments post_id='<%= post_id %>'></comments>
+  <comment_form post_id='<%= post_id %>'></comment_form>
+</div>
+
+
+<!-- <comment> tag -->
+
+<script type="riot/tag">
+	
+	var obs = riot.observable();
+
+	/////////////////////////////////////////
+	// 			comment_form tag
+	/////////////////////////////////////////
+
+	<comment_form class="notee_comment_form" id="notee_form">
+
+    	<label class="notee_label" for="comment_name">Name</label>
+    	<input class="notee_text_field" type="text" name="comment[name]" id="comment_name" />
+      
+      	<label class="notee_label" for="comment_email">Email</label>
+      	<input class="notee_text_field" type="text" name="comment[email]" id="comment_email" />
+      
+      	<label class="notee_label" for="comment_content">Content</label>
+      	<textarea class="notee_text_area" name="comment[content]" id="comment_content"></textarea>
+      
+      	<input 
+      		type="submit" 
+      		value="Create Comment" 
+      		class="notee_submit" 
+      		data-disable-with="Create Comment"
+      		onClick={notee_submit} />
+
+		this.notee_submit = function(e){
+			e.preventDefault();
+			var comment = {
+				post_id: opts.post_id,
+				name: document.getElementById("comment_name").value,
+				email: document.getElementById("comment_email").value,
+				content: document.getElementById("comment_content").value
+			};
+
+			if(comment.content != null){
+				var request = window.superagent;
+			    var url = "/notee/api/comments";
+			    var self = this;
+
+			    request
+				  .post(url)
+				  .send({ comment: comment })
+				  .end(function(err, res){
+				    if(res.status == 200){
+				    	obs.trigger("notee_submit");
+				    	document.getElementById("comment_name").value = "";
+						document.getElementById("comment_email").value = "";
+						document.getElementById("comment_content").value = "";
+				    }
+				  });
+			}
+		}
+
+	</comment_form>
+
+
+
+	/////////////////////////////////////////
+	// 			comment tag
+	/////////////////////////////////////////
+
+
+  	<comment class="notee_comment">
+	    <p class="notee_comment_name">{ name }</p>
+	    <p class="notee_comment_content"> { content } </p>
+
+		 this.name = opts.name;
+		 this.content = opts.content;
+  	</comment>
+
+
+
+  	/////////////////////////////////////////
+	// 			comments tag
+	/////////////////////////////////////////
+
+
+  	<comments class="notee_comments">
+	  	<comment 
+	  		each={ item in items } 
+	  		name={item.name} 
+	  		content={item.content}>
+	  	</comment>
+
+	  	var request = window.superagent;
+		    var url = "/notee/api/comments/" + opts.post_id
+		    var self = this;
+
+	  	this.one('update', function() {
+		    request
+			  .get(url)
+			  .end(function(err, res){
+			    console.log(res.body.comments);
+			    self.items = res.body.comments;
+			    self.update();
+			  });
+		})
+
+		obs.on("notee_submit", function() {
+	      request
+			  .get(url)
+			  .end(function(err, res){
+			    console.log(res.body.comments);
+			    self.items = res.body.comments;
+			    self.update();
+			  });
+	    });
+
+  	</comments>
+</script>
+
+
+<!-- Riot.js Settings -->
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/riot/2.3.18/riot+compiler.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/superagent/2.1.0/superagent.min.js"></script>
+<script>
+	window.onload = function() {
+  		riot.mount('*');
+	};
+</script>

data/app/views/notee/partials/_secret_published.html.erb

@@ -0,0 +1,15 @@
+<% unless display %>
+  <div style="width: 100%; float: left">
+    <div style="width: 40%; margin-left: 26%; margin-top: 60px; border: 1px solid #dcdcdc; padding: 4%;">
+      <h1>Secret Notee</h1>
+      <p>Enter this notee's password</p>
+      <form style="margin-top: 40px;">
+        <h3>PASSWORD:</h3>
+        <input type="password" id="password" />
+        <button type="button" onClick="validate()">ENTER</button>
+      </form>
+    </div>
+  </div>
+<% else %>
+  <%= markdown %>
+<% end %>

data/config/routes.rb

@@ -7,6 +7,7 @@ Notee::Engine.routes.draw do
   get 'category'  => 'notees#index'
   get 'image'     => 'notees#index'
 
+  post 'secret_published' => 'notees#secret_published'
   resources :tokens, only: [:new, :create, :destroy]
 
   scope :api, { format: 'json' } do
@@ -14,5 +15,6 @@ Notee::Engine.routes.draw do
     resources :images, only: [:index, :show, :create, :destroy]
     resources :categories, only: [:index, :show, :create, :update, :destroy]
     resources :statuses, only: [:index, :show]
+    resources :comments, only: [:show, :create]
   end
 end

data/db/migrate/20160605141437_create_notee_posts.rb

@@ -5,7 +5,7 @@ class CreateNoteePosts < ActiveRecord::Migration
 
       # notee's base
 
-      t.string  :title, default: "no title"
+      t.string  :title
       t.text    :content
       t.string  :slug
       t.integer :status, default: 0
@@ -17,6 +17,8 @@ class CreateNoteePosts < ActiveRecord::Migration
       t.string  :seo_keyword, default: ""
       t.string  :seo_description, default: ""
 
+      # secret_published
+      t.string :secret_published_password
 
       # if you have user_id
       # t.integer :user_id

data/db/migrate/20160605141510_create_notee_categories.rb

@@ -15,6 +15,6 @@ class CreateNoteeCategories < ActiveRecord::Migration
     add_index :notee_categories, [:slug], :unique => true
 
     # create default category
-    Notee::Category.create :name => 'None'
+    Notee::Category.create :name => 'No_Category'
   end
 end

data/db/migrate/20160803154954_create_notee_comments.rb

@@ -0,0 +1,13 @@
+class CreateNoteeComments < ActiveRecord::Migration[5.0]
+  def change
+    create_table :notee_comments do |t|
+      t.integer :post_id
+      t.text :content
+      t.string :name
+      t.string :email
+      t.boolean :is_hidden
+
+      t.timestamps
+    end
+  end
+end

data/lib/notee/engine.rb

@@ -1,5 +1,5 @@
-require 'notee/helper'
-require 'notee/view_helper'
+require 'notee/helpers/notee_helper'
+require 'notee/helpers/view_helper'
 
 module Notee
   class Engine < ::Rails::Engine
@@ -11,14 +11,14 @@ module Notee
 
     initializer 'notee.action_controller_helpers' do
       ActiveSupport.on_load :action_controller do
-        include Notee::Helper
+        include Notee::Helpers::NoteeHelper
       end
     end
 
     initializer 'notee.action_view_helpers' do
       ActiveSupport.on_load :action_view do
-        include Notee::Helper
-        include Notee::ViewHelper
+        include Notee::Helpers::NoteeHelper
+        include Notee::Helpers::ViewHelper
       end
     end
 

data/lib/notee/helpers/notee_helper.rb

@@ -0,0 +1,72 @@
+module Notee
+  module Helpers
+    module NoteeHelper
+
+      def notee(search_txt)
+        return false unless search_txt
+        @notee = Notee::Post.find_by(id: search_txt)
+        @notee = Notee::Post.find_by(slug: search_txt) unless @notee
+
+        return if @notee.status == Notee::STATUS[:draft] ||
+                  @notee.status == Notee::STATUS[:deleted] ||
+                  @notee.status == Notee::STATUS[:privated]
+        @notee
+      end
+
+      def notees(search_txt = 'all')
+        @notees = []
+
+        if search_txt == 'all'
+          # all_notees
+          @notees = Notee::Post.where(status: Notee::STATUS[:published]).order(published_at: :desc)
+        else
+          # search_by_category_slug
+          category_id = Notee::Category.find_by(slug: search_txt)
+          category_id = Notee::Category.find_by(name: search_txt) unless category_id
+          return false unless category_id
+
+          @notees = Notee::Post.where(category_id: category_id, status: Notee::STATUS[:published]).order(published_at: :desc)
+        end
+
+        @notees
+      end
+
+      # TODO: secret_mode
+      # def secret_notees
+      #   @notees = Notee::Post.where(status: Notee::STATUS[:secret_published]).order(published_at: :desc)
+      # end
+
+      def notee_categories(sort = nil)
+        @notee_categories = Notee::Category.all.order(created_at: :desc)
+
+        case sort
+          when 'alphabetal'
+            @notee_categories = @notee_categories.sort
+          when 'size'
+            @notee_categories = @notee_categories.sort_by {|category| category.name.size }
+        end
+
+        @notee_categories
+      end
+
+      def notee_archives(year, month)
+        start_date = Date.new(year, month, 1)
+        end_date = Date.new(year, month, -1)
+        @notee_archives = Notee::Post.where(status: Notee::STATUS[:published], :published_at => start_date...end_date)
+
+        @notee_archives
+      end
+
+      def notee_archives_menu(type = nil)
+        case type
+          when 'year'
+            return Notee::Post.where(status: Notee::STATUS[:published]).group('year(published_at)').count
+          when 'month'
+            return Notee::Post.where(status: Notee::STATUS[:published]).group('year(published_at)').group('month(published_at)').count
+          else
+            return Notee::Post.where(status: Notee::STATUS[:published]).group('year(published_at)').group('month(published_at)').count
+        end
+      end
+    end
+  end
+end

data/lib/notee/helpers/view_helper.rb

@@ -0,0 +1,30 @@
+require 'redcarpet'
+
+module Notee
+  module Helpers
+    module ViewHelper
+      def notee_content (notee)
+
+        return if notee.nil?
+
+        unless @markdown
+          renderer = Redcarpet::Render::HTML.new(filter_html: true, hard_wrap: true)
+          @markdown = Redcarpet::Markdown.new(renderer, :fenced_code_blocks => true, :highlight => true)
+        end
+
+        # TODO: secret_mode
+        # if notee.status == Notee::STATUS[:secret_published]
+        #   return render :partial => "notee/partials/secret_published.html.erb", :locals => { :item => notee, :markdown => @markdown.render(notee.content).html_safe, :display => false }
+        # end
+
+        @markdown.render(notee.content).html_safe
+      end
+
+      def notee_comment_box(id)
+        @comments = Notee::Comment.where(post_id: id)
+        @comment = Notee::Comment.new
+        return render :partial => "notee/partials/comment_box.html.erb", :locals => { :post_id => id}
+      end
+    end
+  end
+end

data/lib/notee/status.rb

@@ -4,7 +4,8 @@ module Notee
   STATUS = {
     :draft              => 0,
     :published          => 1,
-    :secret_published   => 2,
+    # TODO: secret_mode
+    # :secret_published   => 2,
     :privated           => 3,
     :deleted            => 4
   }

data/lib/notee/version.rb

@@ -1,3 +1,3 @@
 module Notee
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/tasks/css/notee_default.css

@@ -0,0 +1,59 @@
+
+/*  notee_comment_box */
+
+.notee_comment_box {
+    width: 100%;
+    margin: 30px auto;
+    float: left;
+}
+
+.notee_comments {
+    width: 94%;
+    padding: 3%;
+    margin_bottom: 20px;
+    float: left;
+}
+
+.notee_comment {
+    width: 98%;
+    padding: 1%;
+    margin_bottom: 10px;
+    border-bottom: 1px solid #dcdcdc;
+    float: left;
+}
+.notee_comment_form {
+    width: 60%;
+    padding: 4%;
+    margin_bottom: 20px;
+    float: left;
+}
+
+.notee_label {
+    width: 60%;
+    margin-bottom: 15px;
+    float: left;
+}
+
+.notee_text_field {
+    width: 60%;
+    height: 26px;
+    min-width: 300px;
+    margin-bottom: 15px;
+    float: left;
+    font-size: 14px;
+}
+
+.notee_text_area {
+    width: 100%;
+    height: 78px;
+    margin-bottom: 15px;
+    float: left;
+    font-size: 14px;
+}
+
+.notee_submit {
+    width: 100%;
+    margin-bottom: 15px;
+    float: left;
+    font-size: 30px;
+}