starred/openobserve
1
0
Fork 0
mirror of https://github.com/openobserve/openobserve.git synced 2026-11-06 00:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Billing UI changes (#594)

Browse Source 
* fix: billing changes

* fix: ui changes for billing

* fix: ui changes for billing
This commit is contained in:
Bhargav
2023-04-19 10:30:46 +05:30
committed by GitHub
parent 2928fcf08f
commit e62ac76366
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/App.vue
+2 -1
View File
@@ -20,10 +20,11 @@
<script lang="ts">
import { useStore } from "vuex";
import { useRouter } from "vue-router";
import config from "@/aws-exports";
export default {
setup() {
const store = useStore();
if (window.location.origin != "http://localhost:8081") {
if (config.isZincObserveCloud == "false" && window.location.origin != "http://localhost:8081") {
let endpoint = window.location.origin + window.location.pathname;
let pos = window.location.pathname.indexOf("/web/");
if (pos > -1) {
web/src/constants/plans.ts
+3 -3
View File
@@ -39,9 +39,9 @@ const Plans = [
price: "$1000 or 10% of monthly spend, whichever is greater",
duration: "monthly",
included: {
rule1: "Developer Plan Features",
rule2: "Additional Ingestion ($0.50/GB)",
rule3: "Additional Query Volume ($5/GB)",
rule1: "Additional Ingestion ($0.50/GB)",
rule2: "Additional Query Volume ($5/TB)",
rule3: "",
},
basic: false,
pro: true,
web/src/enterprise/components/billings/planCard.vue
+4 -1
View File
@@ -76,6 +76,9 @@
<div class="text-body1 text-weight-bold q-mt-md">
{{ t("billing.whatIsIncluded") }}
</div>
<div class="text-body1 text-weight-bold q-mt-md" v-if="planData.type == 'pro'">
{{ t("billing.everythingDeveloperPlan") }}
</div>
<div class="q-mt-lg q-mb-xl">
<div class="q-mt-sm">
<q-icon name="check_circle" size="20px"
@@ -91,7 +94,7 @@
planData.included.rule2
}}</span>
</div>
<div class="q-mt-sm">
<div class="q-mt-sm" v-if="planData.included.rule3 != ''">
<q-icon name="check_circle" size="20px"
:color="cardColor" />
<span class="q-ml-sm text-body1 text-weight-redular">{{
web/src/locales/languages/en.json
+3 -2
View File
@@ -44,7 +44,7 @@
"alerts": "Alerts",
"openapi": "OpenAPI",
"docs": "Docs",
"billings": "Billings"
"billings": "Billing"
},
"about": {
"name": "ZincObserve",
@@ -349,7 +349,8 @@
"action": "Action",
"usage": "Usage",
"manageCards": "Manage Cards",
"subscriptionCheckout": "Subscription checkout"
"subscriptionCheckout": "Subscription checkout",
"everythingDeveloperPlan": "Everything in Developer Plan, plus:"
},
"message": {
"ServerInternalError": "Error: Something wrong went. Internal server error.",
web/src/stores/index.ts
+12 -8
View File
@@ -15,16 +15,20 @@
import { createStore } from "vuex";
import { useLocalOrganization, useLocalCurrentUser } from "../utils/zincutils";
const API_ENDPOINT =
import.meta.env.VITE_ZINCOBSERVE_CLOUD &&
import.meta.env.VITE_ZINCOBSERVE_CLOUD == "true"
? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT &&
import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.endsWith("/")
? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.slice(0, -1)
: import.meta.env.VITE_ZINCOBSERVE_ENDPOINT
: window.location.origin != "http://localhost:8081"
? window.location.origin
: "http://localhost:5080";
export default createStore({
state: {
API_ENDPOINT:
(import.meta.env.VITE_ZINCOBSERVE_ENDPOINT &&
import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.endsWith("/")
? import.meta.env.VITE_ZINCOBSERVE_ENDPOINT.slice(0, -1)
: import.meta.env.VITE_ZINCOBSERVE_ENDPOINT) ||
(window.location.origin != "http://localhost:8081"
? window.location.origin
: "http://localhost:5080"),
API_ENDPOINT: API_ENDPOINT,
userInfo: {},
loggedIn: false,
loadingState: true,