gdpr_rails 0.3.1 → 0.3.2

data/app/controllers/policy_manager/application_controller.rb

@@ -12,9 +12,20 @@ module PolicyManager
       return redirect_to root_path unless Config.is_admin?(current_user)
     end
 
+    def doc
+      require "redcarpet"
+      @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true, fenced_code_blocks: true)
+      lines = File.open( PolicyManager::Engine.root.join("README.md")).readlines
+      @html = @markdown.render(lines.join(""))
+      render "policy_manager/doc"
+      #render inline: html, layout: "policy_manager/application"
+    end
+
     def user_authenticated?
       if !current_user
-        render :file => "401.erb", :layout => false, :status => :unauthorized
+        render :file => "policy_manager/401.erb", 
+        :layout => "policy_manager/blank", 
+        :status => :unauthorized
       end
     end
 

data/app/controllers/policy_manager/categories_controller.rb

@@ -13,6 +13,8 @@ module PolicyManager
     # GET /categories/1
     def show
       @category = PolicyManager::Config.rules.find{|o| o.name == params[:id]}
+      @terms = @category.terms.paginate(:page => params[:page], 
+                                        :per_page => 12)
     end
 
     private

data/app/controllers/policy_manager/terms_controller.rb

@@ -5,13 +5,6 @@ module PolicyManager
     before_action :set_term, only: [:show, :edit, :update, :destroy]
     before_action :allow_admins
     
-    # GET /terms
-    def index
-      @terms = Term.where(rule: params[:category_id]).paginate(
-                                                :page => params[:page], 
-                                                :per_page => 10)
-    end
-
     # GET /terms/1
     def show
     end

data/app/helpers/policy_manager/application_helper.rb

@@ -19,6 +19,21 @@ module PolicyManager
       nil
     end
 
+    def state_color(state)
+      case state
+      when "pending", "draft"
+        return "tag-yellow"
+      when "progress"
+        return "tag-azure"
+      when "completed", "published"
+        return "tag-green"
+      end
+    end
+
+    def gravatar_url(user, size)
+      gravatar_id = Digest::MD5.hexdigest(user.email.downcase)
+      "http://gravatar.com/avatar/#{gravatar_id}.png?s=#{size}"
+    end
 
     def chart(data)
       begin

data/app/models/policy_manager/portability_request.rb

@@ -41,7 +41,8 @@ module PolicyManager
     end
 
     def download_link
-      self.attachment.expiring_url(PolicyManager::Config.exporter.expiration_link)
+      url = self.attachment.expiring_url(PolicyManager::Config.exporter.expiration_link) 
+      PolicyManager::Config.exporter.customize_link(url)
     end
 
     def handle_progress

data/app/views/layouts/policy_manager/application.html.erb

@@ -6,12 +6,17 @@
   <%= csrf_meta_tags %>
 
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
   <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
 
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
 
   <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
 
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
   <script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
 
@@ -22,76 +27,26 @@
   <%= javascript_include_tag "policy_manager/application", debug: false %>
 
 </head>
-<body>
-
-  <nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0">
-    <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="/">
-      <%= I18n.t("terms_app.sub_title") %></a>
-    <ul class="navbar-nav px-3">
-      <li class="nav-item text-nowrap">
-        <% if PolicyManager::Config.logout_url.present? %>
-          <a class="nav-link" href="<%= PolicyManager::Config.logout_url %>"><%= I18n.t("terms_app.sign_out") %></a>
-        <% end %>
-      </li>
-    </ul>
-  </nav>
-
-  <div class="container-fluid">
-    <div class="row">
-      <nav class="col-md-2 d-none d-md-block bg-light sidebar">
-        <div class="sidebar-sticky">
-          <ul class="nav flex-column">
-            <% if PolicyManager::Config.is_admin?(controller.current_user) %>
-
-              <li class="nav-item">
-                <a class="nav-link" href="<%= categories_path %>">
-                  <i class="fas fa-balance-scale"></i>
-                  <%= I18n.t("terms_app.menu.policies") %>
-                </a>
-              </li>
 
