citygate 0.1.0 → 0.1.1

data/app/assets/javascripts/FormToWizard/formToWizard.js

@@ -0,0 +1,73 @@
+/* Created by jankoatwarpspeed.com */
+
+(function($) {
+    $.fn.formToWizard = function(options) {
+        options = $.extend({  
+            submitButton: "" 
+        }, options); 
+        
+        var element = this;
+
+        var steps = $(element).find("fieldset");
+        var count = steps.size();
+        var submmitButtonName = "#" + options.submitButton;
+        $(submmitButtonName).hide();
+
+        // 2
+        $(element).before("<ul id='steps'></ul>");
+
+        steps.each(function(i) {
+            $(this).wrap("<div id='step" + i + "'></div>");
+            $(this).append("<p id='step" + i + "commands'></p>");
+
+            // 2
+            var name = $(this).find("legend").html();
+            $("#steps").append("<li id='stepDesc" + i + "'>Step " + (i + 1) + "<span>" + name + "</span></li>");
+
+            if (i == 0) {
+                createNextButton(i);
+                selectStep(i);
+            }
+            else if (i == count - 1) {
+                $("#step" + i).hide();
+                createPrevButton(i);
+            }
+            else {
+                $("#step" + i).hide();
+                createPrevButton(i);
+                createNextButton(i);
+            }
+        });
+
+        function createPrevButton(i) {
+            var stepName = "step" + i;
+            $("#" + stepName + "commands").append("<a href='#' id='" + stepName + "Prev' class='prev'>< Back</a>");
+
+            $("#" + stepName + "Prev").bind("click", function(e) {
+                $("#" + stepName).hide();
+                $("#step" + (i - 1)).show();
+                $(submmitButtonName).hide();
+                selectStep(i - 1);
+            });
+        }
+
+        function createNextButton(i) {
+            var stepName = "step" + i;
+            $("#" + stepName + "commands").append("<a href='#' id='" + stepName + "Next' class='next'>Next ></a>");
+
+            $("#" + stepName + "Next").bind("click", function(e) {
+                $("#" + stepName).hide();
+                $("#step" + (i + 1)).show();
+                if (i + 2 == count)
+                    $(submmitButtonName).show();
+                selectStep(i + 1);
+            });
+        }
+
+        function selectStep(i) {
+            $("#steps li").removeClass("current");
+            $("#stepDesc" + i).addClass("current");
+        }
+
+    }
+})(jQuery); 

data/app/assets/javascripts/citygate/home.js.coffee.erb

@@ -8,7 +8,15 @@ $ ->
     init: ->
       role_selector.select_new_role()
 
+  form_wizard =
+    init: ->
+      $("#new_user").formToWizard({ submitButton: 'save-account' })
+
+  ready = ->
+    role_selector.init()
+    form_wizard.init()
+
   # When using turbolinks
-  $(window).bind 'page:change', role_selector.init()
+  $(document).on('page:load', ready)
   # otherwise
-  role_selector.init()
+  ready()

data/app/assets/stylesheets/{citygate/application.css → citygate.css}

@@ -9,5 +9,5 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree .
+ *= require citygate/main
 */

data/app/assets/stylesheets/citygate/main.sass

@@ -11,3 +11,69 @@
 #flash_alert
   background-color: #FCC
   border: solid 1px #C66
+
+fieldset
+  border: none
+  width: 320px
+
+legend
+  font-size: 18px
+  margin: 0px
+  padding: 10px 0px
+  color: #b0232a
+  font-weight: bold
+
+label
+  display: block
+  margin: 15px 0 5px
+
+input[type=text], input[type=password], input[type=email]
+  width: 300px
+  padding: 5px
+  border:solid 1px #000
+
+.prev, .next
+  background-color: #b0232a
+  padding: 5px 10px
+  color: #fff
+  text-decoration: none
+
+  &:hover
+    background-color: #000
+    text-decoration: none
+
+.prev
+  float: left
+
+.next
+  float: right
+
+#steps
+  list-style: none
+  width: 100%
+  overflow: hidden
+  margin: 0px
+  padding: 0px
+
+  li
+    font-size: 24px
+    float: left
+    padding: 10px
+    color: #b0b1b3
+
+    &.current
+      color: #000
+
+    span
+      font-size: 11px
+      display: block
+
+#makeWizard
+  background-color: #b0232a
+  color: #fff
+  padding: 5px 10px
+  text-decoration: none
+  font-size: 18px
+
+  &:hover
+    background-color: #000

data/app/controllers/citygate/home_controller.rb

