jinda 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d366628d4cd026005bc75ff7c777cc27e783dcc626d57b5c93b6f67601f01b1e
-  data.tar.gz: d3392657824388c9815e929c279b1e538dbf5017411bd7a4e7eb0c7b55decbd8
+  metadata.gz: d49fa24aa2e25021a773b5736e482b5d8478b3a96440c9655fa5f858b59ca4a4
+  data.tar.gz: 50fcacd6f6bb71d63703c1db158b2722b5a1302f98682308f0d22a905a5dadb9
 SHA512:
-  metadata.gz: 67a1ddc7b42bba833d2331f0a8b166928560230cb97fbbda1453192daa2009345e6a06eb4e8eb1699846a50e14bdf373bc3816b75cd275dd36ab5f07ade652f4
-  data.tar.gz: be82dbe2c79f1bac9f7406d2fb97242ba8ce17f39bd0d07469d681e965a7e2db71a476bb3e428dbd85f16ec2e594d16ff81e772429c53e192d8b2d7bca1a5e72
+  metadata.gz: 401cb729865c3138c92668151db6af90f53e5e1c6d3583d35b9e0730e7be1b391a0d862cb9e810cf083678557e7ed3a0726749e44537883c0b9aa9c020e81f91
+  data.tar.gz: 6ef731fb5b4d44c08c6fdfe21a552a3c6a881fbd0ec6578fe78cb56d93903da34ec1bbf42ef9b7474893a6f47bc6f8f9930ff5bff8140c36afdae85d3ae974d7

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
 
@@ -40,7 +40,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.6.9'
+    gem 'jinda', '~> 0.7.0.1'
 
 For Development (most updated)
 

data/app/assets/stylesheets/jinda.scss

@@ -0,0 +1,185 @@
+// jinda.scss from jinda/app engine
+#tooltip{
+  position:absolute;
+  border:1px solid #333;
+  background:#f7f5d1;
+  padding:2px 5px;
+  color:#333;
+  display:none;
+}
+#notice {
+  color: #F90609;
+  background-color: #EBD1D1;
+  font-weight: bolder;
+  padding-left: 10px;
+}
+.step {
+  /*display: table-row;*/
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.steps_more {
+  font-size: 40px;
+  font-weight: bold;
+  vertical-align: middle;
+  color: white;
+  width: 80px;
+  height: 80px;
+  background:url(images/button_blue.png) no-repeat;
+  display: table-cell;
+  text-align:center;
+}
+.step_now {
+  font-size: 40px;
+  font-weight: bold;
+  vertical-align: middle;
+  color: white;
+  width: 80px;
+  height: 80px;
+  background:url(images/button_red.png) no-repeat;
+  display: table-cell;
+  text-align:center;
+}
+.steps_done {
+  font-size: 40px;
+  font-weight: bold;
+  vertical-align: middle;
+  color: white;
+  width: 80px;
+  height: 80px;
+  background:url(images/button_black.png) no-repeat;
+  display: table-cell;
+  text-align:center;
+}
+.sign_in {
+  width: 100%;
+  max-width: 410px;
+  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);
+  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' 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/config_generator.rb

@@ -65,12 +65,13 @@ module Jinda
                 end
             end
 
-           #  desc "Setup Dockerfile"
-           #  def setup_docker
-           #      FileUtils.mv "Dockerfile", "Dockerfile"
-           #      FileUtils.mv "docker-compose.yml", "docker-compose.yml"
-           #      FileUtils.mv "entrypoint.sh", "entrypoint.sh"
-           #  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"

data/lib/generators/jinda/install_generator.rb

@@ -17,9 +17,9 @@ 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.10.10'
+        gem 'nokogiri', '~> 1.11.0'
         gem 'haml', '~> 5.1', '>= 5.1.2'
         gem 'haml-rails', '~> 2.0.1'
         gem 'mail'
@@ -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'
@@ -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
 

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/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/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"

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/generators/jinda/templates/docker-compose.yml

@@ -1,7 +1,8 @@
-version: '3'
+version: '3.5'
 services:
   web:
     build: .
+    env_file: .env
     command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
     volumes:
       - .:/myapp
@@ -13,4 +14,4 @@ services:
   mongodb:
     image: mongo
     ports:
-      - "27017:27017"
+      - "27888:27017"

data/lib/generators/jinda/templates/entrypoint.sh

@@ -5,8 +5,9 @@ cp /myapp/config/mongoid.yml-docker /myapp/config/mongoid.yml
 # Remove a potentially pre-existing server.pid for Rails.
 rm -f /myapp/tmp/pids/server.pid
 # Compile the assets
-# bundle exec rake assets:precompile
+bundle exec rake assets:precompile
 # Add admin user
+# rake db:seed
 rake jinda:seed
 # Then exec the container's main process (what's set as CMD in the Dockerfile).
 exec "$@"

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-01-18 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
@@ -180,7 +166,7 @@ files:
 - app/assets/stylesheets/images/icons-36-black.png
 - app/assets/stylesheets/images/icons-36-white.png
 - app/assets/stylesheets/images/indicator.gif
-- app/assets/stylesheets/jinda.css
+- app/assets/stylesheets/jinda.scss
 - app/assets/stylesheets/jinda_jqm.css.scss
 - app/assets/stylesheets/jquery.mobile-1.2.1.css
 - app/assets/stylesheets/jquery.mobile.datebox.css
@@ -285,6 +271,7 @@ files:
 - lib/generators/jinda/templates/app/views/admins/edit_role/edit_role.html.erb
 - lib/generators/jinda/templates/app/views/admins/edit_role/select_user.html.erb
 - lib/generators/jinda/templates/app/views/api/v1/note.haml
+- lib/generators/jinda/templates/app/views/articles/_report.haml
 - lib/generators/jinda/templates/app/views/articles/edit.haml
 - lib/generators/jinda/templates/app/views/articles/edit_article/edit_article.html.erb
 - lib/generators/jinda/templates/app/views/articles/edit_article/select_article.html.erb
@@ -305,7 +292,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
@@ -343,8 +330,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

data/app/assets/stylesheets/jinda.css

@@ -1,69 +0,0 @@
-#tooltip{
-  position:absolute;
-  border:1px solid #333;
-  background:#f7f5d1;
-  padding:2px 5px;
-  color:#333;
-  display:none;
-}
-#notice {
-  color: #F90609;
-  background-color: #EBD1D1;
-  font-weight: bolder;
-  padding-left: 10px;
-}
-.step {
-  /*display: table-row;*/
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-.steps_more {
-  font-size: 40px;
-  font-weight: bold;
-  vertical-align: middle;
-  color: white;
-  width: 80px;
-  height: 80px;
-  background:url(images/button_blue.png) no-repeat;
-  display: table-cell;
-  text-align:center;
-}
-.step_now {
-  font-size: 40px;
-  font-weight: bold;
-  vertical-align: middle;
-  color: white;
-  width: 80px;
-  height: 80px;
-  background:url(images/button_red.png) no-repeat;
-  display: table-cell;
-  text-align:center;
-}
-.steps_done {
-  font-size: 40px;
-  font-weight: bold;
-  vertical-align: middle;
-  color: white;
-  width: 80px;
-  height: 80px;
-  background:url(images/button_black.png) no-repeat;
-  display: table-cell;
-  text-align:center;
-}
-.sign_in {
-  width: 100%;
-  max-width: 410px;
-  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);
-  transition: all 0.3s cubic-bezier(.25,.8,.25,1);
-}
-

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>