-              <li class="nav-item">
-                <a class="nav-link" href="<%= portability_requests_path %>">
-                  <i class="fas fa-suitcase"></i>
-                  <%= I18n.t("terms_app.menu.portability_requests") %>
-                </a>
-              </li
-
-            <% end %>
-
-            <% if controller.current_user.is_a? PolicyManager::Config.user_resource %>
-
-              <li class="separator"></li>
-
-              <li class="nav-item">
-                <a class="nav-link" href="<%= pending_user_terms_path %>">
-                  <i class="fas fa-user-secret"></i>
-                  <%= I18n.t("terms_app.menu.user_pending_policies") %>
-                </a>
-              </li>
-
-              <li class="nav-item">
-                <a class="nav-link" href="<%= user_portability_requests_path %>">
-                  <i class="fas fa-suitcase"></i>
-                  <%= I18n.t("terms_app.menu.user_portability_requests") %>
-                </a>
-              </li>
-
-            <% end %>
-
-          </ul>
+<body>
 
+    <div class="page">
+      <div class="page-main">
+        <%= render partial: "policy_manager/shared/header" %>
+      
+        <div class="my-3 my-md-5">
+          <div class="container">
+            <p id="notice">
+              <%= flash_messages %>
+            </p>
+            <%= yield %>    
+          </div>
         </div>
-      </nav>
+      </div>
 
-      <main role="main" class="col-md-9 ml-sm-auto col-lg-10 pt-3 px-4">
-        <p id="notice">
-          <%= flash_messages %>
-        </p>
-        <%= yield %>
-      </main>
+      <%= render partial: "policy_manager/shared/footer" %>
     </div>
-  </div>
+ 
 
 </body>
 </html>

data/app/views/layouts/policy_manager/blank.html.erb

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= I18n.t("terms_app.title") %></title>
+
+  <%= csrf_meta_tags %>
+
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+  <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+
+
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext">
+
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
+  <script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
+
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" integrity="sha384-+d0P83n9kaQMCwj8F4RJB66tzIwOKmrdb46+porD/OvrJ+37WqIM7UoBtwHO6Nlg" crossorigin="anonymous">
+
+  <%= javascript_include_tag "https://www.gstatic.com/charts/loader.js" %>
+  <%= stylesheet_link_tag    "policy_manager/application", media: "all" %>
+  <%= javascript_include_tag "policy_manager/application", debug: false %>
+
+</head>
+
+<body>
+    <%= yield %>
+</body>
+</html>

data/app/views/policy_manager/401.erb

@@ -1 +1,14 @@
-<h1>access denied</h1>
+<div class="page">
+  <div class="page-content">
+    <div class="container text-center">
+      <div class="display-1 text-muted mb-5">
+        <i class="si si-exclamation"></i> 401
+      </div>
+      <h1 class="h2 mb-3">Oops.. You just found an error page..</h1>
+      <p class="h4 text-muted font-weight-normal mb-7">We are sorry but you are not authorized to access this page&hellip;</p>
+      <a class="btn btn-primary" href="javascript:history.back()">
+        <i class="fa fa-arrow-left mr-2"></i>Go back
+      </a>
+    </div>
+  </div>
+</div>

data/app/views/policy_manager/categories/index.html.erb

@@ -1,26 +1,43 @@
 <h2><%= I18n.t("terms_app.categories.index.title") %></h2>
 
+<div class="row">
+  <div class="col-12">
+    <div class="card">
+      <%= chart ->{PolicyManager::UserTerm.group_by_day(:created_at, format: "%a").count} %> 
+    </div>
+  </div>
+</div>
 
-<%= chart ->{PolicyManager::UserTerm.group_by_day(:created_at, format: "%a").count} %>
 
-<div class="table-responsive">
-  <table class="table table-striped table-sm">
-  <thead>
-    <tr>
-      <th><%= I18n.t("terms_app.categories.index.table.name") %></th>
-      <th><%= I18n.t("terms_app.categories.index.table.terms") %></th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
+<div class="card">
 
