biovision-courses 0.0.180221 → 0.0.180222

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef0a244be3c7edae730b4a22aa130a30a5e46d5871a077e523f888206f730a4d
-  data.tar.gz: 5dcc1ab277316189046e8bb6f92d76f7ea25b15ac2b2fcd7b9de8f9f6b196686
+  metadata.gz: 1e92e5e05e40d16f33cad8c82b6b40018a4ea7498a457f63ea5a0ef67d05ccea
+  data.tar.gz: afd2ed14417c7b9d91500e62b6928c4e6fdad9a8b8f2c1738f484c643d0d9a89
 SHA512:
-  metadata.gz: 6e079e7d896731c82f592a768f3c0ca054579e4fec37ff1a554d0eab2b739c273be1d45e9f9b3e295da824490f5c6835e10be1da9e237875b883862533be93c6
-  data.tar.gz: b8c41be72cf172bfd3117f4f7a77806edc5a68ca832b5be37b4083360691d2d0ffb07a1ad53617f9eacbcd7b4b57741c62dd0675c6ba4efc95f24845b428c465
+  metadata.gz: 00a9075f2ba86e9224def3657c3c6a1366f865f924ef82f8f847b814d17fef3fefd625d90f9e0b875a7a8fcb231f1fe8179bfcd7699693392240f6ad5837e4de
+  data.tar.gz: eca8189c23cc1429890e3b57d15c3d731172aeb71a39444db1b4178e1348317d98ccb5bb65b6dd2d362c707dfc54130ba19fff493499d17ebc16d9a57080de31

data/app/assets/stylesheets/biovision/courses/biovision-courses.scss

@@ -0,0 +1,75 @@
+.index-course-categories {
+  ul {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    margin: 3.2rem auto;
+    max-width: $content-width;
+    padding: 0;
+  }
+
+  li {
+    border-radius: .6rem;
+    flex: none;
+    height: 16.2rem;
+    list-style: none;
+    margin: 0 .7rem 3.2rem;
+    overflow: hidden;
+    position: relative;
+    width: 20.6rem;
+  }
+
+  .image {
+    height: 100%;
+    overflow: hidden;
+    width: 100%;
+  }
+
+  img {
+    height: 100%;
+    object-fit: cover;
+    width: 100%;
+  }
+
+  a:link,
+  a:visited {
+    align-items: center;
+    background: rgba(0, 0, 0, .46);
+    bottom: 0;
+    color: #fff;
+    display: flex;
+    font: 700 1.8rem/1.02 $font-family-heading;
+    justify-content: center;
+    left: 0;
+    padding: 1.8rem .8rem .6rem;
+    position: absolute;
+    right: 0;
+    text-align: center;
+    top: 0;
+  }
+}
+
+.index-course-tags {
+  ul {
+    margin: 2.4rem auto;
+    max-width: $content-width;
+    padding: 0;
+    text-align: center;
+  }
+
+  li {
+    list-style: none;
+    display: inline-block;
+    margin: .8rem;
+    padding: 0;
+
+    a:link,
+    a:visited {
+      border: .1rem solid #979797;
+      color: #313131;
+      display: inline-block;
+      line-height: 2.6rem;
+      padding: 0 1.4rem;
+    }
+  }
+}

data/app/controllers/course_categories_controller.rb

@@ -1,5 +1,13 @@
-class CourseCategoriesController < AdminController
+class CourseCategoriesController < ApplicationController
+  before_action :restrict_access, except: [:index, :show]
   before_action :set_entity, only: [:edit, :update, :destroy]
+  before_action :set_entity_for_visitor, only: [:show]
+
+  layout 'admin', except: [:index, :show]
+
+  # get /course_categories
+  def index
+  end
 
   # get /course_categories/new
   def new
@@ -21,6 +29,11 @@ class CourseCategoriesController < AdminController
     end
   end
 
+  # get /course_categories/:id
+  def show
+    @collection = @entity.courses.page_for_visitors(current_page)
+  end
+
   # get /course_categories/:id/edit
   def edit
   end
@@ -60,6 +73,13 @@ class CourseCategoriesController < AdminController
     end
   end
 
+  def set_entity_for_visitor
+    @entity = CourseCategory.visible.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find visible course_category')
+    end
+  end
+
   def entity_parameters
     params.require(:course_category).permit(CourseCategory.entity_parameters)
   end

data/app/controllers/course_tags_controller.rb

@@ -1,5 +1,13 @@
-class CourseTagsController < AdminController
+class CourseTagsController < ApplicationController
+  before_action :restrict_access, except: [:index, :show]
   before_action :set_entity, only: [:edit, :update, :destroy]
+  before_action :set_entity_for_visitor, only: [:show]
+
+  layout 'admin', except: [:index, :show]
+
+  # get /course_tags
+  def index
+  end
 
   # get /course_tags/new
   def new
@@ -21,6 +29,11 @@ class CourseTagsController < AdminController
     end
   end
 
+  # get /course_tags/:id
+  def show
+    @collection = @entity.courses.page_for_visitors(current_page)
+  end
+
   # get /course_tags/:id/edit
   def edit
   end
@@ -60,6 +73,13 @@ class CourseTagsController < AdminController
     end
   end
 
+  def set_entity_for_visitor
+    @entity = CourseTag.visible.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find visible course_tag')
+    end
+  end
+
   def entity_parameters
     params.require(:course_tag).permit(CourseTag.entity_parameters)
   end

