jinda 0.7.0.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ca87efff8bd66514eebb024644656648fd93a4b945a22dbb6659df96026d45e
-  data.tar.gz: 77fdbd475b8c9196e64f097c393519d6345f97822d0f3fde0b9e6bab8bdc12aa
+  metadata.gz: faef5ea06cc850bbbf7ebb2b1f8d3ac4e59688d0b5197c124bc4ca525b2ce466
+  data.tar.gz: f84ac716bb2ae580fcfeda5178544f7809440ae998c1f0cd263bbdfd5f58e1ae
 SHA512:
-  metadata.gz: 5ae63a36708f4831d99c564b0ffef7f8f24c48f3753f2ecb8036a988f2720791aa7b5796c53bab21d3c4b2f32a5364d5cabf4a0b91ca551770974dcc796690c9
-  data.tar.gz: a868c134eec359d38bc5f8e7bb5400b20e1e53b40dac9dc2870cbe7b08e500f15c83cded720e8caab516025d450be80a3c48b693872a4f9eb51c3133eb48a352
+  metadata.gz: 1ab17b915d572b178f1d709037c9b1af2ed64db23b14d8cb36d68c1c010bb0e75dabcc8c1e1172acc628826f591ee4ef4278137191a53bfe1c0454b42858f274
+  data.tar.gz: 1404b46acb45165bccd3087926380ee9bf986edee9f8726691a5037ef25504b7b3b56d6ab3e467e752d9e2ac506a0d7e5d6198b1db07c795a2fc13210e1e4e13

data/README.md

@@ -15,7 +15,7 @@ Rails Application Generator using Freemind
 These versions works for sure but others may do.
 
 * Ruby 2.7.1
-* Rails 6.0.3
+* Rails 6.1.0
 * MongoDB 6
 * Freemind 1.0.1
 

data/app/assets/stylesheets/jinda.scss

@@ -1,3 +1,4 @@
+// jinda.scss from jinda/app engine
 #tooltip{
   position:absolute;
   border:1px solid #333;
@@ -56,17 +57,129 @@
   padding: 15px;
   margin: auto;
   display: block;
-  
+
 }
 
 #logreg-forms{
-    width:412px;
-    margin:10vh auto;
-    background-color:#f3f3f3;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+  width:412px;
+  margin:10vh auto;
+  background-color:#f3f3f3;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
   transition: all 0.3s cubic-bezier(.25,.8,.25,1);
 }
 
 .module-table{
   display: grid;
 }
+
+body {
+  background: #dfe7e9;
+  font-family: 'Roboto', sans-serif;
+}
+.form-control {
+  font-size: 16px;
+  transition: all 0.4s;
+  box-shadow: none;
+}
+.form-control:focus {
+  border-color: #5cb85c;
+}
+.form-control, .btn {
+  border-radius: 50px;
+  outline: none !important;
+}
+.form-group input {
+  border-width: 0px;
+}
+.signup-form {
+  width: 480px;
+  margin: 0 auto;
+  padding: 30px 0;
+}
+.signup-form form {
+  border-radius: 5px;
+  margin-bottom: 20px;
+  background: #fff;
+  box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+  padding: 40px;
+}
+.signup-form a {
+  color: #5cb85c;
+}    
+.signup-form h2 {
+  text-align: center;
+  font-size: 34px;
+  margin: 10px 0 15px;
+}
+.signup-form .hint-text {
+  color: #999;
+  text-align: center;
+  margin-bottom: 20px;
+}
+.signup-form .form-group {
+  margin-bottom: 20px;
+}
+.signup-form .btn {        
+  font-size: 18px;
+  line-height: 26px;
+  font-weight: bold;
+  text-align: center;
+}
+.signup-btn {
+  text-align: center;
+  border-color: #5cb85c;
+  transition: all 0.4s;
+}
+.signup-btn:hover {
+  background: #5cb85c;
+  opacity: 0.8;
+}
+.or-seperator {
+  margin: 50px 0 15px;
+  text-align: center;
+  border-top: 1px solid #e0e0e0;
+}
+.or-seperator b {
+  padding: 0 10px;
+  width: 40px;
+  height: 40px;
+  font-size: 16px;
+  text-align: center;
+  line-height: 40px;
+  background: #fff;
+  display: inline-block;
+  border: 1px solid #e0e0e0;
+  border-radius: 50%;
+  position: relative;
+  top: -22px;
+  z-index: 1;
+}
+.social-btn .btn {
+  color: #fff;
+  margin: 10px 0 0 15px;
+  font-size: 15px;
+  border-radius: 50px;
+  font-weight: normal;
+  border: none;
+  transition: all 0.4s;
+}	
+.social-btn .btn:first-child {
+  margin-left: 0;
+}
+.social-btn .btn:hover {
+  opacity: 0.8;
+}
+.social-btn .btn-primary {
+  background: #507cc0;
+}
+.social-btn .btn-info {
+  background: #64ccf1;
+}
+.social-btn .btn-danger {
+  background: #df4930;
+}
+.social-btn .btn i {
+  float: left;
+  margin: 3px 10px;
+  font-size: 20px;
+}

