jinda 0.6.5 → 0.7.0.1

data/config/routes.rb

@@ -0,0 +1,44 @@
+Rails.application.routes.draw do
+  # start jiinda method routes
+  jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']
+  jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']
+  jinda_methods += ['run_redirect', 'run_direct_to','run_if']
+  jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']
+  jinda_methods.each do |aktion| get "/jinda/#{aktion}" => "jinda##{aktion}" end
+  post '/jinda/init' => 'jinda#init'
+  post '/jinda/pending' => 'jinda#index'
+  post '/jinda/end_form' => 'jinda#end_form'
+  post '/jinda/end_output' => 'jinda#end_output'
+  # end jinda method routes
+  post '/auth/:provider/callback' => 'sessions#create'
+  get '/auth/:provider/callback' => 'sessions#create'
+  get '/auth/failure' => 'sessions#destroy'
+  get '/logout' => 'sessions#destroy', :as => 'logout'
+  get '/articles/my' => 'articles#my'
+  get '/articles/my/destroy' => 'articles#destroy'
+  get '/articles/show' => 'articles/show'
+  get '/articles/edit' => 'articles/edit'
+  get '/docs/my' => 'docs/my'
+  get '/notes/my' => 'notes/my'
+  get '/docs/my/destroy' => 'docs#destroy'
+  get '/notes/my/destroy/:id' => 'notes#destroy'
+  get '/notes/destroy/:id' => 'notes#destroy'
+  get '/jinda/document/:id' => 'jinda#document'
+  resources :articles do resources :comments end
+  resources :comments
+  resources :notes
+  resources :docs
+  resources :users
+  resources :identities
+  resources :sessions
+  resources :password_resets
+  resources :jinda, :only => [:index, :new]
+  # root :to => 'jinda#index'
+  # api
+  get '/api/v1/notes/my' => 'api/v1/notes#my'
+  post '/api/v1/notes' => 'api/v1/notes#create', as: 'api_v1_notes'
+  namespace :api do
+  namespace :v1 do resources :notes, :only => [:index] end
+  end
+  # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
+end

data/lib/generators/jinda/config_generator.rb

@@ -65,6 +65,14 @@ module Jinda
                 end
             end
 
+            desc "Setup Dockerfile"
+            def setup_docker
+              puts "      Setup Docker files"
+              FileUtils.cp source_paths[0]+"/"+"Dockerfile", "Dockerfile"
+              FileUtils.cp source_paths[0]+"/"+"docker-compose.yml", "docker-compose.yml"
+              FileUtils.cp source_paths[0]+"/"+"entrypoint.sh", "entrypoint.sh"
+            end
+
             def finish
                 puts "      configured omniauth.\n"
                 puts "      configured Mongoid.\n"

data/lib/generators/jinda/install_generator.rb

@@ -19,7 +19,7 @@ module Jinda
         gem 'bson', '4.4.2'
         gem 'mongoid', '7.1.0.rc0'
         gem 'turbolinks_render'
-        gem 'nokogiri', '1.10.10'
+        gem 'nokogiri', '~> 1.11.0'
         gem 'haml', '~> 5.1', '>= 5.1.2'
         gem 'haml-rails', '~> 2.0.1'
         gem 'mail'
@@ -53,7 +53,7 @@ module Jinda
 		      gem 'selenium-webdriver'
           gem 'rb-fsevent'
 		      gem 'valid_attribute'
-          gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master'
+          gem 'faker' 
         end
       end
 
@@ -79,13 +79,14 @@ module Jinda
         # inside("app/assets/javascripts") {(File.file? "application.js") ? ( say "Please include application-org.js in application.js", :red) : (FileUtils.mv 'application-org.js', 'application.js')}
         # inside("app/assets/stylesheets") {(File.file? "application.css") ? ( say "Please include application-org.css in application.css", :red) : (FileUtils.mv 'application-org.css', 'application.css')}
         # inside("app/assets/stylesheets") {(File.file? "application.css.scss") ? ( say "Please include application-org.css.scss in application.css.scss", :red) : (FileUtils.mv 'application-org.css.scss', 'application.css.scss')}