-  <tbody>
-    <% @categories.each do |category| %>
+  <div class="card-header">
+    <h3 class="card-title">
+      <%= I18n.t("terms_app.categories.index.title") %>
+    </h3>
+  </div>
+
+  <div class="table-responsive">
+    <table class="table card-table table-vcenter text-nowrap">
+    <thead>
       <tr>
-        <td><%= category.name %></td>
-        <td><%= category.terms.size %></td>
-        <td><%= link_to I18n.t("terms_app.categories.index.table.show"), category_path(category.name) %></td>
+        <th><%= I18n.t("terms_app.categories.index.table.name") %></th>
+        <th><%= I18n.t("terms_app.categories.index.table.terms") %></th>
+        <th colspan="1"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
-</div>
+    </thead>
+
+    <tbody>
+      <% @categories.each do |category| %>
+        <tr>
+          <td><%= category.name %></td>
+          <td><%= category.terms.size %></td>
+          <td><%= link_to I18n.t("terms_app.categories.index.table.show"), category_path(category.name), class: "btn btn-secondary btn-sm" %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  </div>
+
+  
+</div>

data/app/views/policy_manager/categories/show.html.erb

@@ -1,32 +1,52 @@
-<h2><%= I18n.t("terms_app.categories.show.title", name: @category.name) %></h2>
-
 <div class="float-right">
   <%= link_to I18n.t("terms_app.misc.back"), categories_path, class: " btn btn-primary" %>
   <%= link_to I18n.t("terms_app.categories.show.new"), new_category_term_path(@category.name), class: " btn btn-success"%>
 </div>
 
-<div class="table-responsive">
-  <table class="table table-striped table-sm">
-    <thead>
-      <tr>
-        <th><%= I18n.t("terms_app.categories.show.table.id") %></th>
-        <th><%= I18n.t("terms_app.categories.show.table.content") %></th>
-        <th><%= I18n.t("terms_app.categories.show.table.state") %></th>
-        <th><%= I18n.t("terms_app.categories.show.table.updated_at") %></th>
-        <th></th>
-      </tr>
-    </thead>
-
-    <tbody>
-      <% @category.terms.each do |term| %>
-        <tr>
-          <td><%= term.id %></td>
-          <td><%= truncate(term.description, length: 17, separator: " ", omission: '...') %></td>
-          <td><%= I18n.t("terms_app.states.#{term.state}") %></td>
-          <td><%= term.updated_at %></td>
-          <td><%= link_to I18n.t("terms_app.categories.show.table.show"), category_term_path(@category.name, term) %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+<h2>
+  <%= I18n.t("terms_app.categories.show.title", name: @category.name) %>
+</h2>
+
+
+<div class="card">
+ 
+  <div class="card-body">
+    
+    <div class="table-responsive">
+      <table class="table card-table table-vcenter text-nowrap">
+        <thead>
+          <tr>
+            <th><%= I18n.t("terms_app.categories.show.table.id") %></th>
+            <th><%= I18n.t("terms_app.categories.show.table.content") %></th>
+            <th><%= I18n.t("terms_app.categories.show.table.state") %></th>
+            <th><%= I18n.t("terms_app.categories.show.table.updated_at") %></th>
+            <th></th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <% @terms.each do |term| %>
+            <tr>
+              <td><%= term.id %></td>
+              <td><%= truncate(term.description, length: 17, separator: " ", omission: '...') %></td>
+              <td>
+                <span class="tag <%=state_color(term.state)%>">
+                  <%= I18n.t("terms_app.states.#{term.state}") %>
+                </span>
+              
+              </td>
+              <td><%= term.updated_at %></td>
+              <td><%= link_to I18n.t("terms_app.categories.show.table.show"), category_term_path(@category.name, term), class: "btn btn-sm btn-secondary" %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+
+      
+    </div>
+  </div> 
 </div>
+
+<%= will_paginate @terms, renderer: PolicyManager::BootstrapLinkRenderer %>
+
+

data/app/views/policy_manager/doc.erb

