casino 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    casino (1.0.0)
-      casino_core (~> 1.2.0)
+    casino (1.1.0)
+      casino_core (~> 1.3.0)
       jquery-rails (~> 2.1)
       rails (~> 3.2.9)
 
@@ -39,17 +39,21 @@ GEM
     addressable (2.3.2)
     arel (3.0.2)
     builder (3.0.4)
-    casino_core (1.2.0)
+    casino_core (1.3.0)
       activerecord (~> 3.2.9)
       addressable (~> 2.3)
+      faraday (~> 0.8)
+      rotp (~> 1.4)
       terminal-table (~> 1.4)
       useragent (~> 0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    faraday (0.8.5)
+      multipart-post (~> 1.1)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.2.0)
+    jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
@@ -57,8 +61,9 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
+    mime-types (1.20.1)
     multi_json (1.5.0)
+    multipart-post (1.1.5)
     polyglot (0.3.3)
     rack (1.4.4)
     rack-cache (1.2)
@@ -85,6 +90,7 @@ GEM
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
+    rotp (1.4.1)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)

data/app/assets/stylesheets/{casino/index.css.scss → casino.scss}

@@ -1,17 +1,28 @@
 @import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,600);
-@import "normalize.css";
+@import "casino/normalize";
 
+/// DEFAULT SETTINGS ///
+$buttonColor: #0074ad !default;
+$buttonSecondaryColor: #c2c2c2 !default;
 
