mno-enterprise-frontend 3.2.1 → 3.3.0

data/app/views/mno_enterprise/pages/app_access_unauthorized.html.haml

@@ -1,7 +1,7 @@
 .banners.promo.dark.darkblue
   .container
     .row.text-center
-      = image_tag("mno_enterprise/main-logo.png")
+      = image_tag(main_logo_white_bg_path)
     .row
       %h2 App Access Not Granted
     %hr

data/app/views/mno_enterprise/pages/app_logout.html.haml

@@ -1,7 +1,7 @@
 .banners.promo.dark.darkblue
   .container
     .row.text-center
-      = image_tag("mno_enterprise/main-logo.png")
+      = image_tag(main_logo_white_bg_path)
     .row
       %h2 Successful logout
     %hr

data/app/views/mno_enterprise/pages/billing_details_required.html.haml

@@ -1,19 +1,21 @@
-.banners.promo.dark.darkblue
+.registration
   .container
-    .row.text-center
-      = image_tag("mno_enterprise/main-logo.png")
     .row
-      %h2 Billing Details Required
-    %hr
-    .row
-      .col-md-6.col-md-offset-3
-        .align-center
-          %h3
-            Oops! It looks like the free trial has ended for this application and no billing details have been entered.
-          %p Please ask your administrator to enter valid billing details for your company.
-        .spacer4
-        .align-center
-          %h5
-            If you think this is a mistake, please send us an email at
-            = mail_to support_email
-        .spacer4
+      .login-box-wrapper.large
+        .login-box-title
+          %h2 Billing Details Required
+        .login-box
+          .brand-logo
+
+          .row
+            .col-md-12
+              .align-center
+                %h3
+                  Oops! It looks like the free trial has ended for this application and no billing details have been entered.
+                %p Please ask your administrator to enter valid billing details for your company.
+              .spacer4
+              .align-center
+                %h5
+                  If you think this is a mistake, please send us an email at
+                  = mail_to support_email
+              .spacer4

data/lib/mno_enterprise/frontend/locales_generator.rb

@@ -49,7 +49,8 @@ module MnoEnterprise
             flatten_translations(prefix + key.to_s, value, locale)
           }
         else
-          locale.merge!({prefix => x})
+          locale[prefix] = x
+          locale
         end
       end
     end

data/lib/tasks/mnoe_admin_tasks.rake

@@ -1,4 +1,6 @@
 require 'fileutils'
+require 'erb'
+require 'rake/clean'
 
 #=============================================
 # Enterprise Express Tasks
@@ -6,48 +8,61 @@ require 'fileutils'
 # Enterprise Express related tasks
 namespace :mnoe do
   namespace :admin do
-    admin_dist_folder = "public/admin"
-    frontend_tmp_folder = 'tmp/build/admin'
-    frontend_orig_folder = 'frontend-admin'
+    # Default version
+    MNOE_ADMIN_PANEL_VERSION = 'v1.0.x'
+    MNOE_ADMIN_PANEL_PKG = "git+https://git@github.com/maestrano/mnoe-admin-panel.git##{MNOE_ADMIN_PANEL_VERSION}"
 
-    # Use bundled gulp
-    gulp = "./node_modules/.bin/gulp"
+    # Final build
+    admin_panel_dist_folder = 'public/admin'
+    # Local overrides
+    admin_panel_project_folder = 'frontend-admin-panel'
+    # Tmp build
+    admin_panel_tmp_folder = 'tmp/build/admin_panel'
+    # Frontend package
+    ADMIN_PANEL_PKG_FOLDER = 'node_modules/mnoe-admin-panel'
 
-    desc "Install dependencies"
-    task :install_dependencies do
-      # Install required tools
-      sh("which bower || npm install -g bower")
+    ## Helper methods
+    def render_template(template_file, output_file, binding = nil)
+      File.open(output_file, "w+") do |f|
+        f.write(ERB.new(File.read(template_file)).result(binding))
+      end
     end
 
+    desc 'Setup the Enterprise Express Admin Panel'
+    task :install do
+      Rake::Task['mnoe:admin:add_package'].invoke
+
+      Rake::Task['mnoe:admin:install_frontend'].invoke
+
+      # Bootstrap frontend folder
+      Rake::Task['mnoe:admin:bootstrap_override_folder'].invoke
 
-    desc "Setup the Enterprise Express Admin Dashboard"
-    task install: :install_dependencies do
-      # Build the admin
-      Rake::Task['mnoe:admin:dist'].invoke
+      # Build the frontend
+      Rake::Task['mnoe:admin:build'].invoke
     end
 
-    desc "Rebuild the Enterprise Express Admin Dashboard"
-    task :dist do
+    desc 'Build/Rebuild the Enterprise Express Admin Panel'
+    task :build do
       # Prepare the build folder
       Rake::Task['mnoe:admin:prepare_build_folder'].execute
 
       # Build frontend using Gulp
