jobshop 0.0.4.2p4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebd478bfbc679ef91271554cd5a9f8c0bd12475d
-  data.tar.gz: 81649a0c32fbfe838c26046da849bd94ad8d08db
+  metadata.gz: 911cba16d1bf58d408dd6776437e6996e6fe04a3
+  data.tar.gz: cfa8021ce4383cec99661fefadfb394c08dd3ade
 SHA512:
-  metadata.gz: c1df82ba9a8337d6f4262bc3c3c093fc4581e0c402c7b15713b334d4b358214aa1bad765b0c5274c67ddfee9fe4131689d772e442a3002ebd2be9f91232cd6bf
-  data.tar.gz: 69071e78619c4e6d17d141cd00b89a7032a61d1201b915ed617071143d0337a281b6f6334cb750993c52f6a542ec6a5910313bad1e5ca83963dcd0512798523f
+  metadata.gz: fb7a4111e42a7383f59c987d77adbdd14d2498b3ee680bbeddf374153162e6f2294e8d7ca582a2d6b99f1bfd061585ad1a634a922241486803b32682cf47d239
+  data.tar.gz: aa5738597b6865e64806ca76ddf507508221f560e79bce0512d9cb3516503f93e761477ba638d1cf52c263e58e5f4278b157adc7c4693a49f689c1eb3d99f28c

data/README.md

@@ -44,13 +44,14 @@ $ rake db:create
 $ rake db:migrate
 ```
 
-Lastly, create your first Jobshop site:
+Lastly, create your first Jobshop team:
 
 ```
