jobshop 0.0.113 → 0.0.127

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 476798ce160b5d3e678f683a8e6dacaf0452721b
-  data.tar.gz: 5407c737ed1626fe28be9a80e612bb3d2cab1c78
+  metadata.gz: a1f7f84dafc9184c1e6a5d3c954721d1675e2085
+  data.tar.gz: 3650939df1f73fa87ff01ea5e25bc21db5c710ee
 SHA512:
-  metadata.gz: 7941c39baba3f7551cbfe5685ee4206dc1f49378407c5bf4ee90b2ff7f0822f6b2eaa79d6a321315a8e7451f5223278c994f0abe6aa11db25a03f60b69e8ffdd
-  data.tar.gz: 9aa7ee6008822968c762c7281c53e67cee9eab378c313db218485778be20090e02fe34de16d1f9da94f706b505bfec264e8fb74586d95359a80ca5253b2322cb
+  metadata.gz: e7a9c6d76e362b90315654764525adddbe8aded05806ca0cbc54ee4ecea7a63c00550795c4c6668e3096890afd7a278373141036e56243060e22dcf41102d43b
+  data.tar.gz: ee9dde1678245104fa8803969fd53ffcc9433b4db143b9188b207ea2356d2198c1f0f661e4720077e78cb37e9111873af03fc649b86b0eed87c7cea27d37be4a

data/app/assets/javascripts/jobshop/application.js

@@ -27,3 +27,8 @@ $(document).on("click", "li.mdl-menu__item", function(event) {
     menuItemLink.get(0).click();
   }
 });
+
+$(document).on("click", "ul.select-users-list li", function(event) {
+  var userCheckBox = $(this).find("input[type=checkbox]").first();
+  userCheckBox.get(0).click();
+});

data/app/assets/stylesheets/jobshop/application.scss

@@ -1,74 +1,57 @@
-@charset "utf-8"
+@charset "utf-8";
 
 @import "material";
-
 @import "jobshop/breakpoints";
-@import "jobshop/static";
+@import "jobshop/dialog";
+@import "jobshop/welcome";
 
 html, body {
   background-color: unquote("rgb(#{$palette-indigo-50})");
   font-family: "Roboto", "Helvetica", sans-serif;
+  margin: 0;
+  padding: 0;
 }
 
-html { height: 100%; }
-body { min-height: 100%; margin: 0 auto; }
-
 main {
-  display: flex;
-  justify-content: center;
-}
-
-#sign-in,
-#register {
-  @extend .mdl-shadow--2dp;
-
-  width: 100%;
-
-  @include tablet-up {
-    width: 440px;
-  }
-
-  .mdl-card__supporting-text {
-    width: auto;
-  }
+  padding-top: 0px;
 
-  .mdl-textfield {
-    width: 100%;
-  }
+  @include larger-than-handset-p { padding-top: 24px; }
+  @include larger-than-handset-l { padding-top: 48px; }
 }
 
