cyclid-ui 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9814c8d110ccfe013e04cea146f6ff28b25ccd3c
-  data.tar.gz: f3501d1380185c9a772b61e3df0947031974fee2
+  metadata.gz: 7c825bc53e4d80b21910dc57748dbc5fd875eb7f
+  data.tar.gz: ea890e1cc6d3f8ec89652cec593e57555dbc25b2
 SHA512:
-  metadata.gz: f1ababb60d429b122929875c5b9299c5b75af95c9e50422ecadf694ad7938bb6a8c5de4ca7a4c1ee5044daa85280fcbb56880a0f673052a243489a940215ba15
-  data.tar.gz: 73792917cfe866677dc6a3960da9e8547627d87294727724b0e2a30874b9531ece5c668839d4a55fcdd79ccfb010b59fa51dcf2d0fd2664a640764540fd3e0d4
+  metadata.gz: 43f2bbd8bad9a2e0b0e73a40202fce843c05b3179db44d3cb60aa487eff9e184236baeb1ad1af85dd375b92f603b519055cf2fb7e9197222bc93866457bac342
+  data.tar.gz: b7c8add78e315865b33af006ff5e026ee93eb536be156bc7f277c654e9c770c740f6eb90c6d720800f050d582a0899b63d4039ff93942a37a43b541cd154c72e

data/app/cyclid_ui.rb

@@ -119,6 +119,7 @@ module Cyclid
       use Controllers::Organization
       use Controllers::User
       use Controllers::Health
+      use Controllers::Default
     end
   end
 end

data/app/cyclid_ui/controllers/default.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+# Copyright 2016 Liqwyd Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Cyclid
+  module UI
+    module Controllers
+      # Sinatra controller for default routes
+      class Default < Base
+        # Default route; redirect depending on the current session status
+        get '/' do
+          # Non-authenticated users will automatically redirect to the login page
+          authenticate!
+
+          # Authenticated users will redirect to one of two potential locations
+          user = current_user
+
+          # Pick the first organization from the users membership and
+          # redirect; if the user doesn't belong to any organizations,
+          # redirect them to their user page
+          initial_page = if user.organizations.empty?
+                           "/user/#{user.username}"
+                         else
+                           user.organizations.first
+                         end
+
+          redirect to initial_page
+        end
+      end
+    end
+  end
+end

data/app/cyclid_ui/models/user.rb

@@ -20,11 +20,12 @@ module Cyclid
       # Cyclid user data that is returned from the API, with the added layer
       # of Memecached caching of the object to avoid API calls.
       class User
-        attr_reader :username, :email, :organizations, :id
+        attr_reader :username, :email, :name, :organizations, :id
 
         def initialize(args = {})
           @username = args['username'] || nil
           @email = args['email'] || nil
+          @name = args['name'] || nil
           @organizations = args['organizations'] || []
           @id = args['id'] || nil
         end
@@ -32,6 +33,7 @@ module Cyclid
         def to_hash
           { 'username' => @username,
             'email' => @email,
+            'name' => @name,
             'organizations' => @organizations,
             'id' => @id }
         end

data/app/cyclid_ui/templates/user.mustache

@@ -28,10 +28,10 @@
 
         <div class="col-md-6 pad-20">
           <div class="row">
-            <div class="col-md-4 text-muted pad-5">
+            <div class="col-md-5 text-muted pad-5">
               <button type="button" class="btn btn-default" style="width:100%;" data-toggle="modal" data-target="#user_password_modal">Change password</button>
             </div>
-            <div class="col-md-8 text-muted pad-5">
+            <div class="col-md-7 text-muted pad-5">
               <small>Change your password and reset your client token.</small>
             </div>
           </div>

data/lib/cyclid_ui/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module Cyclid
+  module UI
+    VERSION = '0.1.1'
+  end
+end

data/public/js/job.js

@@ -113,11 +113,11 @@ function ji_update_status(job) {
   var waiting = '<h6>Unknown</h6>';
   switch(job.status) {
     case 1:
-    case 2:
       waiting = '<h6><i class="fa fa-spinner fa-pulse"></i>&nbsp;Waiting for job to start...</h6>'
       $('#ji_job_waiting').html(waiting);
       $('#ji_job_waiting').removeClass('hidden');
       break;
+    case 2:
     case 3:
     case 4:
       waiting = '<h6><i class="fa fa-cog fa-spin"></i>&nbsp;Waiting for job to complete...</h6>';
@@ -133,6 +133,13 @@ function ji_update_status(job) {
   // Update the status indicator, if there is one
   var indicator = ji_job_status_to_indicator(job.status);
   $(`#row${job.job_id} > #status`).html(indicator);
+
+  if (job.ended) {
+    // Update the duration, if there is one
+    var duration = ji_calculate_duration(job.started, job.ended);
+    console.log(`duration is ${duration}`)
+    $(`#row${job.job_id} > #duration`).text(duration);
+  }
 }
 
 // Set & show the job details
@@ -150,10 +157,10 @@ function ji_update_details(job) {
   if (job.ended) {
     var ended = new Date(job.ended);
     $('#ji_job_ended').text(ended.toUTCString());
-  }
 
-  var duration = ji_calculate_duration(job.started, job.ended);
-  $('#ji_job_duration').text(duration);
+    var duration = ji_calculate_duration(job.started, job.ended);
+    $('#ji_job_duration').text(duration);
+  }
 
   $('#ji_details').removeClass('hidden');
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -205,6 +205,7 @@ files:
 - app/cyclid_ui/config.rb
 - app/cyclid_ui/controllers/auth.rb
 - app/cyclid_ui/controllers/base.rb
+- app/cyclid_ui/controllers/default.rb
 - app/cyclid_ui/controllers/health.rb
 - app/cyclid_ui/controllers/organization.rb
 - app/cyclid_ui/controllers/user.rb
@@ -225,6 +226,7 @@ files:
 - app/cyclid_ui/views/user.rb
 - bin/cyclid-ui-assets
 - lib/cyclid_ui/app.rb
+- lib/cyclid_ui/version.rb
 - public/images/LICENSE
 - public/images/cyclid-logo-large.png
 - public/images/favicon16.png