hatchy 0.0.5.pre → 0.0.6.pre

data/app/models/concerns/hatchy/project_states.rb

@@ -48,7 +48,7 @@ module Hatchy::ProjectStates
 
     def push_to_trash
       if self.status == "draft" or self.status == "rejected" or self.status == "analysis"
-        self.status = "deleted"
+        self.status = "trash"
       else
         self.errors[:status] << "Project must be in draft, rejected or analysis first to be deleted"
       end
@@ -147,10 +147,9 @@ module Hatchy::ProjectStates
         account_attributes:[
           :account,       :account_digit,     :account_type,
           :address_city,  :address_number,    :address_state,
-          :address_street,:address_zip,       :agency,
-          :agency_digit,  :bank_id,           :email,
-          :owner_document,:owner_name,        :phone,
-          :project_id
+          :address_street,:address_zip,       :bank_id,           
+          :email,         :owner_document,    :owner_name,
+          :phone,         :project_id
         ]
       ]
     end

data/app/models/hatchy/project.rb

@@ -16,7 +16,7 @@ module Hatchy
     validates :name, presence: true, uniqueness: true
 
     scope :recommended, -> { where(recommended: true, status:'online') }
-    scope :recent, -> { where(online_date: 5.days.ago.. Time.current) }
+    scope :recent, -> { where(online_date: 5.days.ago.. Time.current, status:'online') }
     scope :online_category, -> (category_id) {where("status='online' AND category_id= ?", category_id)}
 
     def video

data/app/views/hatchy/admin/projects/_about.html.haml

@@ -0,0 +1,8 @@
+.col-md-7
+  %h3 About
+  = @project.about.html_safe
+  %hr
+  %h3 Budget
+  = @project.budget.html_safe
+.col-md-4
+  = render "hatchy/shared/project", project: @project

data/app/views/hatchy/admin/projects/_basic_info.html.haml

@@ -0,0 +1,55 @@
+%table.table.table-condensed.table-striped
+  %tr
+    %th Owner
+    %td= link_to @project.user.full_name, @project.user
+    %th Status
+    %td
+      .dropup
+        %button.btn.btn-default.dropdown-toggle{data:{toggle:"dropdown"}}
+          = @project.status
+          %span.caret
+        %ul.dropdown-menu
+          %li= link_to "send to approved", send_to_approved_admin_project_path, method: :put
+          %li= link_to "push to online", push_to_online_admin_project_path, method: :put
+          %li= link_to "send to rejected", send_to_rejected_admin_project_path, method: :put
+          %li= link_to "send to draft", send_to_draft_admin_project_path, method: :put
+          %li= link_to "push to trash", push_to_trash_admin_project_path, method: :put
+  %tr
+    %th Name
+    %td
+      = best_in_place @project, :name, url: admin_project_path
+      = link_to @project do 
+        %i.fa.fa-share-square-o
+    %th Category
+    %td= link_to @project.category.name, admin_category_path(@project.category)
+  %tr
+    %th Recommended
+    %td= best_in_place @project, :recommended, as: :checkbox, url: admin_project_path
+    %th City
+    %td= @project.city
+  %tr
+    %th Video URL
+    %td= link_to @project.video_url, @project.video_url
+    %th Short URL
+    %td= link_to @project.short_url, @project.short_url
+  %tr
+    %th Online Days
+    %td= @project.online_days
+    %th Budget
+    %td= number_to_currency @project.goal
+  - if @project.online?
+    %tr
+      %th Online Date
+      %td= @project.online_date.strftime("%m/%d/%Y - %l:%M%p")
+      %th Expires at
+      %td= @project.expires_at.strftime("%m/%d/%Y - %l:%M%p")
+  -if @project.rejected?
+    %tr
+      %th Rejected at
+      %td= @project.rejected_at.strftime("%m/%d/%Y - %l:%M%p")
+      %th
+      %td
+  - if @project.draft?
+    %tr
+      %th Send to Draft at
+      %td= @project.send_to_draft_at

data/app/views/hatchy/admin/projects/_project_account.html.haml

@@ -0,0 +1,34 @@
+%table.table.table-condensed.table-striped
+  %tr
+    %th Account Type
+    %td= account.account_type
+    %th Bank
+    %td= link_to account.bank.name, admin_bank_path(account.bank)
+  %tr
+    %th Owner Name
+    %td= account.owner_name
+    %th Owner Document
+    %td= account.owner_document
+  %tr
+    %th Email
+    %td= account.email
+    %th Phone
+    %td= account.phone
+  %tr
+    %th Account
+    %td= account.account
+    %th Account Digit
+    %td= account.account_digit
+  %tr
+    %th Address State
+    %td= account.address_state
+    %th Address City
+    %td= account.address_city
+  %tr
+    %th Address Street
+    %td= account.address_street
+    %th Address Number
+    %td= account.address_number
+  %tr
+    %th Address Zip
+    %td= account.address_zip

data/app/views/hatchy/admin/projects/index.html.haml

