jobshop 0.0.53 → 0.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2d1798548ecae570f0b45babfa2e513b82395c
-  data.tar.gz: bc7448f4acea0f1582843a1a47ff9b98a1c4aae6
+  metadata.gz: c766e8943f2ff604bc6f955b09f613a7532830f0
+  data.tar.gz: 7878f19863f3a3ace1567d858baf9b8aaa738ec4
 SHA512:
-  metadata.gz: 649182157861589f953e47725d6947e86f3245e81e2c90c8d1b36127865fdacd74a4498303dd6bd99b9f837752353dfcd211733ad43c9963d88a5d83346bf3ae
-  data.tar.gz: e7b646ec641cceae9c9e699a5f4afb9e5d725fcd1f0a066e7974af05cf1127ba4af99e484b1966dee8b71972aba0a4faf24d20a489a0f5e26484ee6dd46eca39
+  metadata.gz: 0754b1b7e30d882591947579b5efbb724743241495e0fc4b656aa84ce66929d1e5277237e45d942c2746f1c1195e113189fa68d1cfdd3adf10a1a5cfb2ddb674
+  data.tar.gz: f419625760a603aae816186d7a55f74f8fbe8011d2a9cc2ff59f425cc4f1f0189514690bcaedde7df9500a0715895690ab1396f43f5c5cdaa636afbdc73cdde9

data/app/controllers/jobshop/application_controller.rb

@@ -16,6 +16,14 @@ module Jobshop
     # after_action :verify_authorized, except: :index
     # after_action :verify_policy_scoped, only: :index
 
+    def after_sign_in_path_for(resource_or_scope)
+      if !resource_or_scope.onboard?
+        team_setup_path
+      else
+        super
+      end
+    end
+
     private
 
     def layout_for_application
@@ -26,6 +34,5 @@ module Jobshop
         "jobshop/application"
       end
     end
-
   end
 end

data/app/controllers/jobshop/teams/registrations_controller.rb

@@ -16,7 +16,6 @@ module Jobshop
       @registration = ::Jobshop::Registration.new(params)
 
       if @registration.save
-        store_location_for(:user, team_setup_path)
         sign_in_and_redirect(@registration.user)
       else
         render(:new)

data/app/models/jobshop/user.rb

@@ -21,6 +21,11 @@ module Jobshop
             team_id: warden_conditions[:team_id]).first
     end
 
+    def onboard?
+      # TODO: Implement this correctly.
+      false
+    end
+
   private
     def generate_email_authentication_token
       loop do

data/app/views/jobshop/dashboards/show.html.haml

@@ -27,7 +27,7 @@
           %span(class="visuallyhidden") User Actions
         %ul(class="mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect" for="accbtn")
           %li(class="mdl-menu__item")
-            %a(href="#{destroy_user_session_path(team_id: current_user.team_id)}" data-method="delete") Sign out
+            %a(href="#{destroy_user_session_path}" data-method="delete") Sign out
     %nav(class="demo-navigation mdl-navigation mdl-color--blue-grey-800")
       %a(class="mdl-navigation__link" href="")
         %i(class="mdl-color-text--blue-grey-400 material-icons" role="presentation") home

data/app/views/jobshop/setups/show.html.haml

@@ -1 +1,45 @@
-Welcome aboard!
+%div(class="demo-layout mdl-layout mdl-js-layout mdl-layout--fixed-drawer mdl-layout--fixed-header")
+  %header(class="demo-header mdl-layout__header mdl-color--grey-100 mdl-color-text--grey-600")
+    %div(class="mdl-layout__header-row")
+      %span(class="mdl-layout-title") Home
+      %div(class="mdl-layout-spacer")
+      %div(class="mdl-textfield mdl-js-textfield mdl-textfield--expandable")
+        %label(class="mdl-button mdl-js-button mdl-button--icon" for="search")
+          %i(class="material-icons") search
+        %div(class="mdl-textfield__expandable-holder")
+          %input(class="mdl-textfield__input" type="text" id="search")
+          %label(class="mdl-textfield__label" for="search") Enter your query...
+      %button(class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon" id="hdrbtn")
+        %i(class="material-icons") more_vert
+      %ul(class="mdl-menu mdl-js-menu mdl-js-ripple-effect mdl-menu--bottom-right" for="hdrbtn")
+        %li(class="mdl-menu__item")= link_to("About", about_path)
+        %li(class="mdl-menu__item") Contact
+        %li(class="mdl-menu__item") Legal information
+  %div(class="demo-drawer mdl-layout__drawer mdl-color--blue-grey-900 mdl-color-text--indigo-50")
+    %header(class="demo-drawer-header")
+      %i(class="material-icons" style="font-size: 48px;") person
+      //%img(class="demo-avatar" src="images/user.jpg")
+      %div(class="demo-avatar-dropdown")
+        %span= current_user.email
+        %div(class="mdl-layout-spacer")
+        %button(id="accbtn" class="mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--icon")
+          %i(class="material-icons" role="presentation") arrow_drop_down
+          %span(class="visuallyhidden") User Actions
+        %ul(class="mdl-menu mdl-menu--bottom-right mdl-js-menu mdl-js-ripple-effect" for="accbtn")
+          %li(class="mdl-menu__item")
+            %a(href="#{destroy_user_session_path}" data-method="delete") Sign out
+    %nav(class="demo-navigation mdl-navigation mdl-color--blue-grey-800")
+      %a(class="mdl-navigation__link" href="#{root_path}")
+        %i(class="mdl-color-text--blue-grey-400 material-icons" role="presentation") home
+        Home
+      %a(class="mdl-navigation__link" href="")
+        %i(class="mdl-color-text--blue-grey-400 material-icons" role="presentation") flag
+        Updates
+      %div(class="mdl-layout-spacer")
+      %a(class="mdl-navigation__link" href="")
+        %i(class="mdl-color-text--blue-grey-400 material-icons" role="presentation") help_outline
+        Help
+
+  %main(class="mdl-layout__content mdl-color--grey-100")
+    %div(class="mdl-grid demo-content")
+      Welcome Aboard

data/config/routes.rb

@@ -6,7 +6,7 @@ Jobshop::Engine.routes.draw do
   devise_scope :user do
     get "teams/:team_id/sign_in" => "sessions#new", as: :new_user_session
     post "teams/:team_id/sign_in" => "sessions#create", as: :user_session
-    delete "teams/:team_id/sign_out" => "sessions#destroy", as: :destroy_user_session
+    delete "/sign_out" => "sessions#destroy", as: :destroy_user_session
   end
 
   resources :teams, only: [ ] do
@@ -15,12 +15,12 @@ Jobshop::Engine.routes.draw do
         as: "teams_lookup"
     end
 
-    resource :setup, only: [ :show ]
-
     resource :registration, only: [ :new, :create ],
       controller: "teams/registrations"
   end
 
+  get "/setup" => "setups#show", as: :team_setup
+
   get "/about" => redirect("https://jobshop.io"), as: :about
 
   root to: "dashboards#show"

data/lib/jobshop/version.rb

@@ -6,7 +6,7 @@ module Jobshop
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 53
+    TINY  = 59
     PRE   = nil
 
     CODE_NAME = "bump it up prime".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobshop
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.59
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails