admission 0.2.1 → 0.2.7

data/visualisation/style.scss

@@ -1,6 +1,8 @@
 $border-color: black;
-$border-color2: #91287b;
-$bg-color: #feebff;
+//$border-color2: #6d3291;
+$border-color2: #4a207e;
+$bg-color: #eee6ff;
+$bg-selected: #d5c3fc;
 
 $border: 5;
 
@@ -22,18 +24,25 @@ html, body {
 body {
   margin: 0;
   align-items: center;
-  justify-content: center;
+  //justify-content: center;
   background-color: #717171;
+  overflow-y: scroll;
 }
 
 #admission-visualisation {
   flex: 0 0;
   max-width: 100%;
   max-height: 100%;
-  background-color: $bg-color;
 
   .splash-message {
     padding: px(2 * $border);
+    background-color: $bg-color;
+    margin: px(10 * $border) 0;
+  }
+
+  .admission-app-container {
+    background-color: $bg-color;
+    margin: px(10 * $border) 0;
   }
 
   .panels-list {
@@ -46,16 +55,19 @@ body {
       margin: px($border);
       margin-left: 0;
       padding: px(2 * $border);
-      border: 3px outset $border-color;
+      border: 2px solid $border-color;
       cursor: pointer;
       font-weight: bold;
       &:first-of-type { margin-left: px($border); }
 
       &.active {
-        border-color: $border-color2;
-        border-style: inset;
+        background-color: $bg-selected;
+        border-style: solid;
         color: $border-color2;
       }
+      &:hover {
+        background-color: $bg-selected;
+      }
     }
   }
 
@@ -63,13 +75,6 @@ body {
     padding: px($border);
   }
 
-  .controls-row {
-    > * {
-      display: inline-block;
-      margin-left: px($border);
-      &:first-child { margin-left: 0; }
-    }
-  }
 }
 
 .flex-column {
@@ -90,18 +95,34 @@ body {
   }
 }
 
+.check_box {
+  display: inline-block;
+  padding: px($border);
+  border: 1px solid $border-color;
+  background-color: white;
+  &.checked { background-color: $bg-selected; }
+  &:hover { cursor: pointer }
+}
+
 .button {
+  display: inline-block;
   padding: px($border);
   margin: 0;
   border: 1px solid $border-color;
   border-radius: 0;
   background-color: white;
   &:hover {
-    background-color: white;
+    background-color: $bg-selected;
+    cursor: pointer;
+  }
+
+  &.small {
+    font-size: 80%;
+    padding: px($border / 2);
   }
 }
 
-.controls-select {
+.select_box {
   > ._inputs {
     display: flex;
     > input {
@@ -117,27 +138,111 @@ body {
   > ._dropdown {
     position: relative;
     > ul {
+      z-index: 1;
       background-color: white;
       position: absolute;
-      width: 100%;
+      max-width: 300%;
       border: 1px solid $border-color;
-      border-top: none;
       list-style-type: none;
       margin: 0;
       padding: 0;
+      top: -1px;
       > li {
         @include no-select();
         padding: px($border);
         border: 1px solid transparent;
+        overflow: hidden;
         &.selected {
           background-color: $border-color2;
           color: white;
         }
         &:hover {
-          background-color: $bg-color;
+          background-color: $bg-selected;
+          color: inherit;
         }
       }
     }
   }
 
+}
+
+.controls {
+  > .controls-group {
+    margin-left: px($border);
+    border-left: 1px solid $border-color;
+    padding-left: px($border);
+
+    &:first-child {
+      margin-left: 0;
+      border-left: none;
+      padding-left: 0;
+    }
+  }
+}
+
+.controls-group {
+  display: inline-block;
+  margin: px($border) 0;
+  > * {
+    display: inline-block;
+    margin-left: px($border);
+    &:first-child { margin-left: 0; }
+  }
+}
+
+.nested-list {
+  $_color: black;
+
+  width: 500px;
+  padding: px($border) 0 0 0;
+  list-style-type: none;
+  margin: 0 0 0 px($border);
+  z-index: 0;
+
+  .nested-list-content {
+    display: inline-block;
+    .icon {
+      margin-left: px($border);
+    }
+    .content {
+      margin-left: px($border);
+    }
+  }
+
+  position: relative;
+  &:before {
+    content: '';
+    position: absolute;
+    display: block;
+    width: 0;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    border-left: 1px solid $_color;
+  }
+
+  > li {
+    padding-left: px(3*$border);
+    line-height: 1.5em;
+
+    position: relative;
+    &:before {
+      content: '';
+      position: absolute;
+      display: block;
+      width: px(3*$border);
+      height: 0;
+      margin-top: px(1);
+      top: 0.75em;
+      left: 0;
+      border-top: 1px solid $_color;
+    }
+    &:last-child:before {
+      background-color: $bg-color;
+      height: auto;
+      top: 0.75em;
+      bottom: 0;
+    }
+  }
+
 }

data/visualisation/webpack.config.js

@@ -1,10 +1,18 @@
 var path = require('path');
+var UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+
+var production_build = process.env.BUILD === 'dist';
+
+var plugins = [];
+if (production_build) {
+    plugins.push(new UglifyJSPlugin({output: {ascii_only: true}}));
+}
 
 module.exports = {
     entry: './index.jsx',
     output: {
-        filename: 'admission_visualisation.js',
-        path: path.resolve(__dirname, 'build')
+        filename: 'app.js',
+        path: path.resolve(__dirname, (production_build ? 'dist' : 'build'))
     },
 
     module: {
@@ -28,5 +36,7 @@ module.exports = {
 
     resolve: {
         extensions: ['.js', '.jsx']
-    }
+    },
+
+    plugins: plugins
 };

data/visualisation/yarn.lock

@@ -2878,6 +2878,10 @@ source-list-map@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
 
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+
 source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
@@ -3106,10 +3110,27 @@ uglify-js@^2.8.27:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@^2.8.29:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uglifyjs-webpack-plugin@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  dependencies:
+    source-map "^0.5.6"
+    uglify-js "^2.8.29"
+    webpack-sources "^1.0.1"
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -3187,6 +3208,13 @@ webpack-sources@^0.2.3:
     source-list-map "^1.1.1"
     source-map "~0.5.3"
 
+webpack-sources@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.5.3"
+
 webpack@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admission
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.7
 platform: ruby
 authors:
 - doooby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies: []
 description: update-me
 email: zelazk.o@email.cz
@@ -23,8 +23,8 @@ files:
 - LICENSE
 - README.md
 - admission.gemspec
+- bin/build
 - bin/rspec
-- bin/server.rb
 - lib/admission.rb
 - lib/admission/ability.rb
 - lib/admission/admission.rb
@@ -35,7 +35,7 @@ files:
 - lib/admission/resource_arbitration.rb
 - lib/admission/status.rb
 - lib/admission/version.rb
-- lib/admission/visualisation.rb
+- lib/admission/visualisation_app.rb
 - spec/integration/_helper.rb
 - spec/integration/action_arbitrating_spec.rb
 - spec/integration/resource_arbitrating_spec.rb
@@ -55,12 +55,17 @@ files:
 - visualisation/actions/index.js
 - visualisation/components/app_container.jsx
 - visualisation/components/input_with_select.jsx
+- visualisation/components/nested_list_row.jsx
 - visualisation/components/privilege_select.jsx
 - visualisation/components/privileges_panel.jsx
+- visualisation/components/rules_panel.jsx
 - visualisation/dist/.gitkeep
+- visualisation/dist/app.js
+- visualisation/helpers.js
 - visualisation/index.jsx
 - visualisation/package.json
 - visualisation/reducers/index.js
+- visualisation/server.rb
 - visualisation/style.scss
 - visualisation/webpack.config.js
 - visualisation/yarn.lock

data/bin/server.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-
-require 'rack'
-require 'byebug'
-
-require_relative '../lib/admission'
-require_relative '../lib/admission/visualisation'
-require_relative '../spec/test_context/index'
-
-Admission::Visualisation.set :js_entry,
-    Admission::Visualisation::ASSETS_PATH.join('build', 'admission_visualisation.js')
-
-Admission::Visualisation.set :admission_data,
-    {
-        order: PRIVILEGES_ORDER,
-        rules: ACTIONS_RULES,
-        arbitrator: Admission::Arbitration
-    }
-
-
-Rack::Handler::WEBrick.run Admission::Visualisation

data/lib/admission/visualisation.rb

@@ -1,81 +0,0 @@
-require 'sinatra/base'
-require 'sinatra/json'
-require 'haml'
-require 'pathname'
-
-class Admission::Visualisation < Sinatra::Base
-  ASSETS_PATH = Pathname.new(__FILE__).join('..', '..', '..', 'visualisation')
-
-  enable :inline_templates
-
-  set :js_entry, ASSETS_PATH.join('dist', 'admission_visualisation.js')
-
-  get '/' do
-    haml :index
-  end
-
-  get '/admission_visualisation.js' do
-    send_file settings.js_entry
-  end
-
-  get '/admission_data' do
-    json Admission::Visualisation.admission_data_to_js(
-        **settings.admission_data)
-  end
-
-  def self.admission_data_to_js order:, rules:, arbitrator:, **_
-    js_data = {}
-
-    top_levels = []
-    privileges = order.values.inject Array.new do |arr, levels|
-      tops, others = levels.to_a.partition{|key, _| key == :'^'}
-      tops.first[1].tap{|privilege| top_levels << privilege.text_key}
-
-      others.each do |_, privilege|
-        arr << {name: privilege.name, level: privilege.level,
-            inherits: privilege.inherited && privilege.inherited.map(&:text_key)}
-      end
-
-      arr
-    end
-    js_data[:top_levels] = top_levels
-    js_data[:privileges] = privileges
-
-    rules = if arbitrator == Admission::Arbitration
-      rules.to_a.map do |scope, index|
-
-        index = index.to_a.map do |privilege, rule|
-          if rule.is_a? Proc
-            rule = 'proc'
-          end
-
-          [privilege.text_key, rule]
-        end
-
-        [scope, Hash[index]]
-      end
-
-    else
-      raise "not implemented for #{arbitrator.name}"
-
-    end
-    js_data[:rules] = Hash[rules]
-
-    js_data
-  end
-
-end
-
-__END__
-
-@@ layout
-!!! 5
-%html
-  %head
-    %title= 'Admission'
-  %body.flex-column
-    = yield
-
-@@ index
-#admission-visualisation(data-url="/admission_data")
-%script(src="/admission_visualisation.js")