data/app/controllers/concerns/jinda_run_concern.rb

@@ -18,9 +18,12 @@ module JindaRunConcern
           # Check if help file available for this form
           ###############################################################################################
           @help = File.read(fhelp) if File.exists?(fhelp)
-          f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
-          if File.file?(f)
-            @ui= File.read(f)
+          f1= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
+          f2= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.haml"
+          if File.file?(f1)
+            @ui= File.read(f1)
+          elsif File.file?(f2)
+            @ui= File.read(f2)
           else
             # flash[:notice]= "Error: Can not find the view file for this controller"
             ma_log "Error: Can not find the view file for this controller"

data/app/views/jinda/index.html.haml

@@ -6,7 +6,7 @@
       Dashboard
 .content
   %div.row::before 
-    %div.col-lg-3.col-xs-6
+    %div.col-lg-4.col-md-4.col-xs-12
       %div.small-box.bg-aqua
         %div.inner
           %b Current gems version found: 
@@ -14,31 +14,31 @@
             %li Ruby Version #{RUBY_VERSION }
             %li Rails Version #{Rails.version }
             %li gem jinda #{Gem.loaded_specs['jinda'].version}
-    %div.col-lg-3.col-xs-6
+    %div.col-lg-4.col-md-4.col-xs-12
       %div.small-box.bg-green
         %div.inner
           %b Recently tested with:
           %ul  
             %li Rubygems 2.7.1
-            %li Rails 6.0.3
-    %div.col-lg-3.col-xs-6
+            %li Rails 6.1.0
+    %div.col-lg-4.col-md-4.col-xs-12
       %div.small-box.bg-yellow
         %div.inner
           %b Create New Rails:
           %ul  
             %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record --skip-javascript --skip-turbolinks 
             %li (rails new YOURAPP -BOTJ)
-    %div.col-lg-3.col-xs-6
+    %div.col-lg-6.col-md-12.col-xs-12
       %div.small-box.bg-red
         %div.inner
           %b Installation
           %ul
-            %li add gem 'jinda', '0.7.0.1' to Gemfile then $ bundle
+            %li add gem 'jinda'  # to Gemfile then $ bundle
             %li rails generate jinda:install, then bundle
             %li rails generate jinda:config
             %li rails jinda:seed, will create initial user:password admin:secret
             %li when update app/jinda/index.mm, run rake jinda:update
-    %div.col-lg-3.col-xs-6
+    %div.col-lg-6.col-md-12.col-xs-12
       %div.small-box.bg-blue
         %div.inner
           %b Option: Themes available: Jinda_adminbsb, Jinda_adminlte

data/config/routes.rb

@@ -12,7 +12,7 @@ Rails.application.routes.draw do
   # end jinda method routes
   post '/auth/:provider/callback' => 'sessions#create'
   get '/auth/:provider/callback' => 'sessions#create'
-  get '/auth/failure' => 'sessions#destroy'
+  get '/auth/failure' => 'sessions#failure'
   get '/logout' => 'sessions#destroy', :as => 'logout'
   get '/articles/my' => 'articles#my'
   get '/articles/my/destroy' => 'articles#destroy'

data/lib/generators/jinda/install_generator.rb

@@ -17,7 +17,7 @@ module Jinda
         gem 'jquery-turbolinks', '2.1.0'
         gem 'mongo', '2.11.3'
         gem 'bson', '4.4.2'
-        gem 'mongoid', '7.1.0.rc0'
+        gem 'mongoid', git: 'git@github.com:kul1/mongoid.git'
         gem 'turbolinks_render'
         gem 'nokogiri', '~> 1.11.0'
         gem 'haml', '~> 5.1', '>= 5.1.2'
@@ -32,7 +32,7 @@ module Jinda
         gem 'omniauth-identity', '~> 1.1.1'
         gem 'omniauth-facebook', '6.0.0'
         gem 'omniauth-google-oauth2', '0.8.0'
