jinda 0.7.0 → 0.7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d366628d4cd026005bc75ff7c777cc27e783dcc626d57b5c93b6f67601f01b1e
-  data.tar.gz: d3392657824388c9815e929c279b1e538dbf5017411bd7a4e7eb0c7b55decbd8
+  metadata.gz: 2ca87efff8bd66514eebb024644656648fd93a4b945a22dbb6659df96026d45e
+  data.tar.gz: 77fdbd475b8c9196e64f097c393519d6345f97822d0f3fde0b9e6bab8bdc12aa
 SHA512:
-  metadata.gz: 67a1ddc7b42bba833d2331f0a8b166928560230cb97fbbda1453192daa2009345e6a06eb4e8eb1699846a50e14bdf373bc3816b75cd275dd36ab5f07ade652f4
-  data.tar.gz: be82dbe2c79f1bac9f7406d2fb97242ba8ce17f39bd0d07469d681e965a7e2db71a476bb3e428dbd85f16ec2e594d16ff81e772429c53e192d8b2d7bca1a5e72
+  metadata.gz: 5ae63a36708f4831d99c564b0ffef7f8f24c48f3753f2ecb8036a988f2720791aa7b5796c53bab21d3c4b2f32a5364d5cabf4a0b91ca551770974dcc796690c9
+  data.tar.gz: a868c134eec359d38bc5f8e7bb5400b20e1e53b40dac9dc2870cbe7b08e500f15c83cded720e8caab516025d450be80a3c48b693872a4f9eb51c3133eb48a352

data/README.md

@@ -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.css → jinda.scss}

@@ -67,3 +67,6 @@
   transition: all 0.3s cubic-bezier(.25,.8,.25,1);
 }
 
+.module-table{
+  display: grid;
+}

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

@@ -33,7 +33,7 @@
         %div.inner
           %b Installation
           %ul
-            %li add gem 'jinda', '0.7.0' to Gemfile then $ bundle
+            %li add gem 'jinda', '0.7.0.1' 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

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

@@ -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
 

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/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/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.0.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.0.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-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -180,7 +180,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 +285,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