Skip to content

Commit

Permalink
Merge pull request #2 from beclab/origin/fix/link
Browse files Browse the repository at this point in the history
fix: update links and CheckVault add tip
  • Loading branch information
wushuangs authored May 15, 2024
2 parents a0ec706 + 2dec116 commit 0c57239
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 12 deletions.
13 changes: 10 additions & 3 deletions packages/frontend/src/css/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,10 @@
margin-top: 8px;
font-size: 12px;

span {
a {
color: #3377ff;
cursor: pointer;
text-decoration: none;
}
}

Expand Down Expand Up @@ -376,6 +377,12 @@
}
}

.active-tip {
border-radius: 8px;
background: #F6F6F6;
font-size: 10px;
}

.State_text {
font-family: 'Roboto';
font-style: normal;
Expand Down Expand Up @@ -403,7 +410,7 @@
.qrcode_scanning {
display: flex;
justify-content: center;
margin-top: multiple(32px, $multiple-num);
margin-top: multiple(20px, $multiple-num);

.qrcode_image_itme {
padding: multiple(0px, $multiple-num) multiple(0px, $multiple-num) !important;
Expand Down Expand Up @@ -660,4 +667,4 @@

@media screen and (min-width: 980px) and (max-width: 1679px) {
@include installation-boot-whole(1);
}
}
7 changes: 6 additions & 1 deletion packages/frontend/src/pages/step/Step1Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
/>
<p class="failFlag" v-if="failFlag">
{{ t(failInfo.message) }}
<span v-if="failInfo.showLink">{{ t('err_learn_more') }}.</span>
<a
v-if="failInfo.showLink"
href="https://docs.jointerminus.com/how-to/terminus/setup/wizard.html#enter-password"
target="_blank"
>{{ t('err_learn_more') }}.</a
>
</p>
</div>
</div>
Expand Down
7 changes: 6 additions & 1 deletion packages/frontend/src/pages/step/Step3Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
<p class="get-text">{{ t('step_select_proxy') }}</p>
<p class="account_please_text">
{{ t('step_proxy_text_1') }}<br />
{{ t('step_proxy_text_2') }} <a>{{ t('step_proxy_text_3') }}</a>
{{ t('step_proxy_text_2') }}
<a
href="https://docs.jointerminus.com/overview/terminus/network.html#setup-reverse-proxy"
target="_blank"
>{{ t('step_proxy_text_3') }}</a
>
</p>
<div class="Account_input_from">
<p>{{ t('step_select_region') }}</p>
Expand Down
26 changes: 19 additions & 7 deletions packages/frontend/src/pages/step/status/CheckVault.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="row justify-evenly account_box">
<div class="q-pa-md;wrap account_conter" style="word-wrap: break-word">
<div class="q-pa-md wrap account_conter" style="word-wrap: break-word">
<div class="boot_justify">
<animationPage
:picture="wizard_system"
Expand All @@ -15,12 +15,15 @@
<span @click="openTip">{{ t('err_learn_more') }}</span
><br />
</p>
<p
v-if="tokenStore.user.selfhosted"
class="account_please_text please_text"

<div
class="active-tip row items-center justify-center text-grey-8 q-px-sm q-py-xs q-mt-md"
v-if="isAdminAccount"
>
{{ t('vault_content_2') }}
</p>
<q-icon class="q-mr-sm" name="sym_r_error" />
<span>{{ t('vault_content_2') }}</span>
</div>

<div class="qrcode_scanning">
<div class="qrcode_scanning_itme">
<qrcode-vue :value="url" class="qrcode_img" level="L"></qrcode-vue>
Expand All @@ -31,7 +34,7 @@
</template>

<script lang="ts">
import { defineComponent, ref } from 'vue';
import { defineComponent, ref, computed } from 'vue';
import { useQuasar } from 'quasar';
import { useI18n } from 'vue-i18n';
import QrcodeVue from 'qrcode.vue';
Expand All @@ -56,6 +59,14 @@ export default defineComponent({
tokenStore.wizard.url = base_url;
const isAdminAccount = computed(() => {
const origin = window.location.origin;
if (tokenStore.user.selfhosted && origin.indexOf('30180') > -1) {
return true;
}
return false;
});
const url = ref<string>(
'active_vault://' +
Encoder.stringToBase64Url(JSON.stringify(tokenStore.wizard))
Expand Down Expand Up @@ -84,6 +95,7 @@ export default defineComponent({
openTip,
wizard_systema,
wizard_system,
isAdminAccount,
t
};
}
Expand Down

0 comments on commit 0c57239

Please sign in to comment.