lcms-engine 0.3.0 → 0.4.0

data/app/views/lcms/engine/admin/shared/_header.html.erb

@@ -13,36 +13,36 @@
         <div class="o-top-bar__item c-header__menu">
           <ul class="dropdown menu" data-dropdown-menu>
             <li class="c-header__link">
-              <%= link_to t('lcms.engine.admin.nav.curriculum'), edit_admin_curriculum_path %>
+              <%= link_to t('lcms.engine.admin.nav.curriculum'), lcms_engine.edit_admin_curriculum_path %>
             </li>
 
             <li class="dropdown c-header__link">
-              <%= link_to t('lcms.engine.admin.nav.resources'), admin_resources_path %>
+              <%= link_to t('lcms.engine.admin.nav.resources'), lcms_engine.admin_resources_path %>
               <ul class="menu vertical">
-                <%= nav_link t('lcms.engine.admin.nav.resources'), admin_resources_path %>
-                <%= nav_link t('lcms.engine.admin.nav.add_resource'), new_admin_resource_path %>
+                <%= nav_link t('lcms.engine.admin.nav.resources'), lcms_engine.admin_resources_path %>
+                <%= nav_link t('lcms.engine.admin.nav.add_resource'), lcms_engine.new_admin_resource_path %>
                 <%#= nav_link t('lcms.engine.admin.nav.sketch_compilation', version: 'v1'), new_admin_sketch_compiler_path(:v1) %>
                 <%#= nav_link t('lcms.engine.admin.nav.sketch_compilation', version: 'v2'), new_admin_sketch_compiler_path(:v2) %>
-                <%= nav_link t('lcms.engine.admin.nav.lessons'), admin_documents_path %>
-                <%= nav_link t('lcms.engine.admin.nav.materials'), admin_materials_path %>
-                <%= nav_link t('lcms.engine.admin.nav.batch_reimport'), new_admin_batch_reimport_path %>
+                <%= nav_link t('lcms.engine.admin.nav.lessons'), lcms_engine.admin_documents_path %>
+                <%= nav_link t('lcms.engine.admin.nav.materials'), lcms_engine.admin_materials_path %>
+                <%= nav_link t('lcms.engine.admin.nav.batch_reimport'), lcms_engine.new_admin_batch_reimport_path %>
               </ul>
             </li>
 
             <li class="c-header__link">
-              <%= link_to t('lcms.engine.admin.nav.standards'), admin_standards_path %>
+              <%= link_to t('lcms.engine.admin.nav.standards'), lcms_engine.admin_standards_path %>
             </li>
 
             <li class="dropdown c-header__link">
-              <%= link_to t('lcms.engine.admin.nav.users'), admin_users_path %>
+              <%= link_to t('lcms.engine.admin.nav.users'), lcms_engine.admin_users_path %>
               <ul class="menu vertical">
-                <%= nav_link t('lcms.engine.admin.nav.users'), admin_users_path %>
-                <%= nav_link t('lcms.engine.admin.nav.access_codes'), admin_access_codes_path %>
+                <%= nav_link t('lcms.engine.admin.nav.users'), lcms_engine.admin_users_path %>
+                <%= nav_link t('lcms.engine.admin.nav.access_codes'), lcms_engine.admin_access_codes_path %>
               </ul>
             </li>
 
             <li class="c-header__link">
-              <%= link_to t('lcms.engine.admin.nav.sign_out'), destroy_user_session_path %>
+              <%= link_to t('lcms.engine.admin.nav.sign_out'), lcms_engine.destroy_user_session_path %>
             </li>
           </ul>
         </div>

data/app/views/lcms/engine/admin/standards/_form.html.erb