@@ -0,0 +1,9 @@
+<div class="card">
+  <div class="card-body">
+    <%= @html.html_safe %>
+  </div>
+
+  <div class="card-footer">
+    
+  </div>
+</div>

data/app/views/policy_manager/portability_requests/index.html.erb

@@ -1,42 +1,65 @@
+
 <h2><%= I18n.t("terms_app.portability_requests.index.title") %></h2>
 
 <% if @portability_requests.size == 0 %>
   <p><%= I18n.t("terms_app.portability_requests.index.empty") %></p>
 <% else %>
 
-  <%= chart ->{PolicyManager::PortabilityRequest.group_by_day(:created_at).count} %>
-
-  <div class="table-responsive">
-    <table class="table table-striped table-sm">
-      <thead>
-        <tr>
-          <th><%= I18n.t("terms_app.portability_requests.index.table.user") %></th>
-          <th><%= I18n.t("terms_app.portability_requests.index.table.state") %></th>
-          <th><%= I18n.t("terms_app.portability_requests.index.table.created_at") %></th>
-          <!--<th>Expire at</th>-->
-          <th colspan="2"></th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <% @portability_requests.each do |portability_request| %>
+  <div class="row">
+    <div class="col-12">
+      <div class="card">
+        <%= chart ->{PolicyManager::PortabilityRequest.group_by_day(:created_at).count} %>
+      </div>
+    </div>
+  </div>
+
+  <div class="card">
+
+    <div class="card-header">
+      <h3 class="card-title">
+        <%= I18n.t("terms_app.portability_requests.index.title") %>
+      </h3>
+    </div>
+
+    <div class="table-responsive">
+      <table class="table card-table table-vcenter text-nowrap">
+        <thead>
           <tr>
-            <td><%= portability_request.user.email %></td>
-            <td><%= I18n.t("terms_app.portability_requests.index.states.#{portability_request.state}") %></td>
-            <td><%= portability_request.created_at %></td>
-            <!--<td><%= portability_request.expire_at %></td>-->
-            <td>
-              <%= link_to I18n.t("terms_app.portability_requests.index.table.confirm"), confirm_portability_request_path(portability_request), data: { confirm: I18n.t("terms_app.misc.are_you_sure") } if portability_request.pending?
-              %>
-            
-            </td>
-            <td><%= link_to I18n.t("terms_app.portability_requests.index.table.destroy"), portability_request, method: :delete, data: { confirm: I18n.t("terms_app.misc.are_you_sure") } %></td>
+            <th><%= I18n.t("terms_app.portability_requests.index.table.user") %></th>
+            <th><%= I18n.t("terms_app.portability_requests.index.table.state") %></th>
+            <th><%= I18n.t("terms_app.portability_requests.index.table.created_at") %></th>
+            <!--<th>Expire at</th>-->
+            <th colspan="2"></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
+        </thead>
 
-    <%= will_paginate @portability_requests, :style => 'letter-spacing: 5px' %>
+        <tbody>
+          <% @portability_requests.each do |portability_request| %>
+            <tr>
+              <td><%= portability_request.user.email %></td>
+              <td>
+                <span class="tag <%=state_color(portability_request.state)%>">
+                  <%= I18n.t("terms_app.portability_requests.index.states.#{portability_request.state}") %>
+                </span>
+
+                </td>
+              <td><%= portability_request.created_at %></td>
+              <!--<td><%= portability_request.expire_at %></td>-->
+              <td>
+                <%= link_to I18n.t("terms_app.portability_requests.index.table.confirm"), confirm_portability_request_path(portability_request), data: { confirm: I18n.t("terms_app.misc.are_you_sure") } if portability_request.pending?
+                %>
+              
+              </td>
+              <td><%= link_to I18n.t("terms_app.portability_requests.index.table.destroy"), portability_request, method: :delete, data: { confirm: I18n.t("terms_app.misc.are_you_sure") }, class: "btn btn-sm btn-danger" %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+
+    </div>
 
   </div>
+
+  <%= will_paginate @portability_requests, renderer: PolicyManager::BootstrapLinkRenderer %>
+
 <% end %>