-        gem 'dotenv-rails', '2.7.5'
+        gem 'dotenv-rails'
         gem 'cloudinary', '1.13.2'
         gem 'kaminari', '1.2.0'
         gem 'kaminari-mongoid', '1.0.1'

data/lib/generators/jinda/templates/app/controllers/comments_controller.rb

@@ -0,0 +1,31 @@
+class CommentsController < ApplicationController
+  before_action :comment_params, only: [:create]
+  before_action :load_commmentable
+
+  def index
+    @comments = @commentable.comments 
+  end
+
+  def create
+    @comment = @commentable.comments.new comment_params
+    @comment.save!
+    redirect_to [@commentable], notice: "Comment created"
+  end
+
+  private
+
+  # def article_params
+  #   params.require(:comment).permit(:article_id)
+  # end
+
+  def comment_params
+    resource = request.path.split('/')[1]                                
+    commentable_id = "#{resource.singularize.to_sym}_id" #:article_id
+    params.require(:comment).permit(:body, :user_id,:name, :image, commentable_id.to_sym)
+  end
+
+  def load_commmentable                                                        
+    resource, id = request.path.split('/')[1,2]                                
+    @commentable = resource.singularize.classify.constantize.find(id)          
+  end     
+end

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

@@ -5,6 +5,7 @@ class SessionsController < ApplicationController
   end
 
   def failure
+    # redirect_to login_path, alert: "Authentication failed, please try again."
     redirect_to login_path, alert: "Authentication failed, please try again."
   end
 
@@ -21,8 +22,8 @@ class SessionsController < ApplicationController
       cookies[:auth_token] = user.auth_token
     end
     # refresh_to root_path, :ma_notice => "Logged in" # Called by jinda_conroller
-    # redirect_to root_path
-		redirect_to articles_my_path
+    redirect_to root_path
+		# redirect_to articles_my_path
 
   rescue
     redirect_to root_path, :alert=> "Authentication failed, please try again."
@@ -38,6 +39,6 @@ class SessionsController < ApplicationController
 
   def failure
     ma_log "Authentication failed, please try again."
-    redirect_to root_path, :alert=> "Authentication failed, please try again."
+    redirect_to new_session_path, :alert=> "Authentication failed, please try again."
   end
 end

data/lib/generators/jinda/templates/app/jinda/template/view.html.erb

@@ -1,11 +1,17 @@
+
+<%- @title= 'Template for Document' %>
 <%
     doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
-%>
-<%= fields_for doc do |f| %>
-  <%= f.label :category, "Category" %>
-  <%= f.select :category, [["Book", "book"], ["Letter", "letter"], ["Brochure", "brochure"]] %>
-  <!--div>
-    </div-->
+  %>
+
+<h1>
+  <%= @title %>
+</h1>
+
+<div class = "module-table">
+  <%= fields_for doc do |f| %>
+    <%= f.label :category, "Category" %>
+    <%= f.select :category, [["Book", "book"], ["Letter", "letter"], ["Brochure", "brochure"]] %>
     <%= f.label :issue_on, "Dated" %>
     <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
 
@@ -13,14 +19,16 @@
     <%= f.file_field :dscan %>
   <% end %>
   <div>
-  <%= label_tag :description, "Description" %>
-  <%= text_field_tag :description %>
+    <%= label_tag :description, "Description" %>
+    <%= text_field_tag :description %>
   </div>
   <div>
     <%= label_tag :ma_display, "Display", :class=>"ui-input-text" %>
     <%= select_tag :ma_display, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
   </div>
   <div>
-  <%= label_tag :keywords, "Search Keywords" %>
-  <%= text_field_tag :keywords %>
+    <%= label_tag :keywords, "Search Keywords" %>
+    <%= text_field_tag :keywords %>
   </div>
+</div>
+

data/lib/generators/jinda/templates/app/models/comment.rb

@@ -4,9 +4,10 @@ class Comment
   # jinda begin
   include Mongoid::Timestamps
   field :body, :type => String
+  field :name, :type => String
+  field :image, :type => String
   belongs_to :article, :class_name => "Article"  
   belongs_to :user, :class_name => "User"  
-  belongs_to :job, :class_name => "Job"  
   belongs_to :commentable, polymorphic: true 
   index({ commentable_id: 1, commentable_type: 1}) 
   # jinda end

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

@@ -18,7 +18,7 @@
                 %div.inner
                   %div.font-weight-light
                     Author:    
-                    %b= comment.user.code if comment.user
+                    %b= comment.name if comment.name
                   %div#comment-body
                     %i= comment.body
     %hr
@@ -37,6 +37,10 @@
               .form-group 
                 = f.text_area :body, rows: 5, class: "form-control"
               .form-group 