-      Dir.chdir(frontend_tmp_folder) do
-        sh "npm install"
-        sh "bower install"
-        sh gulp
+      Dir.chdir(admin_panel_tmp_folder) do
+        sh 'yarn install'
+        sh 'bower install'
+        sh 'npm run build'
       end
 
       # Ensure distribution folder exists
-      mkdir_p admin_dist_folder
+      mkdir_p admin_panel_dist_folder
 
       # Cleanup previously compiled files
-      Dir.glob("#{admin_dist_folder}/{styles,scripts}/app-*.{css,js}").each do |f|
+      Dir.glob("#{admin_panel_dist_folder}/{styles,scripts}/*.{css,js}").each do |f|
         rm_f f
       end
 
       # Copy assets to public
-      cp_r("#{frontend_tmp_folder}/dist/.", "#{admin_dist_folder}/")
+      cp_r("#{admin_panel_tmp_folder}/dist/.", "#{admin_panel_dist_folder}/")
 
       # Clear tmp cache in development - recompile assets otherwise
       if Rails.env.development? || Rails.env.test?
@@ -57,13 +72,94 @@ namespace :mnoe do
       end
     end
 
-    desc "Reset the admin build folder"
+    # Alias to dist for backward compatibility
+    task dist: :build
+
+    desc 'Update the admin panel and rebuild it'
+    task update: :install_dependencies do
+      # Fetch new version of the packages
+      sh 'yarn upgrade --ignore-scripts --ignore-engines'
+
+      # Cleanup
+      rm_rf "#{admin_panel_tmp_folder}/bower_components"
+
+      # Rebuild the admin panel
+      Rake::Task['mnoe:admin:build'].execute
+    end
+
+    # Install dependencies
+    task :install_dependencies do
+      unless system('which yarn')
+        puts 'Yarn executable was not detected in the system.'
+        puts 'Download Yarn at https://yarnpkg.com/en/docs/install'
+        raise
+      end
+
+      # Install required tools
+      sh('which bower || npm install -g bower')
+    end
+
+    # Add 'mnoe-admin-panel' to package.json
+    task :add_package do
+      sh "yarn add  --ignore-scripts --ignore-engines #{MNOE_ADMIN_PANEL_PKG}"
+    end
+
+    task install_frontend: [:install_dependencies] do
+      # Fetch the packages
+      sh('yarn install --ignore-scripts --ignore-engines')
+    end
+
+    # Create & populate the admin panel override folder
+    task :bootstrap_override_folder do
+      # Create admin panel override folder
+      mkdir_p(admin_panel_project_folder)
+      touch "#{admin_panel_project_folder}/.keep"
+
+      # Bootstrap override folder
+      # Replace relative image path by absolute path in the LESS files
+      mkdir_p("#{admin_panel_project_folder}/src/app/stylesheets")
+      %w(src/app/stylesheets/theme.less src/app/stylesheets/variables.less).each do |path|
+        next if File.exist?("#{admin_panel_project_folder}/#{path}")
+
+        # Generate file from template
+        cp("#{ADMIN_PANEL_PKG_FOLDER}/#{path}","#{admin_panel_project_folder}/#{path}")
+
+        # Replace image relative path
+        content = File.read("#{admin_panel_project_folder}/#{path}")
+        File.open("#{admin_panel_project_folder}/#{path}", 'w') do |f|
+          f << content.gsub('../images', File.join(admin_panel_dist_folder.gsub('public', ''), 'images'))
+        end
+      end
+
+      # Create custom fonts files so we can safely include them in main.less
+      admin_panel_font_folder = File.join(admin_panel_project_folder, 'src/fonts')
+      unless File.exist?(File.join(admin_panel_font_folder, 'font-faces.less'))
+        font_src = File.join(File.expand_path(File.dirname(__FILE__)),'templates','font-faces.less')
+
+        mkdir_p(admin_panel_font_folder)
+        cp(font_src, admin_panel_font_folder)
+      end
+    end
+
+    # Reset the frontend build folder and apply local customisations
     task :prepare_build_folder do