@@ -1,4 +1,6 @@
-<%= simple_form_for @standard, as: :standard, url: admin_standard_path(@standard), html: { class: 'o-standard-form' } do |f| %>
+<%= javascript_include_tag Ckeditor.cdn_url %>
+
+<%= simple_form_for @standard, as: :standard, url: lcms_engine.admin_standard_path(@standard), html: { class: 'o-standard-form' } do |f| %>
 
   <div class="row o-admin-standard-readonly">
     <label>Name: </label>

data/app/views/lcms/engine/admin/standards/_search_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for :query, url: :admin_standards, html: { class: 'form-inline well o-admin-standards-search', method: :get } do |f| %>
+<%= simple_form_for :query, url: lcms_engine.admin_standards_path, html: { class: 'form-inline well o-admin-standards-search', method: :get } do |f| %>
 
   <div class='row align-bottom align-justify'>
     <%= f.input :name, label: 'Name', required: false, wrapper_html: { class: 'resource-search-title' } %>

data/app/views/lcms/engine/admin/users/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for [:admin, @user], html: { id: 'user_form' } do |f| %>
+<%= simple_form_for @user, url: @url.presence || lcms_engine.admin_users_path, html: { id: 'user_form' } do |f| %>
   <%= f.input :id, disabled: true %>
   <%= f.input :name %>
   <%= f.input :email %>

data/app/views/lcms/engine/admin/users/_search_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for :query, url: :admin_users, html: { class: 'form-inline well o-admin-users-search', method: :get } do |f| %>
+<%= simple_form_for :query, url: lcms_engine.admin_users_path, html: { class: 'form-inline well o-admin-users-search', method: :get } do |f| %>
 
   <div class='row align-bottom align-justify'>
     <%= f.input :email, label: false, required: false, placeholder: 'Search by E-mail', wrapper_html: { class: 'o-admin-search-term' } %>

data/app/views/lcms/engine/admin/users/index.html.erb

@@ -7,7 +7,7 @@
 
   <div class="row">
     <div class="flex-pull-right">
-      <%= link_to t('.new_user'), :new_admin_user, class: 'button success' %>
+      <%= link_to t('.new_user'), lcms_engine.new_admin_user_path, class: 'button success' %>
     </div>
     <table class="table">
       <tr>
@@ -27,17 +27,17 @@
       <% @users.each do |user| %>
         <% cache user do %>
           <tr id="user_<%= user.id %>">
-            <td><%= link_to user.id, edit_admin_user_path(user) %>
-            <td><%= link_to user.survey&.fetch('first_name', nil) || user.name, edit_admin_user_path(user) %>
+            <td><%= link_to user.id, lcms_engine.edit_admin_user_path(user) %>
+            <td><%= link_to user.survey&.fetch('first_name', nil) || user.name, lcms_engine.edit_admin_user_path(user) %>
             <td><%= raw user.survey&.fetch('last_name', nil) %>
             <td><%= user.email %>
             <td><%= user.role %>
             <td><%= user.access_code.presence || '-' %>
             <td><%= user.confirmed? ? 'YES' : 'NO' %>
             <td class="u-txt--small"><%= user.created_at.to_s %>
-            <td><%= link_to content_tag(:i, nil, class: 'fas fa-pencil-alt').html_safe, edit_admin_user_path(user), class: 'button small primary' %>
-            <td><%= button_to t('.reset_password_btn'), reset_password_admin_user_path(user), class: 'button small', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %>
-            <td><%= button_to t('ui.delete'), admin_user_path(user), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %></td>
+            <td><%= link_to content_tag(:i, nil, class: 'fas fa-pencil-alt').html_safe, lcms_engine.edit_admin_user_path(user), class: 'button small primary' %>
+            <td><%= button_to t('.reset_password_btn'), lcms_engine.reset_password_admin_user_path(user), class: 'button small', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :post %>
+            <td><%= button_to t('ui.delete'), lcms_engine.admin_user_path(user), class: 'button small alert', data: { confirm: t('ui.are_you_sure') }, form_class: 'inline', method: :delete %></td>
           </tr>
         <% end %>
       <% end %>