-        inside("app/controllers") {(File.file? "application_controller.rb") ? ( say "Pleas merge existing jinda_org/application_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/application_controller.rb', 'application_controller.rb')}
         inside("app/controllers") {(File.file? "admins_controller.rb") ? ( say "Please merge existing jinda_org/admins_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/admins_controller.rb', 'admins_controller.rb')}
         inside("app/controllers") {(File.file? "articles_controller.rb") ? ( say "Please merge existing jinda_org/articles_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/articles_controller.rb', 'articles_controller.rb')}
         inside("app/controllers") {(File.file? "comments_controller.rb") ? ( say "Please merge existing jinda_org/comments_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/comments_controller.rb', 'comments_controller.rb')}
         inside("app/controllers") {(File.file? "docs_controller.rb") ? ( say "Please merge existing jinda_org/docs_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/docs_controller.rb', 'docs_controller.rb')}
         inside("app/controllers") {(File.file? "identities_controller.rb") ? ( say "Please merge existing jinda_org/identities_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/identities_controller.rb', 'identities_controller.rb')}
-        inside("app/controllers") {(File.file? "jinda_controller.rb") ? ( say "Please merge existing jinda_org/jinda_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/jinda_controller.rb', 'jinda_controller.rb')}
+        inside("app/controllers") {(File.file? "application_controller.rb") ? ( say "Pleas merge existing jinda_org/application_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/application_controller.rb', 'application_controller.rb')}
+        ## Moved to Engine
+        # inside("app/controllers") {(File.file? "jinda_controller.rb") ? ( say "Please merge existing jinda_org/jinda_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/jinda_controller.rb', 'jinda_controller.rb')}
         inside("app/controllers") {(File.file? "password_resets_controller.rb") ? ( say "Please merge existing jinda_org/password_resets_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/password_resets_controller.rb', 'password_resets_controller.rb')}
         inside("app/controllers") {(File.file? "password_resets.rb") ? ( say "Please merge existing jinda_org/password_resets.rb after this installation", :red) : (FileUtils.mv 'jinda_org/password_resets.rb', 'password_resets.rb')}
         inside("app/controllers") {(File.file? "sessions_controller.rb") ? ( say "Please merge existing jinda_org/sessions_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/sessions_controller.rb', 'sessions_controller.rb')}
@@ -94,49 +95,50 @@ module Jinda
         inside("app/controllers") {(File.file? "notes_controller.rb") ? ( say "Please merge existing jinda_org/notes_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/notes_controller.rb', 'notes_controller.rb')}
       end
       # routes created each line as reversed order in routes
+      # Moved routes to Engine
       def setup_routes
       #  route "end"
-        route "  end"
-        route "    namespace :v1 do resources :notes, :only => [:index] end"
-        route "  namespace :api do"
-        route "post '/api/v1/notes' => 'api/v1/notes#create', as: 'api_v1_notes'" 
-        route "get '/api/v1/notes/my' => 'api/v1/notes#my'"
-        route "\# api"
+      #   route "  end"
+      #   route "    namespace :v1 do resources :notes, :only => [:index] end"
+      #   route "  namespace :api do"
+      #   route "post '/api/v1/notes' => 'api/v1/notes#create', as: 'api_v1_notes'" 
+      #   route "get '/api/v1/notes/my' => 'api/v1/notes#my'"
+      #   route "\# api"
         route "root :to => 'jinda#index'"        
-        route "resources :jinda, :only => [:index, :new]"
-        route "resources :password_resets"
-        route "resources :sessions"
-        route "resources :identities"
-        route "resources :users"
-        route "resources :docs"
-        route "resources :notes"
-        route "resources :comments"
-        route "resources :articles do resources :comments end"
-        route "get '/jinda/document/:id' => 'jinda#document'"
-        route "get '/notes/destroy/:id' => 'notes#destroy'"
-        route "get '/notes/my/destroy/:id' => 'notes#destroy'"
-        route "get '/docs/my/destroy' => 'docs#destroy'"
-        route "get '/notes/my' => 'notes/my'"
-        route "get '/docs/my' => 'docs/my'"
-        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'"
-        route "get '/auth/:provider/callback' => 'sessions#create'"
-        route "post '/auth/:provider/callback' => 'sessions#create'"        
-		    route "\# end jinda method routes"
-        route "post '/jinda/end_output' => 'jinda#end_output'"
-        route "post '/jinda/end_form' => 'jinda#end_form'"
-        route "post '/jinda/pending' => 'jinda#index'"
-        route "post '/jinda/init' => 'jinda#init'"
-        route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
-        route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
-        route "jinda_methods += ['run_redirect', 'run_direct_to','run_if']"
-        route "jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']"
-        route "jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']"  
-        route "\# start jiinda method routes"
+      #   route "resources :jinda, :only => [:index, :new]"
+      #   route "resources :password_resets"
+      #   route "resources :sessions"
+      #   route "resources :identities"
+      #   route "resources :users"
+      #   route "resources :docs"
+      #   route "resources :notes"
+      #   route "resources :comments"
+      #   route "resources :articles do resources :comments end"
+      #   route "get '/jinda/document/:id' => 'jinda#document'"
+      #   route "get '/notes/destroy/:id' => 'notes#destroy'"
+      #   route "get '/notes/my/destroy/:id' => 'notes#destroy'"
+      #   route "get '/docs/my/destroy' => 'docs#destroy'"
+      #   route "get '/notes/my' => 'notes/my'"
+      #   route "get '/docs/my' => 'docs/my'"
+      #   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'"
+      #   route "get '/auth/:provider/callback' => 'sessions#create'"
+      #   route "post '/auth/:provider/callback' => 'sessions#create'"        
+		  #   route "\# end jinda method routes"
+      #   route "post '/jinda/end_output' => 'jinda#end_output'"
+      #   route "post '/jinda/end_form' => 'jinda#end_form'"
+      #   route "post '/jinda/pending' => 'jinda#index'"
+      #   route "post '/jinda/init' => 'jinda#init'"
+      #   route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
+      #   route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
+      #   route "jinda_methods += ['run_redirect', 'run_direct_to','run_if']"
+      #   route "jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']"
+      #   route "jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']"  
+      #   route "\# start jiinda method routes"
 	    end
 
       def setup_env
@@ -210,6 +212,7 @@ Mongoid::Config.belongs_to_required_by_default = false
         end
         inject_into_file 'config/environments/development.rb', :after => 'config.action_mailer.raise_delivery_errors = false' do
           "\n  config.action_mailer.default_url_options = { :host => 'localhost:3000' }"
+          "\n  config.assets.check_precompiled_asset = false"
         end
         inject_into_file 'config/environments/production.rb', :after => 'config.assets.compile = false' do
           "\n  config.assets.compile = true"

data/lib/generators/jinda/templates/Dockerfile

@@ -11,13 +11,15 @@ COPY . /myapp
 
 # Set Rails environment to production
 # ENV RAILS_ENV production
-# RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-#    && apt install -y nodejs
+ENV RAILS_ENV development
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  && apt install -y nodejs
 
 # Add a script to be executed every time the container starts.
 COPY entrypoint.sh /usr/bin/
 RUN chmod +x /usr/bin/entrypoint.sh
 ENTRYPOINT ["entrypoint.sh"]
+# EXPOSE 3000
 EXPOSE 3000
 
 # Start the main process.

data/lib/generators/jinda/templates/app/assets/javascripts/application.js

@@ -10,15 +10,6 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
-//= require jquery_ujs
-//= require jquery.mobile.splitview
-//= require jquery.mobile-1.2.1
-//= require jquery.mobile.datebox
-//= require iscroll-wrapper
-//= require iscroll
-//= require jinda
-//  require turbolinks
-//  require disable_enter_key.js
+//= require jinda_jqm
 
 

data/lib/generators/jinda/templates/app/assets/stylesheets/application.css.scss

@@ -12,23 +12,4 @@
  *= require_self
  *= require normalize-rails
  */
-
-@import "jquery.mobile-1.2.1";
-@import "jquery.mobile.splitview";
-@import "jquery.mobile.grids.collapsible";
-@import "jquery.mobile.datebox.css";
-@import "sarabun";
-@import "jinda";
-@import "kul-4.2";
-@import "articles";
-@import "app.scss";
-@import "font-awesome-sprockets";
-@import "font-awesome";
-@import "social";
-
-
-
-
-
-
-
+@import "jinda_jqm"

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

@@ -0,0 +1,32 @@
+.box.box-info
+  .box-header.with-border
+
+    %h3.box-title
+      = @page_title
+    .label-warning
+      = flash[:notice]
+    .box-tools.pull-right
+      %button.btn.btn-box-tool{"data-widget" => "collapse", :type => "button"}
+        %i.fa.fa-minus
+      %button.btn.btn-box-tool{"data-widget" => "remove", :type => "button"}
+        %i.fa.fa-times
+  / /.box-header
+  .box-body
+    .table-responsive
+      %table.table.no-margin
+        %thead
+          %tr
+            %th Title
+            %th Description
+            %th Created
+            %th Updated
+            %th Delete
+            %th Edit  
+          - report.each do |article|
+            %tr
+              %td= link_to article.title, :controller=>"articles", :action=>"show", :article_id => article.id
+              %td= article.text.html_safe
+              %td= article.created_at.strftime('%m/%d/%Y')
+              %td= article.updated_at.strftime('%m/%d/%Y')
+              %td(align='center')= link_to image_tag('delete.png', style:'border:none; float:none;'), {controller: "articles", action: "destroy",  article_id: article.id}, data: { confirm: "Please Confirm" }
+              %td(align='center')= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'articles:xedit_article', article_id: article.id}, data: { confirm: "Please Confirm" }

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

@@ -1,12 +1,23 @@
+- @title= "Edit"
+- @page_title  = 'Edit'
+.container
+  %div.row::before 
+    %div.col-md-12
+      %h2.display-3.mt-5.pt-5
+        = @article.title
+      %hr
+        = @article.text
+      %h4.display-5
+        = @article.body.html_safe
 
-%h1= @page_title
-.content= @article.text
-
-= form_for @article, :article_id => @article.id  do |f|
-  = f.label :title, "Title"
-  = f.text_field :title, :required => true 
-  = f.label :text, "Description" 
-  = f.text_field :text, :required => true 
-  = f.label :body, "Body Content"
-  = f.text_area :body, rows: 10
-  = f.submit
+    .container
+      .card
+        = form_for @article, :html => {:class => "form-horizontal center"} , :article_id => @article.id  do |f|
+          .form-group 
+            = f.text_field :title, class: "form-control", :required => true 
+          .form-group 
+            = f.text_field :text, class: "form-control", :required => true 
+          .form-group 
+            = f.text_area :body, rows: 10, class: "form-control"
+          .form-group 
+            = f.submit "Submit",  class: "btn btn-default btn-success"

data/lib/generators/jinda/templates/app/views/articles/edit_article/edit_article.html.erb

@@ -1,13 +1,15 @@
 <%
-  article = Article.find_by :id=> $xvars["select_article"]["title"]
-%>
-<%= fields_for article do |f| %>
-  <%= f.label :title, "Title" %>
-  <%= f.text_field :title %>
-  <%= f.label :text, "Text" %>
-  <%= f.text_field :text %>
-  <%= f.label :text, "Keywords" %>
-  <%= f.text_field :keywords %>
-  <%= f.label :body, "Body Content" %>
-  <%= f.text_area :body %>
-<% end %>
+    article = Article.find_by :id=> $xvars["select_article"]["title"]
+  %>
+<div class ="module-table">
+  <%= fields_for article do |f| %>
+    <%= f.label :title, "Title" %>
+    <%= f.text_field :title %>
+    <%= f.label :text, "Text" %>
+    <%= f.text_field :text %>
+    <%= f.label :text, "Keywords" %>
+    <%= f.text_field :keywords %>
+    <%= f.label :body, "Body Content" %>
+    <%= f.text_area :body %>
+  <% end %>
+</div>

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

@@ -1,23 +1,5 @@
 - @title= "All Articles"
+%p
+- @page_title  = 'All Articlces'
+= render :partial => 'report', locals: { report: @articles}
 = paginate @articles
-%table{:id=>"pending-table", :width=>"100%"}
-  %tr{:style=>"color:black; background-color:#97BF60;"}
-    %th User
-    %th Title
-    %th Description
-    %th Created
-    %th Updated
-    %th Delete
-  - @articles.each do |article|
-    %tr
-      %td= article.user.code if article.user
-      %td= link_to article.title, :controller=>"articles", :action=>"show", :article_id=>article.id
-      %td= article.text
-      %td= article.created_at
-      %td= article.updated_at
-      %td(align='center')
-        - next unless login?
-        - unless current_ma_user.role.upcase.split(',').include?("A")
-          - next unless article.user
-          - next unless current_ma_user == article.user
-        = link_to image_tag('delete.png', style:'border:none; float:none;'), {controller: "articles", action: "destroy",  article_id: article.id}, data: { confirm: "Please Confirm" }

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

@@ -1,20 +1,5 @@
 - @title= "My Articles"
 %p
 - @page_title  = 'All Articlces'
+= render :partial => 'report', locals: { report: @my_articles}
 = paginate @my_articles
-%table#article-table
-  %tr
-    %th Title
-    %th Description
-    %th Created
-    %th Updated
-    %th Delete
-    %th Edit  
-  - @my_articles.each do |article|
-    %tr
-      %td= link_to article.title, :controller=>"articles", :action=>"show", :article_id => article.id
-      %td= article.text.html_safe
-      %td= article.created_at.strftime('%m/%d/%Y')
-      %td= article.updated_at.strftime('%m/%d/%Y')
-      %td(align='center')= link_to image_tag('delete.png', style:'border:none; float:none;'), {controller: "articles", action: "destroy",  article_id: article.id}, data: { confirm: "Please Confirm" }
-      %td(align='center')= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'articles:xedit_article', article_id: article.id}, data: { confirm: "Please Confirm" }

data/lib/generators/jinda/templates/app/views/articles/new_article/form_article.html.erb

@@ -2,7 +2,7 @@
 <%
   article = @article
 %>
-<div id="article-table">
+<div class ="module-table">
 <%= fields_for article do |f| %>
   <%= f.label :title, "Title" %>
   <%= f.text_field :title, :required => true %>

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

@@ -1,26 +1,42 @@
 - title @article.title
 - description @article.text
 - keywords @article.keywords
+.container
+  %div.row::before 
+    %div.col-md-12
+      %h2.display-3.mt-5.pt-5
+        = @article.title
+        = 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" }
+      %hr
+        = @article.text
+      %h4.display-5
+        = @article.body.html_safe
+        - @comments.each do |comment|
+          %div#article-comment.ui-corner-all
+            .col-md-10.col-sm-12
+              %div.small-box.bg-gray
+                %div.inner
+                  %div.font-weight-light
+                    Author:    
+                    %b= comment.user.code if comment.user
+                  %div#comment-body
+                    %i= comment.body
+    %hr
 
-= 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
+    .container
+      .card
 
-#article-text= @article.body.html_safe
-
-- @comments.each do |comment|
-  %div#article-comment.ui-corner-all
-    Author:    
-    %b= comment.user.code if comment.user
-    %div#comment-body
-      %i= comment.body
--# 
-- if login?
-  %h3 Add a comment:
-  =# form_for([@comment, @article.comments.build]) do |f|
-  = form_with(model: [@article, Comment.new], local: true) do |f|
-    = f.hidden_field :article_id, :value => @article.id
-    = f.label :body, "Comment"
-    = f.text_area :body
-    = f.hidden_field :user_id, :value => current_ma_user
-    = f.submit
+        - if login?
+          %h4.display-5
+            Add a comment:
+            = form_with(model: [@article, Comment.new], local: true) do |f|
+              .form-group 
+                = f.hidden_field :article_id, :value => @article.id
+              .form-group 
+                = f.label :body, "Comment"
+              .form-group 
+                = f.text_area :body, rows: 5, class: "form-control"
+              .form-group 
+                = f.hidden_field :user_id, :value => current_ma_user
+              .form-group 
+                = f.submit "Submit",  class: "btn btn-default btn-success"