+$logo: "logo.png" !default;
+$logoRetina: "logo@2x.png" !default;
+$logoWidth: 146px !default;
+$logoHeight: 34px !default;
+
+
+
+/// GLOBAL STUFF ///
 * {
   box-sizing: border-box;
 }
 
 body {
-  background: #F6F6F5;
+  background: #f6f6f5;
   color: #222222;
   font-family: 'Source Sans Pro', sans-serif;
-  font-weight: 300;
   font-size: 15px;
+  font-weight: 300;
 }
 
 label {
@@ -43,9 +54,9 @@ input[type=password] {
 }
 
 a.button, input[type=submit] {
-  background: #0074ad;
+  background: $buttonColor;
   border: none;
-  border: 1px solid #006394;
+  border: 1px solid darken($buttonColor, 3%);
   color: #fff;
   cursor: pointer;
   display: inline-block;
@@ -72,13 +83,23 @@ a.button, input[type=submit] {
   }
 
   &:hover {
+    background-color: darken($buttonColor, 5%);
     color: white;
-    background-color: #005F8F;
   }
 
   &:active {
     top: 2px;
   }
+
+  &.secondary {
+    background: $buttonSecondaryColor;
+    border: 1px solid darken($buttonSecondaryColor, 3%);
+    color: #222;
+
+    &:hover {
+      background-color: darken($buttonSecondaryColor, 5%);
+    }
+  }
 }
 
 table {
@@ -86,8 +107,8 @@ table {
   font-size: 90%;
 
   th, td {
-    text-align: left;
     padding: 8px;
+    text-align: left;
 
     &:first-child {
       padding-left: 0px;
@@ -105,112 +126,178 @@ table {
   }
 }
 
+
+/// LAYOUT ///
 .container {
   width: 100%;
+}
 
-  .box {
-    background: #fff;
-    border: 1px solid #e6e6e6;
-    margin: auto;
-    margin-top: 10%;
-    overflow: auto;
-    padding: 20px;
-    width: 560px;
+.box {
+  background: #fff;
+  border: 1px solid #e6e6e6;
+  margin: auto;
+  margin-top: 10%;
+  overflow: auto;
+  padding: 20px;
+  width: 560px;
+}
 
-    .info {
-      width: 100%;
-      height: auto;
-      background: image-url("logo.png") no-repeat right top;
-    }
+.logo {
+  background-image: image-url($logo);
+  background-repeat: no-repeat;
+
+  img {
+    visibility: hidden;
   }
 
+  @media (min--moz-device-pixel-ratio: 1.3),
+         (-o-min-device-pixel-ratio: 2.6/2),
+         (-webkit-min-device-pixel-ratio: 1.3),
+         (min-device-pixel-ratio: 1.3),
+         (min-resolution: 1.3dppx) {
+    background-image: image-url($logoRetina);
+    background-size: $logoWidth $logoHeight;
+  }
+}
 
-  .login {
-    > div {
-      height: 241px;
-    }
+footer {
+  color: #949494;
+  font-size: 80%;
+  font-weight: 200;
+  padding-top: 10px;
+  margin-bottom: 50px;
+  text-align: center;
+}
 
-    #flash_error {
-      // position: absolute;
-      margin-top: -10px;
-      background-color: #ffebeb;
-      border: 1px solid #FFD6D6;
-      padding: 0 5px;
-      width: 100%;
-      height: 28px;
-      line-height: 28px;
-      font-weight: 400;
-    }
+#flash_notice,
+#flash_error {
+  background-color: #FBECC6;
+  border: 1px solid #F8DFA0;
+  font-weight: 600;
+  height: 28px;
+  line-height: 28px;
+  margin-top: -10px;
+  padding: 0 5px;
+  width: 100%;
+}
 
-    .logo {
-      background: image-url("logo.png") no-repeat 15px 50%;
-      float: left;
-      padding: 0 15px;
-      width: 45%;
+#flash_error {
+  background-color: #ffebeb;
+  border: 1px solid #FFD6D6;
+}
 
-      img {
-        visibility: hidden;
-      }
-    }
+/// LOGIN ///
+.login {
+  > div {
+    height: 241px;
+  }
 
-    .form {
-      border-left: 1px solid #eee;
-      float: left;
-      padding: 15px;
-      width: 55%;
+  .logo {
+    background-position: 15px 50%;
+    display: inline-block;
+    float: left;
+    padding: 0 15px;
+    width: 45%;
+
+    img {
+      visibility: hidden;
     }
   }
 
-  .sessions {
-    width: 800px;
+  .form {
+    border-left: 1px solid #eee;
+    float: left;
+    padding: 15px;
+    width: 55%;
+  }
+}
 
-    a.button {
-      margin-top: 0;
-    }
 
-    h3 {
-      margin: 40px 0 5px;
-    }
+/// SESSIONS ///
+.sessions, .logout {
+  width: 800px;
 
-    table.tickets {
-      margin-bottom: 10px;
-    }
+  > div {
+    height: 190px;
+  }
+
+  .info {
+    float: left;
+    width: 60%;
+  }
+
+  .logo {
+    background-position: right 1.8em;
+    float: left;
+    width: 40%;
+  }
+
+
+  a.button {
+    margin-top: 0;
+  }
+
+  h3 {
+    margin: 40px 0 5px;
+  }
+
+  table.tickets {
+    margin-bottom: 10px;
   }
 }
 
-footer {
-  color: #949494;
-  text-align: center;
-  padding-top: 10px;
-  font-size: 80%;
-  font-weight: 200;
+/// LOGOUT ///
+.logout {
+  width: 560px;
 }
 
+/// TWO-FACTOR ///
+.twofactor {
+  margin-top: 5%;
+
+  #qr-code {
+    width: 100%;
+    text-align: center;
+  }
+}
+
+
+/// RESPONSIVE ///
 @media only screen and (max-width: 600px)  {
   .container {
     padding-top: 0;
+  }
 
-    .box {
+  .box {
+    width: 100%;
+  }
+
+  .sessions, .logout {
+    .info {
+      margin-top: 40px;
       width: 100%;
     }
 
-    .login {
-      > div {
-        height: auto;
-      }
+    .logo {
+      background-position: 0 0;
+      float: none;
+      height: 200px;
+      padding: 0;
+      width: 100%;
+    }
+  }
 
-      .logo {
-        float: none;
-        width: 100%;
-        padding: 0px 15px;
-        background-position: 15px 0;
-      }
+  .login, .logout {
+    > div {
+      height: auto;
+    }
+  }
 
-      .form {
-        border-left: none;
-        width: 100%;
-        padding-bottom: 0;
-      }
+  .login {
+    .form {
+      border-left: none;
+      padding-bottom: 0;
+      width: 100%;
     }
   }
 }
@@ -219,8 +306,8 @@ footer {
 @media only screen and (max-width: 800px)  {
   .container {
     .sessions {
-      width: 100%;
       margin-top: 10px;
+      width: 100%;
     }
 
     table, thead, tbody, th, td, tr {
@@ -233,8 +320,8 @@ footer {
 
     tr {
       border: none;
-      margin-bottom: 10px;
       border-bottom: 1px solid #e2e2e2;
+      margin-bottom: 10px;
 
       &:last-child {
         border-bottom: none;
@@ -248,8 +335,8 @@ footer {
 
     td {
       border: none;
-      position: relative;
       padding-left: 50%;
+      position: relative;
 
       &:first-child {
         padding-left: 50%;
@@ -261,14 +348,14 @@ footer {
     }
 
     td:before {
-      position: absolute;
-      top: 6px;
+      content: attr(data-label);
+      font-weight: bold;
       left: 0;
-      width: 45%;
       padding-right: 10px;
+      position: absolute;
+      top: 6px;
       white-space: nowrap;
-      font-weight: bold;
-      content: attr(data-label);
+      width: 45%;
     }
   }
 }

data/app/controllers/casino/sessions_controller.rb

@@ -2,6 +2,7 @@ class CASino::SessionsController < CASino::ApplicationController
   include CASino::SessionsHelper
 
   def index
+    processor(:TwoFactorAuthenticatorOverview).process(cookies, request.user_agent)
     processor(:SessionOverview).process(cookies, request.user_agent)
   end
 
@@ -20,4 +21,8 @@ class CASino::SessionsController < CASino::ApplicationController
   def logout
     processor(:Logout).process(params, cookies, request.user_agent)
   end
+
+  def validate_otp
+    processor(:SecondFactorAuthenticationAcceptor).process(params, request.user_agent)
+  end
 end