data/app/views/lcms/engine/documents/gdoc/_agenda.html.erb

@@ -11,7 +11,7 @@
     <td class="u-text--right o-agenda__item"><p>TIME</p></td>
   </tr>
   <% document.toc.children.each do |l1| %>
-    <% l1_excluded = l1.excluded?(excludes, document.ela?) %>
+    <% l1_excluded = l1.excluded?(excludes, ela: document.ela?) %>
     <% l1_time = l1_excluded ? l1.time : l1.time_with(excludes) %>
     <tr class="<%= 'u-text--strikethrough' if l1_excluded %>">
       <td colspan="3" class="u-txt--agenda-l1-title o-agenda__item">

data/app/views/lcms/engine/documents/show.html.erb

@@ -14,7 +14,7 @@
           Go to Lessons Admin
         <% end %>
         <%= link_to @document.file_url, class: 'o-ub-ld-btn o-ub-ld-btn--bordered', target: '_blank' do %>
-          <i class="ub-icon ub-file-gdoc"></i> Google Doc
+          <i class="fab fa-google"></i> Google Doc
         <% end %>
         <%= render partial: 'lcms/engine/admin/documents/reimport', locals: { lesson: @document, btn_class: 'o-ub-ld-btn o-ub-ld-btn--bordered' } %>
 

data/app/views/lcms/engine/materials/show.html.erb

@@ -6,7 +6,7 @@
       <div>
         <%= link_to 'Go to Materials Admin', admin_materials_path(request.query_parameters), class: 'button primary u-margin-right--base' %>
         <%= link_to @material.file_url, class: 'button primary u-margin-right--base', target: '_blank' do %>
-            <i class="ub-icon ub-file-gdoc"></i> Google Doc
+          <i class="fab fa-google"></i> Google Doc
         <% end %>
         <%= render partial: 'lcms/engine/admin/materials/reimport', locals: { material: @material, btn_size: 'default' } %>
       </div>

data/app/views/lcms/engine/pages/not_found.html.erb

@@ -0,0 +1,5 @@
+<% set_page_title t('lcms.engine.pages.not_found.page_title') %>
+
+<div class="o-filterbar-title">
+  <h2><%= t('lcms.engine.pages.not_found.page_header') %></h2>
+</div>

data/app/views/lcms/engine/resources/_download.html.erb

@@ -3,14 +3,14 @@
     <span>
       <%= link_to preview_download_path(id: download, slug: resource.slug), class: 'resource-attachment',
         data: { no_turbolink: true }, target: '_blank' do %>
-        <i class="ub-icon ub-eye" aria-hidden="true"></i>
+        <i class="fas fa-eye" aria-hidden="true"></i>
       <% end %>
     </span>
   <% end %>
   <% id = SecureRandom.hex(4) %>
   <span data-toggle="<%= id %>">
     <%= link_to download_path(download, slug: resource.slug), class: 'resource-attachment', data: { no_turbolink: true } do %>
-      <i class="ub-icon fa-lg file-<%= "#{file_icon(download.download.attachment_content_type)} #{indent}" %>"></i>
+      <i class="far fa-file-<%= "#{file_icon(download.download.attachment_content_type)} #{indent}" %>"></i>
       <%= download.download.title %>
     <% end %>
   </span>

data/app/views/lcms/engine/resources/_unit_bundles.html.erb

@@ -9,12 +9,12 @@
         <li class="o-unit-bundles__item">
           <div class="o-unit-bundles__item--links">
             <%= link_to bundle.file&.url, data: { no_turbolink: true } do %>
-              <i class="ub-icon fa-lg ub-file-zip"></i>
+              <i class="far fa-file-archive"></i>
             <% end %>
             <% if (gdoc_bundle =  resource.document_bundles.detect { |b| b.content_type == 'gdoc' }) %>
               <% if cat == 'full' %>
                 <%= link_to gdoc_bundle.url, target: '_blank', data: { no_turbolink: true } do %>