@@ -1,14 +1,14 @@
 class Citygate::HomeController < Citygate::ApplicationController
   authorize_resource :class => false
   skip_authorize_resource :only => :role_change
-  
+
   def index
     @users = Citygate::User.all
   end
-  
+
   def role_change
     saved = current_user.update_attribute :role_id, params[:data]
-    
+
     respond_to do |format|
       format.json { render json: { text: (saved) ? "OK" : "Arrebentou", redirect: root_path } }
     end

data/app/controllers/citygate/users/omniauth_callbacks_controller.rb

@@ -6,17 +6,21 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
   def facebook
     oauthorize "Facebook"
   end
-  
+
   # Authorize user with his google (openid) account
   def google
     oauthorize "Google"
   end
-  
+
+  def twitter
+    oauthorize "Twitter"
+  end
+
   # In case of error renders 404
   def passthru
     render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false
   end
-  
+
   private
 
   def oauthorize(kind)
@@ -30,7 +34,7 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
       @user.authorizations.map(&:destroy)
       flash[:error] = @user.errors.full_messages.first
       redirect_to new_user_registration_url
-    end    
+    end
   end
 
   def find_for_oauth(provider, access_token, resource=nil)
@@ -39,13 +43,13 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
     when "Facebook"
       uid = access_token['uid']
       email = access_token['extra']['raw_info']['email']
-      auth_attr = { 
-        :uid => uid, 
+      auth_attr = {
+        :uid => uid,
         :token => access_token['credentials']['token'],
         :secret => nil,
         :name => access_token['extra']['raw_info']['name'],
         :link => access_token['extra']['raw_info']['link'],
-        :image_url => access_token['info']['image'] 
+        :image_url => access_token['info']['image']
       }
     when "Google"
       uid = access_token['uid']
@@ -56,6 +60,16 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
         :secret => nil,
         :name => access_token['info']['name'],
       }
+    when "Twitter"
+      uid = access_token['extra']['raw_info']['id']
+      name = access_token['extra']['raw_info']['name']
+      auth_attr = {
+        :uid => uid,
+        :token => access_token['credentials']['token'],
+        :secret => nil,
+        :name => access_token['extra']['raw_info']['name'],
+        :image_url => access_token['extra']['raw_info']['profile_image_url']
+      }
     else
       raise "Provider #{provider} not handled"
     end
@@ -74,7 +88,13 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
     auth = user.authorizations.find_by_provider(provider)
     auth ||= user.authorizations.build(:provider => provider)
     auth.update_attributes auth_attr
-    
+
+    #TODO: Add config for this
+    user.update_attributes(
+      role_id: 1,
+      confirmed_at: Time.now
+    )
+
     return user
   end
 
@@ -100,8 +120,8 @@ class Citygate::Users::OmniauthCallbacksController < Devise::OmniauthCallbacksCo
     if user = Citygate::User.find_by_first_name(name)
       user
     else
-      user = Citygate::User.new(:first_name => name, :password => Devise.friendly_token[0,20], :email => "#{UUIDTools::UUID.random_create}@host")
-      user.save false
+      user = Citygate::User.new(:first_name => name, :password => Devise.friendly_token[0,20], :email => "#{UUIDTools::UUID.random_create}@host.com")
+      user.save
     end
     return user
   end

data/app/models/citygate/user.rb

@@ -1,5 +1,5 @@
 module Citygate
-  
+
   # @author Zamith
   # @!attribute name
   #   @return [String] the name of the user
@@ -15,11 +15,11 @@ module Citygate
     devise  :encryptor => :sha1
     # @!endgroup
 
-    attr_accessible :first_name, :last_name, :email, :password, :password_confirmation, :remember_me, :confirmed_at, :role_id
+    attr_accessible :first_name, :last_name, :email, :password, :password_confirmation, :remember_me, :confirmed_at, :role_id, :username
 
     has_many :authorizations, :dependent => :destroy
     belongs_to :role
-    
+
     before_create :check_no_of_users
 
     def method_missing(method_name, *args, &block)

data/app/views/citygate/users/show.html.erb

@@ -10,7 +10,7 @@
     <% class_str += (connected_providers.include? provider.to_s.capitalize) ? "connected" : "can-connect" %>
 
     <div class="<%= class_str %>">
-      <%= link_to "#{provider.to_s.capitalize}", user_omniauth_authorize_path(provider, {user: current_user}) %>
+      <%= link_to "#{provider.to_s.capitalize}", "/users/auth/#{provider.to_s}?user=#{current_user.id}" %>
     </div>
   <% end %>
 </div>

data/app/views/devise/registrations/new.html.erb