-      # Reset tmp folder from mno-enterprise/frontend-admin source
-      rm_rf "#{admin_dist_folder}"
-      rm_rf "#{frontend_tmp_folder}"
-      mkdir_p frontend_tmp_folder
-      cp_r(File.join(Gem.loaded_specs["mno-enterprise"].full_gem_path, "#{frontend_orig_folder}/."), "#{frontend_tmp_folder}/")
+      # Ensure frontend is downloaded
+      Rake::Task['mnoe:admin:install_frontend'].invoke unless File.directory?(ADMIN_PANEL_PKG_FOLDER)
+
+      # Reset tmp folder from mnoe-admin-panel source
+      rm_rf "#{admin_panel_tmp_folder}/src"
+      rm_rf "#{admin_panel_tmp_folder}/e2e"
+      mkdir_p admin_panel_tmp_folder
+      cp_r("#{ADMIN_PANEL_PKG_FOLDER}/.", "#{admin_panel_tmp_folder}/")
+
+      # Apply frontend customisations
+      cp_r("#{admin_panel_project_folder}/.", "#{admin_panel_tmp_folder}/")
+    end
+
+    desc 'Remove all generated files'
+    task :clean do
+      clean = FileList[admin_panel_tmp_folder, admin_panel_dist_folder, ADMIN_PANEL_PKG_FOLDER, 'node_modules/.yarn-integrity']
+      Rake::Cleaner.cleanup_files(clean)
     end
   end
 end

data/lib/tasks/mnoe_frontend_tasks.rake

@@ -9,8 +9,8 @@ require 'rake/clean'
 namespace :mnoe do
   namespace :frontend do
     # Default version
-    MNOE_ANGULAR_VERSION = "1.0.x"
-    IMPAC_ANGULAR_VERSION = "1.4.x"
+    MNOE_ANGULAR_VERSION = "v1.1.x"
+    IMPAC_ANGULAR_VERSION = "v1.5.x"
 
     # Final build
     frontend_dist_folder = "public/dashboard"

data/lib/tasks/mnoe_locales.rake

@@ -13,6 +13,22 @@ namespace :mnoe do
 
       # Copy locales to public
       cp_r("#{locales_tmp_folder}/.","#{locales_dist_folder}/")
+
+      Rake::Task['mnoe:locales:impac'].invoke
+    end
+
+    desc "Copy impac locales to the public locales folder"
+    task :impac do
+      locales_impac_folder = 'tmp/build/frontend/bower_components/impac-angular/dist/locales'
+      cp_r("#{locales_impac_folder}/.","#{locales_dist_folder}/impac/")
+
+      # TODO: remove when locales moved to four letters
+      # 4-letters locales --> 2-letters locales
+      dir = "#{locales_dist_folder}/impac/"
+      Dir.foreach(dir) do |f|
+        next unless f.include?(".json")
+        File.rename("#{dir}#{f}", "#{dir}#{f.slice(0,2)}.json")
+      end
     end
   end
 end

data/lib/tasks/templates-admin/font-faces.less

@@ -0,0 +1,2 @@
+// Use this file to declare your custom fonts
+// See https://github.com/maestrano/mno-enterprise#adding-a-custom-font

data/lib/tasks/templates/package.json

@@ -4,5 +4,8 @@
   "dependencies": {
     "mno-enterprise-angular": "<%= mnoe_angular_pkg %>",
     "impac-angular": "<%= impac_angular_pkg %>"
+  },
+  "engines": {
+    "node": ">= 6.9.0"
   }
 }

data/spec/lib/tasks/mnoe_locales_rake_spec.rb

@@ -10,6 +10,7 @@ describe 'mnoe:locales:generate' do
     allow(MnoEnterprise::Frontend::LocalesGenerator).to receive(:new) { generator }
     allow(generator).to receive(:generate_json)
     allow_any_instance_of(Rake::FileUtilsExt).to receive(:cp_r)
+    allow(rake['mnoe:locales:impac']).to receive(:invoke)
   end
 
   it { expect(subject.prerequisites).to include('environment') }
@@ -28,4 +29,36 @@ describe 'mnoe:locales:generate' do
     expect_any_instance_of(Rake::FileUtilsExt).to receive(:cp_r).with('tmp/build/frontend/src/locales/.', 'public/dashboard/locales/')
     subject.invoke
   end
+
+  it 'invokes the mnoe:locales:impac task' do
+    expect(rake['mnoe:locales:impac']).to receive(:invoke)
+    subject.invoke
+  end
+end
+
+
+describe 'mnoe:locales:impac' do
+  include_context 'rake_task'
+
+  before do
+    allow_any_instance_of(Rake::FileUtilsExt).to receive(:cp_r)
+    allow(Dir).to receive(:foreach) { [] }
+  end
+
+  it 'copies the locales to the public folder' do
+    expect_any_instance_of(Rake::FileUtilsExt).to receive(:cp_r).with(
+      'tmp/build/frontend/bower_components/impac-angular/dist/locales/.',
+      'public/dashboard/locales/impac/'
+    )
+    subject.invoke
+  end
+
+  it 'transform 4 letters locales to 2 letters locales' do
+    allow(Dir).to receive(:foreach).and_yield('en-GB.json')
+    expect(File).to receive(:rename).with(
+      'public/dashboard/locales/impac/en-GB.json',
+      'public/dashboard/locales/impac/en.json'
+    )
+    subject.invoke
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mno-enterprise-frontend
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Arnaud Lachaume
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mno-enterprise-core
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: mno-enterprise-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: less-rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,22 +172,16 @@ files:
 - app/assets/stylesheets/mno_enterprise/custom/angular-animate.less
 - app/assets/stylesheets/mno_enterprise/custom/angular-material.less
 - app/assets/stylesheets/mno_enterprise/custom/bootstrap-on-juice.less
