hatchy 0.0.6.pre → 0.0.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e145ab2442f609b60865ae885df01448a1b4f8ec
-  data.tar.gz: 7bd3a8aec7e366dfa033b38690bdd844dfa43f5e
+  metadata.gz: 61a6182e44639450d4f7f3930be10374ea274854
+  data.tar.gz: 1dc7c936060fb776dd44d5e6eb3c4798a6aaed23
 SHA512:
-  metadata.gz: 7f85d4e07cb8761b8b6b0fcbc36c5a7c261f8ffb14b6aa3a476cd4af4c8d46b9c5338e37609bd88e58dfc4965ae265d7bc19a79791171fb19fc3decf1ff821f5
-  data.tar.gz: 68189b3e839f519eff98091ef5ae48109158e31cc760c6786e4a015fcfcdc53b38a9698a5511f0d1dcb851b641e0e285495e7f6d9629d97525a16638924eff72
+  metadata.gz: af098cc9f62af806ede65c34cf4f70f08fd6956cefd1d90926dfb25f76f1b6723372b4bfcb7f0019056511f03dcd59449e5376ddd7326372d777fb7deb9cc05e
+  data.tar.gz: 9cbb89245e199a17f6ba700777f38d34916238894de22cefa0258fc5616eca14ab732c4c714ee86fc3972cd0ed7e3f22c676d74cf3f1ce388f09c61d27e248e6

data/README.md

@@ -1,5 +1,9 @@
 # Hatchy - Crowdfunding Platform
 
