From 1ed5b4e2d2ab0260c8592488906f065a09dbb91a Mon Sep 17 00:00:00 2001
From: Splines <37160523+Splines@users.noreply.github.com>
Date: Tue, 18 Apr 2023 22:09:33 +0200
Subject: [PATCH] Sync production with mampf-next (#464)

* added watchlist authorization

* Revert "Merge remote-tracking branch 'origin/imap-server' into mampf-next"

This reverts commit c45a6f2b369487c27fbd80644448b60612d525bf, reversing
changes made to 775ecbfbfbcd7957c67b02a64c4220cd4820db64.

* Revert "Merge branch 'updates' into mampf-next"

This reverts commit 11009acb452ee7bb3a7b0c124e3f344e258a2ffa, reversing
changes made to 78a7a0b2e98096c8612336bacb15a12098168795.

* Revert "Revert "Merge branch 'updates' into mampf-next""

This reverts commit 7fb05e49517c3bab4f666851f3622a1584135961.

* Revert "Revert "Merge remote-tracking branch 'origin/imap-server' into mampf-next""

This reverts commit 4311633416985abd7e5599109fbf0034627142ec.

* fix missing media in user edit view

* Check if lecture variable is present

and pass it into lecture_path(...)

* add authentification to main routes and remove old home

* render sidebar only if lecture is present

---------

Co-authored-by: Fabian Kontor <fabiankontor@aol.com>
Co-authored-by: Fabian K <zebleck@users.noreply.github.com>
Co-authored-by: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
---
 app/controllers/main_controller.rb     |  3 +--
 app/views/layouts/application.html.erb | 17 ++++++++++-------
 app/views/shared/_sidebar.html.erb     | 20 +++++++++++---------
 app/views/users/_data.html.erb         |  2 +-
 config/routes.rb                       |  4 +---
 5 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
index 70cc1e463..d1769a925 100644
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -1,7 +1,6 @@
 # MainController
 class MainController < ApplicationController
-  skip_before_action :authenticate_user!, only: [:home, :about, :news,
-                                                 :sponsors]
+
   before_action :check_for_consent
   authorize_resource class: false, only: :start
   layout 'application_no_sidebar'
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 34fce2320..fec436f11 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,13 +9,16 @@
     <%= render partial: 'shared/navbar' %>
     <div class="d-flex container-fluid flex-grow-1">
       <div class="row" id="main-content-row">
-        <div id="sidebar-container"
-          class="col-sm-4 col-md-3 col-xl-2">
-          <nav id="sidebar">
-            <%= render partial: 'shared/sidebar',
-                      locals: { lecture: @lecture || current_lecture } %>
-          </nav>
-        </div>
+        <% lecture = @lecture || current_lecture %>
+        <% if lecture %>
+          <div id="sidebar-container"
+            class="col-sm-4 col-md-3 col-xl-2">
+            <nav id="sidebar">
+              <%= render partial: 'shared/sidebar',
+                         locals: { lecture: lecture } %>
+            </nav>
+          </div>
+        <% end %>
         <main class="col-sm-8 ml-auto col-md-9 col-xl-10 pt-3" role="main">
           <div class="alert alert-danger" id="js-messages" role="alert"
                style="display: none;">
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index 4bf217645..5da00361f 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -4,15 +4,17 @@
 <ul class="nav nav-pills flex-column">
 
   <%# Overview %>
-  <% fullpath = lecture_path(lecture)%>
-  <% active_class = get_class_for_path(lecture_path()) %>
-  <li class="sidebar-item nav-link <%= active_class %>
-          <%= !lecture ? "disabled" : ""%>">
-    <a href="<%= url_for(fullpath)%>">
-      <i class="bi bi-house<%= active_class.present? ? "-fill" : "" %>"></i>
-      <%= t('basics.overview') %>
-    </a>
-  </li>
+  <% if lecture %>
+    <% fullpath = lecture_path(lecture)%>
+    <% active_class = get_class_for_path(lecture_path(lecture)) %>
+    <li class="sidebar-item nav-link <%= active_class %>
+            <%= !lecture ? "disabled" : ""%>">
+      <a href="<%= url_for(fullpath)%>">
+        <i class="bi bi-house<%= active_class.present? ? "-fill" : "" %>"></i>
+        <%= t('basics.overview') %>
+      </a>
+    </li>
+  <% end %>
 
   <%# Lectures (Kaviar) %>
   <% project_name = 'kaviar' %>
diff --git a/app/views/users/_data.html.erb b/app/views/users/_data.html.erb
index 8010d6aae..b10701543 100644
--- a/app/views/users/_data.html.erb
+++ b/app/views/users/_data.html.erb
@@ -44,7 +44,7 @@
       </div>
       <div class="card-body">
         <% if user.edited_courses.any? || user.edited_lectures.any? ||
-              user.given_lectures.any? %>
+              user.given_lectures.any? || user.edited_media.any? %>
           <%= render partial: 'users/content',
                      locals: { user: user,
                                f: f } %>
diff --git a/config/routes.rb b/config/routes.rb
index 964976b33..a19b72ba5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -859,7 +859,7 @@
     authenticated :user do
       root to: 'main#start'
     end
-	
+
     unauthenticated do
       root to: 'devise/sessions#new', as: :unauthenticated_root
     end
@@ -873,8 +873,6 @@
   get 'error',
       to: 'main#error'
 
-  get 'main/home'
-
   get 'main/news',
       to: 'main#news',
       as: 'news'