From 42591677e535a96082d787d6bb236598324293fd Mon Sep 17 00:00:00 2001
From: Baoshuo <i@baoshuo.ren>
Date: Mon, 26 Sep 2022 18:56:38 +0800
Subject: [PATCH] feat: include sidebar in index page

---
 web/app/controllers/index.php | 11 ++++++++---
 web/app/views/sidebar.php     |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/web/app/controllers/index.php b/web/app/controllers/index.php
index fd26c15..f6a78fe 100644
--- a/web/app/controllers/index.php
+++ b/web/app/controllers/index.php
@@ -111,10 +111,10 @@
 		<?php endif ?>
 	</div>
 	<div class="col">
-		<div class="d-none d-md-block">
+		<div class="d-none d-md-block mb-4">
 			<img class="media-object img-thumbnail" src="/images/logo.png" alt="Logo" />
 		</div>
-		<div class="card card-default mt-4">
+		<div class="card card-default mb-2">
 			<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 			<div class="card-header bg-white">
 				<b><?= UOJLocale::get('countdowns') ?></b>
@@ -154,7 +154,12 @@
 				<?php endif ?>
 			</div>
 		</div>
-		<div class="card card-default mt-4">
+
+		<?php if (Auth::check()): ?>
+		<?php uojIncludeView('sidebar') ?>
+		<?php endif ?>
+
+		<div class="card card-default mb-2">
 			<?php if (isset($REQUIRE_LIB['bootstrap5'])): ?>
 				<div class="card-header bg-white">
 					<b><?= UOJLocale::get('friend links') ?></b>
diff --git a/web/app/views/sidebar.php b/web/app/views/sidebar.php
index 24798d5..39142de 100644
--- a/web/app/views/sidebar.php
+++ b/web/app/views/sidebar.php
@@ -1,4 +1,6 @@
-<?php if (!isset($group_announcements_hidden) && Auth::check()): ?>
+<?php if (Auth::check()): ?>
+
+<?php if (!isset($group_announcements_hidden)): ?>
 <?php $groups = queryGroupsOfUser(Auth::id()); ?>
 <?php if (count($groups)): ?>
 <div class="card card-default mb-2" id="group-user-announcements">
@@ -80,3 +82,5 @@
 	</div>
 </div>
 <?php endif ?>
+
+<?php endif // Auth::check() ?>