-                = f.hidden_field :user_id, :value => current_ma_user
+                = f.hidden_field :user_id, :value => current_ma_user.id
+              .form-group 
+                = f.hidden_field :name, :value => current_ma_user.code
+              .form-group 
+                = f.hidden_field :image, :value => current_ma_user.image
               .form-group 
                 = f.submit "Submit",  class: "btn btn-default btn-success"

data/lib/generators/jinda/templates/app/views/identities/new.html.haml

@@ -0,0 +1,32 @@
+.container
+  .signup-form
+    - @title= 'Sign Up'
+    = form_tag "/auth/identity/register", {'data-ajax'=>'false'} do
+      %h1.h3.mb-3.font-weight-normal{:style => "text-align: center"} Sign Up
+      .sign_in
+      .label-warning
+        = flash[:alert]
+        - if @identity && @identity.errors.any?
+          .error_messages
+            %h3
+              = pluralize(@identity.errors.count, "error")
+              prohibited this account from being saved:
+            %ul
+              - @identity.errors.full_messages.each do |msg|
+                %li= msg
+      .form-group.form-control
+        = label_tag :code, 'Username'
+        = text_field_tag :code, @identity.try(:code)
+      .form-group.form-control
+        = label_tag :email
+        = text_field_tag :email, @identity.try(:email)
+      .form-group.form-control
+        = label_tag :password, 'Password'
+        = password_field_tag :password
+      .form-group.form-control
+        = label_tag :password_confirmation, 'Confirm password'
+        = password_field_tag :password_confirmation
+      %button.btn.btn-success.btn-block.actions{:type => "submit"}
+        %i.fas.fa-sign-up-alt
+        Sign Up
+

data/lib/generators/jinda/templates/app/views/password_resets/new.html.haml

@@ -0,0 +1,11 @@
+.container
+	.signup-form
+		.sign_in
+			= form_tag password_resets_path, :method => :post do
+				.form-group.form-control
+					= label_tag :email
+					= text_field_tag :email, params[:email]
+				%button.btn.btn-success.btn-block.actions{:type => "submit"}
+					%i.fas.fa-sign-in-alt
+					Reset Password
+

data/lib/generators/jinda/templates/app/views/sessions/new.html.haml

@@ -0,0 +1,22 @@
+.container
+  .signup-form
+    = form_tag "/auth/identity/callback", {'data-ajax'=>'false'} do
+      %h1.h3.mb-3.font-weight-normal{:style => "text-align: center"} Sign in
+      .sign_in
+      .label-warning
+        = flash[:alert]
+      .form-group.form-control
+        = label_tag :auth_key, "User name"
+        = text_field_tag :auth_key
+      .form-group.form-control
+        = label_tag :password, "Password"
+        = password_field_tag :password
+      .form-group
+        = label_tag :remember_me
+        = check_box_tag :remember_me, 1, params.permit[:remember_me]
+      %button.btn.btn-success.btn-block.actions{:type => "submit"}
+        %i.fas.fa-sign-in-alt
+        Sign in
+      = link_to 'Forgotten password?', new_password_reset_path, data: {icon: 'info', mini: 'true', role: 'button'}
+      %hr/
+

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-  VERSION = "0.7.0.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.7.0.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,20 +59,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.1.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 description: 'Generate Rails workflow from mind map: Freemind'
 email:
 - 1.0@kul.asia
@@ -236,6 +222,7 @@ files:
 - lib/generators/jinda/templates/app/channels/application_cable/channel.rb
 - lib/generators/jinda/templates/app/channels/application_cable/connection.rb
 - lib/generators/jinda/templates/app/controllers/api/v1/notes_controller.rb
+- lib/generators/jinda/templates/app/controllers/comments_controller.rb
 - lib/generators/jinda/templates/app/controllers/jinda_org/admins_controller.rb
 - lib/generators/jinda/templates/app/controllers/jinda_org/application_controller.rb
 - lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb
@@ -306,7 +293,7 @@ files:
 - lib/generators/jinda/templates/app/views/docs/edit/select_note.html.erb
 - lib/generators/jinda/templates/app/views/docs/index.haml
 - lib/generators/jinda/templates/app/views/docs/my.haml
-- lib/generators/jinda/templates/app/views/identities/new.html.erb
+- lib/generators/jinda/templates/app/views/identities/new.html.haml
 - lib/generators/jinda/templates/app/views/jinda_mailer/gmail.html.erb
 - lib/generators/jinda/templates/app/views/layouts/_head.html.erb
 - lib/generators/jinda/templates/app/views/layouts/_meta_tag.html.erb