+[![Gem Version](https://badge.fury.io/rb/hatchy.svg)](https://badge.fury.io/rb/hatchy)
+[![Build Status](https://travis-ci.org/hugomarquez/hatchy.svg?branch=master)](https://travis-ci.org/hugomarquez/hatchy)
+[![Coverage Status](https://coveralls.io/repos/github/hugomarquez/hatchy/badge.svg?branch=master)](https://coveralls.io/github/hugomarquez/hatchy?branch=master)
+
 Hatchy, is the first open source Rails engine with Crowdfunding features, such as:
 * Projects
 * Project's Admin Interface
@@ -24,21 +28,19 @@ To get up and running with Hatchy in a new Rails application is simple. Just fol
 
 ## State of the project
 The project is not production ready yet.
-Currently working on 0.0.6.pre and the first release
+Currently working on 0.0.7.pre and the first release
 
 ## Documentation
 auto-generated by yard
 
-## Links
-TO-DO:
+## TO-DO
 * Payments Gateway with activemerchant
-* Admin Projects
-* Admin Users
-* Admin Contributions
 * Project's Posts and comments
 * Project's admin metrics
 * Project's Donations
 * CronJobs for project's states
+* Explore search and presentation
+* More Testing
 * Demo
 
 ## Contribution

data/app/assets/javascripts/hatchy/dashboard.js

@@ -1,7 +1,7 @@
 var dashboard = (function(){
   // Cache DOM
   var $owl_your_projects = $('#owl-your-projects');
-  var $owl_projects_you_support = $('#owl-projects-you-support')
+  var $owl_contributions = $('#owl-contributions')
 
   // Functions
   function projectsCarousel() {
@@ -11,7 +11,7 @@ var dashboard = (function(){
       items: 3
     });
 
-    $owl_projects_you_support.owlCarousel({
+    $owl_contributions.owlCarousel({
       autoPlay: true,
       stopOnHover: true,
       items: 3

data/app/assets/javascripts/hatchy/projects/contributions/edit_contribution.js

@@ -0,0 +1,18 @@
+var edit_contribution = (function(){
+	// Cache DOM
+	var $billing_row = $('#billing_data');
+	var $payment_row = $('#payment_data');
+	var $currentRow = $('.container .col-md-12 .row.hidden' + window.location.hash);
+
+	// Bind Events
+	// Functions
+	function showHashLocation() {
+		if(window.location.hash != ''){
+			$billing_row.addClass('hidden');
+			$currentRow.removeClass('hidden');
+		}
+  }
+
+  showHashLocation();
+	return{};
+})();

data/app/assets/javascripts/hatchy/projects/contributions/new_contribution.js

@@ -2,16 +2,10 @@ var new_contribution = (function(){
 	// Cache DOM
 	var $rewards_section = $('.reward-select');
 	var $rewards_row = $('#reward_data');
-	var $billing_row = $('#billing_data');
-	var $payment_row = $('#payment_data');
-	var $reward_continue = $('.reward_continue');
-	var $billing_continue = $('#billing_continue');
 	init();
 
 	// Bind Events
 	$rewards_section.on('click', selectReward);
-	$reward_continue.on('click', renderBilling);
-	$billing_continue.on('click', renderPayment);
 	
 	// Functions
 	function selectReward(event){
@@ -29,16 +23,6 @@ var new_contribution = (function(){
 		$('.reward-body').not('.hidden').addClass('hidden');
 	}
 
-	function renderBilling(event){
-		$rewards_row.addClass('hidden');
-		$billing_row.removeClass('hidden');
-	}
-
-	function renderPayment(event){
-		$billing_row.addClass('hidden');
-		$payment_row.removeClass('hidden');
-	}
-
 	function init(){
 		$radio = $('input[type=radio]:checked');
 		$reward_select = $radio.closest('.reward-select');

data/app/assets/stylesheets/hatchy/base.scss

@@ -123,7 +123,40 @@
 .project-card .content .body {
   color: #7e7e7e;
 }
-
+/* Small Project Card */
+.project-card-sm {
+  width: 237px;
+  height: 418px;
+  max-height: 418px;
+  border: 1px solid #EFEFEF;
+  border-radius: 6px;
+  overflow: hidden;
+  background: white;
+  text-align: left;
+  font-size: 12px;
+}
+.project-card-sm .header {
+  width: 237px;
+  height: 200px;
+}
+.project-card-sm .content {
+  position: relative;
+  padding-bottom: 0;
+  padding-top: 20px;
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.project-card-sm .footer {
+  padding: 20px;
+  font-weight: 500;
+  color: #7e7e7e;
+}
+.project-card-sm .content .title {
+  font-weight: 300;
+}
+.project-card-sm .content .body {
+  color: #7e7e7e;
+}
 /* Flash errors */
 #flash_notice{
   @extend .alert-info;

data/app/controllers/hatchy/admin/contributions_controller.rb

@@ -0,0 +1,22 @@
+module Hatchy
+  class Admin::ContributionsController < Admin::ApplicationController
+    before_action :set_contribution, only: [:show]
+
+    # GET /contributions
+    def index
+      respond_to do |format|
+        format.html
+        format.json { render json: Hatchy::ContributionsDatatable.new(view_context) }
+      end
+    end
+    
+    # GET /contribution/:id
+    def show
+    end
+
+    private
+    def set_contribution
+      @contribution = Hatchy::Contribution.find(params[:id])
+    end
+  end
+end

data/app/controllers/hatchy/admin/users_controller.rb

@@ -41,7 +41,7 @@ module Hatchy
     end
 
     def user_params
-      params[:user].permit(:first_name, :last_name)
+      params[:user].permit(:admin)
     end
   end
 end

data/app/controllers/hatchy/categories/subscriptions_controller.rb

@@ -0,0 +1,29 @@
+module Hatchy
+  class Categories::SubscriptionsController < ApplicationController
+  	before_filter :authenticate_user!
+		before_action :set_category
+
+		def create
+			if current_user.categories.where(id: @category.id).present?
+				redirect_to root_path(category_id: @category.id)
+				flash[:notice] = "You are already following #{@category.name}"
+			else
+				@category.users << current_user
+				redirect_to root_path(category_id: @category.id)
+				flash[:success] = "You are now following #{@category.name}"
+			end
+		end
+
+		def destroy
+			@category.users.delete(current_user)
+			redirect_to root_path(category_id: @category.id)
+			flash[:notice] = "You unfollowed #{@category.name}"
+		end
+
+		private
+		def set_category
+			@category ||= Category.find(params[:id])
+		end
+		
+  end
+end

data/app/controllers/hatchy/dashboard_controller.rb

@@ -2,7 +2,7 @@ module Hatchy
   class DashboardController < ApplicationController
     def index
       @my_projects = current_user.projects
-      @supported_projects = nil
+      @contributions = current_user.contributions
     end
   end
 end

data/app/controllers/hatchy/projects/contributions_controller.rb

@@ -1,42 +1,52 @@
 module Hatchy
   class Projects::ContributionsController < ApplicationController
-    before_action :set_resources, only: [:new, :create]
+    before_action :set_project, only:[:new, :edit, :create, :update]
+    before_action :set_contribution, only:[:edit, :update]
 
-    def new 
-      @contribution = Hatchy::Contribution.new(project: @project)
-      empty_reward = Hatchy::Reward.new(min_value: 10.0, description: 'No reward contributions')
-      @rewards = [empty_reward] + @project.rewards.order(:min_value) #Bring remaining rewards from project
+    def new
+      @contribution = @project.contributions.build
+      @rewards = @project.rewards.order(:min_value)
       @selected_reward = @project.rewards.find(params[:reward_id]) if params[:reward_id]
       if @selected_reward.present?
         @contribution.reward = @selected_reward
       end
     end
 
-    def create
-      @contribution = Hatchy::Contribution.new(contribution_params)
-      @contribution.ip_address = request.remote_ip
-      @contribution.user = @user
-      @contribution.project = @project
-      @selected_reward = @project.rewards.find(params[:reward_id]) if params[:reward_id]
-      if @selected_reward.present?
-        @contribution.reward = @selected_reward
-      end
+    def edit
+      @user = current_user
+      @countries = Hatchy::Country.all
+    end
 
+    def create
+      @contribution = @project.contributions.new(contribution_params)
+      @contribution.user = current_user
       if @contribution.valid?
         @contribution.save
-        redirect_to project_path(@project)
-        flash[:notice] = "Contribution created successfully"
+        redirect_to edit_project_contribution_path(@project, @contribution), notice: "Contribution saved successfully"
       else
-        redirect_to new_project_contribution_path
+        redirect_to root_path
         flash[:error] = @contribution.errors.full_messages.to_sentence
       end
     end
 
-    def review
-      current_user.build_bank_account unless current_user.bank_account
+    def update
+      @contribution.ip_address = request.remote_ip
+      if @contribution.update(contribution_params)
+        redirect_to edit_project_contribution_path(@project, @contribution, anchor: params[:anchor]), notice: 'Contribution was successfully updated.'
+      else
+        render :edit
+        flash[:error] = @contribution.errors.full_messages.to_sentence
+      end
     end
 
     private
+    def set_project
+      @project = Hatchy::Project.find(params[:project_id])
+    end
+
+    def set_contribution
+      @contribution = Hatchy::Contribution.find(params[:id])
+    end
     
     def contribution_params
       params[:contribution].permit(
@@ -46,15 +56,9 @@ module Hatchy
         :email,             :name,                :notified_when_finish,
         :project,           :reward_id,           :user,
         :value,             :card_type,           :card_expires_on,
-        :card_number,       :card_verification
+        :card_number,       :card_verification,   :step
       )
     end
 
-    def set_resources
-      @project = Hatchy::Project.find(params[:project_id])
-      @user = current_user if current_user
-      @countries = Hatchy::Country.order(:name)
-    end
-
   end
 end

data/app/datatables/hatchy/application_datatable.rb

@@ -0,0 +1,8 @@
+module Hatchy
+  class ApplicationDatatable
+  	include ActionView::Context
+		include ActionView::Helpers
+		include Hatchy::Engine.routes.url_helpers
+
+  end
+end

data/app/datatables/hatchy/contributions_datatable.rb

@@ -1,5 +1,5 @@
 module Hatchy
-	class ContributionsDatatable
+	class ContributionsDatatable < Hatchy::ApplicationDatatable
 		delegate :params, :link_to, :check_box, :number_to_currency, to: :@view
 
 		def initialize(view)
@@ -20,15 +20,26 @@ module Hatchy
 	  def data
 	  	contributions.map do |contribution|
 	      [
-	      	link_to(contribution.id, "#"),
-	      	link_to(contribution.project.name, contribution.project),
-	      	link_to(contribution.user.full_name, "/admin/users/#{contribution.user.id}"),
-	      	link_to(contribution.reward.id, "#"),
-	      	check_box("Anonymous", contribution.anonymous, checked: contribution.anonymous, disabled: true),
-	      	contribution.ip_address,
-	      	contribution.card_type,
+	      	contribution.id,
+	      	link_to(contribution.project.name, admin_project_path(contribution.project)),
+	      	link_to(contribution.project.user.full_name, admin_user_path(contribution.project.user)),
+	      	link_to(contribution.user.full_name, admin_user_path(contribution.user)),
+	      	number_to_currency(contribution.reward.min_value),
 	      	number_to_currency(contribution.value),
-	      	contribution.status
+	      	contribution.status,
+	      	(
+	        	content_tag :ul, class:'inline list-inline' do 
+	        		content_tag :li, title:'info', rel:'tooltip', class:'pull-right' do
+	        			link_to admin_contribution_path(contribution) do 
+	        				content_tag :i, class:'fa fa-lg fa-info-circle' do 
+	        					content_tag :span, style:'display:none;' do 
+	        						"info"
+	        					end
+	        				end
+	        			end
+	        		end
+	        	end
+	        	)
 	      ]
 	    end
 	  end
@@ -55,7 +66,7 @@ module Hatchy
 	  end
 
 	  def sort_column
-	    columns = %w[id project user reward anonymous ip_address card_type value status]
+	    columns = %w[id project user reward value status anonymous]
 	    hash = params[:order]
 	    columns[hash.flatten[1]["column"].to_i]
 	  end

data/app/datatables/hatchy/projects_datatable.rb

@@ -1,5 +1,5 @@
 module Hatchy
-  class ProjectsDatatable
+  class ProjectsDatatable < Hatchy::ApplicationDatatable
     delegate :params, :h, :link_to, :check_box, :number_to_currency, to: :@view
 
     def initialize(view)
@@ -20,18 +20,27 @@ module Hatchy
     def data
       projects.map do |project|
         [
-          link_to(project.id, "/admin/projects/#{project.id}"),
+          project.id,
           check_box("Recommended", project.recommended, checked: project.recommended, disabled: true),
-          link_to(project.name, project),
-          link_to(project.user.full_name, project.user),
+          link_to(project.name, project_path(project)),
+          link_to(project.user.full_name, admin_user_path(project.user)),
           project.category.name,
           project.city,
           project.status,
           number_to_currency(project.goal),
-          project.send_to_draft_at.strftime("%m/%d/%Y - %l:%M%p"),
-          project.online_days,
-          project.online? ? project.online_date.strftime("%m/%d/%Y - %l:%M%p") : "-",
-          project.online? ? project.expires_at.strftime("%m/%d/%Y - %l:%M%p") : "-",
+          (
+            content_tag :ul, class:'inline list-inline' do 
+              content_tag :li, title:'info', rel:'tooltip', class:'pull-right' do
+                link_to admin_project_path(project) do 
+                  content_tag :i, class:'fa fa-lg fa-info-circle' do 
+                    content_tag :span, style:'display:none;' do 
+                      "info"
+                    end
+                  end
+                end
+              end
+            end
+            )
         ]
       end
     end
@@ -58,7 +67,7 @@ module Hatchy
     end
 
     def sort_column
-      columns = %w[id name city goal online_days online_date expires_at send_to_draft_at status recommended]
+      columns = %w[id recommended name city goal]
       hash = params[:order]
       columns[hash.flatten[1]["column"].to_i]
     end

data/app/datatables/hatchy/users_datatable.rb

@@ -1,5 +1,5 @@
 module Hatchy
-	class UsersDatatable
+	class UsersDatatable < Hatchy::ApplicationDatatable
 		delegate :params, :h, :link_to, :check_box, :number_to_currency, to: :@view
 
 		def initialize(view)
@@ -20,17 +20,26 @@ module Hatchy
 	  def data
 	  	users.map do |user|
 	      [
-	      	link_to(user.id, "/admin/users/#{user.id}"),
-	      	check_box("admin", user.admin, checked: user.admin, disabled: true),
+	      	user.id,
 	      	user.first_name,
 	      	user.last_name,
+	      	check_box("admin", user.admin, checked: user.admin, disabled: true),
 	        link_to(user.email, user),
-	        user.document,
 	        user.phone,
 	        user.mobile,
-	        check_box("newsletter", user.newsletter, checked: user.newsletter, disabled: true),
-	        user.sign_in_count,
-	        user.last_sign_in_at.strftime("%m/%d/%Y - %l:%M%p"),
+	        (
+	        	content_tag :ul, class:'inline list-inline' do 
+	        		content_tag :li, title:'info', rel:'tooltip', class:'pull-right' do
+	        			link_to admin_user_path(user) do 
+	        				content_tag :i, class:'fa fa-lg fa-info-circle' do 
+	        					content_tag :span, style:'display:none;' do 
+	        						"info"
+	        					end
+	        				end
+	        			end
+	        		end
+	        	end
+	        	)
 	      ]
 	    end
 	  end
@@ -57,7 +66,7 @@ module Hatchy
 	  end
 
 	  def sort_column
-	    columns = %w[id admin first_name last_name email document phone mobile newsletter sign_in_count last_sign_in_at]
+	    columns = %w[id first_name last_name admin email phone mobile]
 	    hash = params[:order]
 	    columns[hash.flatten[1]["column"].to_i]
 	  end