hatchy 0.0.7.pre → 0.0.8.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a6182e44639450d4f7f3930be10374ea274854
-  data.tar.gz: 1dc7c936060fb776dd44d5e6eb3c4798a6aaed23
+  metadata.gz: a28c2aff584d85fe0f16817743a5aa334f1903aa
+  data.tar.gz: b7c74a02c38bfbee51698e8799dd30218804736d
 SHA512:
-  metadata.gz: af098cc9f62af806ede65c34cf4f70f08fd6956cefd1d90926dfb25f76f1b6723372b4bfcb7f0019056511f03dcd59449e5376ddd7326372d777fb7deb9cc05e
-  data.tar.gz: 9cbb89245e199a17f6ba700777f38d34916238894de22cefa0258fc5616eca14ab732c4c714ee86fc3972cd0ed7e3f22c676d74cf3f1ce388f09c61d27e248e6
+  metadata.gz: 5adb47e4734ebcaa39efbad8c2cdb9620c90f1f83b417370fac4f517632489829bcfe931dee4505f538aa78b9b14092c2ed75d8d176feefb93912db645ce8a26
+  data.tar.gz: 25ce1154be34eeb4d71f242de11cfc55822cc475cf51449fadd320e27c8fd030a3de727f08a816913b743ef35723674edad8a20ce91b770f7ec9cf597c61b8f0

data/README.md

@@ -20,7 +20,7 @@ To get up and running with Hatchy in a new Rails application is simple. Just fol
 		
 		rails new my_project
 		cd my_project
-		echo "gem 'hatchy', '0.0.6.pre'" >> Gemfile
+		echo "gem 'hatchy', '0.0.8.pre'" >> Gemfile
 		bundle
 		rails g hatchy:install
 		rake db:migrate hatchy:setup
@@ -28,14 +28,14 @@ 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.7.pre and the first release
+Currently working on 0.0.9.pre and the first release
 
 ## Documentation
 auto-generated by yard
 
 ## TO-DO
 * Payments Gateway with activemerchant
-* Project's Posts and comments
+* Post's tags
 * Project's admin metrics
 * Project's Donations
 * CronJobs for project's states
@@ -44,7 +44,7 @@ auto-generated by yard
 * Demo
 
 ## Contribution
-If you'd like to help with this project, please get in touch with me. By e-mail to hugomarquez.dev@gmail.com
+If you'd like to help with this project, please get in touch with me. On Twitter @hugomarquezdev or by e-mail to hugomarquez.dev@gmail.com
 
 ## Credits
 Author: Hugo Márquez

data/app/assets/javascripts/hatchy/projects/contributions/{edit_contribution.js → edit.js}

