From 547f0f139ea07238db0006176546f7187856af80 Mon Sep 17 00:00:00 2001
From: Nikita Melnikov <nikmel2803@gmail.com>
Date: Sat, 23 Nov 2024 00:47:03 +0800
Subject: [PATCH 1/3] fix staging

---
 .github/workflows/build-and-push-docker-image.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml
index 8663f2cd..506ecf9a 100644
--- a/.github/workflows/build-and-push-docker-image.yml
+++ b/.github/workflows/build-and-push-docker-image.yml
@@ -16,10 +16,14 @@ jobs:
         if: endsWith(github.ref, '/stage')
         uses: SpicyPizza/create-envfile@v1
         with:
-          envkey_VUE_APP_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_STAGE }}
-          envkey_VUE_APP_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_STAGE }}
+          envkey_VUE_APP_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_PROD }}
+          envkey_VUE_APP_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_PROD }}
           envkey_VUE_APP_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_STAGE }}
-          envkey_VUE_APP_API_ENDPOINT: "https://api.stage.hawk.so"
+          envkey_VUE_APP_API_ENDPOINT: "https://api.hawk.so"
+          # envkey_VUE_APP_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_STAGE }}
+          # envkey_VUE_APP_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_STAGE }}
+          # envkey_VUE_APP_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_STAGE }}
+          # envkey_VUE_APP_API_ENDPOINT: "https://api.stage.hawk.so"
 
       - name: Make prod envfile
         if: endsWith(github.ref, '/prod')

From fd6b02894c06e7a1064af09c5dce548126287904 Mon Sep 17 00:00:00 2001
From: Tanya Fomina <fomina.tatianaaa@yandex.ru>
Date: Sun, 1 Dec 2024 14:06:25 +0300
Subject: [PATCH 2/3] Fix link

---
 src/components/aside/WorkspaceInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/aside/WorkspaceInfo.vue b/src/components/aside/WorkspaceInfo.vue
index 97869ff0..dfdd1dcc 100644
--- a/src/components/aside/WorkspaceInfo.vue
+++ b/src/components/aside/WorkspaceInfo.vue
@@ -29,7 +29,7 @@
       <router-link
         v-if="isAdmin"
         :to="{
-          name: 'workspace-settings-billing',
+          name: 'workspace-settings-used-volume',
           params: { workspaceId: workspace.id },
         }"
       >

From 8e65946ba40671a4ed9b6110461c9a1997fd7a93 Mon Sep 17 00:00:00 2001
From: Tanya Fomina <fomina.tatianaaa@yandex.ru>
Date: Sun, 1 Dec 2024 15:03:25 +0300
Subject: [PATCH 3/3] Fix plans layout

---
 .../modals/ChooseTariffPlanPopup.vue          | 14 ++++-
 src/components/utils/TariffPlan.vue           | 55 +++++++++++++++++--
 src/i18n/messages/en.json                     |  1 +
 src/i18n/messages/ru.json                     |  1 +
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/components/modals/ChooseTariffPlanPopup.vue b/src/components/modals/ChooseTariffPlanPopup.vue
index 5e0b18ff..b7279d1e 100644
--- a/src/components/modals/ChooseTariffPlanPopup.vue
+++ b/src/components/modals/ChooseTariffPlanPopup.vue
@@ -14,7 +14,11 @@
           class="choose-plan__description"
           v-html="$t('workspaces.chooseTariffPlanDialog.description', {featuresURL: '#'})"
         />
-        <div class="choose-plan__plans">
+
+        <div :class="{
+          'choose-plan__plans': true,
+          'choose-plan__plans--horizontal': plans.length > 3,
+        }">
           <TariffPlan
             v-for="plan in plans"
             :key="plan.id"
@@ -23,9 +27,12 @@
             :price="plan.monthlyCharge"
             :currency="plan.monthlyChargeCurrency"
             :selected="plan.id === selectedPlan.id"