-$ rails g Jobshop:site "My Organization Name"
+$ rails g Jobshop:team "My Team Name"
 ```
 
-Fire up your server `$ rails s` and navigate to the link provided by the site generator!
+Fire up your server `$ rails s` and navigate to the link provided by the team
+generator!
 
 ## Bug Reports
 If you discover a problem with Jobshop, we would like to know about it.

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

@@ -12,5 +12,18 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require materialize-sprockets
+//= require material
+//= require turbolinks
 //= require_tree .
+
+document.addEventListener("turbolinks:load", function() {
+  componentHandler.upgradeDom();
+});
+
+$(document).on("click", "li.mdl-menu__item", function(event) {
+  var menuItemLink = $(this).find("a").first();
+
+  if (menuItemLink.length !== 0) {
+    menuItemLink.get(0).click();
+  }
+});

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

@@ -1,56 +1,264 @@
 @charset "utf-8"
-@import url(https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic);
-
-@import "materialize/components/color";
-// TODO: Import overrides here;
-$primary-color: color("blue", "lighten-5") !default;
-$navbar-font-color: color("blue-grey", "darken-4") !default;
-$navbar-brand-font-size: 2.5rem !default;
-@import "materialize";
-@import "material-icons";
-
-html {
-  height: 100%;
-
-  body {
-    background-color: color("blue", "lighten-5");
-    margin: 0;
+
+@import "material";
+
+@import "jobshop/breakpoints";
+
+html, body {
+  background-color: unquote("rgb(#{$palette-indigo-50})");
+  font-family: "Roboto", "Helvetica", sans-serif;
+}
+
+html { height: 100% }
+body { min-height: 100%; }
+
+.session-layout,
+.registration-layout {
+  @extend .mdl-layout;
+}
+
+body.static-index {
+  & > .layout {
+    @extend .mdl-layout, .mdl-layout--fixed-header;
+
+    & > header {
+      @extend .mdl-layout__header, .mdl-color--white, .mdl-color-text--black;
+
+      & > div {
+        @extend .mdl-layout__header-row;
+
+        font-weight: bold !important;
+      }
+    }
+  }
+}
+
+main {
+  @extend .mdl-layout__content;
+
+  display: flex;
+  justify-content: center;
+}
+
+#sign-in,
+#register {
+  @extend .mdl-card;
+  @extend .mdl-shadow--2dp;
+
+  margin: 1rem;
+  width: 100%;
+
+  @include tablet-up {
+    width: 440px;
   }
 
-  h2 { font-family: 'Lora', serif; }
-
-  .bubble:before {
-    content: '';
-    position: absolute;
-    border-style: solid;
-    border-width: 0 1.2rem 1.2rem;
-    border-color: #fff transparent;
-    display: block;
-    z-index: 0;
-    margin-left: -1.2rem;
-    top: -1.17rem; /* FIXME: 1.2rem leaves a 1px gap at some breakpoints */
-    left: 50%;
+  .mdl-card__supporting-text {
+    width: auto;
   }
 
-  .card-action {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+  .mdl-textfield {
+    width: 100%;
   }
+}
+
+.mdl-menu__item a {
+  color: inherit;
+  font-weight: inherit;
+  text-decoration: none;
+}
 
-  .card-content {
-    .error {
-      color: $error-color !important;
-      text-align: center;
+.mdl-card__title {
+  align-items: center;
+  height: 200px;
+  justify-content: space-around;
+
+  h4 {
+    opacity: 0.82;
+    text-align: right;
+
+    strong {
+      font-size: 1.1em;
     }
   }
+}
 
-  .logo { margin: 2rem auto; }
+.mdl-card__actions {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  padding: $card-vertical-padding $card-horizontal-padding;
 
-  .sub-head {
-    font-size: 1.5rem;
-    font-weight: 300;
+  button {
+    @extend .mdl-button;
+    @extend .mdl-button--colored;
   }
 }
 
-@import "generics";
+/**
+* .demo-avatar {
+*   width: 48px;
+*   height: 48px;
+*   border-radius: 24px;
+* }
+* 
+* .demo-layout {
+*   .demo-header {
+*     .mdl-textfield {
+*       padding: 0px;
+*       margin-top: 41px;
+* 
+*       .mdl-textfield__expandable-holder {
+*         bottom: 19px;
+*       }
+*     }
+*   }
+* 
+*   .demo-navigation {
+*     .mdl-navigation__link {
+*       display: flex !important;
+*       flex-direction: row;
+*       align-items: center;
+*       color: rgba(255, 255, 255, 0.56);
+*       font-weight: 500;
+*     }
+* 
+*     .mdl-navigation__link:hover {
+*       background-color: #00BCD4;
+*       color: #37474F;
+*     }
+*   }
+* 
+*   .mdl-layout__header {
+*     .mdl-layout__drawer-button { color: rgba(0, 0, 0, 0.54); }
+*   }
+* }
+* 
+* .mdl-layout__drawer {
+*   .avatar { margin-bottom: 16px; }
+* }
+* 
+* .demo-drawer {
+*   border: none;
+* 
+*   /* iOS Safari specific workaround * /
+*   .mdl-menu__container { z-index: -1; }
+*   .demo-navigation { z-index: -2; }
+*   /* END iOS Safari specific workaround * /
+* 
+*   .mdl-menu .mdl-menu__item {
+*     display: flex;
+*     align-items: center;
+* 
+*     a {
+*       display: block;
+*     }
+*   }
+* }
+* 
+* .demo-drawer-header {
+*   box-sizing: border-box;
+*   display: flex;
+*   flex-direction: column;
+*   justify-content: flex-end;
+*   padding: 16px;
+*   height: 151px;
+* }
+* 
+* .demo-avatar-dropdown {
+*   display: flex;
+*   position: relative;
+*   flex-direction: row;
+*   align-items: center;
+*   width: 100%;
+* }
+* 
+* .demo-navigation {
+*   flex-grow: 1;
+* 
+*   .mdl-navigation__link .material-icons {
+*     font-size: 24px;
+*     color: rgba(255, 255, 255, 0.56);
+*     margin-right: 32px;
+*   }
+* }
+* 
+* .demo-content { max-width: 1080px; }
+* 
+* .demo-cards {
+*   align-items: flex-start;
+*   align-content: flex-start;
+* 
+*   .demo-separator { height: 32px; }
+* 
+*   .mdl-card__title.mdl-card__title {
+*     color: white;
+*     font-size: 24px;
+*     font-weight: 400;
+*   }
+* 
+*   .mdl-card__actions {
+*     a {
+*       color: #00BCD4;
+*       text-decoration: none;
+*     }
+*   }
+* 
+*   ul { padding: 0; }
+*   h3 { font-size: 1em; }
+* }
+* 
+* .demo-updates .mdl-card__title {
+*   min-height: 200px;
+*   background-image: url('images/dog.png');
+*   background-position: 90% 100%;
+*   background-repeat: no-repeat;
+* }
+* 
+* .demo-options {
+*   .material-icons { color: rgba(255, 255, 255, 0.89); }
+* 
+*   .mdl-card__actions {
+*     height: 64px;
+*     display: flex;
+*     box-sizing: border-box;
+*     align-items: center;
+*   }
+* 
+*   .mdl-checkbox__box-outline {
+*     border-color: rgba(255, 255, 255, 0.89);
+*   }
+* 
+*   h3 { margin: 0; }
+* 
+*   ul {
+*     margin: 0;
+*     list-style-type: none;
+*   }
+* 
+*   li { margin: 4px 0; }
+* }
+* 
+* .demo-charts { align-items: center; }
+* .demo-chart:nth-child(1) { color: #ACEC00; }
+* .demo-chart:nth-child(2) { color: #00BBD6; }
+* .demo-chart:nth-child(3) { color: #BA65C9; }
+* .demo-chart:nth-child(4) { color: #EF3C79; }
+* 
+* .demo-graphs {
+*   padding: 16px 32px;
+*   display: flex;
+*   flex-direction: column;
+*   align-items: stretch;
+* }
+* 
+* /* TODO: Find a proper solution to have the graphs
+*  * not float around outside their container in IE10/11.
+*  * Using a browserhacks.com solution for now.
+*  * /
+* _:-ms-input-placeholder, :root .demo-graphs { min-height: 664px; }
+* _:-ms-input-placeholder, :root .demo-graph { max-height: 300px; }
+* /* TODO end * /
+* 
+* .demo-graph:nth-child(1) { color: #00b9d8; }
+* .demo-graph:nth-child(2) { color: #d9006e; }
+*/

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

@@ -0,0 +1,35 @@
+a {
+  color: red;
+}
+
+$breakpoints: (
+  s-handset-p:  0px,
+  m-handset-p:  360px,
+  l-handset-p:  400px,
+  xl-handset-p: 480px,
+  s-tablet-p:   600px,
+  m-tablet-p:   720px,
+  l-tablet-p:   840px,
+  s-handset-l:  480px,
+  m-handset-l:  600px,
+  l-handset-l:  720px,
+  xl-handset-l: 840px,
+  s-tablet-l:   960px,
+  m-tablet-l:  1024px,
+  l-tablet-l:  1280px,
+  s-desktop:   1440px,
+  m-desktop:   1600px,
+  l-desktop:   1920px
+);
+
+@mixin handset {
+  @media screen and (max-width: #{map-get($breakpoints, xl-handset-p)}) {
+    @content;
+  }
+}
+
+@mixin tablet-up {
+  @media screen and (min-width: #{map-get($breakpoints, xl-handset-p) + 1}) {
+    @content;
+  }
+}

data/app/builders/jobshop/builder.rb

@@ -0,0 +1,34 @@
+module Jobshop
+  class Builder < ActionView::Helpers::FormBuilder # :nodoc:
+    [ :email_field, :password_field, :text_field ].each do |field_method|
+      define_method field_method do |field, options = {}|
+        output  = ""
+        output += @template.content_tag(:div, class: "mdl-textfield mdl-js-textfield") do
+          content  = ""
+          content += super(field, class: [ "mdl-textfield__input" ])
+          content += label(field, class: [ "mdl-textfield__label" ])
+          content.html_safe
+        end
+        output.html_safe
+      end
+    end
+
+    def check_box(field, *args)
+      output = ""
+      output += label(field, class: [ "mdl-checkbox", "mdl-js-checkbox", "mdl-js-ripple-effect" ]) do
+        content  = ""
+        content += super(field, class: [ "mdl-checkbox__input" ])
+        content += @template.content_tag(:span, field.to_s.humanize, class: [ "mdl-checkbox__label" ])
+        content.html_safe
+      end
+      output.html_safe
+    end
+
+    def button(value = nil, *args)
+      button_classes = [ "mdl-button", "mdl-js-button", "mdl-button--raised",
+        "mdl-button--colored", "mdl-js-ripple-effect" ]
+
+      super(value, class: button_classes)
+    end
+  end
+end

data/app/controllers/concerns/registration_token_validation.rb

@@ -6,20 +6,22 @@ module RegistrationTokenValidation
   end
 
   def validate_registration_token!
-    redirect_to new_user_session_path unless token_present_and_resolves?
+    redirect_to new_user_session_path unless registration_token_valid?
   end
 
-  def token_present_and_resolves?
+  def registration_token_valid?
     params[:registration_token].present? && registration_token_resolves?
   end
 
   def registration_token_resolves?
     encrypted_token = Devise.token_generator.digest(
-      Jobshop::Site, :registration_token, params[:registration_token])
+      Jobshop::Team, :registration_token, params[:registration_token])
 
-    configurable = Jobshop::Site.find_by(
-      id: params[:site_id], registration_token: encrypted_token)
+    configurable = Jobshop::Team.find_by(
+      id: params[:team_id], registration_token: encrypted_token)
 
-    configurable && configurable.registration_token_period_valid?
+    configurable &&
+      configurable.registration_token_period_valid? &&
+      configurable.owner.blank?
   end
 end