@@ -0,0 +1,25 @@
+.content-wrapper
+  .container-fluid
+    .row
+      .text-center
+        %h1 Projects
+      %hr
+    .row
+      .col-md-12
+        = render 'hatchy/admin/shared/admin_navtabs', list_view: admin_projects_path, new_view: ""
+        %table.table.table-condensed.table-striped.ajax-data-table{data:{source:admin_projects_url(format: :json)}}
+          %thead
+            %tr
+              %th Id
+              %th Recommended
+              %th Name
+              %th Owner
+              %th Category
+              %th City
+              %th Status
+              %th Goal
+              %th Draft At
+              %th Online Days
+              %th Online Date
+              %th Expires At
+          %tbody

data/app/views/hatchy/admin/projects/show.html.haml

@@ -0,0 +1,22 @@
+.content-wrapper
+  .container-fluid
+    .row
+      .text-center
+        %h1= @project.name
+      %hr
+    .row
+      .col-md-12
+        %ul.nav.nav-tabs
+          %li{class: "#{current_page?(admin_projects_path) ? 'active' : ''}" }
+            = link_to admin_projects_path do 
+              %i.fa.fa-list
+              %span Index
+        %h3 Basic Info
+        = render 'hatchy/admin/projects/basic_info'
+        - if @project.account != nil
+          %h3 Project Account
+          = render 'hatchy/admin/projects/project_account', account: @project.account
+        %hr
+        = render 'hatchy/admin/projects/about'
+        .col-sm-offset-2.col-sm-10
+          =link_to "Delete", admin_projects_path, method: :delete, data:{confirm: "Are you sure?"}, class:'btn btn-danger btn-lg'

data/app/views/hatchy/admin/users/_basic_info.html.haml

@@ -0,0 +1,54 @@
+%table.table.table-condensed.table-striped
+  %tr
+    %th Admin
+    %td= check_box "Admin", @user.admin, checked: @user.admin, disabled:true
+    %th Email
+    %td= @user.email
+  %tr
+    %th First Name
+    %td= @user.first_name
+    %th Last Name
+    %td= @user.last_name
+  %tr
+    %th Country
+    %td= @user.country.present? ? @user.country.name : "-"
+    %th State
+    %td= @user.address_state
+  %tr
+    %th City
+    %td= @user.address_city
+    %th Zipcode
+    %td= @user.address_zip
+  %tr
+    %th Street
+    %td= @user.address_street
+    %th Number
+    %td= @user.address_number
+  %tr
+    %th Phone
+    %td= @user.phone
+    %th Mobile
+    %td= @user.mobile
+  %tr
+    %th Facebook
+    %td= @user.facebook_link
+    %th Twitter
+    %td= @user.twitter_link
+  %tr
+    %th Created at
+    %td= @user.created_at.strftime("%m/%d/%Y - %l:%M%p")
+    %th Updated at
+    %td= @user.updated_at.strftime("%m/%d/%Y - %l:%M%p")
+  %tr
+    %th Sign In Count
+    %td= @user.sign_in_count
+  %tr
+    %th Current Sign In at
+    %td= @user.current_sign_in_at.strftime("%m/%d/%Y - %l:%M%p")
+    %th Last Sign In at
+    %td= @user.last_sign_in_at.strftime("%m/%d/%Y - %l:%M%p")
+  %tr
+    %th Last Sign In Ip
+    %td= @user.last_sign_in_ip
+    %th Current Sign In Ip
+    %td= @user.current_sign_in_ip

data/app/views/hatchy/admin/users/_contributions.html.haml

@@ -0,0 +1,25 @@
+%table.table.table-condensed.table-striped.data-table
+  %thead
+    %tr
+      %th Project
+      %th User
+      %th Reward
+      %th Anonymous
+      %th Document
+      %th Ip Address
+      %th Card Type
+      %th Value
+      %th Status
+
+  %tbody
+    - contributions.each do |contribution|
+      %tr
+        %td= link_to contribution.project.name, admin_projects_path
+        %td= link_to contribution.user.full_name, admin_users_path
+        %td= link_to contribution.reward.id, "#"
+        %td= check_box "Anonymous", contribution.anonymous, checked: contribution.anonymous, disabled:true
+        %td= contribution.document
+        %td= contribution.ip_address
+        %td= contribution.card_type
+        %td= number_to_currency contribution.value
+        %td= contribution.status

data/app/views/hatchy/admin/users/_projects.html.haml

@@ -0,0 +1,31 @@
+%table.table.table-condensed.table-striped.data-table
+  %thead
+    %tr
+      %th Name
+      %th Recommended
+      %th Category
+      %th City
+      %th Status
+      %th Goal
+      %th Draft At
+      %th Online Days
+      %th Online Date
+      %th Expires At
+
+  %tbody
+    - projects.each do |project|
+      %tr
+        %td= project.name
+        %td= check_box "recommended", project.recommended, checked: project.recommended, disabled:true
+        %td= link_to project.category.name, admin_category_path(project.category)
+        %td= project.city
+        %td= project.status
+        %td= number_to_currency project.goal
+        %td= project.send_to_draft_at.strftime("%m/%d/%Y - %l:%M%p")
+        %td= project.online_days
+        - if project.online?
+          %td= project.online_date.strftime("%m/%d/%Y - %l:%M%p")
+          %td= project.expires_at.strftime("%m/%d/%Y - %l:%M%p")
+        - else
+          %td -
+          %td -