-                  <i class="ub-icon fa-lg ub-file-gdoc"></i>
+                  <i class="fab fa-google"></i>
                 <% end %>
               <% else %>
                 <span class="o-unit-bundles__item--placeholder"></span>

data/app/views/lcms/engine/resources/generic.html.erb

@@ -1,5 +1,4 @@
 <% set_page_title @resource.title %>
-<% set_social_media_sharing @resource %>
 
 <div class="o-page o-page--margin-to-bottom">
   <div class="o-page__module u-margin-bottom--gutter">
@@ -30,9 +29,6 @@
     </div>
     <hr class="o-resource-hr">
     <div class="o-resource-summary u-padding-bottom--gutter">
-      <div class="o-resource-summary__map">
-        <%= render partial: 'lcms/engine/shared/social_sharing', locals: { resource: @resource, cl: '' } %>
-      </div>
       <div class="o-resource-summary__content">
         <% if @resource.preview? %>
           <div class="o-generic-preview">

data/app/views/lcms/engine/resources/media.html.erb

@@ -1,5 +1,4 @@
 <% set_page_title @resource.title %>
-<% set_social_media_sharing @resource %>
 
 <div class="o-page o-page--margin-to-bottom">
   <div class="o-page__module u-margin-bottom--gutter">
@@ -26,9 +25,6 @@
     </div>
     <hr class="o-resource-hr">
     <div class="o-resource-summary u-padding-bottom--gutter">
-      <div class="o-resource-summary__map">
-        <%= render partial: 'lcms/engine/shared/social_sharing', locals: { resource: @resource, cl: '' } %>
-      </div>
       <div class="o-resource-summary__content">
         <div class="o-resource__item o-resource-summary__content--media">
           <div class="o-media-<%= @resource.resource_type %>">

data/app/views/lcms/engine/resources/show.html.erb

@@ -1,5 +1,4 @@
 <% set_page_title @resource.page_title %>
-<% set_social_media_sharing @resource %>
 
 <% set_canonical_url(show_with_slug_path @resource.slug) if @resource.slug %>
 
@@ -65,7 +64,6 @@
               <strong><%= @resource.subject_and_grade_title %> Curriculum Map</strong>
             </div>
             <%= react_component('CurriculumMap', @props.merge(mapType: 'cs')) %>
-            <%= render partial: 'lcms/engine/shared/social_sharing', locals: { resource: @resource, cl: 'u-margin-top--base' } %>
           </div>
           <div class="o-resource-summary__content">
             <div class="o-resource__item o-resource__item--description">

data/config/initializers/airbrake.rb

@@ -1,27 +1,79 @@
 # frozen_string_literal: true
 
-project_id = ENV['AIR_BRAKE_PROJECT_ID']
-project_key = ENV['AIR_BRAKE_PROJECT_KEY']
+project_id = ENV.fetch('AIR_BRAKE_PROJECT_ID', nil)
+project_key = ENV.fetch('AIR_BRAKE_PROJECT_KEY', nil)
 
 AIRBRAKE_ENABLED = project_id.present? && project_key.present?
 
+# Airbrake is an online tool that provides robust exception tracking in your
+# Rails applications. In doing so, it allows you to easily review errors, tie an
+# error to an individual piece of code, and trace the cause back to recent
+# changes. Airbrake enables for easy categorization, searching, and
+# prioritization of exceptions so that when errors occur, your team can quickly
+# determine the root cause.
+#
+# Configuration details:
+# https://github.com/airbrake/airbrake-ruby#configuration
 if AIRBRAKE_ENABLED
   require 'airbrake'
 
   Airbrake.configure do |c|
+    # You must set both project_id & project_key. To find your project_id and
+    # project_key navigate to your project's General Settings and copy the
+    # values from the right sidebar.
+    # https://github.com/airbrake/airbrake-ruby#project_id--project_key
     c.project_id = project_id
     c.project_key = project_key
 
