Merge pull request #330 from lockdown-systems/322-remove-premium-for-…

…paid Only show premium badges if the user is not paying for premium
lockdown-systems · Dec 8, 2024 · 925de9b · 925de9b
2 parents 15d4b76 + 853f84e
commit 925de9b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/renderer/src/views/x/AccountXView.vue b/src/renderer/src/views/x/AccountXView.vue
@@ -489,7 +489,8 @@ onUnmounted(async () => {
                         :model="unref(model)" @set-state="setState($event)" @update-account="updateAccount" />
 
                     <XWizardDeleteOptionsPage v-if="model.state == State.WizardDeleteOptionsDisplay"
-                        :model="unref(model)" @update-account="updateAccount" @set-state="setState($event)" />
+                        :model="unref(model)" :user-authenticated="userAuthenticated" :user-premium="userPremium"
+                        @update-account="updateAccount" @set-state="setState($event)" />
 
                     <XWizardReviewPage v-if="model.state == State.WizardReviewDisplay" :model="unref(model)"
                         @set-state="setState($event)" @update-account="updateAccount" @start-jobs="startJobs" />

diff --git a/src/renderer/src/views/x/XWizardDeleteOptionsPage.vue b/src/renderer/src/views/x/XWizardDeleteOptionsPage.vue
@@ -15,6 +15,8 @@ import XLastImportOrBuildComponent from './XLastImportOrBuildComponent.vue';
 // Props
 const props = defineProps<{
     model: AccountXViewModel;
+    userAuthenticated: boolean;
+    userPremium: boolean;
 }>();
 
 // Emits
@@ -187,7 +189,8 @@ onMounted(async () => {
                                 </div>
                             </div>
                         </div>
-                        <span class="premium badge badge-primary">Premium</span>
+                        <span v-if="!userAuthenticated || !userPremium"
+                            class="premium badge badge-primary">Premium</span>
                     </div>
                     <div class="d-flex align-items-center justify-content-between">
                         <div class="d-flex align-items-center flex-nowrap">
@@ -214,7 +217,8 @@ onMounted(async () => {
                                 </div>
                             </div>
                         </div>
-                        <span class="premium badge badge-primary">Premium</span>
+                        <span v-if="!userAuthenticated || !userPremium"
+                            class="premium badge badge-primary">Premium</span>
                     </div>
                     <div class="d-flex align-items-center justify-content-between">
                         <div class="d-flex align-items-center flex-nowrap">
@@ -241,7 +245,8 @@ onMounted(async () => {
                                 </div>
                             </div>
                         </div>
-                        <span class="premium badge badge-primary">Premium</span>
+                        <span v-if="!userAuthenticated || !userPremium"
+                            class="premium badge badge-primary">Premium</span>
                     </div>
                 </div>
             </div>
@@ -284,7 +289,8 @@ onMounted(async () => {
                                 </div>
                             </div>
                         </div>
-                        <span class="premium badge badge-primary">Premium</span>
+                        <span v-if="!userAuthenticated || !userPremium"
+                            class="premium badge badge-primary">Premium</span>
                     </div>
                 </div>
             </div>
@@ -300,7 +306,7 @@ onMounted(async () => {
                         </label>
                         <span class="ms-2 text-muted">(recommended)</span>
                     </div>
-                    <span class="premium badge badge-primary">Premium</span>
+                    <span v-if="!userAuthenticated || !userPremium" class="premium badge badge-primary">Premium</span>
                 </div>
             </div>
 
@@ -314,7 +320,8 @@ onMounted(async () => {
                         </label>
                     </div>
                     <div class="d-flex align-items-center flex-nowrap">
-                        <span class="premium badge badge-primary">Premium</span>
+                        <span v-if="!userAuthenticated || !userPremium"
+                            class="premium badge badge-primary">Premium</span>
                     </div>
                 </div>
                 <div class="indent">
@@ -335,7 +342,7 @@ onMounted(async () => {
                             </label>
                         </div>
                     </div>
-                    <span class="premium badge badge-primary">Premium</span>
+                    <span v-if="!userAuthenticated || !userPremium" class="premium badge badge-primary">Premium</span>
                 </div>
                 <div class="indent">
                     <small class="form-text text-muted">