@@ -344,8 +331,8 @@ files:
 - lib/generators/jinda/templates/app/views/notes/show.haml
 - lib/generators/jinda/templates/app/views/notes/xedit/edit_note.html.erb
 - lib/generators/jinda/templates/app/views/password_resets/edit.html.erb
-- lib/generators/jinda/templates/app/views/password_resets/new.html.erb
-- lib/generators/jinda/templates/app/views/sessions/new.html.erb
+- lib/generators/jinda/templates/app/views/password_resets/new.html.haml
+- lib/generators/jinda/templates/app/views/sessions/new.html.haml
 - lib/generators/jinda/templates/app/views/sitemap/index.xml.haml
 - lib/generators/jinda/templates/app/views/user_mailer/password_reset.html.haml
 - lib/generators/jinda/templates/app/views/user_mailer/password_reset.text.erb
@@ -479,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: 'Rails workflow from mind map: Freemind'

data/lib/generators/jinda/templates/app/views/identities/new.html.erb

@@ -1,37 +0,0 @@
-<div class="container">
-  <div id="logreg-forms">
-    <div class="sign_in">
-      <%- @title= 'Sign Up' %>
-      <%= form_tag "/auth/identity/register", {'data-ajax'=>'false'} do %>
-        <h1 class="h3 mb-3 font-weight-normal" style="text-align: center"> Sign Up</h1>
-        <% if @identity && @identity.errors.any? %>
-          <div class="error_messages">
-            <h2><%= pluralize(@identity.errors.count, "error") %> prohibited this account from being saved:</h2>
-            <ul>
-              <% @identity.errors.full_messages.each do |msg| %>
-                <li><%= msg %></li>
-              <% end %>
-            </ul>
-          </div>
-        <% end %>
-        <div class="field form-control" data-role="fieldcontain">
-          <%= label_tag :code, 'Username' %>
-          <%= text_field_tag :code, @identity.try(:code) %>
-        </div>
-        <div class="field form-control" data-role="fieldcontain">
-          <%= label_tag :email %>
-          <%= text_field_tag :email, @identity.try(:email) %>
-        </div>
-        <div class="field form-control" data-role="fieldcontain">
-          <%= label_tag :password, 'Password' %>
-          <%= password_field_tag :password %>
-        </div>
-        <div class="field form-control" data-role="fieldcontain">
-          <%= label_tag :password_confirmation, 'Confirm password' %>
-          <%= password_field_tag :password_confirmation %>
-        </div>
-        <button class="btn btn-warning btn-block actions" type="submit"><i class="fas fa-sign-up-alt"></i> Sign Up</button>
-      <% end %>
-    </div>
-  </div>
-</div>

data/lib/generators/jinda/templates/app/views/password_resets/new.html.erb

@@ -1,13 +0,0 @@
-<div class="container">
-	<div id="logreg-forms">
-		<div class="sign_in">
-			<%= form_tag password_resets_path, :method => :post do %>
-				<div class="field">
-					<%= label_tag :email %>
-					<%= text_field_tag :email, params[:email] %>
-				</div>
-        <button class="btn btn-success btn-block actions" type="submit"><i class="fas fa-sign-in-alt"></i> Reset Password</button>
-			<% end %>
-		</div>
-	</div>
-</div>

data/lib/generators/jinda/templates/app/views/sessions/new.html.erb

@@ -1,26 +0,0 @@
-<div class="container">
-  <div id="logreg-forms">
-    <div class="sign_in">
-
-      <%= form_tag "/auth/identity/callback", {'data-ajax'=>'false'} do %>
-        <h1 class="h3 mb-3 font-weight-normal" style="text-align: center"> Sign in</h1>
-        <div class="form-control" data-role="fieldcontain">
-          <%= label_tag :auth_key, "User name" %>
-          <%= text_field_tag :auth_key %>
-        </div>
-        <div class="form-control" data-role="fieldcontain">
-          <%= label_tag :password, "Password" %>
-          <%= password_field_tag :password %>
-        </div>
-        <div class="field" data-role="fieldcontain" data-icon="info">
-          <%= label_tag :remember_me %>
-          <%= check_box_tag :remember_me, 1, params.permit[:remember_me] %>
-        </div>
-
-        <button class="btn btn-success btn-block actions" type="submit"><i class="fas fa-sign-in-alt"></i> Sign in</button>
-        <%= link_to 'Forgotten password?', new_password_reset_path, data: {icon: 'info', mini: 'true', role: 'button'} %>
-        <hr>
-      <% end %>
-    </div>
-  </div>
-</div>