@@ -3,16 +3,303 @@
 <%= form_for resource, :as => resource_name, :url => registration_path(resource_name) do |f| %>
   <%= devise_error_messages! %>
 
-  <%= f.label :email %>
-  <%= f.email_field :email, :required => true %>
+  <fieldset>
+    <legend>Account Information</legend>
+    <%= f.label :email %>
+    <%= f.email_field :email, :required => true %>
 
-  <%= f.label :password %>
-  <%= f.password_field :password, :required => true %>
+    <%= f.label :password %>
+    <%= f.password_field :password, :required => true %>
 
-  <%= f.label :password_confirmation %>
-  <%= f.password_field :password_confirmation, :required => true %>
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation, :required => true %>
+  </fieldset>
 
-  <%= f.submit t('admin.users.new.create_link') %>
+  <fieldset>
+    <legend>Billing information</legend>
+    <label for="NameOnCard">Name on Card</label>
+    <input id="NameOnCard" type="text" />
+    <label for="CardNumber">Card Number</label>
+    <input id="CardNumber" type="text" />
+    <label for="CreditcardMonth">Expiration</label>
+    <select id="CreditcardMonth">
+      <option value="1">1</option>
+      <option value="2">2</option>
+      <option value="3">3</option>
+      <option value="4">4</option>
+      <option value="5">5</option>
+      <option value="6">6</option>
+      <option value="7">7</option>
+      <option value="8">8</option>
+      <option value="9">9</option>
+      <option value="10">10</option>
+      <option value="11">11</option>
+      <option value="12">12</option>
+    </select>
+    <select id="CreditcardYear">
+      <option value="2009">2009</option>
+      <option value="2010">2010</option>
+      <option value="2011">2011</option>
+      <option value="2012">2012</option>
+      <option value="2013">2013</option>
+      <option value="2014">2014</option>
+      <option value="2015">2015</option>
+      <option value="2016">2016</option>
+      <option value="2017">2017</option>
+      <option value="2018">2018</option>
+      <option value="2019">2019</option>
+    </select>
+    <label for="Address1">Address 1</label>
+    <input id="Address1" type="text" />
+    <label for="Address2">Address 2</label>
+    <input id="Address2" type="text" />
+    <label for="City">City</label>
+    <input id="City" type="text" />
+    <label for="City">City</label>
+    <select id="Country">
+      <option value="CA">Canada</option>
+      <option value="US">United States of America</option>
+      <option value="GB">United Kingdom (Great Britain)</option>
+      <option value="AU">Australia</option>
+      <option value="JP">Japan</option>
+      <option value="AF">Afghanistan</option>
+      <option value="AX">Aland Island</option>
+      <option value="AL">Albania</option>
+      <option value="DZ">Algeria</option>
+      <option value="AS">American Samoa</option>
+      <option value="AD">Andorra</option>
+      <option value="AO">Angola</option>
+      <option value="AI">Anguilla</option>
+      <option value="AQ">Antarctica</option>
+      <option value="AG">Antigua & Barbuda</option>
+      <option value="AR">Argentina</option>
+      <option value="AM">Armenia</option>
+      <option value="AW">Aruba</option>
+      <option value="AT">Austria</option>
+      <option value="AZ">Azerbaijan</option>
+      <option value="BS">Bahama</option>
+      <option value="BH">Bahrain</option>
+      <option value="BD">Bangladesh</option>
+      <option value="BB">Barbados</option>
+      <option value="BY">Belarus</option>
+      <option value="BE">Belgium</option>
+      <option value="BZ">Belize</option>
+      <option value="BJ">Benin</option>
+      <option value="BM">Bermuda</option>
+      <option value="BT">Bhutan</option>
+      <option value="BO">Bolivia</option>
+      <option value="BA">Bosnia and Herzegovina</option>
+      <option value="BW">Botswana</option>
+      <option value="BV">Bouvet Island</option>
+      <option value="BR">Brazil</option>
+      <option value="IO">British Indian Ocean Territory</option>
+      <option value="VG">British Virgin Islands</option>
+      <option value="BN">Brunei Darussalam</option>
+      <option value="BG">Bulgaria</option>
+      <option value="BF">Burkina Faso</option>
+      <option value="BI">Burundi</option>
+      <option value="KH">Cambodia</option>
+      <option value="CM">Cameroon</option>
+      <option value="CV">Cape Verde</option>
+      <option value="KY">Cayman Islands</option>
+      <option value="CF">Central African Republic</option>
+      <option value="TD">Chad</option>
+      <option value="CL">Chile</option>
+      <option value="CN">China</option>
+      <option value="CX">Christmas Island</option>
+      <option value="CC">Cocos (Keeling) Islands</option>
+      <option value="CO">Colombia</option>
+      <option value="KM">Comoros</option>
+      <option value="CG">Congo</option>
+      <option value="CK">Cook Iislands</option>
+      <option value="CR">Costa Rica</option>
+      <option value="HR">Croatia</option>
+      <option value="CU">Cuba</option>
+      <option value="CY">Cyprus</option>
+      <option value="CZ">Czech Republic</option>
+      <option value="CI">Côte D'ivoire (Ivory Coast)</option>
+      <option value="DK">Denmark</option>
+      <option value="DJ">Djibouti</option>
+      <option value="DM">Dominica</option>
+      <option value="DO">Dominican Republic</option>
+      <option value="TP">East Timor</option>
+      <option value="EC">Ecuador</option>
+      <option value="EG">Egypt</option>
+      <option value="SV">El Salvador</option>
+      <option value="GQ">Equatorial Guinea</option>
+      <option value="ER">Eritrea</option>
+      <option value="EE">Estonia</option>
+      <option value="ET">Ethiopia</option>
+      <option value="FK">Falkland Islands (Malvinas)</option>
+      <option value="FO">Faroe Islands</option>
+      <option value="FJ">Fiji</option>
+      <option value="FI">Finland</option>
+      <option value="FR">France</option>
+      <option value="FX">France, Metropolitan</option>
+      <option value="GF">French Guiana</option>
+      <option value="PF">French Polynesia</option>
+      <option value="TF">French Southern Territories</option>
+      <option value="GA">Gabon</option>
+      <option value="GM">Gambia</option>
+      <option value="GE">Georgia</option>
+      <option value="DE">Germany</option>
+      <option value="GH">Ghana</option>
+      <option value="GI">Gibraltar</option>
+      <option value="GR">Greece</option>
+      <option value="GL">Greenland</option>
+      <option value="GD">Grenada</option>
+      <option value="GP">Guadeloupe</option>
+      <option value="GU">Guam</option>
+      <option value="GT">Guatemala</option>
+      <option value="GN">Guinea</option>
+      <option value="GW">Guinea-Bissau</option>
+      <option value="GY">Guyana</option>
+      <option value="HT">Haiti</option>
+      <option value="HM">Heard & McDonald Islands</option>
+      <option value="HN">Honduras</option>
+      <option value="HK">Hong Kong</option>
+      <option value="HU">Hungary</option>
+      <option value="IS">Iceland</option>
+      <option value="IN">India</option>
+      <option value="ID">Indonesia</option>
+      <option value="IQ">Iraq</option>
+      <option value="IE">Ireland</option>
+      <option value="IR">Islamic Republic of Iran</option>
+      <option value="IL">Israel</option>
+      <option value="IT">Italy</option>
+      <option value="JM">Jamaica</option>
+      <option value="JO">Jordan</option>
+      <option value="KZ">Kazakhstan</option>
+      <option value="KE">Kenya</option>
+      <option value="KI">Kiribati</option>
+      <option value="KP">Korea, Democratic People's Republic of</option>
+      <option value="KR">Korea, Republic of</option>
+      <option value="KW">Kuwait</option>
+      <option value="KG">Kyrgyzstan</option>
+      <option value="LA">Lao People's Democratic Republic</option>
+      <option value="LV">Latvia</option>
+      <option value="LB">Lebanon</option>
+      <option value="LS">Lesotho</option>
+      <option value="LR">Liberia</option>
+      <option value="LY">Libyan Arab Jamahiriya</option>
+      <option value="LI">Liechtenstein</option>
+      <option value="LT">Lithuania</option>
+      <option value="LU">Luxembourg</option>
+      <option value="MO">Macau</option>
+      <option value="MG">Madagascar</option>
+      <option value="MW">Malawi</option>
+      <option value="MY">Malaysia</option>
+      <option value="MV">Maldives</option>
+      <option value="ML">Mali</option>
+      <option value="MT">Malta</option>
+      <option value="MH">Marshall Islands</option>
+      <option value="MQ">Martinique</option>
+      <option value="MR">Mauritania</option>
+      <option value="MU">Mauritius</option>
+      <option value="YT">Mayotte</option>
+      <option value="MX">Mexico</option>
+      <option value="FM">Micronesia</option>
+      <option value="MD">Moldova, Republic of</option>
+      <option value="MC">Monaco</option>
+      <option value="MN">Mongolia</option>
+      <option value="MS">Monserrat</option>
+      <option value="MA">Morocco</option>
+      <option value="MZ">Mozambique</option>
+      <option value="MM">Myanmar</option>
+      <option value="NA">Namibia</option>
+      <option value="NR">Nauru</option>
+      <option value="NP">Nepal</option>
+      <option value="NL">Netherlands</option>
+      <option value="AN">Netherlands Antilles</option>
+      <option value="NC">New Caledonia</option>
+      <option value="NZ">New Zealand</option>
+      <option value="NI">Nicaragua</option>
+      <option value="NE">Niger</option>
+      <option value="NG">Nigeria</option>
+      <option value="NU">Niue</option>
+      <option value="NF">Norfolk Island</option>
+      <option value="MP">Northern Mariana Islands</option>
+      <option value="NO">Norway</option>
+      <option value="OM">Oman</option>
+      <option value="PK">Pakistan</option>
+      <option value="PW">Palau</option>
+      <option value="PA">Panama</option>
+      <option value="PG">Papua New Guinea</option>
+      <option value="PY">Paraguay</option>
+      <option value="PE">Peru</option>
+      <option value="PH">Philippines</option>
+      <option value="PN">Pitcairn</option>
+      <option value="PL">Poland</option>
+      <option value="PT">Portugal</option>
+      <option value="PR">Puerto Rico</option>
+      <option value="QA">Qatar</option>
+      <option value="RO">Romania</option>
+      <option value="RU">Russian Federation</option>
+      <option value="RW">Rwanda</option>
+      <option value="RE">Réunion</option>
+      <option value="LC">Saint Lucia</option>
+      <option value="WS">Samoa</option>
+      <option value="SM">San Marino</option>
+      <option value="ST">Sao Tome & Principe</option>
+      <option value="SA">Saudi Arabia</option>
+      <option value="SN">Senegal</option>
+      <option value="RS">Serbia</option>
+      <option value="SC">Seychelles</option>
+      <option value="SL">Sierra Leone</option>
+      <option value="SG">Singapore</option>
+      <option value="SK">Slovakia</option>
+      <option value="SI">Slovenia</option>
+      <option value="SB">Solomon Islands</option>
+      <option value="SO">Somalia</option>
+      <option value="ZA">South Africa</option>
+      <option value="GS">South Georgia and the South Sandwich Islands</option>
+      <option value="ES">Spain</option>
+      <option value="LK">Sri Lanka</option>
+      <option value="SH">St. Helena</option>
+      <option value="KN">St. Kitts and Nevis</option>
+      <option value="PM">St. Pierre & Miquelon</option>
+      <option value="VC">St. Vincent & the Grenadines</option>
+      <option value="SD">Sudan</option>
+      <option value="SR">Suriname</option>
+      <option value="SJ">Svalbard & Jan Mayen Islands</option>
+      <option value="SZ">Swaziland</option>
+      <option value="SE">Sweden</option>
+      <option value="CH">Switzerland</option>
+      <option value="SY">Syrian Arab Republic</option>
+      <option value="TW">Taiwan, Province of China</option>
+      <option value="TJ">Tajikistan</option>
+      <option value="TZ">Tanzania, United Republic of</option>
+      <option value="TH">Thailand</option>
+      <option value="TG">Togo</option>
+      <option value="TK">Tokelau</option>
+      <option value="TO">Tonga</option>
+      <option value="TT">Trinidad & Tobago</option>
+      <option value="TN">Tunisia</option>
+      <option value="TR">Turkey</option>
+      <option value="TM">Turkmenistan</option>
+      <option value="TC">Turks & Caicos Islands</option>
+      <option value="TV">Tuvalu</option>
+      <option value="UG">Uganda</option>
+      <option value="UA">Ukraine</option>
+      <option value="AE">United Arab Emirates</option>
+      <option value="UM">United States Minor Outlying Islands</option>
+      <option value="VI">United States Virgin Islands</option>
+      <option value="UY">Uruguay</option>
+      <option value="UZ">Uzbekistan</option>
+      <option value="VU">Vanuatu</option>
+      <option value="VA">Vatican City State (Holy See)</option>
+      <option value="VE">Venezuela</option>
+      <option value="VN">Viet Nam</option>
+      <option value="WF">Wallis & Futuna Islands</option>
+      <option value="EH">Western Sahara</option>
+      <option value="YE">Yemen</option>
+      <option value="ZR">Zaire</option>
+      <option value="ZM">Zambia</option>
+      <option value="ZW">Zimbabwe</option>
+    </select>
+  </fieldset>
+
+  <%= f.submit t('admin.users.new.create_link'), id: "save-account" %>
 <% end %>
 
 <%= render :partial => "citygate/shared/navigation" %>