biovision-base 0.15.180502 → 0.17.180619

data/config/locales/feedback-en.yml

@@ -5,6 +5,7 @@ en:
     attributes:
       feedback_request:
         comment: "Comment"
+        consent: "Consent on processing personal data"
         email: "E-mail"
         image: "Image"
         language: "Language"
@@ -27,5 +28,9 @@ en:
       result: "Thank you, we will contact you"
   feedback_mailer:
     new_feedback_request:
-      subject: "New feedback request from agency.tm"
+      subject: "New feedback request"
       title: "New feebdack request came"
+  about:
+    contact:
+      title: "Contact"
+      heading: "Contact"

data/config/locales/feedback-ru.yml

@@ -5,6 +5,7 @@ ru:
     attributes:
       feedback_request:
         comment: "Комментарий"
+        consent: "Согласие на обработку персональных данных"
         email: "Почта"
         image: "Картинка"
         language: "Язык"
@@ -23,11 +24,6 @@ ru:
       dashboard:
         biovision_feedback:
           heading: "Обратная связь"
-  index:
-    index:
-      contact:
-        heading: "Контакты"
-        or_use_form: "Или оставьте ваши контактные данные и мы очень быстро свяжемся с вами"
   feedback_requests:
     form:
       result: "Спасибо, с Вами свяжутся"
@@ -35,3 +31,7 @@ ru:
     new_feedback_request:
       subject: "Новый запрос обратной связи"
       title: "Поступил новый запрос на обратную связь"
+  about:
+    contact:
+      title: "Контакты"
+      heading: "Контакты"

data/config/locales/users-en.yml

@@ -49,6 +49,7 @@ en:
         agent: "User agent at the time if registration"
         allow_login: "Allow logging in"
         allow_mail: "Allow email notifications"
+        balance: "Balance"
         birthday: "Birthday"
         bot: "It is bot"
         consent: "Consent for processing of personal data and acceptance of terms of service"

data/config/locales/users-ru.yml

@@ -49,6 +49,7 @@ ru:
         agent: "Агент пользователя при регистрации"
         allow_login: "Позволить вход"
         allow_mail: "Разрешить email-уведомления"
+        balance: "Баланс"
         birthday: "Дата рождения"
         bot: "Это бот"
         consent: "Согласие на обработку персональных данных и принятие пользовательского соглашения"

data/config/routes.rb

@@ -37,6 +37,7 @@ Rails.application.routes.draw do
       get 'about' => :index
       get 'tos' => :tos
       get 'privacy' => :privacy
+      get 'contact' => :contact
     end
 
     scope 'u/:slug', controller: :profiles, constraints: { slug: /[^\/]+/ } do
@@ -61,7 +62,11 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :editable_pages, only: [:index, :show]
+      resources :editable_pages, only: [:index, :show] do
+        member do
+          post 'priority', defaults: { format: :json }
+        end
+      end
       resources :stored_values, only: [:index, :show]
 
       resources :metrics, only: [:index, :show] do
@@ -126,7 +131,9 @@ Rails.application.routes.draw do
     namespace :my do
       get '/' => 'index#index'
 
-      resource :profile, except: [:destroy]
+      resource :profile, except: [:destroy] do
+        post 'check'
+      end
       resource :confirmation, :recovery, only: [:show, :create, :update]
       resources :tokens, only: [:index] do
         member do
@@ -161,5 +168,7 @@ Rails.application.routes.draw do
     end
 
     resources :feedback_requests, only: [:create]
+
+    get ':editable_page_url' => 'fallback#show', constraints: { editable_page_url: /.+/ }
   end
 end

data/db/migrate/20170302000101_create_privileges.rb

@@ -7,6 +7,7 @@ class CreatePrivileges < ActiveRecord::Migration[5.1]
         t.boolean :locked, default: false, null: false
         t.boolean :deleted, default: false, null: false
         t.boolean :regional, default: false, null: false
+        t.boolean :administrative, default: true, null: false
         t.integer :priority, limit: 2, default: 1, null: false
         t.integer :users_count, default: 0, null: false
         t.string :parents_cache, default: '', null: false

data/db/migrate/20170320000000_create_editable_pages.rb

@@ -10,24 +10,14 @@ class CreateEditablePages < ActiveRecord::Migration[5.1]
         t.string :nav_group
         t.string :url
         t.string :image
+        t.string :image_alt_text
         t.string :title, default: '', null: false
         t.string :keywords, default: '', null: false
         t.string :description, default: '', null: false
         t.text :body, default: '', null: false
       end
 
-      pages = {
-        index: { ru: 'Главная страница', en: 'Main page' },
-        about: { ru: 'О проекте', en: 'About' },
-        tos: { ru: 'Пользовательское соглашение', en: 'Terms of service' },
-        privacy: { ru: 'Соглашение о конфиденциальности', en: 'Privacy' }
-      }
-
-      pages.each do |slug, names|
-        Language.all.each do |language|
-          EditablePage.create(slug: slug, name: names[language.code.to_sym], language: language)
-        end
-      end
+      create_pages
     end
   end
 
@@ -36,4 +26,27 @@ class CreateEditablePages < ActiveRecord::Migration[5.1]
       drop_table :editable_pages
     end
   end
+
+  def create_pages
+    pages = {
+      index:   ['', { ru: 'Главная страница', en: 'Main page' }],
+      about:   ['about', { ru: 'О проекте', en: 'About' }],
+      tos:     ['tos', { ru: 'Пользовательское соглашение', en: 'Terms of service' }],
+      privacy: ['privacy', { ru: 'Политика конфиденциальности', en: 'Privacy' }],
+      contact: ['contact', { ru: 'Контакты', en: 'Contact' }]
+    }
+
+    pages.each do |slug, data|
+      url   = data[0]
+      names = data[1]
+      Language.all.each do |language|
+        EditablePage.create(
+          slug:     slug,
+          name:     names[language.code.to_sym],
+          language: language,
+          url:      url
+        )
+      end
+    end
+  end
 end

data/db/migrate/20171211000000_create_feedback_requests.rb

@@ -7,6 +7,7 @@ class CreateFeedbackRequests < ActiveRecord::Migration[5.1]
         t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
         t.inet :ip
         t.boolean :processed
+        t.boolean :consent, default: false, null: false
         t.string :name
         t.string :email
         t.string :phone
@@ -15,7 +16,12 @@ class CreateFeedbackRequests < ActiveRecord::Migration[5.1]
       end
 
       Privilege.create(slug: 'feedback_manager', name: 'Менеджер обратной связи')
-      StoredValue.create(slug: 'feedback_receiver', value: 'support@example.com', name: 'Адрес для запросов обратной связи', description: 'На этот адрес будут отправляться запросы обратной связи')
+      StoredValue.create(
+        slug: 'feedback_receiver',
+        value: 'support@example.com',
+        name: 'Адрес для запросов обратной связи',
+        description: 'На этот адрес будут отправляться запросы обратной связи'
+      )
     end
   end
 

data/db/migrate/20180610222222_add_consent_to_feedback_requests.rb

@@ -0,0 +1,15 @@
+class AddConsentToFeedbackRequests < ActiveRecord::Migration[5.2]
+  def up
+    unless column_exists?(:feedback_requests, :consent)
+      add_column :feedback_requests, :consent, :boolean, default: false, null: false
+
+      FeedbackRequest.order('id asc').each do |entity|
+        entity.update! consent: true
+      end
+    end
+  end
+
+  def down
+    # No need to rollback
+  end
+end

data/db/migrate/20180612111111_add_administrative_to_privilege.rb

@@ -0,0 +1,11 @@
+class AddAdministrativeToPrivilege < ActiveRecord::Migration[5.2]
+  def up
+    unless column_exists?(:privileges, :administrative)
+      add_column :privileges, :administrative, :boolean, default: true, null: false
+    end
+  end
+
+  def down
+    # No need to rollback
+  end
+end

data/db/migrate/20180619121212_add_image_alt_text_to_editable_page.rb

@@ -0,0 +1,11 @@
+class AddImageAltTextToEditablePage < ActiveRecord::Migration[5.2]
+  def up
+    unless column_exists?(:editable_pages, :image_alt_text)
+      add_column :editable_pages, :image_alt_text, :string
+    end
+  end
+
+  def down
+    # no rollback needed
+  end
+end

data/lib/biovision/base/base_methods.rb

@@ -24,8 +24,9 @@ module Biovision
       #
       # @param [Symbol] param
       # @return [String]
-      def param_from_request(param)
-        params[param].to_s.encode('UTF-8', 'UTF-8', invalid: :replace, replace: '')
+      def param_from_request(*param)
+        value = params.dig(*param)
+        value.to_s.encode('UTF-8', 'UTF-8', invalid: :replace, replace: '')
       end
 
       # Get current user from token cookie

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.15.180502'
+    VERSION = '0.17.180619'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.15.180502
+  version: 0.17.180619
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,6 +240,7 @@ files:
 - app/controllers/concerns/toggleable_entity.rb
 - app/controllers/editable_pages_controller.rb
 - app/controllers/errors_controller.rb
+- app/controllers/fallback_controller.rb
 - app/controllers/feedback_requests_controller.rb
 - app/controllers/index_controller.rb
 - app/controllers/media_files_controller.rb
@@ -278,6 +279,7 @@ files:
 - app/models/browser.rb
 - app/models/code.rb
 - app/models/code_type.rb
+- app/models/concerns/checkable.rb
 - app/models/concerns/has_owner.rb
 - app/models/concerns/required_unique_name.rb
 - app/models/concerns/required_unique_slug.rb
@@ -313,6 +315,7 @@ files:
 - app/uploaders/editable_page_image_uploader.rb
 - app/uploaders/media_file_uploader.rb
 - app/uploaders/media_snapshot_uploader.rb