data/app/helpers/biovision_courses_helper.rb

@@ -42,6 +42,20 @@ module BiovisionCoursesHelper
     link_to(text, course_path(entity.id), options)
   end
 
+  # @param [CourseCategory] entity
+  # @param [String] text
+  # @param [Hash] options
+  def course_category_link(entity, text = entity.name, options = {})
+    link_to(text, course_category_path(entity.id), options)
+  end
+
+  # @param [CourseTag] entity
+  # @param [String] text
+  # @param [Hash] options
+  def course_tag_link(entity, text = entity.name, options = {})
+    link_to(text, course_tag_path(entity.id), options)
+  end
+
   # Course image preview for displaying in "administrative" lists
   #
   # @param [Course] entity

data/app/views/courses/_preview.html.erb

@@ -0,0 +1,10 @@
+<div class="course-preview">
+  <div class="image"><%= course_image_small(entity) %></div>
+  <div class="info">
+    <div class="title"><%= course_link(entity) %></div>
+    <div class="lead"><%= simple_format(entity.lead) %></div>
+    <div class="footer">
+      <div class="duration"><%= entity.duration %></div>
+    </div>
+  </div>
+</div>

data/app/views/courses/index.html.erb

@@ -0,0 +1,13 @@
+<% content_for :meta_title, t('.title', page: current_page) %>
+
+<article>
+  <h1><%= t('.heading') %></h1>
+
+  <%= paginate @collection %>
+  <ul>
+    <% @collection.each do |entity| %>
+      <li><%= course_link(entity) %></li>
+    <% end %>
+  </ul>
+  <%= paginate @collection %>
+</article>

data/app/views/courses/index.jbuilder

@@ -0,0 +1,17 @@
+json.data @collection do |entity|
+  json.id entity.id
+  json.type entity.class.table_name
+  json.attributes do
+    json.(entity, :title, :subtitle, :lead, :duration)
+  end
+  json.meta do
+    unless entity.image.blank?
+      json.image do
+        json.small entity.image.small.url
+        json.small_2x entity.image.medium.url
+      end
+    end
+    json.html render(partial: 'courses/preview', formats: [:html], locals: { entity: entity } )
+  end
+end
+json.partial! 'shared/pagination', locals: { collection: @collection }

data/app/views/index/index/biovision_courses/_categories.html.erb

@@ -0,0 +1,15 @@
+<% collection = CourseCategory.visible.for_tree %>
+<% if collection.any? %>
+  <section class="index-course-categories">
+    <h2><%= t('.heading') %></h2>
+
+    <ul>
+      <% collection.each do |entity| %>
+        <li>
+          <div class="image"><%= course_image_small(entity) %></div>
+          <%= course_category_link(entity) %>
+        </li>
+      <% end %>
+    </ul>
+  </section>
+<% end %>

data/app/views/index/index/biovision_courses/_tags.html.erb

@@ -0,0 +1,12 @@
+<% collection = CourseTag.list_for_visitors %>
+<% if collection.any? %>
+  <section class="index-course-tags">
+    <h2><%= t('.heading') %></h2>
+
+    <ul>
+      <% collection.each do |entity| %>
+        <li><%= course_tag_link(entity) %></li>
+      <% end %>
+    </ul>
+  </section>
+<% end %>

data/config/locales/courses-ru.yml

@@ -136,3 +136,13 @@ ru:
     new:
       title: "Добавление курса"
       heading: "Новый курс"
+    index:
+      title: "Все курсы, страница %{page}"
+      heading: "Все курсы"
+  index:
+    index:
+      biovision_courses:
+        categories:
+          heading: "Категории курсов"
+        tags:
+          heading: "Метки курсов"

data/config/routes.rb

@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
-  resources :courses
-  resources :course_categories, :course_tags, except: [:index, :show]
+  resources :courses, :course_categories, :course_tags
 
   namespace :admin do
     resources :course_categories, only: [:index, :show] do

data/lib/biovision/courses/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Courses
-    VERSION = '0.0.180221'
+    VERSION = '0.0.180222'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-courses
 version: !ruby/object:Gem::Version
-  version: 0.0.180221
+  version: 0.0.180222
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,7 +120,7 @@ files:
 - Rakefile
 - app/assets/config/biovision_courses_manifest.js
 - app/assets/javascripts/biovision/courses/application.js
-- app/assets/stylesheets/biovision/courses/application.css
+- app/assets/stylesheets/biovision/courses/biovision-courses.scss
 - app/controllers/admin/course_categories_controller.rb
 - app/controllers/admin/course_tags_controller.rb
 - app/controllers/admin/courses_controller.rb
@@ -163,11 +163,16 @@ files:
 - app/views/course_tags/new.html.erb
 - app/views/course_tags/new.js.erb
 - app/views/courses/_form.html.erb
+- app/views/courses/_preview.html.erb
 - app/views/courses/edit.html.erb
 - app/views/courses/edit.js.erb
 - app/views/courses/form/_wysiwyg.html.erb
+- app/views/courses/index.html.erb
+- app/views/courses/index.jbuilder
 - app/views/courses/new.html.erb
 - app/views/courses/new.js.erb
+- app/views/index/index/biovision_courses/_categories.html.erb
+- app/views/index/index/biovision_courses/_tags.html.erb
 - app/views/layouts/biovision/courses/application.html.erb
 - config/locales/courses-ru.yml
 - config/routes.rb

data/app/assets/stylesheets/biovision/courses/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */