From 2e798bd1ec173533a7845913a20d1d534e3a78a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Wed, 1 Jun 2022 10:59:59 +0200
Subject: [PATCH] - navigation bar long title is now allowed

---
 config/language-translations.php                            | 2 +-
 resources/js/components/Layout/Toolbars/NavigationBar.vue   | 6 +++---
 resources/js/components/UI/Others/MemberAvatar.vue          | 4 +++-
 resources/js/views/Admin/Settings/AppSettingsTabs/Index.vue | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/language-translations.php b/config/language-translations.php
index 3fe344e4..c66ad9e4 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -910,7 +910,7 @@ return [
         'new_team_invitation'                            => 'New Team Invitation',
         'x_invite_to_join_team'                          => ':name invite you to join into Team Folder.',
         'team_invitation_notify_title'                   => 'You are invited to collaboration with team folder in :app',
-        'team_invitation_notify_desc'                    => 'You are invited to collaboration with team folder',
+        'team_invitation_notify_desc'                    => 'You are invited to collaboration with team folder.',
         'team_invitation_notify_desc_without_account'    => 'You are invited to collaboration with team folder. But at first, you have to create an account to proceed into team folder.',
         'join_into_team_folder'                          => 'Join into Team Folder',
         'join_and_create_account'                        => 'Join & Create an Account',
diff --git a/resources/js/components/Layout/Toolbars/NavigationBar.vue b/resources/js/components/Layout/Toolbars/NavigationBar.vue
index 36d2f492..fafa7d69 100644
--- a/resources/js/components/Layout/Toolbars/NavigationBar.vue
+++ b/resources/js/components/Layout/Toolbars/NavigationBar.vue
@@ -1,5 +1,5 @@
 <template>
-    <div @click="goBack" class="relative flex select-none items-center text-left">
+    <div @click="goBack" class="relative flex select-none items-center text-left min-w-0 lg:pr-6 pr-12">
         <!--Menu icon-->
         <div
             v-if="!isVisibleNavigationBars"
@@ -15,13 +15,13 @@
                 '-translate-x-3 opacity-0': !isLoadedFolder || !isNotHomepage,
                 'translate-x-0 opacity-100': isLoadedFolder && isNotHomepage,
             }"
-            class="mr-2 -ml-1 cursor-pointer align-middle transition-all duration-200 lg:-mt-0.5"
+            class="mr-2 -ml-1 cursor-pointer align-middle transition-all duration-200 lg:-mt-0.5 shrink-0"
         />
 
         <!--Folder Title-->
         <b
             :class="{ '-translate-x-4': !isLoadedFolder || !isNotHomepage }"
-            class="inline-block lg:max-w-[210px] max-w-[190px] transform overflow-hidden text-ellipsis whitespace-nowrap align-middle text-sm font-bold transition-all duration-200 dark:text-gray-100"
+            class="inline-block min-w-0 transform overflow-hidden text-ellipsis whitespace-nowrap align-middle text-sm font-bold transition-all duration-200 dark:text-gray-100"
         >
             {{ $getCurrentLocationName() }}
         </b>
diff --git a/resources/js/components/UI/Others/MemberAvatar.vue b/resources/js/components/UI/Others/MemberAvatar.vue
index bca4ad53..c3ca67b8 100644
--- a/resources/js/components/UI/Others/MemberAvatar.vue
+++ b/resources/js/components/UI/Others/MemberAvatar.vue
@@ -28,7 +28,9 @@
                 background: member.data.attributes.color ? member.data.attributes.color : '',
             }"
         >
-            <span :class="fontSize" class="font-extrabold uppercase text-white dark:text-gray-900">
+            <span class="font-extrabold uppercase text-white dark:text-gray-900"
+				:class="[fontSize, {'!text-gray-900': !member.data.attributes.color}]"
+			>
                 {{ letter }}
             </span>
         </div>
diff --git a/resources/js/views/Admin/Settings/AppSettingsTabs/Index.vue b/resources/js/views/Admin/Settings/AppSettingsTabs/Index.vue
index fc5b653c..4bff1dc9 100644
--- a/resources/js/views/Admin/Settings/AppSettingsTabs/Index.vue
+++ b/resources/js/views/Admin/Settings/AppSettingsTabs/Index.vue
@@ -305,7 +305,7 @@
                 </div>
 
                 <!--Pricing Content-->
-                <div v-if="config.isSaaS" class="card shadow-card">
+                <div v-if="config.subscriptionType === 'fixed'" class="card shadow-card">
                     <FormLabel>Pricing Content</FormLabel>
 
                     <div class="block-wrapper">
@@ -540,7 +540,7 @@ export default {
             })
             .then((response) => {
                 this.app = {
-                    allow_homepage: parseInt(response.data.allow_homepage),
+                    allow_homepage: parseInt(response.data.allow_homepage || 1),
                     section_features: parseInt(response.data.section_features),
                     section_feature_boxes: parseInt(response.data.section_feature_boxes),
                     section_pricing_content: parseInt(response.data.section_pricing_content),