-- app/assets/stylesheets/mno_enterprise/custom/button.less
 - app/assets/stylesheets/mno_enterprise/custom/footer.less
 - app/assets/stylesheets/mno_enterprise/custom/form.less
-- app/assets/stylesheets/mno_enterprise/custom/header.less
-- app/assets/stylesheets/mno_enterprise/custom/modal.less
-- app/assets/stylesheets/mno_enterprise/custom/utilities.less
 - app/assets/stylesheets/mno_enterprise/custom/utility/progress-bar.less
 - app/assets/stylesheets/mno_enterprise/custom/utility/step.less
-- app/assets/stylesheets/mno_enterprise/custom/utility/tabset.less
 - app/assets/stylesheets/mno_enterprise/custom/utility/text.less
 - app/assets/stylesheets/mno_enterprise/custom/views/pages/confirmation_lounge.less
 - app/assets/stylesheets/mno_enterprise/custom/views/pages/oauth-config-page.less
 - app/assets/stylesheets/mno_enterprise/custom/views/registration.less
 - app/assets/stylesheets/mno_enterprise/custom/views/templates/notification-widget.less
 - app/assets/stylesheets/mno_enterprise/custom/views/templates/password-strength.less
-- app/assets/stylesheets/mno_enterprise/custom/xeditable.less
 - app/assets/stylesheets/mno_enterprise/font-awesome/font-awesome-regular.less
 - app/assets/stylesheets/mno_enterprise/font-awesome/font-awesome-sprockets.less
 - app/assets/stylesheets/mno_enterprise/font-awesome/font-awesome.less
@@ -310,6 +304,7 @@ files:
 - lib/tasks/mnoe_admin_tasks.rake
 - lib/tasks/mnoe_frontend_tasks.rake
 - lib/tasks/mnoe_locales.rake
+- lib/tasks/templates-admin/font-faces.less
 - lib/tasks/templates/bower.json
 - lib/tasks/templates/font-faces.less
 - lib/tasks/templates/package.json

data/app/assets/stylesheets/mno_enterprise/custom/button.less

@@ -1,84 +0,0 @@
-.btn-fluid-wrapper .btn {
-  width: 100%;
-}
-
-.btn {
-  &.float-right {
-    float:right;
-  }
-  &.btn-promo {
-    font-size:18px;
-    padding-left:30px;
-    padding-right:30px;
-  }
-
-  .subtitle {
-    font-size:@small;
-    font-weight:300;
-    width:100%;
-    display:block;
-    text-align:center;
-  }
-
-  &.arrow,
-  &.arrow-right {
-    background-image: image-url('icons/icon-arrow-right.png');
-    background-repeat: no-repeat;
-    background-position: 96% 50%;
-  }
-
-  &.arrow-left {
-    background-image: image-url('icons/icon-arrow-left.png');
-    background-repeat: no-repeat;
-    background-position: 4% 50%;
-  }
-
-  &.btn-dark {
-    .font(16px, 300, @bg-main-color);
-    background-color: @bg-inverse-color;
-
-    &:hover {
-      color: @elem-cozy-color;
-    }
-  }
-
-  &.btn-shaded {
-    background-color: @bg-inverse-color;
-    border: solid 1px @bg-inverse-intense-color;
-    color: @text-inverse-color;
-    font-weight: 400;
-
-    &:hover {
-      color: lighten(@text-inverse-color,5%);
-      background-color: lighten(@bg-inverse-color,5%);
-    }
-  }
-
-  &.btn-grey {
-    background-color: @bg-main-color;
-    border: solid 1px @bg-main-color;
-    color: lighten(@bg-inverse-color,5%);
-    font-weight: 400;
-
-    &:hover {
-      color: @bg-inverse-color;
-      background-color: darken(@bg-main-color,5%);
-    }
-
-    &.btn-grey-bordered {
-      border: solid 1px darken(@bg-main-color,5%);
-    }
-  }
-
-  &.btn-whited {
-    background-color: lighten(#ccc,15%);
-    border: solid 1px #ccc;
-    color: #ccc;
-    font-weight: 400;
-
-    &:hover {
-      color: darken(#ccc,20%);
-      background-color: #ccc;
-    }
-  }
-}