@@ -1,4 +1,4 @@
-var edit_contribution = (function(){
+var edit = (function(){
 	// Cache DOM
 	var $billing_row = $('#billing_data');
 	var $payment_row = $('#payment_data');

data/app/assets/javascripts/hatchy/projects/posts/edit.js

@@ -0,0 +1,14 @@
+var edit = (function(){
+  // Cache DOM
+  // Bind Events
+
+  // Functions
+  function initSummerNote() {
+    var summerNote;
+    summerNote = $('.summernote');
+    return summerNote.summernote({ height: 300 });
+  }
+
+  initSummerNote();
+  return {};
+})();

data/app/assets/javascripts/hatchy/projects/show.js

@@ -1,16 +1,63 @@
-var edit = (function(){
+var show = (function(){
 	// Cache DOM
-	var $time = $('#counter');
+	var $time = $('#clock');
+	var $description = $('#description-view');
+	var $descriptionLink = $("#project-show li a[href='#description']" );
+	var $budget = $('#budget-view');
+	var $post = $('#posts-view');
+	var $currentSection = $(window.location.hash + '-view');
+	var $ulMenu = $('#project-show li a');
+	var $hashLink = $.grep( $( '#project-show li a' ), function (o) {
+    return o.hash === window.location.hash;
+  });
 
 	// Bind Events
+	$ulMenu.on('click', toggleMenu);
 
 	// Functions
+	function showCurrentSection() {
+		if (window.location.hash == '') {
+			$description.removeClass('hidden');
+			$($descriptionLink).parent().addClass('active');
+		}else{
+			$description.addClass('hidden');
+			$currentSection.removeClass('hidden');
+			$($hashLink).parent().addClass('active');
+		}
+	}
+
+	function toggleMenu() {
+		$ulMenu.parent().removeClass('active');
+		$description.addClass('hidden');
+		$post.addClass('hidden');
+		$budget.addClass('hidden');
+		$(this).parent().addClass('active');
+		$(this.hash + '-view').removeClass('hidden');
+	}
+
 	function setClock() {
-		$time.countdown($time.data('time'), function (e){
-			$(this).text(e.strftime('%D days %H:%M:%S'));
-		});
+		$time.countdown($time.data('time'))
+		.on('update.countdown', function (e) {
+			var format = '%H:%M:%S';
+			if(e.offset.days > 0) {
+				format = '%-d day%!d ' + format;
+			}
+			if(e.offset.weeks > 0) {
+				format = '%-w week%!w ' + format;
+			}
+			$(this).html(e.strftime(format));
+		})
+		.on('finish.countdown', function(e) {
+			$(this).html('This offer has expired!')
+				.parent().addClass('disabled');
+			});
 	}
 
 	setClock();
-	return{};
+	showCurrentSection();
+	return{
+		currentSection : $currentSection,
+		descriptionLink : $descriptionLink
+	};
+
 })();

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

@@ -1,3 +1,67 @@
+/* Project Show */
+.project-show {
+  padding-top: 40px;
+  padding-bottom: 80px;
+}
+.project-show .header {
+  text-align: center;
+  padding-bottom: 20px;
+}
+.project-show .info .goal,
+.project-show .info .contributions {
+  padding-bottom: 15px;
+}
+.project-show .info .goal span.headline {
+  font-weight: 300;
+  font-size: 30px;
+}
+.project-show .info .contributions span.headline {
+  font-weight: 300;
+  font-size: 30px;
+}
+.project-show .info .countdown {
+  padding-bottom: 15px;
+  font-weight: 300;
+  font-size: 30px;
+}
+.project-show .info .info-card {
+  height: 130px;
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.project-show .rewards {
+  padding-top: 60px;
+}
+.project-show .rewards .reward-card {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.project-show .posts {
+  padding-top: 20px;
+}
+.project-show .posts .post-card {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
 /* Sidebar */
 .sidebar-page {
   padding-top: 50px;

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

@@ -0,0 +1,41 @@
+module Hatchy
+  class Projects::PostsController < ApplicationController
+    skip_before_filter :authenticate_user!, only: [:show]
+  	before_action :set_project, only:[:show, :edit, :update, :destroy]
+  	before_action :set_post, only:[:show, :edit, :update, :destroy]
+
+  	def show
+  	end
+    
+    def edit
+    end
+
+    def update
+      if @post.update(post_params)
+        redirect_to project_post_path(@project, @post), notice: 'Post was successfully updated.'
+      else
+        redirect_to edit_project_post_path(@project, @post)
+        flash[:error] = @post.errors.full_messages.to_sentence
+      end
+    end
+  	
+  	def destroy
+  		@post.destroy
+  		redirect_to edit_project_path(@project, anchor: 'post')
+  		flash[:notice] = "Post was successfully destroyed."
+  	end
+
+  	private
+  	def set_project
+  		@project = Hatchy::Project.find(params[:project_id])
+  	end
+
+  	def set_post
+  		@post = @project.posts.find(params[:id])
+  	end
+
+    def post_params
+      params[:project_post].permit(:title, :content, :private)
+    end
+  end
+end

data/app/controllers/hatchy/projects_controller.rb

@@ -20,14 +20,16 @@ module Hatchy
 
     # GET /projects/:id
     def show
-      if @project.user == current_user || current_user.admin?
-        unless params[:preview]
-          redirect_to edit_project_path(@project, anchor:'basic')
-        end
-        if !@project.online?
-          flash[:notice] = "Your project status: #{@project.status}"
-        else
-          flash[:info] = "This project is online"
+      if current_user
+        if @project.user == current_user || current_user.admin?
+          unless params[:preview]
+            redirect_to edit_project_path(@project, anchor:'basic')
+          end
+          if !@project.online?
+            flash[:notice] = "Your project status: #{@project.status}"
+          else
+            flash[:info] = "This project is online"
+          end
         end
       end
     end

data/app/helpers/hatchy/application_helper.rb

@@ -1,4 +1,23 @@
-module Hatchy
-  module ApplicationHelper
-  end
+module Hatchy::ApplicationHelper
+	
+	def number_of_projects_created(user)
+		"#{user.projects.count} projects created"
+	end
+
+	def number_of_projects_funded(user)
+		"#{user.contributions.count} projects funded"
+	end
+
+	def authorized_posts(current_user, project)
+		if current_user
+			if !current_user.contributions.where(project: project).empty? || current_user == project.user || current_user.admin?
+				@posts = project.posts.order('created_at DESC')
+			else
+				@posts = @project.posts.where(private: false).order('created_at DESC')
+			end
+		else
+			@posts = @project.posts.where(private: false).order('created_at DESC')
+		end
+	end
+
 end

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

@@ -163,6 +163,8 @@ module Hatchy::ProjectStates
         :headline,
         :project_img, :video_url,
 
+        posts_attributes:[:user, :project, :title, :content, :private],
+        
         rewards_attributes:[
           :_destroy,  :deliver_at,        :description,
           :id,        :max_contributions, :min_value,

data/app/models/hatchy/project.rb

@@ -5,12 +5,14 @@ module Hatchy
     has_one     :account,         class_name:'Hatchy::ProjectAccount'
     has_many    :rewards,         class_name:'Hatchy::Reward'
     has_many    :contributions,   class_name:'Hatchy::Contribution'
+    has_many    :posts,           class_name:'Hatchy::ProjectPost'
     has_many    :payments,        through: :contributions
     belongs_to  :user,            class_name:'Hatchy::User'
     belongs_to  :category,        class_name:'Hatchy::Category'
 
     accepts_nested_attributes_for :account
     accepts_nested_attributes_for :rewards, allow_destroy: true
+    accepts_nested_attributes_for :posts, allow_destroy: true
 
     mount_uploader :project_img, Hatchy::ProjectUploader
     validates :name, presence: true, uniqueness: true

data/app/models/hatchy/project_post.rb

@@ -0,0 +1,16 @@
+module Hatchy
+  class ProjectPost < ActiveRecord::Base
+  	belongs_to :project, class_name:'Hatchy::Project'
+  	belongs_to :user, class_name:'Hatchy::User'
+
+  	validates_presence_of :user, :project, :content, :title
+
+  	before_validation :set_user
+  	before_save :set_user
+
+  	private
+  	def set_user
+  		self.user_id = self.project.try(:user_id)
+  	end
+  end
+end

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

@@ -0,0 +1,15 @@
+%table.table.table-condensed.table-striped.data-table
+  %thead
+    %tr
+      %th Id
+      %th Private
+      %th Created at
+      %th Title
+
+  %tbody
+    - posts.order('created_at DESC').each do |post|
+      %tr
+        %td= post.id
+        %td= check_box "Private", post.private, checked: post.private, disabled:true
+        %td= post.created_at.strftime("%m/%d/%Y - %l:%M%p")
+        %td= post.title

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

@@ -17,6 +17,9 @@
           %h3 Project Account
           = render 'hatchy/admin/projects/project_account', account: @project.account
         %hr
+        %h3 Posts
+        = render 'hatchy/admin/projects/posts', posts: @project.posts
+        %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/projects/contributions/edit.html.haml

@@ -1,5 +1,5 @@
 - content_for :javascripts do 
-  = javascript_include_tag "hatchy/projects/contributions/edit_contribution"
+  = javascript_include_tag "hatchy/projects/contributions/edit"
 .row
   %section
     .container

data/app/views/hatchy/projects/contributions/new.html.haml

@@ -1,5 +1,5 @@
 - content_for :javascripts do 
-  = javascript_include_tag "hatchy/projects/contributions/new_contribution"
+  = javascript_include_tag "hatchy/projects/contributions/new"
 .row
   %section
     .container

data/app/views/hatchy/projects/edit.html.haml

@@ -15,4 +15,6 @@
 			- if !@project.draft?
 				= render "hatchy/projects/edit/account"
 			- if @project.analysis?
-				= render "hatchy/projects/edit/analysis_success"
+				= render "hatchy/projects/edit/analysis_success"
+			- if @project.online?
+				= render "hatchy/projects/edit/post"

data/app/views/hatchy/projects/edit/_post.html.haml

@@ -0,0 +1,37 @@
+.container-fluid.hidden#post_dashboard
+  .row
+    .text-center
+      %h1 New Post
+  .row
+    %hr
+    .col-md-12
+      = form_for @project, html:{class: "form-horizontal"} do |f|
+        = f.fields_for :posts, @project.posts.build do |p|
+          = form_group_for p, :title do
+            .col-sm-8
+              = p.text_field :title, class: "form-control"
+          = form_group_for p, :content do
+            .col-sm-8
+              = p.text_area :content, class: "summernote"
+          .form-group
+            .col-sm-8.col-sm-offset-2
+              = p.check_box :private
+              = p.label :private
+        .form-group
+          .col-sm-offset-2.col-sm-10
+            = hidden_field_tag 'anchor', 'post'
+            = f.submit "Save Post" , class: 'btn btn-success'
+  .row
+    %hr
+    .text-center
+      %h2 Old Posts
+    .col-md-12
+      - @project.posts.order('created_at DESC').each do |post|
+        - if post.persisted?
+          .col-sm-8.col-md-offset-2.well
+            .col-md-6
+              %p= link_to post.title, project_post_path(@project, post)
+              %p= "Created at #{post.created_at.strftime("%m/%d/%Y - %l:%M%p")}"
+            .col-md-6
+              .pull-right
+                = link_to "", project_post_path(@project, post), class: 'btn btn-default fa fa-lg fa-trash ', method: :delete, data:{confirm:'Are you sure?'}

data/app/views/hatchy/projects/edit/_project_sidebar.html.haml

@@ -9,11 +9,15 @@
 				= link_to '#basic' do 
 					%i.fa.fa-pencil 
 					%span Basic
-		- if !@project.online?
 			%li
 				= link_to '#goal' do 
 					%i.fa.fa-list-ol 
 					%span Goals
+		-elsif @project.online?
+			%li
+				= link_to '#post' do 
+					%i.fa.fa-envelope
+					%span Posts
 		%li
 			= link_to '#description' do 
 				%i.fa.fa-file-text