data/app/views/hatchy/admin/users/index.html.haml

@@ -0,0 +1,24 @@
+.content-wrapper
+  .container-fluid
+    .row
+      .text-center
+        %h1 Users
+      %hr
+    .row
+      .col-md-12
+        = render 'hatchy/admin/shared/admin_navtabs', list_view: admin_users_path, new_view: ""
+        %table.table.table-condensed.table-striped.ajax-data-table{data:{source:admin_users_url(format: :json)}}
+          %thead
+            %tr
+              %th Id
+              %th Admin
+              %th First Name
+              %th Last Name
+              %th Email
+              %th Document
+              %th Phone
+              %th Mobile
+              %th Newsletter
+              %th Signin Count
+              %th Last Signin At
+          %tbody

data/app/views/hatchy/admin/users/show.html.haml

@@ -0,0 +1,20 @@
+.content-wrapper
+  .container-fluid
+    .row
+      .text-center
+        %h1= @user.full_name
+      %hr
+    .row
+      .col-md-12
+        = render 'hatchy/admin/shared/admin_navtabs', list_view: admin_users_path, new_view: "", edit_path: edit_admin_user_path
+        %h3 Basic Info
+        = render 'hatchy/admin/users/basic_info'
+        %hr
+        %h3 Projects
+        = render 'hatchy/admin/users/projects', projects: @user.projects
+        %hr
+        %h3 Contributions
+        = render 'hatchy/admin/users/contributions', contributions: @user.contributions
+        %hr
+        .col-sm-offset-2.col-sm-10
+          =link_to "Delete", admin_user_path(@user), method: :delete, data:{confirm: "Are you sure?"}, class:'btn btn-danger btn-lg'

data/lib/generators/hatchy/install_generator.rb

@@ -0,0 +1,24 @@
+require 'rails/generators'
+module Hatchy::Generators
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path("../../templates", __FILE__)
+    
+    def create_route
+      route 'mount Hatchy::Engine => "/"'
+    end
+
+    def copy_initializer
+    	template "hatchy.rb", "config/initializers/hatchy.rb"
+    end
+
+    def copy_locale
+    	copy_file "../../../config/locales/en.yml", "config/locales/hatchy.en.yml"
+    	copy_file "../../../config/locales/devise.en.yml", "config/locales/devise.en.yml"
+    end
+
+    def copy_devise_initializer
+      copy_file "../../../config/initializers/devise.rb", "config/initializers/devise.rb"
+    end
+
+  end
+end

data/lib/generators/templates/hatchy.rb

@@ -0,0 +1,4 @@
+Hatchy.setup do |config|
+	# Set Theme
+	config.theme = 'default'
+end

data/lib/hatchy.rb

@@ -8,6 +8,7 @@ require "video_info"
 require "pundit"
 require "kaminari"
 require "jquery-datatables-rails"
+require "best_in_place"
 require "hatchy/engine"
 
 module Hatchy
@@ -21,4 +22,11 @@ module Hatchy
 
   mattr_accessor :theme
   @@theme = 'default'
+
+  # Default way to setup Hatchy. Run rails generate hatchy_install to create
+  # a fresh initializer with all configuration values.
+  def self.setup
+  	yield self
+  end
+
 end

data/lib/hatchy/version.rb

@@ -1,3 +1,3 @@
 module Hatchy
-  VERSION = "0.0.5.pre"
+  VERSION = "0.0.6.pre"
 end

data/lib/tasks/hatchy_tasks.rake

@@ -5,14 +5,24 @@ namespace :hatchy do
       require File.join(Hatchy.root, 'db', 'seed')
     end
 
-   desc "Import default set of countries"
+  desc "Import default set of countries"
     task :import_countries => :environment do
       Hatchy::CountryImporter.import
     end
 
+  desc "Create a default admin user"
+    task :create_admin_user => :environment do 
+      Hatchy::User.create(email:'admin@example.com', password:'password', password_confirmation:'password', first_name:'Default', last_name:'Admin', admin: true)
+      puts "    New user has been created successfully."
+      puts
+      puts "    E-Mail Address..: admin@example.com"
+      puts "    Password........: password"
+    end
+
   desc "Run the setup task for a new application"
     task :setup => :environment do
       Rake::Task["hatchy:seed"].invoke
       Rake::Task["hatchy:import_countries"].invoke if Hatchy::Country.all.empty?
+      Rake::Task["hatchy:create_admin_user"].invoke if Hatchy::User.all.empty?
     end
 end

data/spec/controllers/hatchy/admin/projects_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module Hatchy
+  RSpec.describe Admin::ProjectsController, type: :controller do
+
+  end
+end

data/spec/controllers/hatchy/admin/users_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+module Hatchy
+  RSpec.describe Admin::UsersController, type: :controller do
+
+  end
+end