+    # Configures the root directory of your project. Expects a String or a
+    # Pathname, which represents the path to your project. Providing this option
+    # helps us to filter out repetitive data from backtrace frames and link to
+    # GitHub files from our dashboard.
+    # https://github.com/airbrake/airbrake-ruby#root_directory
     c.root_directory = Rails.root
-    c.logger = Rails.logger
+
+    # By default, Airbrake Ruby outputs to STDOUT. In Rails apps it makes sense
+    # to use the Rails' logger.
+    # https://github.com/airbrake/airbrake-ruby#logger
+    c.logger = Airbrake::Rails.logger
+
+    # Configures the environment the application is running in. Helps the
+    # Airbrake dashboard to distinguish between exceptions occurring in
+    # different environments.
+    # NOTE: This option must be set in order to make the 'ignore_environments'
+    # option work.
+    # https://github.com/airbrake/airbrake-ruby#environment
     c.environment = Rails.env
-    c.blacklist_keys = Rails.application.config.filter_parameters
 
+    # Setting this option allows Airbrake to filter exceptions occurring in
+    # unwanted environments such as :test.  NOTE: This option *does not* work if
+    # you don't set the 'environment' option.
+    # https://github.com/airbrake/airbrake-ruby#ignore_environments
     c.ignore_environments = %w(test)
 
-    c.performance_stats = true
+    # A list of parameters that should be filtered out of what is sent to
+    # Airbrake. By default, all "password" attributes will have their contents
+    # replaced.
+    # https://github.com/airbrake/airbrake-ruby#blocklist_keys
+    c.blocklist_keys = [/password/i, /authorization/i]
+
+    # Alternatively, you can integrate with Rails' filter_parameters.
+    # Read more: https://goo.gl/gqQ1xS
+    # c.blocklist_keys = Rails.application.config.filter_parameters
   end
 
