jinda 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9ccb1a4e45e53213b02caa625662e84ccd386d446509fef479f183f8a2aa3b9
-  data.tar.gz: f0efd2ac4630d6a145510969de1d361a28d3c376179649b906bb3f6f9e5b46b9
+  metadata.gz: 5437584419d20b8bf830bee5b254f52d79da72b0c7a63e4cff973a7c10156394
+  data.tar.gz: ec3d5a1838787b031e5072fb682b39a592edec96efabf8d3760327a4f832fb27
 SHA512:
-  metadata.gz: a2fbe028c4cd8b129c70b35c908479ca9aec7b0d0389256a1e423eb81315b8c07728ac8dc5a81d469114f2eb9e6380c39420d35202247b878bc690cda832d8d2
-  data.tar.gz: 84ef6f473657779def3fdfe49dfbfdb08f386d79028d3cffb5d3896ae06d864185b6ddb949e695a0deb1162fcae7f40ffa353b289f67cc6d2320c532a0f5b88a
+  metadata.gz: 332c30c673a0107c09994ba8c394751789a018d9957adac57839413d86f8dea0f306714f435afeb22d0c9a6e6b34e8278be6f1306c096824e422ef9605a8052c
+  data.tar.gz: 110fb30d49712728b1988754995712612dd1c820c79f829c571fb89e02466fa37d7d300b72276355f2a47e8d0c537474bc24dbddefc5902be7a5002fb761943b

data/README.md

@@ -40,7 +40,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.5.7'
+    gem 'jinda', '~> 0.5.8'
 
 For Development (most updated)
 

data/lib/generators/jinda/install_generator.rb

@@ -118,8 +118,9 @@ module Jinda
         route "get '/docs/my/destroy' => 'docs#destroy'"
         route "get '/notes/my' => 'notes/my'"
         route "get '/docs/my' => 'docs/my'"
-		    route "get '/articles/my/destroy' => 'articles#destroy'"
+        route "get '/articles/edit' => 'articles/edit'"
         route "get '/articles/show' => 'articles/show'"
+		    route "get '/articles/my/destroy' => 'articles#destroy'"
         route "get '/articles/my' => 'articles#my'"
         route "get '/logout' => 'sessions#destroy', :as => 'logout'"
         route "get '/auth/failure' => 'sessions#destroy'"

data/lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb

@@ -1,7 +1,7 @@
 class ArticlesController < ApplicationController
  before_action :load_articles, except: [:destroy] 
  before_action :load_my_articles, only: [:my]
- before_action :load_article, only: [:destroy, :update]
+ before_action :load_article, only: [:destroy, :edit]
 
 	def index
     # before_action
@@ -34,13 +34,15 @@ class ArticlesController < ApplicationController
     @article.save!
   end
 
-  def my_update
-    # before_action
-    @article.update(title: $xvars["edit_article"]["article"]["title"],
-                    text: $xvars["edit_article"]["article"]["text"],
-                    keywords: $xvars["edit_article"]["article"]["keywords"],
-                    body: $xvars["edit_article"]["article"]["body"]
+  def update
+    @article = Article.find(params[:id])
+    @article.update(
+                    title: params["article"]["title"],
+                    text: params["article"]["text"],
+                    keywords: params["article"]["keywords"],
+                    body: params["article"]["body"]
 										)
+    redirect_to :action=> 'show', :article_id => @article.id
   end
 
   def j_update

data/lib/generators/jinda/templates/app/views/articles/edit.haml

@@ -1,12 +1,12 @@
 
-%h1= @article.title
-%h1= title 'Member Login'
+%h1= @page_title
 .content= @article.text
-%div= markdown(@article.body)
 
-= form_for @article, url: "/jinda/init?s=articles:edit_article" do |f|
+= form_for @article, :article_id => @article.id  do |f|
   = f.label :title, "Title"
-  = f.text_field :title
+  = f.text_field :title, :required => true 
+  = f.label :text, "Description" 
+  = f.text_field :text, :required => true 
   = f.label :body, "Body Content"
-  = f.cktext_area :body, rows: 10
-  = f.submit
+  = f.text_area :body, rows: 10
+  = f.submit

data/lib/generators/jinda/templates/app/views/articles/show.html.haml

@@ -2,12 +2,12 @@
 - description @article.text
 - keywords @article.keywords
 
+= link_to image_tag('pencil.png', style:'border:none; float:right;', id: 'article_pen'), {controller: "articles", action: "edit", article_id: @article.id}, data: { confirm: "Please Confirm" }
 %div{"data-role" => "menu_mm", "data-theme" => "b", "data-backbtn"=>"false"}
   #article-title= @article.title
 
 #article-text= @article.body.html_safe
 
-= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "comments", action: "create", article_id: @article.id}, data: { confirm: "Please Confirm" }
 - @comments.each do |comment|
   %div#article-comment.ui-corner-all
     Author:    

data/lib/generators/jinda/templates/app/views/jinda/index.html.haml

@@ -21,7 +21,7 @@
 
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.5.7'
+    %li add gem 'jinda', '0.5.8'
     %li bundle
     %li rails generate jinda:install
     %li (run all with "sh install.sh" )

data/lib/generators/jinda/templates/app/views/layouts/_head.html.erb

@@ -1,10 +1,10 @@
 <head>
   <%= favicon_link_tag %>
-  <%= csrf_meta_tags %>
-  <%= meta_tags %> 
   <meta name="description" content="Jinda" />
   <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track":"reload" %>
   <%= javascript_include_tag "application", "data-turbolinks-track": "reload" %>
   <%= stylesheet_link_tag "jinda", "sarabun" %>
   <script src = "https://ajax.aspnetcdn.com/ajax/jquery.validate/1.12.0/jquery.validate.js" ></script>
+  <%= csrf_meta_tags %>
+  <%= display_meta_tags %> 
 </head>

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler