social_stream 2.0.4 → 2.1.0

data/oauth2_server/app/assets/stylesheets/social_stream-oauth2_server.css.sass

@@ -1,4 +1,4 @@
-@import "social_stream/oauth2_server/mixins/mixins/"
+@import "social_stream/oauth2_server/mixins/mixin"
 
 @import "social_stream/oauth2_server/applications/applications-oauth2server"
 @import "social_stream/oauth2_server/applications/layout/applications-oauth2server"

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass

@@ -4,7 +4,7 @@
       @include colorfont-big-size
       float: left
     a
-      @include btn-primary
+      @include btn-secundary
       @include border-radius(5px)
       margin: 12px 0
     .soften

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass

@@ -49,3 +49,7 @@
         &[type="file"]
           line-height: 0px
 
+
+.site_clients_list
+  ul 
+    li

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/_create-oauth2server.css.sass

@@ -1,10 +1,6 @@
-#content
-  .box
-    @include border-radius (5px)
-    background-color: whitesmoke
-    .image
-      @include border-radius (5px)
-      background-color: $white
+form.new_site_client
+  @include principal-box
+
 
 
 

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixin.css.sass

@@ -0,0 +1,10 @@
+// menu horizontal
+// ----------------------------------
+
+@mixin principal-box
+  @include border-radius(5px)
+  @include box-shadow (1px 1px 15px 0px rgba(50, 50, 50, 0.1))
+  border: 1px solid 
+  border-color: rgba(0,0,0, 0.1)
+  background-color: $auxiliarColor
+  border-color: rgba(0,0,0, 0.1)

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass

@@ -34,8 +34,8 @@
   margin-left: 2.85%
   .site_client
     width: 95% 
-    padding-left: 2.5%
-    padding-right: 2.5%
+    padding: 0 2.5%
+    margin-bottom: 30px
     display: inline-block
     h1
       @include clearfix
@@ -56,6 +56,9 @@
         margin-top: -50px
         h4
           margin-bottom: 0px
+          font-size: 18px
+          color: $principalColor
+          font-family: $serifFontFamily 
         .name,
         .url,
         .users
@@ -69,21 +72,27 @@
           margin-left: 20px
           padding-top: 5px
           border-top: 1px solid #C1C1C1
+          color: #929292
+          font-size: 17px
       .btn-group
         @include btn-primary
         @include border-radius(5px)
         @include btn-add
+        float: right
         .dropdown-menu
           width: 300px
           margin-left: -196px
+          padding: 10px 14px
+          color: $gray
           li
-            word-break: break-all
-            overflow-y: hidden
-            overflow-x: scroll
             h6
               border-bottom: 1px solid #CCC
               a
-                color: principalColor
+                color: $principalColor !important
+          li.client-secret
+            p
+              word-break: break-all
+              overflow-x: scroll
 
 
      

data/oauth2_server/app/controllers/site/clients_controller.rb

@@ -1,18 +1,12 @@
 class Site::ClientsController < ApplicationController
   before_filter :authenticate_user!
 
-  before_filter :set_author_ids, only: [ :create, :update ]
+  before_filter :set_author_ids, only: [ :new, :create, :update ]
 
-  def index
-    @developer_clients = current_subject.developer_site_clients
-  end
-
-  def show
-    @client = Site::Client.find params[:id]
-  end
+  load_and_authorize_resource
 
-  def new
-    @client = Site::Client.new
+  def index
+    @clients = current_subject.managed_site_clients
   end
 
   def create
@@ -20,7 +14,9 @@ class Site::ClientsController < ApplicationController
 
     if @client.save
       respond_to do |format|
-        format.html { redirect_to @client }
+        format.html { 
+          redirect_to edit_site_client_path(@client, step: 2)
+        }
       end
     else
       respond_to do |format|
@@ -47,9 +43,16 @@ class Site::ClientsController < ApplicationController
     end
   end
 
+  def destroy
+    @client.destroy
+
+    redirect_to home_path
+  end
+
   private
 
   def set_author_ids
+    params[:site_client] ||= HashWithIndifferentAccess.new
     params[:site_client][:author_id]      = current_subject.actor_id
     params[:site_client][:user_author_id] = current_user.actor_id
     params[:site_client][:owner_id]       = current_subject.actor_id

data/oauth2_server/app/models/relation/manager.rb

@@ -0,0 +1,19 @@
+# Owner of client sites
+class Relation::Manager < Relation::Single
+  PERMISSIONS =
+    [
+      [ 'manage', nil ],
+      [ 'manage', 'relation/custom' ],
+      [ 'manage', 'contact' ]
+    ]
+
+  class << self
+    def create_activity?
+      false
+    end
+  end
+
+  def available_permissions
+    Permission.instances PERMISSIONS
+  end
+end

data/oauth2_server/app/models/site/client.rb

@@ -4,12 +4,13 @@ class Site::Client < Site
   before_validation :set_secret,
                     on: :create
 
-  after_create :set_admin
+  after_create :set_manager
 
-  scope :administered_by, lambda { |actor|
-    joins(actor: :sent_ties).
+  scope :managed_by, lambda { |actor|
+    select("DISTINCT sites.*").
+      joins(actor: :sent_permissions).
       merge(Contact.received_by(actor)).
-      merge(Tie.related_by(Relation::Admin.instance))
+      merge(Permission.where(action: 'manage', object: nil))
   }
 
   %w{ url callback_url secret }.each do |m|
@@ -32,7 +33,10 @@ class Site::Client < Site
     self.secret = SecureRandom.hex(64)
   end
 
-  def set_admin
-    contact_to!(author).relation_ids = [ Relation::Admin.instance.id ]
+  def set_manager
+    c = sent_contacts.create! receiver_id: author.id,
+                              user_author: author
+
+    c.relation_ids = [ ::Relation::Manager.instance.id ]
   end
 end

data/oauth2_server/app/views/site/clients/_avatar.html.erb

@@ -0,0 +1,15 @@
+<section class="avatar">
+  <% if can? :update, @profile %>
+    <header>
+      <%= render partial: 'edit_icon' %>
+      <h4>
+        <%= t('avatar.profile_change') %>
+      </h4>
+    </header>
+    <div class="update">
+      <%= render partial: 'avatars/form',
+                 object: @profile.actor,
+                 as: :avatarable %>
+    </div>
+  <% end %>
+</section>

data/oauth2_server/app/views/site/clients/_edit.html.erb

@@ -0,0 +1,6 @@
+<%= render partial: 'form' %>
+
+<section class="site_client_roles">
+  <%= render partial: 'relation/customs/index',
+             locals: { subject: @client } %>
+</section>

data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb

@@ -0,0 +1,11 @@
+<%= image_tag 'step_2.png' %>
+
+<section class="new_app">
+<h1>Set the application's logo</h1>
+
+<%= render partial: 'avatars/form',
+           object: @client,
+           as: :avatarable %>
+
+<%= link_to "Next", edit_site_client_path(@client, step: 3) %>
+</section>

data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb

@@ -0,0 +1,10 @@
+<%= image_tag 'step_3.png' %>
+
+<h1>Manage roles and permissions</h1>
+
+<section class="site_client_roles">
+  <%= render partial: 'relation/customs/index',
+             locals: { subject: @client } %>
+</section>
+
+<%= link_to 'Finish', @client %>

data/oauth2_server/app/views/site/clients/_list.html.erb

@@ -1,24 +1,27 @@
 <section class="site_clients_list">
-  <% list.each do |client| %>
+  <ul>
+    <% list.each do |client| %>
+      <li>
+        <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
 
-    <%= image_tag client.logo.url(:small), style: "width: 40px; height: 40px;" %>
-
-    <div class="name">
-      <%= link_to client.name, client %>
-    </div>
-    <div class="url">
-      <%= link_to client.url, client.url, target: '_blank' %>
-    </div>
-    <div class="users">
-      <span>
-        5
-      </span>
-      users
-    </div>
-  <hr class="soften">
-  <% end %>
+        <div class="name">
+          <%= link_to client.name, client %>
+        </div>
+        <div class="url">
+          <%= link_to client.url, client.url, target: '_blank' %>
+        </div>
+        <div class="users">
+          <span>
+            5
+          </span>
+          users
+        </div>
+        <hr class="soften">
+      </li>
+    <% end %>
 
   <%= javascript_tag do %>
     SocialStream.SiteClient.index();
   <% end %>
+  </ul>
 </section>

data/oauth2_server/app/views/site/clients/edit.html.erb

@@ -3,12 +3,11 @@
   <%= render partial: 'toolbar/home' %>
 
   <section class="edit_site_client" id="edit_<%= dom_id @client %>">
-    <%= render partial: 'form' %>
-    
-    <section class="site_client_roles">
-      <%= render partial: 'relation/customs/index',
-                 locals: { list: @client.relations } %>
-    </section>
+    <% if params[:step].present? %>
+      <%= render partial: "edit_step_#{ params[:step] }" %>
+    <% else %>
+      <%= render partial: 'edit' %>
+    <% end %>
   </section>
 </section>
 

data/oauth2_server/app/views/site/clients/index.html.erb

@@ -44,7 +44,7 @@
       <div class="tab-content">
         <div class="tab-pane active" id="tab1">
           <%= render partial: 'list',
-               object: @developer_clients %>
+               object: @clients %>
         </div>
 
         <div class="tab-pane" id="tab2">

data/oauth2_server/app/views/site/clients/new.html.erb

@@ -2,9 +2,11 @@
   <%= render partial: 'toolbar/home' %>
 
   <section class="new_site_client">
+    <%= image_tag 'step_1.png' %>
 
-
-    <%= render partial: 'form_step1' %>
+    <article class="new_app">
+      <%= render partial: 'form' %>
+    </article>
   </section>
 </section>
 

data/oauth2_server/app/views/site/clients/show.html.erb

@@ -20,7 +20,7 @@
           <%= Site::Client.human_attribute_name :description %>
         </h4>
         <div class="result">
-          <%= link_to @client.description, @client.description%>
+          <%= @client.description%>
         </div>
 
         <h4>
@@ -30,45 +30,52 @@
           <%= link_to @client.url, @client.url%>
         </div>
 
-        <h4>
-          <%= Site::Client.human_attribute_name :callback_url %>
-        </h4>
-        <div class="result">
-          <%= @client.callback_url %>
-        </div>
+        <% if can? :update, @client %>
+          <h4>
+            <%= Site::Client.human_attribute_name :callback_url %>
+          </h4>
+          <div class="result">
+            <%= @client.callback_url %>
+          </div>
+        <% end %>
       </div>
         
-      <div class="btn-group">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-          Credentials
-          <span class="caret"></span>
-        </a>
-        <ul class="dropdown-menu">
-          <li>
-            <h6>
-            <%= Site::Client.human_attribute_name :id %>
-            <a href="#" class="pull-right">refresh</a>
-            </h6>
-            <%= @client.id %>
-          </li>
-
-          <li>
-            <h6>
-              <%= Site::Client.human_attribute_name :secret %>
-              <a href="#" class="pull-right">refresh</a>
-            </h6>
-            <%= @client.secret %>
-          </li>
-        </ul>  
-      </div>   
+      <% if can? :update, @client %>
+        <div class="btn-group">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+            Credentials
+            <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu">
+            <li>
+              <h6>
+              <%= Site::Client.human_attribute_name :id %>
+              </h6>
+              <p>
+                <%= @client.id %>
+              </p>
+            </li>
+
+            <li class="client-secret">
+              <h6>
+                <%= Site::Client.human_attribute_name :secret %>
+                <a href="#" class="pull-right">refresh</a>
+              </h6>
+              <p>
+                <%= @client.secret %>
+              </p>
+            </li>
+          </ul>  
+        </div>   
+      <% end %>
     </div>
   </section>
 
   <div class="tabbable"> <!-- Only required for left/right tabs -->
     <ul class="nav nav-tabs">
-      <li class="active"><a href="#tab1" data-toggle="tab">Users</a></li>
-      <li><a href="#tab2" data-toggle="tab">Organizations</a></li>
-      <li><a href="#tab3" data-toggle="tab">Stats</a></li>
+      <li class="active"><a href="#authorized" data-toggle="tab">Authorized</a></li>
+      <li><a href="#registered" data-toggle="tab">Registered</a></li>
+      <li><a href="#stats" data-toggle="tab">Stats</a></li>
     </ul>
     <div class="search-nav hidden-phone">
       <%= form_tag search_path, method: 'get', class: "navbar-search pull-left" do %>
@@ -79,6 +86,7 @@
           SocialStream.SearchHeader.show();
         });
       <% end %>
+
       <div class="mat">
         <%= render partial: 'layouts/loading' %>
 
@@ -97,18 +105,17 @@
 
 
     <div class="tab-content">
-      <div class="tab-pane active" id="tab1">
-        <ul class="nav nav-pills">
-          <li class="active">
-            <a href="#">added</a>
-          </li>
-          <li><a href="#">registered</a></li>
-        </ul>
+      <div class="tab-pane active" id="authorized">
+        <%= render partial: 'contacts/contact',
+                   collection: @client.sent_contacts.first(12) %>
+      </div>
+
+      <div class="tab-pane" id="registered">
       </div>
 
-      <div class="tab-pane" id="tab2">
+      <div class="tab-pane" id="stats">
       </div>
     </div>
   </div>
 
-</section>
+</section>