temporary fix for general category permissions, adjusted some things

CaffeineSheep · Mar 18, 2023 · 41d7147 · 41d7147
1 parent ab68594
commit 41d7147
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -44,8 +44,7 @@ public function index(Request $request, ActivityQueries $activities)
         $quickLinks = collect([
             new BasicListItem('/shelves/symbols', 'All Symbols', 'See all of the official symbols', 'star-circle'),
             new BasicListItem(env('TASK_MANAGER_URL', null), 'SymbolHub', 'Find new symbols to add', 'symbolhub'),
-            new BasicListItem('/shelves/getting-started/all', 'How Can I Help?', 'Learn how you can help Symbolpedia!', 'info'),
-            // ...(Bookshelf::getBySlug('contribute')->visibleBooks()->get()->all() ?? [], true),
+            new BasicListItem('/books/general/page/getting-started', 'Getting Started', 'Learn how you can help Symbolpedia!', 'info'),
             ...Bookshelf::getBySlug('contribute')->visibleBooks()->get()->all(),
         ]);
 

diff --git a/resources/sass/_colors.scss b/resources/sass/_colors.scss
@@ -95,6 +95,10 @@
   color: var(--color-chapter);
   fill: var(--color-chapter);
 }
+.text-info, .text-info:hover {
+  color: var(--color-info);
+  fill: var(--color-info);
+}
 
 /*
  * Standard & Entity background colors

diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
@@ -48,6 +48,15 @@ $fs-s: 12px;
   --color-book: #077b70;
   --color-bookshelf: #a94747;
 
+  // --color-info: #E4572E;
+  // --color-info: #F7B801;
+  // --color-info: #52FFB8;
+  // --color-info: #00CC77;
+  // --color-info: #55DDE0;
+
+  // --color-info: #26CCCF;
+  --color-info: #23BBBE;
+
   // --color-tasks: #5249ff;
   // --color-tasks: #4983ff;
   --color-tasks: #359d49;

diff --git a/resources/views/search/parts/entity-selector-list.blade.php b/resources/views/search/parts/entity-selector-list.blade.php
@@ -5,7 +5,7 @@
             @include('entities.list-item', [
             'entity' => $entity,
             'showPath' => true,
-            'locked' => $permission !== 'view' && !userCan($permission, $entity) && ($entity->slug !== 'community-review' && userCan('page-update', $entity) && $entity instanceof \BookStack\Entities\Models\Book)
+            'locked' => $permission !== 'view' && !userCan($permission, $entity) && (($entity->slug !== 'community-review' && userCan('page-update', $entity)) || ($entity->slug == 'general' && !userCan('page-update', $entity))) && $entity instanceof \BookStack\Entities\Models\Book
             ])
 
             @if($index !== count($entities) - 1)