+  # A filter that collects request body information. Enable it if you are sure you
+  # don't send sensitive information to Airbrake in your body (such as passwords).
+  # https://github.com/airbrake/airbrake#requestbodyfilter
+  # Airbrake.add_filter(Airbrake::Rack::RequestBodyFilter.new)
+
+  # Attaches thread & fiber local variables along with general thread information.
+  # Airbrake.add_filter(Airbrake::Filters::ThreadFilter.new)
+
+  # Attaches loaded dependencies to the notice object
+  # (under context/versions/dependencies).
+  # Airbrake.add_filter(Airbrake::Filters::DependencyFilter.new)
+
   ignore_errors = %w(
     AbstractController::ActionNotFound
     ActiveRecord::RecordNotFound
@@ -31,9 +83,9 @@ if AIRBRAKE_ENABLED
   Airbrake.add_filter do |notice|
     notice.ignore! if notice[:errors].any? { |error| ignore_errors.include?(error[:type]) }
   end
-end
 
-# If Airbrake doesn't send any expected exceptions, we suggest to uncomment the
-# line below. It might simplify debugging of background Airbrake workers, which
-# can silently die.
-# Thread.abort_on_exception = ['test', 'development'].include?(Rails.env)
+  # If you want to convert your log messages to Airbrake errors, we offer an
+  # integration with the Logger class from stdlib.
+  # https://github.com/airbrake/airbrake#logger
+  # Rails.logger = Airbrake::AirbrakeLogger.new(Rails.logger)
+end

data/config/initializers/bitly.rb

@@ -6,5 +6,5 @@ Bitly.use_api_version_3
 
 Bitly.configure do |config|
   config.api_version = 3
-  config.access_token = ENV['BITLY_API_TOKEN']
+  config.access_token = ENV.fetch('BITLY_API_TOKEN', nil)
 end

data/config/initializers/carrier_wave.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
+require 'fog/aws'
+
 CarrierWave.configure do |config|
   if (Rails.env.development? && ENV['AWS_ACCESS_KEY_ID'].blank?) || Rails.env.test?
     config.storage = :file
   else
     config.fog_credentials = {
       provider: 'AWS',
-      aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-      aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
-      region: ENV['AWS_REGION']
+      aws_access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID', nil),
+      aws_secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', nil),
+      region: ENV.fetch('AWS_REGION', nil)
     }
-    config.fog_directory = ENV['AWS_S3_BUCKET_NAME']
+    config.fog_directory = ENV.fetch('AWS_S3_BUCKET_NAME', nil)
     config.fog_public = true
     config.storage = :fog
   end

data/config/initializers/ckeditor.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Ckeditor.setup do |config|
+  # //cdn.ckeditor.com/<version.number>/<distribution>/ckeditor.js
+  config.cdn_url = '//cdn.ckeditor.com/4.6.1/basic/ckeditor.js'
+end

data/config/initializers/elasticsearch.rb

@@ -3,6 +3,6 @@
 require 'elasticsearch/model'
 
 Elasticsearch::Model.client = Elasticsearch::Client.new(
-  host: ENV['ELASTICSEARCH_ADDRESS']
+  host: ENV.fetch('ELASTICSEARCH_ADDRESS', nil)
 )
 Hashie.logger = Logger.new('/dev/null')

data/config/initializers/resque.rb

@@ -3,8 +3,8 @@
 Resque.redis = ENV.fetch('REDIS_URL', 'redis://localhost:6379')
 Resque.redis.namespace = ENV.fetch('RESQUE_NAMESPACE', 'resque:development')
 
-project_id = ENV['AIR_BRAKE_PROJECT_ID']
-project_key = ENV['AIR_BRAKE_PROJECT_KEY']
+project_id = ENV.fetch('AIR_BRAKE_PROJECT_ID', nil)
+project_key = ENV.fetch('AIR_BRAKE_PROJECT_KEY', nil)
 
 if project_id.present? && project_key.present?
   require 'airbrake/resque'

data/config/locales/admin/en.yml

@@ -216,7 +216,7 @@ en:
             unit_bundles: Generate Unit Bundles
           create:
             error: Error
-            success: Lesson %{name} parsed successfully.
+            success: Lesson %{name} parsed successfully. %{errors}
           new:
             page_title: Add a lesson
             submit: Parse
@@ -268,7 +268,6 @@ en:
           import_glossary: Import Glossary
           sign_out: Sign out
           standards: Standards
-          component_search: Search Component
           sketch_compilation: Compile lesson sketch %{version}
           import_lesson: Import Lesson
           lessons: Lessons

data/config/locales/ui/en.yml

@@ -124,6 +124,7 @@ en:
     add: Add
     all: All
     are_you_sure: Are you sure?
+    async: Asynchronously
     close: Close
     contents: Contents
     delete: Delete

data/config/routes.rb

@@ -32,7 +32,6 @@ Lcms::Engine::Engine.routes.draw do
 
   namespace :admin do
     get '/' => 'welcome#index'
-    get '/whoami' => 'admin#whoami'
     get '/association_picker' => 'association_picker#index'
     resource :resource_bulk_edits, only: %i(new create)
     get '/resource_picker' => 'resource_picker#index'
@@ -69,11 +68,15 @@ Lcms::Engine::Engine.routes.draw do
         get :import_status, to: 'materials#import_status'
       end
     end
-    resource :curriculum, only: %i(edit update)
+    resource :curriculum, only: %i(edit update) do
+      get :children
+    end
     resources :access_codes, except: :show
     resource :batch_reimport, only: %i(new create)
   end
 
+  get '/oauth2callback' => 'welcome#oauth2callback'
+
   get '/*slug' => 'resources#show', as: :show_with_slug
 
   root to: 'welcome#index'