+- app/views/about/contact.html.erb
 - app/views/about/editable.html.erb
 - app/views/admin/agents/_filter.html.erb
 - app/views/admin/agents/_list.html.erb
@@ -391,6 +394,7 @@ files:
 - app/views/admin/users/_nav_item.html.erb
 - app/views/admin/users/_search.html.erb
 - app/views/admin/users/codes.html.erb
+- app/views/admin/users/entity/_custom_nav.html.erb
 - app/views/admin/users/entity/_in_list.html.erb
 - app/views/admin/users/entity/_preview.jbuilder
 - app/views/admin/users/entity/_privilege.html.erb
@@ -410,6 +414,7 @@ files:
 - app/views/agents/new.html.erb
 - app/views/agents/show.jbuilder
 - app/views/application/error.html.erb
+- app/views/application/error.jbuilder
 - app/views/application/not_found.html.erb
 - app/views/application/not_found.jbuilder
 - app/views/application/service_unavailable.html.erb
@@ -430,9 +435,11 @@ files:
 - app/views/editable_pages/_editable_page.html.erb
 - app/views/editable_pages/_form.html.erb
 - app/views/editable_pages/edit.html.erb
+- app/views/editable_pages/entity/_content.html.erb
 - app/views/editable_pages/entity/_metadata.html.erb
 - app/views/editable_pages/new.html.erb
 - app/views/errors/error.html.erb
+- app/views/fallback/show.html.erb
 - app/views/feedback_mailer/new_feedback_request.html.erb
 - app/views/feedback_mailer/new_feedback_request.text.erb
 - app/views/feedback_requests/_form.html.erb
@@ -486,6 +493,7 @@ files:
 - app/views/my/login_attempts/index.html.erb
 - app/views/my/login_attempts/index.jbuilder
 - app/views/my/profiles/_nav_item.html.erb
+- app/views/my/profiles/check.jbuilder
 - app/views/my/profiles/edit.html.erb
 - app/views/my/profiles/edit/_form.html.erb
 - app/views/my/profiles/edit/form/_profile_data.html.erb
@@ -524,8 +532,10 @@ files:
 - app/views/shared/editable_pages/_body.html.erb
 - app/views/shared/filter/_flag.html.erb
 - app/views/shared/forms/_default_ajax_handler.html.erb
+- app/views/shared/forms/_entity_flags.html.erb
 - app/views/shared/forms/_list_of_errors.js.erb
 - app/views/shared/forms/_wysiwyg.html.erb
+- app/views/shared/forms/check.jbuilder
 - app/views/shared/forms/errors.js.erb
 - app/views/stored_values/_form.html.erb
 - app/views/stored_values/edit.html.erb
@@ -572,16 +582,17 @@ files:
 - db/migrate/20170425000002_create_foreign_users.rb
 - db/migrate/20170629120000_create_login_attempts.rb
 - db/migrate/20170823000001_create_stored_values.rb
-- db/migrate/20171025222222_add_new_fields_171026.rb
 - db/migrate/20171202000000_create_media_folders.rb
 - db/migrate/20171202000001_create_media_files.rb
 - db/migrate/20171211000000_create_feedback_requests.rb
-- db/migrate/20171217222222_add_fields_to_feedback_requests.rb
 - db/migrate/20171223333333_amend_foreign_keys.rb
 - db/migrate/20180117151515_add_language_to_models.rb
 - db/migrate/20180117160000_create_user_languages.rb
 - db/migrate/20180321000000_add_profile_data_to_users.rb
 - db/migrate/20180405000000_add_consent_to_users.rb
+- db/migrate/20180610222222_add_consent_to_feedback_requests.rb
+- db/migrate/20180612111111_add_administrative_to_privilege.rb
+- db/migrate/20180619121212_add_image_alt_text_to_editable_page.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb

data/db/migrate/20171025222222_add_new_fields_171026.rb

@@ -1,21 +0,0 @@
-class AddNewFields171026 < ActiveRecord::Migration[5.1]
-  def up
-    unless column_exists?(:editable_pages, :url)
-      change_table :editable_pages do |t|
-        t.integer :priority, limit: 2, default: 1, null: false
-        t.string :url
-        t.string :nav_group
-      end
-    end
-
-    unless column_exists?(:users, :balance)
-      change_table :users do |t|
-        t.integer :balance, default: 0, null: false
-      end
-    end
-  end
-
-  def down
-  #   No need to rollback
-  end
-end

data/db/migrate/20171217222222_add_fields_to_feedback_requests.rb

@@ -1,10 +0,0 @@
-class AddFieldsToFeedbackRequests < ActiveRecord::Migration[5.1]
-  def up
-    add_column :feedback_requests, :image, :string unless column_exists?(:feedback_requests, :image)
-    add_column :feedback_requests, :comment, :text unless column_exists?(:feedback_requests, :comment)
-  end
-
-  def down
-  #   No need to rollback
-  end
-end