Merge branch 'develop' into 0valt/1759/select-init

Author: Oaphi

app/assets/stylesheets/tour.scss

@@ -1,16 +1,29 @@
 .codidactyl {
-    width: 80px;
-    padding: 2rem;
-    margin-top: 1rem;
+  width: 80px;
+  padding: 2rem;
+  margin-top: 1rem;
+}
+
+.codidactyl + .is-flexible {
+  width: 0;
 }
-.codidactyl + .is-flexible { width: 0; }
 
 .codidactyl-sticky {
-    position: sticky;
-    top: 0.5rem;
-    padding: 1rem;
+  position: sticky;
+  top: 0.5rem;
+  padding: 1rem;
 }
 
 .codidactyl-small {
-    max-height: 1em;
-}
+  max-height: 1em;
+}
+
+@media (max-width: 768px) {
+  .tour-editor-wrapper {
+    order: 2;
+  }
+
+  .tour-hints-wrapper {
+    order: 1;
+  }
+}

app/controllers/categories_controller.rb

@@ -21,6 +21,12 @@ def show
 
   def homepage
     @category = Category.where(is_homepage: true).first
+
+    unless @category.present?
+      redirect_to categories_path
+      return
+    end
+
     update_last_visit(@category)
     set_list_posts
     render :show
@@ -199,6 +205,9 @@ def set_list_posts
     @posts = @posts.paginate(page: params[:page], per_page: 50).order(sort_param)
   end
 
+  # Updates last visit cache for a given category
+  # @param category [Category] category to update
+  # @return [Boolean] whether the cache entry is deleted
   def update_last_visit(category)
     return if current_user.blank?
 

app/models/category.rb

@@ -27,6 +27,12 @@ class Category < ApplicationRecord
             'pink',
             'red'].freeze
 
+  # Is the category set as the homepage?
+  # @return [Boolean] check result
+  def homepage?
+    is_homepage == true
+  end
+
   # Can anyone view the category (even if not logged in)?
   # @return [Boolean] check result
   def public?

app/views/tour/question2.html.erb

@@ -1,4 +1,5 @@
 <%= render 'posts/markdown_script' %>
+<%= render 'posts/image_upload' %>
 
 <div class="grid step-0">
   <div class="grid--cell codidactyl">
@@ -20,7 +21,7 @@
 <hr>
 
 <div class="grid">
-  <div class="grid--cell is-8">
+  <div class="grid--cell is-8-lg is-12-md is-12-sm tour-editor-wrapper">
     <h1>New Post in Q&amp;A</h1>
     <div class="notice is-info">
       <%= raw(sanitize(render_markdown(SiteSetting['AskingGuidance']), scrubber: scrubber)) %>
@@ -53,7 +54,7 @@
     </div>
 
   </div>
-  <div class="grid--cell is-4">
+  <div class="grid--cell is-4-lg is-12-md is-12-sm tour-hints-wrapper">
     <div class="codidactyl-hints codidactyl-sticky">
       <div class="widget step-1 hide">
         <div class="widget--header">

test/controllers/categories_controller_test.rb

@@ -9,6 +9,22 @@ class CategoriesControllerTest < ActionController::TestCase
     assert_not_nil assigns(:categories)
   end
 
+  test ':homepage should correctly show the homepage category' do
+    get :homepage
+    assert_response(:success)
+    @category = assigns(:category)
+    assert_not_nil @category
+    assert @category.homepage?
+  end
+
+  test ':homepage should redirect to the categories list if there is no default category' do
+    Category.where(is_homepage: true).destroy_all
+
+    get :homepage
+    assert_response(:found)
+    assert_redirected_to(categories_path)
+  end
+
   test 'should correctly show public categories' do
     public_categories = categories.select(&:public?)