Merge 'master' branch of lightair from github

Author: Pbasnal

Gemfile

@@ -67,6 +67,7 @@ gem 'devise_invitable'
 
 # Use bootstrap to generate quick, elegent and responsive layouts
 gem 'bootstrap-sass'
+gem 'bootstrap-datepicker-rails'
 
 # The following gems for testing purpose in development and testing environment
 group :development, :test do
@@ -90,5 +91,12 @@ group :test do
 end
 
 gem 'simple_form'
+# Use to add redactor editor
+gem 'redactor-rails'
+gem 'carrierwave'
+gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+gem 'mini_magick'
+gem 'redis-rails'
+gem 'redis-namespace'
 gem 'pry'
 gem 'rest_client'

Gemfile.lock

@@ -43,10 +43,21 @@ GEM
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
     bcrypt (3.1.7)
+    bootstrap-datepicker-rails (1.3.0.2)
+      railties (>= 3.0)
     bootstrap-sass (3.2.0.0)
       sass (~> 3.2)
     bson (2.3.0)
     builder (3.2.2)
+    carrierwave (0.10.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+    carrierwave-mongoid (0.7.1)
+      carrierwave (>= 0.8.0, < 0.11.0)
+      mongoid (>= 3.0, < 5.0)
+      mongoid-grid_fs (>= 1.3, < 3.0)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     coderay (1.1.0)
@@ -124,13 +135,18 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mini_magick (3.7.0)
+      subexec (~> 0.2.1)
     mini_portile (0.6.0)
     minitest (5.3.5)
     mongoid (4.0.0)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
+    mongoid-grid_fs (2.1.0)
+      mime-types (>= 1.0, < 3.0)
+      mongoid (>= 3.0, < 5.0)
     moped (2.0.0)
       bson (~> 2.2)
       connection_pool (~> 2.0)
@@ -188,9 +204,29 @@ GEM
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
+    redactor-rails (0.4.5)
+      devise
+      mime-types
+      orm_adapter
     redis (3.1.0)
+    redis-actionpack (4.0.0)
+      actionpack (~> 4)
+      redis-rack (~> 1.5.0)
+      redis-store (~> 1.1.0)
+    redis-activesupport (4.0.0)
+      activesupport (~> 4)
+      redis-store (~> 1.1.0)
     redis-namespace (1.5.0)
       redis (~> 3.0, >= 3.0.4)
+    redis-rack (1.5.0)
+      rack (~> 1.5)
+      redis-store (~> 1.1.0)
+    redis-rails (4.0.0)
+      redis-actionpack (~> 4)
+      redis-activesupport (~> 4)
+      redis-store (~> 1.1.0)
+    redis-store (1.1.4)
+      redis (>= 2.2)
     ref (1.0.5)
     rest_client (1.7.3)
       netrc (~> 0.7.7)
@@ -253,6 +289,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
+    subexec (0.2.3)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
@@ -282,7 +319,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-datepicker-rails
   bootstrap-sass
+  carrierwave
+  carrierwave-mongoid
   coffee-rails (~> 4.0.0)
   database_cleaner
   devise
@@ -296,10 +336,14 @@ DEPENDENCIES
   jbuilder (~> 2.0)
   jquery-rails
   linkedin
+  mini_magick
   mongoid
   omniauth-google-oauth2
   pry
   rails (= 4.1.2)
+  redactor-rails
+  redis-namespace
+  redis-rails
   rest_client
   rspec-rails
   sass-rails (~> 4.0.3)

app/assets/javascripts/application.js

@@ -14,6 +14,10 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require bootstrap
+//= require bootstrap-datepicker
+// require bootstrap-datepicker-rails
+//= require redactor-rails
+//= require redactor-rails/plugins
 //= require_tree .
 
 

app/assets/javascripts/users.js.coffee

@@ -1,3 +1,4 @@
 # Place all the behaviors and hooks related to the matching controller here.
 # All this logic will automatically be available in application.js.
 # You can use CoffeeScript in this file: http://coffeescript.org/
+$('.datepicker').datepicker()

app/assets/stylesheets/application.scss

@@ -12,6 +12,9 @@
  *
  *= require_tree .
  *= require_self
+ *= require bootstrap-datepicker
+ *= require redactor-rails
+ *= redactor-rails/plugins
  */
 
  @import "bootstrap";

app/assets/stylesheets/newsletters.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the newsletters controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/newsletters_controller.rb

@@ -1,2 +1,47 @@
 class NewslettersController < ApplicationController
+
+  def index
+    @newsletters = Newsletter.order_by([:sent_on, :asc])
+  end
+
+  def show
+    @newsletter = Newsletter.find(params[:id])
+  end
+
+  def new 
+    @newsletter = Newsletter.new
+  end
+
+  def newsletters_params
+    params.require(:newsletter).permit(:id, :content, :sent_on, :users_count)
+  end
+
+  def create 
+    @newsletter = Newsletter.new(newsletters_params)
+    if @newsletter.save
+      redirect_to newsletters_path
+    else
+      render action: 'new'
+    end
+  end
+
+  def edit
+    @newsletter = Newsletter.find(params[:id])
+  end
+
+  def update
+    @newsletter = Newsletter.find(params[:id])
+    if @newsletter.update_attributes(newsletters_params)
+      redirect_to newsletters_path
+    else
+      render action: 'edit'
+    end
+  end
+
+  def destroy
+    @newsletter = Newsletter.find(params[:id])
+    @newsletter.destroy
+    redirect_to newsletters_path
+  end
+
 end

app/controllers/users_controller.rb

@@ -13,15 +13,36 @@ def new
 
   def create
     @user = User.new(users_params)
+    # @news = Newsletter.last
+    
+    #respond_to do |format|
     if @user.save
-      redirect_to users_path
+      redirect_to users_path  
+        # UserMailer.welcome_message(@user,@news.content).deliver
+        # format.html { redirect_to(@user, notice: 'User was successfully created.')}
+        # format.json { render json: @user, status: :created, locaton: @user}
     else
       render action: 'new'
+        # format.html {render action: 'new'}
+        # format.json {render json: @user.errors, status: :unprocessable_entity }
     end
+      #end
   end
 
+  def subscribe
+    @user = User.find(params[:id])
+    @user.update(is_subscribed: 'false')
+  end
+  
+  def sendmailer
+    #@user = User.where(is_subscribed: 'true')
+    #@news = Newsletter.last
+    HardWorker.perform_async()
+    redirect_to users_path
+  end
+  
   def users_params
-    params.require(:user).permit(:id, :email_id, :is_subscribed, :joined_on, :source)
+    params.require(:user).permit(:id, :email_id, :is_subscribed, :joined_on, :source, :username)
     end
 
   def edit

app/mailers/user_mailer.rb

@@ -0,0 +1,22 @@
+class UserMailer < ActionMailer::Base
+  include SendGrid
+  sendgrid_category :use_subject_lines
+  sendgrid_enable   :ganalytics, :opentrack
+  sendgrid_unique_args :key1 => "value1", :key2 => "value2"
+
+  def welcome_message(email, newsletter_content,id,name)
+    sendgrid_category "Welcome"
+    sendgrid_unique_args :key2 => "newvalue2", :key3 => "value3"
+
+    content = ERB.new(newsletter_content)
+    object_id = id
+    #headers['X-SMTPAPI'] = { :to => user.pluck(:email_id) }.to_json
+
+    mail( to: email,
+          category: "newuser",
+          subject: "Welcome #{name}",
+          body: content.result(binding),
+          content_type: "text/html" 
+        )
+  end
+end

app/models/redactor_rails/asset.rb

@@ -0,0 +1,9 @@
+class RedactorRails::Asset
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  include RedactorRails::Orm::Mongoid::AssetBase
+
+  delegate :url, :current_path, :size, :content_type, :filename, :to => :data
+  validates_presence_of :data
+end