+            :isCurrentPlan="plan.id === workspace.plan.id"
             @click.native="selectPlan(plan.id)"
+            :horizontal="plans.length > 3"
           />
         </div>
+
         <UiButton
           class="choose-plan__continue-button"
           :content="$t('common.continue')"
@@ -217,9 +224,12 @@ export default Vue.extend({
 
     &__plans {
       display: flex;
-      align-items: center;
       justify-content: space-between;
     }
+    
+    &__plans--horizontal {
+      flex-direction: column;
+    }
 
     &__continue-button {
       margin-top: 30px;
diff --git a/src/components/utils/TariffPlan.vue b/src/components/utils/TariffPlan.vue
index 442b049e..a9d9549b 100644
--- a/src/components/utils/TariffPlan.vue
+++ b/src/components/utils/TariffPlan.vue
@@ -1,7 +1,10 @@
 <template>
   <div
     class="tariff-plan"
-    :class="{'tariff-plan--selected': selected}"
+    :class="{
+      'tariff-plan--selected': selected,
+      'tariff-plan--horizontal': horizontal,
+    }"
   >
     <h4 class="tariff-plan__name">
       {{ name }}
@@ -13,12 +16,14 @@
       <div class="tariff-plan__price">
         {{ price === 0 ? $t('common.free') : `${$options.filters.spacedNumber(price)}${$tc('common.moneyPerMonth', currencySign, { currency: currencySign })}` }}
       </div>
+      
       <UiButton
         small
         submit
         rounded
-        :content="$t('common.select')"
+        :content="isCurrentPlan ? $t('common.selected') : $t('common.select')"
         class="tariff-plan__button"
+        :disabled="isCurrentPlan"
       />
     </div>
   </div>
@@ -55,17 +60,31 @@ export default {
       type: Number,
       required: true,
     },
+    /**
+     * Currency for price
+     */
     currency: {
       type: String,
       required: true
     },
     /**
-     * Is plan card selected
+     * Is plan selected
      */
     selected: {
       type: Boolean,
       default: false,
     },
+    /**
+     * True if horizontal view enabled
+     */
+    horizontal: {
+      type: Boolean,
+      default: false
+    },
+    isCurrentPlan: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     currencySign() {
@@ -92,6 +111,34 @@ export default {
       border: 3px solid var(--color-indicator-medium);
     }
 
+    &--horizontal {
+      height: auto;
+      width: auto;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      &:not(:last-of-type) {
+        margin-bottom: 10px;
+      }
+
+      .tariff-plan__name {
+        margin-bottom: 0;
+        width: 100px;
+      }
+      .tariff-plan__limit {
+        width: 300px;
+      }
+
+      .tariff-plan__footer {
+        margin-left: auto;
+      }
+
+      .tariff-plan__price {
+        margin-right: 20px
+      }
+    }
+
     &__name {
       margin: 0 0 10px;
       color: var(--color-text-main);
@@ -117,8 +164,6 @@ export default {
       align-items: center;
       justify-content: space-between;
       margin-top: auto;
-      /* align-self: flex-end; */
-      /* margin: 30px 0 0; */
     }
 
     &__price {
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
index 0ff94c01..14b3122e 100644
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -414,6 +414,7 @@
     "copiedNotification": "Copied!",
     "free": "FREE",
     "select": "Select",
+    "selected": "Selected",
     "continue": "Continue",
     "eventsPerMonth": "events / mo",
     "moneyPerMonth": "{currency} / mo",
diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json
index 8c40687c..66cfee3e 100644
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -414,6 +414,7 @@
     "copiedNotification": "Скопировано!",
     "free": "БЕСПЛАТНО",
     "select": "Выбрать",
+    "selected": "Выбрано",
     "continue": "Продолжить",
     "eventsPerMonth": "событий / мес",
     "moneyPerMonth": "{currency} / мес",