cyclid-ui 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54597e4a74f4231ac7751cbe80cd08cafca83c7a
-  data.tar.gz: 2dd3f1258e59e0842cbda74b7f58df4268795524
+  metadata.gz: cd6a99f9802100c3fe15f93e3803c624106d7c62
+  data.tar.gz: 83257bb0735724017e9f6f6276e34a359ecd9d72
 SHA512:
-  metadata.gz: 32fcd54d76df4ed9a5d08e53db10749ab1dfe54dd5aadcb924ae19e23d54a53fdaca4aac9d799680358333c86859480b51674333960000a7bccdf6fdf4e1576e
-  data.tar.gz: 4b2b95a1077b6409aa51bcf1406adbd5f0d33b1fcf4ed91d13faec2d1a3149da45941247d9270973e0cb12ef73a448c1cd1b290667b04f341eca5788dccd72b8
+  metadata.gz: 3d0377e09d764eaa4faca71fbc86667d25f854581bf3c7866392f17d81c97531fe5d760b81a5c0e6cc258b82d28cb42e01bcc328d8c1ea3e9be003285063848e
+  data.tar.gz: e547570fe202d684e48be60f3dc36f79835c18c76c89f192bc54c76f3ac5ff18da8ad03cd337ec42b9904afecc43bba6105ef03cf1a93f8230b7dba32dad9c5e

data/app/cyclid_ui.rb

@@ -133,6 +133,8 @@ module Cyclid
         # it sees the 401 response
         env['warden'].custom_failure!
         flash[:login_error] = 'Invalid username or password'
+        session[:request_uri] = env['REQUEST_URI'] \
+          unless session.key? :request_uri
         cookies.delete 'cyclid.token'
         redirect to '/login'
       end

data/app/cyclid_ui/controllers/auth.rb

@@ -71,8 +71,16 @@ module Cyclid
           # 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/#{username}"
+          request_uri = session[:request_uri]
+          Cyclid.logger.debug "request_uri=#{request_uri}"
+          initial_page = if request_uri
+                           request_uri
+                         elsif user.organizations.empty?
+                           if Cyclid.config.signup
+                             "/user/#{username}/intro"
+                           else
+                             "/user/#{username}"
+                           end
                          else
                            user.organizations.first
                          end

data/app/cyclid_ui/controllers/user.rb

@@ -36,6 +36,22 @@ module Cyclid
 
           mustache :user
         end
+
+        get '/user/:username/intro' do
+          authenticate!
+
+          # Build breadcrumbs
+          username = params[:username]
+
+          @crumbs = []
+          @crumbs << { 'name' => 'User' }
+          @crumbs << { 'url' => "/user/#{username}", 'name' => username }
+          @crumbs << { 'url' => "/user/#{username}/intro", 'name' => 'Introduction' }
+
+          @current_user = current_user
+
+          mustache :intro
+        end
       end
     end
   end

data/app/cyclid_ui/templates/intro.mustache

@@ -0,0 +1,22 @@
+<div class="container" id="intro">
+  <div class="row">
+    <div class="col-md-8">
+      <h1>Welcome to Cyclid!</h1>
+      <p><span style="font-size:140%;">You currently don't belong to any organizations. Without an organization, you won't be able to run any jobs!</span></p>
+      <p>You can either <a href="{{signup}}/organization">create a new organization</a>, or ask someone to add you to an existing organization.</p>
+      <hr>
+      <p>While you're here, there are some useful links which can help you get the most from Cyclid:</p>
+      <ul style="line-height: 1.75;">
+        <li>The official Cyclid documentation at <a href="//docs.cyclid.io">docs.cyclid.io</a>.</li>
+        <li>Cyclid source code at <a href="//github.com/Cyclid/">Github</a>, including example projects.</li>
+        <li>The <a href="//cyclid.io/blog/">Cyclid Blog</a> for news and articles about Cyclid & Continuous Integration.</li>
+        <li>You can follow <a href="//twitter.com/cyclidci">@cyclidci</a> on Twitter for news & updates.</li>
+      </ul>
+      <p>If you'd like to get in touch, just email us at <a href="mailto:contact@cyclid.io">contact@cyclid.io</a>.</p>
+    </div>
+
+    <div class="col-md-4">
+      <img style="padding-top: 90px;" src="/images/cyclid-logo-large.png">
+    </div>
+  </div>
+</div>

data/app/cyclid_ui/templates/login.mustache

@@ -32,7 +32,7 @@
 
       <div class="container">
         <div class="row">
-          <img class="center-block" src="images/cyclid-logo-large.png">
+          <img class="center-block" src="/images/cyclid-logo-large.png">
         </div>
       </div>
 

data/app/cyclid_ui/views/intro.rb

@@ -0,0 +1,24 @@
+# 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 Views
+      # New user introduction view
+      class Intro < Layout
+      end
+    end
+  end
+end

data/lib/cyclid_ui/version.rb

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

data/public/js/user.js

@@ -44,7 +44,7 @@ function user_update_details(user){
         var config = `server: ${gblAPIURL}\n` +
                      `organization: ${org}\n` +
                      `username: ${user.username}\n` +
-                     `secret: `;  
+                     `secret: ${user.secret}\n`;
 
         console.log(`${org} was clicked: ${config}`);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-ui
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -228,6 +228,7 @@ files:
 - app/cyclid_ui/models/user.rb
 - app/cyclid_ui/templates/config.mustache
 - app/cyclid_ui/templates/footer.mustache
+- app/cyclid_ui/templates/intro.mustache
 - app/cyclid_ui/templates/job.mustache
 - app/cyclid_ui/templates/job_info.mustache
 - app/cyclid_ui/templates/layout.mustache
@@ -235,6 +236,7 @@ files:
 - app/cyclid_ui/templates/organization.mustache
 - app/cyclid_ui/templates/user.mustache
 - app/cyclid_ui/views/config.rb
+- app/cyclid_ui/views/intro.rb
 - app/cyclid_ui/views/job.rb
 - app/cyclid_ui/views/layout.rb
 - app/cyclid_ui/views/login.rb