-.mdl-layout-title {
-  text-decoration: none;
-}
-
-.mdl-menu__item a {
-  color: inherit;
-  font-weight: inherit;
-  text-decoration: none;
+.mdl-textfield {
+  width: 100%;
 }
 
-.mdl-card__title {
-  align-items: center;
-  justify-content: space-around;
+.static-header {
+  @extend .mdl-color--white;
+  @extend .mdl-color-text--black;
 
-  h4 {
-    opacity: 0.82;
-    text-align: right;
+  z-index: 50;
+  margin: 0 !important;
 
-    strong {
-      font-size: 1.1em;
-    }
+  .mdl-layout-title {
+    color: rgba(0, 0, 0, 0.87) !important;
+    font-weight: 700;
+    opacity: 0.87;
+    text-decoration: none;
   }
-}
 
-.mdl-card__actions {
-  align-items: center;
-  display: flex;
-  justify-content: space-between;
-  padding: $card-vertical-padding $card-horizontal-padding;
-
-  button {
-    @extend .mdl-button;
-    @extend .mdl-button--colored;
+  .mdl-navigation {
+    .mdl-navigation__link {
+      @extend .mdl-typography--text-uppercase;
+
+      background-color: transparent !important;
+      border-bottom: 4px solid transparent;
+      color: rgba(0, 0, 0, 0.87);
+      display: inline-block;
+      font-weight: 700;
+      height: 60px;
+      line-height: 68px;
+
+      &:hover {
+        border-bottom: 4px solid unquote("rgb(#{$palette-indigo-500})");
+      }
+    }
   }
 }

data/app/assets/stylesheets/jobshop/breakpoints.scss

@@ -23,7 +23,19 @@ $breakpoints: (
 );
 
 @mixin handset {
-  @media screen and (max-width: #{map-get($breakpoints, xl-handset-p)}) {
+  @media screen and (max-width: #{map-get($breakpoints, xl-handset-l)}) {
+    @content;
+  }
+}
+
+@mixin larger-than-handset-l {
+  @media screen and (min-width: #{map-get($breakpoints, xl-handset-l)}) {
+    @content;
+  }
+}
+
+@mixin larger-than-handset-p {
+  @media screen and (min-width: #{map-get($breakpoints, xl-handset-p)}) {
     @content;
   }
 }

data/app/assets/stylesheets/jobshop/dialog.scss

@@ -0,0 +1,43 @@
+.dialog-box {
+  @extend .mdl-grid;
+  @extend .mdl-shadow--2dp;
+
+  background: $card-background-color;
+  max-width: 480px;
+}
+
+.dialog-box .dialog-box__header {
+  @extend .mdl-cell;
+  @extend .mdl-cell--4-col;
+  @extend .mdl-color-text--white;
+
+  align-items: flex-start;
+  background-color: unquote("rgb(#{$palette-indigo-500})");
+  display: flex;
+  justify-content: center;
+
+  @include handset {
+    display: none;
+  }
+
+  & > .material-icons {
+    font-size: 10rem;
+    margin-top: 1rem;
+  }
+}
+
+.dialog-box .dialog-box__content {
+  @extend .mdl-cell;
+  @extend .mdl-cell--12-col;
+  @extend .mdl-card;
+}
+
+.dialog-box .dialog-box__header + .dialog-box__content {
+  @extend .mdl-cell--8-col;
+}
+
+
+.dialog-box .dialog-box__content .mdl-card__actions {
+  display: flex;
+  justify-content: space-between;
+}

data/app/controllers/concerns/registration_token_validation.rb

@@ -4,12 +4,12 @@ class RegistrationTokenValidation
   end
 
   def initialize(controller)
-    @controller = controller.dup
+    @controller = controller
     @token      = @controller.params.fetch(:registration_token, nil)
     @team_id    = @controller.params.fetch(:team_id, nil)
 
     if @token
-      @controller.redirect_to(@controller.new_user_session_path) unless valid?
+      @controller.redirect_to(@controller.new_user_session_path(team_id: @team_id)) unless valid?
     end
   end
 

data/app/controllers/jobshop/application_controller.rb

@@ -4,8 +4,6 @@
 
 module Jobshop
   class ApplicationController < ActionController::Base
-    include Pundit
-
     layout :layout_for_application
 
     protect_from_forgery
@@ -13,12 +11,9 @@ module Jobshop
     before_action EmailTokenValidation
     before_action :authenticate_user!
 
-    # 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
+        welcome_path
       else
         super
       end
@@ -26,6 +21,10 @@ module Jobshop
 
     private
 
+    def current_team
+      @current_team ||= current_user && current_user.team
+    end; helper_method :current_team
+
     def layout_for_application
       if devise_controller? && controller_name == "sessions" ||
           controller_path == "jobshop/teams/lookups"

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

@@ -11,7 +11,7 @@ module Jobshop
     def create
       emails = params[:user][:email].split(",").map(&:strip).take(5)
       Jobshop::Team.grouped_by_email(emails).each_pair do |email, teams|
-        Jobshop::TeamsMailer.found_teams(email, teams).deliver_later
+        Jobshop::TeamsMailer.found_teams(email, teams).deliver_now
       end
 
       redirect_to teams_lookup_path

data/app/controllers/jobshop/welcome/places_controller.rb

@@ -0,0 +1,42 @@
+require_dependency "jobshop/application_controller"
+
+module Jobshop
+  class Welcome::PlacesController < ApplicationController
+    respond_to :html
+
+    def new
+      @place = if session[:place_id].present?
+                 current_team.places.find_by(id: session[:place_id])
+               end
+      @place ||= current_team.places.build
+      respond_with(@place)
+    end
+
+    def index
+      redirect_to new_welcome_places_path
+    end
+
+    def create
+      if @place = current_team.places.create(place_params)
+        session[:place_id] = @place.id
+        session[:next_onboard_path] = "/"
+      end
+
+      respond_with @place, location: -> { "/" }
+    end
+
+    def update
+      @place = current_team.places.find(params[:id])
+      if @place.update(place_params)
+        session[:place_id] = @place.id
+        respond_with @place, location: -> { "/" }
+      else
+        render :new
+      end
+    end
+
+    private def place_params
+      params.require(:place).permit(:name)
+    end
+  end
+end

data/app/controllers/jobshop/{teams → welcome}/registrations_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "jobshop/application_controller"
 
 module Jobshop
-  class Teams::RegistrationsController < ApplicationController
+  class Welcome::RegistrationsController < ApplicationController
     skip_before_action :authenticate_user!
 
     before_action RegistrationTokenValidation
@@ -23,4 +23,3 @@ module Jobshop
     end
   end
 end
-

data/app/controllers/jobshop/welcome/things_controller.rb

@@ -0,0 +1,42 @@
+require_dependency "jobshop/application_controller"
+
+module Jobshop
+  class Welcome::ThingsController < ApplicationController
+    respond_to :html
+
+    def new
+      @thing = if session[:thing_id].present?
+                 current_team.things.find_by(id: session[:thing_id])
+               end
+      @thing ||= current_team.things.build
+      respond_with(@thing)
+    end
+
+    def index
+      redirect_to new_welcome_things_path
+    end
+
+    def create
+      if @thing = current_team.things.create(thing_params)
+        session[:thing_id] = @thing.id
+        session[:next_onboard_path] = new_welcome_places_path
+      end
+
+      respond_with @thing, location: -> { new_welcome_places_path }
+    end
+
+    def update
+      @thing = current_team.things.find(params[:id])
+      if @thing.update(thing_params)
+        session[:thing_id] = @thing.id
+        respond_with @thing, location: -> { new_welcome_places_path }
+      else
+        render :new
+      end
+    end
+
+    private def thing_params
+      params.require(:thing).permit(:identifier)
+    end
+  end
+end

data/app/controllers/jobshop/welcome_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "jobshop/application_controller"
+
+module Jobshop
+  class WelcomeController < ApplicationController
+    def index
+      if session[:next_onboard_path].present?
+        redirect_to session[:next_onboard_path]
+      end
+    end
+  end
+end

data/app/helpers/jobshop/application_helper.rb

@@ -1,7 +1,14 @@
 module Jobshop
   module ApplicationHelper
     def body_class
-      @body_class ||= "#{controller_name}-#{action_name}"
+      @body_class ||= [
+        controller_class,
+        "#{controller_name}__#{action_name}"
+      ].flatten.uniq.compact
+    end
+
+    private def controller_class
+      @controller_class = controller_path.split("/").reject { |i| i == "jobshop" }
     end
   end
 end

data/app/models/jobshop/place.rb

@@ -0,0 +1,9 @@
+module Jobshop
+  class Place < ApplicationRecord
+    belongs_to :team
+
+    validates(:name,
+              uniqueness: { scope: :team_id, case_sensitive: false },
+              presence: true)
+  end
+end

data/app/models/jobshop/registration.rb

@@ -39,7 +39,7 @@ module Jobshop
 
     def user_params
       registration_params.fetch(:user, ActionController::Parameters.new)
-        .permit(:email, :password, :password_confirmation)
+        .permit(:forename, :surname, :email, :password, :password_confirmation)
     end
   end
 end

data/app/models/jobshop/team.rb

@@ -1,7 +1,9 @@
 module Jobshop
   class Team < ApplicationRecord
     belongs_to :owner, class_name: "Jobshop::User", optional: true
-    has_many :users, class_name: "Jobshop::User"
+    has_many :users
+    has_many :things
+    has_many :places
     has_one :default_dashboard, class_name: "Jobshop::Dashboard"
 
     scope :grouped_by_email, ->(email_addresses) {
@@ -15,6 +17,7 @@ module Jobshop
     }
 
     def generate_registration_token
+      return false if owner_id
       raw, encrypted = Devise.token_generator.generate(
         self.class, :registration_token)
 

data/app/models/jobshop/thing.rb

@@ -0,0 +1,9 @@
+module Jobshop
+  class Thing < ApplicationRecord
+    belongs_to :team
+
+    validates(:identifier,
+              uniqueness: { scope: :team_id, case_sensitive: false },
+              presence: true)
+  end
+end

data/app/models/jobshop/user.rb

@@ -4,7 +4,7 @@ module Jobshop
     # :confirmable, :lockable, :timeoutable and :omniauthable
     devise :database_authenticatable, :recoverable, :rememberable
 
-    belongs_to :team, optional: true
+    belongs_to :team
     has_one :default_dashboard, class_name: "Jobshop::Dashboard", through: :team
     has_many :session_activations, dependent: :destroy
 
@@ -27,6 +27,10 @@ module Jobshop
       false
     end
 
+    def full_name
+      @full_name = [ forename, surname ].join(" ")
+    end
+
     def activate_session
       session_activations.activate(SecureRandom.hex).activation_token
     end

data/app/views/devise/sessions/new.html.haml

@@ -1,16 +1,15 @@
 %main.mdl-layout__content
-  %div.mdl-grid
-    %div.mdl-cell.mdl-cell--12-col
-      %div#sign-in.mdl-card
-        = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-          .mdl-card__title(style="height: 200px;")
-            %object.logo{ type: "image/svg+xml", data: image_path("jobshop/logo.svg") }
+  .dialog-box(style="max-width: 400px;")
+    .dialog-box__content
+      = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+        .mdl-card__title
+          %object.logo{ type: "image/svg+xml", data: image_path("jobshop/logo.svg"), style: "margin: 0 auto;" }
 
-          .mdl-card__supporting-text
-            = f.input(:email)
-            = f.input(:password)
-            = f.input(:team_id, as: :hidden, input_html: { value: params[:team_id] })
+        .mdl-card__supporting-text
+          = f.input(:email)
+          = f.input(:password)
+          = f.input(:team_id, as: :hidden, input_html: { value: params[:team_id] })
 
-          .mdl-card__actions
-            = f.input :remember_me, as: :boolean, input_html: { class: "mdl-checkbox__input" }
-            = f.button :submit, "Log in"
+        .mdl-card__actions
+          = f.input :remember_me, as: :boolean, input_html: { class: "mdl-checkbox__input" }
+          = f.button :submit, "Log in"

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

@@ -1,22 +1,12 @@
-%div.mdl-layout.mdl-js-layout.mdl-layout--fixed-header
-  %header.mdl-layout__header.mdl-layout__header--waterfall
-    %div.mdl-layout__header-row
-      %a.mdl-layout-title(href="#{jobshop.root_path}") Jobshop
-      %div.mdl-layout-spacer
-      %div.static-navigation-container
-        %nav.mdl-navigation
-          %a.mdl-navigation__link{ href: jobshop.about_path }
-            About
-          %a.mdl-navigation__link.mdl-color-text--pink{ href: jobshop.teams_lookup_path }
-            Sign In
-
-  %main
-    %div
-      You are currently logged in at these stations:
-      %ul
+%div.mdl-layout.mdl-js-layout
+  = render partial: "jobshop/shared/authenticated_header"
+  %main.mdl-layout__content
+    .mdl-cell.mdl-cell--12-col
+      %p You are currently logged in at these stations:
+      %table.mdl-data-table.mdl-js-data-table.mdl-data-table--selectable.mdl-shadow--2dp
         - session_activations.each do |s|
-          %li{ id: s.id }
-            %p
-              = s.id
-              = "(current)" if s.activation_token == session[:activation_token]
-            %p= link_to "log this out", revoke_session_path(s), remote: true, method: :delete, data: { confirm: "Are you sure you want to log out of the selected session?" }
+          %tbody
+            %tr
+              %td= s.id
+              %td= "(current)" if s.activation_token == session[:activation_token]
+              %td= link_to "log this out", revoke_session_path(s), remote: true, method: :delete, data: { confirm: "Are you sure you want to log out of the selected session?" }

data/app/views/jobshop/shared/_authenticated_header.html.haml

@@ -0,0 +1,8 @@
+%header.static-header.mdl-layout__header.mdl-layout__header--waterfall
+  %div.mdl-layout__header-row
+    %a.mdl-layout-title(href="#{jobshop.root_path}") Jobshop
+    %div.mdl-layout-spacer
+    %div.static-navigation-container
+      %nav.mdl-navigation
+        = link_to destroy_user_session_path, method: :delete, class: %w(mdl-navigation__link mdl-color-text--pink) do
+          Sign out

data/app/views/jobshop/shared/_unauthenticated_header.html.haml

@@ -0,0 +1,10 @@
+%header.static-header.mdl-layout__header.mdl-layout__header--waterfall
+  %div.mdl-layout__header-row
+    %a.mdl-layout-title(href="#{jobshop.root_path}") Jobshop
+    %div.mdl-layout-spacer
+    %div.static-navigation-container
+      %nav.mdl-navigation
+        %a.mdl-navigation__link{ href: jobshop.about_path }
+          About
+        %a.mdl-navigation__link.mdl-color-text--pink{ href: jobshop.teams_lookup_path }
+          Sign In

data/app/views/jobshop/teams/lookups/show.html.haml

@@ -1,15 +1,14 @@
 %main.mdl-layout__content
-  %div.mdl-grid
-    %div.mdl-cell.mdl-cell--12-col
-      %div#sign-in.mdl-card
-        = simple_form_for @lookup, url: teams_lookup_path do |f|
-          .mdl-card__title
-            %h4 Can't find your team?
+  .dialog-box
+    .dialog-box__content
+      = simple_form_for @lookup, url: teams_lookup_path do |f|
+        .mdl-card__title
+          %h4 Can't find your team?
 
-          .mdl-card__supporting-text
-            %p Enter your email address and we'll send you the link.
-            = f.input :email
+        .mdl-card__supporting-text
+          %p Enter your email address and we'll send you the link.
+          = f.input :email
 
-          .mdl-card__actions
-            .expand
-            = f.button :submit, "Send the link to my email!"
+        .mdl-card__actions
+          .expand
+          = f.button :submit, "Send the link to my email!"

data/app/views/jobshop/welcome/index.html.haml

@@ -0,0 +1,21 @@
+.mdl-layout.mdl-js-layout.mdl-layout--fixed-header
+  = render partial: "jobshop/shared/authenticated_header"
+  %main.mdl-layout__content
+    .dialog-box
+      .dialog-box__header
+        %i.material-icons location_city
+      .dialog-box__content
+        .mdl-card__title
+          %h4 Welcome Aboard
+
+        .mdl-card__supporting-text
+          %p
+            To get you up and running quickly, let's walk through making
+            your first product together. We'll track this order as it
+            moves around the shop to discover exactly where time is being
+            spent.
+
+        .mdl-card__actions
+          .expand
+          %a.mdl-button.mdl-button--primary.mdl-button--raised{ href: new_welcome_things_path }
+            Get started »

data/app/views/jobshop/welcome/places/new.html.haml

@@ -0,0 +1,22 @@
+.mdl-layout.mdl-js-layout.mdl-layout--fixed-header
+  = render partial: "jobshop/shared/authenticated_header"
+  %main.mdl-layout__content
+    .dialog-box
+      .dialog-box__header
+        %i.material-icons location_city
+      .dialog-box__content
+        = simple_form_for @place, url: welcome_places_path do |f|
+          .mdl-card__title
+            %h4 First Place
+
+          .mdl-card__supporting-text
+            %p
+              Places are how Jobshop manages all the different locations in your
+              shop that a product may visit during its lifetime.
+
+            = hidden_field_tag(:id, @place.id, id: nil) if @place.persisted?
+            = f.input :name, label: "Where are you?", as: :string
+
+          .mdl-card__actions
+            %a.mdl-button.mdl-button--raised.mdl-button--secondary{ href: new_welcome_things_path } « Back
+            = f.button :submit, raw("Next »")

data/app/views/jobshop/welcome/registrations/new.html.haml

@@ -0,0 +1,31 @@
+%main.mdl-layout__content
+  .dialog.dialog--no-back.mdl-grid.mdl-grid--no-spacing.mdl-shadow--2dp
+    %header.onboard__avatar.mdl-cell.mdl-cell--4-col
+      %i.material-icons location_city
+    .mdl-card.mdl-cell.mdl-cell--8-col
+      = simple_form_for @registration, url: welcome_registration_path do |f|
+        .mdl-card__title
+          %h4.mdl-card__title-text
+            Registration
+        .mdl-card__supporting-text
+          = hidden_field_tag(:team_id, params[:team_id])
+          = hidden_field_tag(:registration_token, params[:registration_token])
+          = f.fields_for(f.object.user) do |uf|
+            = uf.input :forename, label: "First Name"
+            = uf.input :surname, label: "Last Name"
+            = uf.input :email
+
+          = f.fields_for(f.object.team) do |tf|
+            %p
+              Choose a name for your team.
+            = tf.input :name, label: "Team Name"
+
+          = f.fields_for(f.object.user) do |uf|
+            %p
+              Pick a strong password. Ideally it will be longer than eight
+              characters, have mixed upper/lower case, and include numbers
+              and symbols.
+            = uf.input :password
+            = uf.input :password_confirmation
+        .mdl-card__actions
+          = f.button :submit, "Next »".html_safe

data/app/views/jobshop/welcome/things/new.html.haml

@@ -0,0 +1,24 @@
+.mdl-layout.mdl-js-layout.mdl-layout--fixed-header
+  = render partial: "jobshop/shared/authenticated_header"
+  %main.mdl-layout__content
+    .dialog-box
+      .dialog-box__header
+        %i.material-icons location_city
+      .dialog-box__content
+        = simple_form_for @thing, url: welcome_things_path do |f|
+          .mdl-card__supporting-text
+            %h4 First Product
+
+            %p
+              How do you identify this particular product? You can enter an
+              <strong>SKU</strong>, a <strong>Part Number</strong> or any other
+              unique identifier your team may be using. We'll use this to look
+              up the product again in the future.
+
+            = hidden_field_tag(:id, @thing.id, id: nil) if @thing.persisted?
+            = f.input :identifier, label: "Product Identifier", as: :string
+
+          .mdl-card__actions
+            .expand
+            = f.button :submit, raw("Next &raquo;")
+

data/app/views/layouts/jobshop/unauthenticated.html.haml

@@ -1,16 +1,6 @@
 = content_for(:body) do
   %div.mdl-layout.mdl-js-layout.mdl-layout--fixed-header
-    %header.mdl-layout__header.mdl-layout__header--waterfall
-      %div.mdl-layout__header-row
-        %a.mdl-layout-title(href="#{jobshop.root_path}") Jobshop
-        %div.mdl-layout-spacer
-        %div.static-navigation-container
-          %nav.mdl-navigation
-            %a.mdl-navigation__link{ href: jobshop.about_path }
-              About
-            %a.mdl-navigation__link.mdl-color-text--pink{ href: jobshop.teams_lookup_path }
-              Sign In
-
+    = render partial: "jobshop/shared/unauthenticated_header"
     = yield
 
 = render template: "layouts/jobshop/application"

data/config/initializers/simple_form.rb

@@ -6,7 +6,8 @@ SimpleForm.setup do |config|
   # stack. The options given below are used to wrap the
   # whole input.
 
-  config.wrappers :string, class: [ "mdl-textfield", "mdl-js-textfield" ],
+  config.wrappers :string,
+    class: %w(mdl-textfield mdl-js-textfield),
     error_class: "is-invalid" do |b|
 
     b.use :html5
@@ -143,11 +144,9 @@ SimpleForm.setup do |config|
   # config.input_class = nil
 
   # Define the default class of the input wrapper of the boolean input.
-  config.boolean_label_class = [
-    "mdl-checkbox",
-    " mdl-js-checkbox",
-    " mdl-js-ripple-effect"
-  ]
+  config.boolean_label_class = %w(mdl-checkbox
+                                  mdl-js-checkbox
+                                  mdl-js-ripple-effect)
 
   # Defines if the default input wrapper class should be included in radio
   # collection wrappers.

data/config/routes.rb

@@ -1,27 +1,45 @@
 Jobshop::Engine.routes.draw do
-  devise_for(:users, class_name: "Jobshop::User", module: "devise", skip: [ :sessions ])
+  devise_for :users, class_name: "Jobshop::User", module: "devise",
+    skip: :sessions
 
-  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 "/sign_out" => "sessions#destroy", as: :destroy_user_session
-    delete "/revoke(/:id)" => "session_activations#destroy", as: :revoke_session
-  end
+  unauthenticated do
+    devise_scope :user do
+      get  "/sign_in/:team_id", to: "sessions#new",    as: :new_user_session
+      post "/sign_in/:team_id", to: "sessions#create", as: :user_session
+    end
+
+    get  "/teams/lookup", to: "teams/lookups#show", as: :teams_lookup
+    post "/teams/lookup", to: "teams/lookups#create"
 
-  resources :teams, only: [ ] do
-    collection do
-      resource :lookup, only: [ :show, :create ], module: "teams",
-        as: "teams_lookup"
+    namespace :welcome do
+      resource :registration, except: %w(edit destroy show update)
     end
 
-    resource :registration, only: [ :new, :create ],
-      controller: "teams/registrations"
+    get "/", to: "dashboards#show"
   end
 
-  get "/setup"  => "setups#show", as: :team_setup
-  get "/places" => "places#show"
+  authenticated do
+    devise_scope :user do
+      delete "/sign_out", to: "sessions#destroy", as: :destroy_user_session
+      delete "/revoke/:id",
+        to: "session_activations#destroy", as: :revoke_session
+    end
 
-  get "/about" => redirect("https://github.com/jobshop/jobshop"), as: :about
+    namespace :welcome do
+      resource :things, except: %w(destroy show) do
+        get "/", action: :index
+      end
 
-  root to: "dashboards#show"
+      resource :places, except: %w(destroy show) do
+        get "/", action: :index
+      end
+    end
+
+    get "/welcome", to: "welcome#index"
+    get "/logins", to: "places#show"
+
+    root to: "dashboards#show"
+  end
+
+  get "/about" => redirect("https://github.com/jobshop/jobshop"), as: :about
 end

data/db/migrate/20170311194758_initialize_jobshop.rb

@@ -1,9 +1,10 @@
 class InitializeJobshop < ActiveRecord::Migration[5.0]
   def change
-    enable_extension "pgcrypto" unless extension_enabled?("pgcrypto")
+    enable_extension "pgcrypto" unless extension_enabled? "pgcrypto"
+    enable_extension "citext"   unless extension_enabled? "citext"
 
-    create_table :jobshop_users,
-        id: :uuid, default: -> { "gen_random_uuid()" } do |t|
+    create_table(:jobshop_users, id: :uuid,
+                 default: -> { "gen_random_uuid()" }) do |t|
       ## Database authenticatable
       t.string :email,              null: false, default: ""
       t.string :encrypted_password, null: false, default: ""
@@ -33,10 +34,12 @@ class InitializeJobshop < ActiveRecord::Migration[5.0]
       # t.string   :unlock_token # Only if unlock strategy is :email or :both
       # t.datetime :locked_at
 
-      t.uuid     :team_id
+      t.uuid     :team_id, null: false
+      t.string   :forename
+      t.string   :surname
       t.string   :email_authentication_token
       t.datetime :email_authentication_token_sent_at, :datetime
-      t.timestamps null: false
+      t.timestamps
     end
 
     add_index :jobshop_users, [ :email, :team_id ],  unique: true
@@ -44,8 +47,8 @@ class InitializeJobshop < ActiveRecord::Migration[5.0]
     # add_index :jobshop_users, :confirmation_token,   unique: true
     # add_index :jobshop_users, :unlock_token,         unique: true
 
-    create_table :jobshop_teams,
-        id: :uuid, default: -> { "gen_random_uuid()" } do |t|
+    create_table(:jobshop_teams, id: :uuid,
+                 default: -> { "gen_random_uuid()" }) do |t|
       t.string   :name
       t.uuid     :owner_id
       t.string   :registration_token
@@ -53,6 +56,11 @@ class InitializeJobshop < ActiveRecord::Migration[5.0]
       t.timestamps
     end
 
+    add_check :jobshop_teams, <<~CHECK, name: :check_owner_id_on_jobshop_teams
+      ((owner_id IS NULL AND registration_token IS NOT NULL AND registration_token_sent_at IS NOT NULL) OR
+       (owner_id IS NOT NULL AND registration_token IS NULL AND registration_token_sent_at IS NULL))
+    CHECK
+
     add_index :jobshop_teams, [ "registration_token" ], unique: true
 
     add_foreign_key :jobshop_users,
@@ -61,8 +69,8 @@ class InitializeJobshop < ActiveRecord::Migration[5.0]
     add_foreign_key :jobshop_teams,
         :jobshop_users, column: "owner_id", on_delete: :restrict
 
-    create_table :jobshop_dashboards,
-        id: :uuid, default: -> { "gen_random_uuid()" } do |t|
+    create_table(:jobshop_dashboards, id: :uuid,
+                 default: -> { "gen_random_uuid()" }) do |t|
       t.uuid :team_id
       t.timestamps
     end
@@ -70,15 +78,34 @@ class InitializeJobshop < ActiveRecord::Migration[5.0]
     add_foreign_key :jobshop_dashboards,
         :jobshop_teams, column: "team_id", on_delete: :cascade
 
-    create_table :jobshop_session_activations,
-        id: :uuid, default: -> { "gen_random_uuid()" } do |t|
-      t.uuid   :user_id, null: false
-      t.string :activation_token
-
+    create_table(:jobshop_session_activations, id: :uuid,
+                 default: -> { "gen_random_uuid()" }) do |t|
+      t.uuid   :user_id,          null: false
+      t.string :activation_token, null: false
       t.timestamps
     end
 
     add_index :jobshop_session_activations, :user_id
     add_index :jobshop_session_activations, :activation_token, unique: true
+
+    create_table(:jobshop_things, id: :uuid,
+                 default: -> { "gen_random_uuid()" }) do |t|
+      t.uuid :team_id,       null: false
+      t.citext :identifier
+
+      t.timestamps
+    end
+
+    add_index :jobshop_things, [ :identifier, :team_id ], unique: true
+
+    create_table(:jobshop_places, id: :uuid,
+                 default: -> { "gen_random_uuid()" }) do |t|
+      t.uuid :team_id, null: false
+      t.citext :name
+
+      t.timestamps
+    end
+
+    add_index :jobshop_places, [ :name, :team_id ], unique: true
   end
 end

data/lib/generators/jobshop/config/templates/config/initializers/jobshop.rb.tt

@@ -1,2 +1,4 @@
 Jobshop.configure do |config|
+  # URL of the redis db maintaining session data.
+  #config.session_store_url = ENV.fetch("REDIS_URL") if Rails.env.production?
 end

data/lib/generators/jobshop/dummy/dummy_generator.rb

@@ -90,6 +90,7 @@ module Jobshop
         bundle_command("exec rails db:create")
         bundle_command("exec rails db:migrate")
         bundle_command("exec rails db:test:load_schema")
+        bundle_command("exec rails g jobshop:team")
       end
 
     protected

data/lib/generators/jobshop/team/team_generator.rb

@@ -16,7 +16,7 @@ module Jobshop
       end
 
       def create_team
-        @team = ::Jobshop::Team.create!
+        @team = ::Jobshop::Team.new
       end
 
       def generate_token
@@ -30,10 +30,11 @@ module Jobshop
         # protocol. HTTPS isn't mandatory in production but it is very, VERY
         # highly recommended.
         @secure_url = ::Jobshop::Engine.routes.url_helpers.
-          new_team_registration_url(@team,
+          new_welcome_registration_url(
           protocol: link_protocol,
           host: link_host,
-          registration_token: @token
+          registration_token: @token,
+          team_id: @team.id
         )
       end
 
@@ -46,7 +47,7 @@ module Jobshop
 
       #{@secure_url}
 
-      This link is valid for 30 minutes from now and will expire at:
+      This link is valid for 30 minutes and will expire at:
       #{30.minutes.from_now.in_time_zone("Eastern Time (US & Canada)")}
 
       Thank you for using Jobshop!

data/lib/jobshop/cli.rb

@@ -20,10 +20,10 @@ module Jobshop
 
     class Dummy < Thor
       desc "server", "Start the dummy app"
-      default_command def server
+      default_command def server(*args)
         if Jobshop::DummyApp.exist?
           Dir.chdir(Jobshop::DummyApp.path)
-          exec("rails s")
+          exec %Q(rails s #{args.join(" ")})
         else
           abort <<~MESSAGE
             Dummy app does not exist at #{Jobshop::DummyApp.path}

data/lib/jobshop/engine.rb

@@ -1,4 +1,5 @@
 require "action_view"
+require "postgresql/check"
 require "devise"
 require "haml-rails"
 require "jquery-rails"
@@ -42,7 +43,6 @@ module Jobshop
       Warden::Manager.after_set_user except: :fetch do |user, warden, opts|
         SessionActivation.deactivate(warden.raw_session["activation_token"])
         warden.raw_session["activation_token"] = user.activate_session
-        #warden.cookies.permanent.encrypted[:_jobshop_place_id]
       end
 
       Warden::Manager.after_fetch do |user, warden, opts|

data/lib/jobshop/version.rb

@@ -6,7 +6,7 @@ module Jobshop
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 113
+    TINY  = 127
     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.113
+  version: 0.0.127
 platform: ruby
 authors:
 - Frank J. Mattia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: postgresql-check
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -335,7 +349,8 @@ files:
 - app/assets/javascripts/jobshop/application.js
 - app/assets/stylesheets/jobshop/application.scss
 - app/assets/stylesheets/jobshop/breakpoints.scss
-- app/assets/stylesheets/jobshop/static.scss
+- app/assets/stylesheets/jobshop/dialog.scss
+- app/assets/stylesheets/jobshop/welcome.scss
 - app/controllers/concerns/email_token_validation.rb
 - app/controllers/concerns/registration_token_validation.rb
 - app/controllers/jobshop/application_controller.rb
@@ -343,19 +358,23 @@ files:
 - app/controllers/jobshop/places_controller.rb
 - app/controllers/jobshop/session_activations_controller.rb
 - app/controllers/jobshop/sessions_controller.rb
-- app/controllers/jobshop/setups_controller.rb
 - app/controllers/jobshop/teams/lookups_controller.rb
-- app/controllers/jobshop/teams/registrations_controller.rb
 - app/controllers/jobshop/teams_controller.rb
+- app/controllers/jobshop/welcome/places_controller.rb
+- app/controllers/jobshop/welcome/registrations_controller.rb
+- app/controllers/jobshop/welcome/things_controller.rb
+- app/controllers/jobshop/welcome_controller.rb
 - app/helpers/jobshop/application_helper.rb
 - app/jobs/jobshop/application_job.rb
 - app/mailers/jobshop/application_mailer.rb
 - app/mailers/jobshop/teams_mailer.rb
 - app/models/jobshop/application_record.rb
 - app/models/jobshop/dashboard.rb
+- app/models/jobshop/place.rb
 - app/models/jobshop/registration.rb
 - app/models/jobshop/session_activation.rb
 - app/models/jobshop/team.rb
+- app/models/jobshop/thing.rb
 - app/models/jobshop/user.rb
 - app/models/jobshop/virtual_record.rb
 - app/policies/jobshop/application_policy.rb
@@ -374,11 +393,15 @@ files:
 - app/views/jobshop/dashboards/show.html.haml
 - app/views/jobshop/places/show.html.haml
 - app/views/jobshop/session_activations/destroy.js.erb
-- app/views/jobshop/setups/show.html.haml
+- app/views/jobshop/shared/_authenticated_header.html.haml
+- app/views/jobshop/shared/_unauthenticated_header.html.haml
 - app/views/jobshop/teams/lookups/show.html.haml
-- app/views/jobshop/teams/registrations/new.html.haml
 - app/views/jobshop/teams_mailer/found_teams.html.haml
 - app/views/jobshop/teams_mailer/found_teams.text.erb
+- app/views/jobshop/welcome/index.html.haml
+- app/views/jobshop/welcome/places/new.html.haml
+- app/views/jobshop/welcome/registrations/new.html.haml
+- app/views/jobshop/welcome/things/new.html.haml
 - app/views/layouts/jobshop/application.html.haml
 - app/views/layouts/jobshop/mailer.text.erb
 - app/views/layouts/jobshop/unauthenticated.html.haml
@@ -430,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: An open source Manufacturing Execution System.

data/app/assets/stylesheets/jobshop/static.scss

@@ -1,41 +0,0 @@
-body.sessions-new,
-body.lookups-show,
-body.registrations-new,
-body.registrations-create {
-  header {
-    @extend .mdl-color--white;
-    @extend .mdl-color-text--black;
-
-    z-index: 50;
-    margin: 0 !important;
-
-    .mdl-layout-title {
-      color: rgba(0, 0, 0, 0.87) !important;
-      opacity: 0.87;
-      font-weight: 700;
-    }
-
-    .mdl-navigation {
-      .mdl-navigation__link {
-        @extend .mdl-typography--text-uppercase;
-
-        background-color: transparent !important;
-        border-bottom: 4px solid transparent;
-        color: rgba(0, 0, 0, 0.87);
-        display: inline-block;
-        font-weight: 700;
-        height: 60px;
-        line-height: 68px;
-
-        &:hover {
-          border-bottom: 4px solid unquote("rgb(#{$palette-indigo-500})");
-        }
-      }
-    }
-  }
-
-  .mdl-layout__content {
-    display: flex;
-    justify-content: center;
-  }
-}

data/app/controllers/jobshop/setups_controller.rb

@@ -1,8 +0,0 @@
-require_dependency "jobshop/application_controller"
-
-module Jobshop
-  class SetupsController < ApplicationController
-    def show
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-%div.mdl-layout.mdl-js-layout.mdl-layout--fixed-header
-  %header.mdl-layout__header.mdl-layout__header--waterfall
-    %div.mdl-layout__header-row
-      %a.mdl-layout-title(href="#{jobshop.root_path}") Jobshop
-      %div.mdl-layout-spacer
-      %div.static-navigation-container
-        %nav.mdl-navigation
-          %a.mdl-navigation__link{ href: jobshop.about_path }
-            About
-          %a.mdl-navigation__link.mdl-color-text--pink{ href: jobshop.teams_lookup_path }
-            Sign In
-
-  %main
-    %div(class="mdl-grid demo-content")
-      Welcome Aboard

data/app/views/jobshop/teams/registrations/new.html.haml

@@ -1,30 +0,0 @@
-%main.mdl-layout__content
-  %div.mdl-grid
-    %div.mdl-cell.mdl-cell--12-col
-      %div#register.mdl-card
-        = simple_form_for @registration,
-          url: team_registration_path(@registration.team) do |f|
-          .mdl-card__title
-            %object.logo{ type: "image/svg+xml",
-                          data: image_path("jobshop/logo.svg") }
-            %h4
-              Get started with
-              %br>
-              %strong Jobshop
-          .mdl-card__supporting-text
-            = hidden_field_tag(:registration_token, params[:registration_token])
-            = f.fields_for(f.object.team) do |tf|
-              %p
-                Pick a name for your team. It will usually be (or include) your
-                company's name.
-              = tf.input :name, label: "Team Name"
-
-            = f.fields_for(f.object.user) do |uf|
-              = uf.input :email
-              %p
-                Pick a strong password. Ideally it will be longer than eight
-                characters, have mixed upper/lower case, and include numbers
-                and symbols.
-              = uf.input :password
-              = uf.input :password_confirmation
-              = f.button :submit, "Next »".html_safe