Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update APP_SERVICE_CLOUD_URL to SPACE_URL #55

Merged
merged 1 commit into from
Nov 13, 2024
Merged

feat: update APP_SERVICE_CLOUD_URL to SPACE_URL #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/frontend/src/i18n/en-US/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export default {
'To use an NFT image as your exclusive avatar in your Profile, you need to bind a blockchain wallet',
import: 'Import',
you_need_to_bind_a_blockchain_wallet_to_obtain_the_corresponding_nft_image_message_more:
'"To use an NFT image as your exclusive avatar in your Profile, you need to bind a blockchain wallet. To get the NFT image:\\n1. Install the MetaMask plugin from Chrome App Store to create or import your blockchain wallet. \\n2. Click the button above to import the wallet.\\n3. Bind the wallet to your Olares ID as instructed."',
'To use an NFT image as your exclusive avatar in your Profile, you need to bind a blockchain wallet. To get the NFT image:<br>1. Install the MetaMask plugin from Chrome App Store to create or import your blockchain wallet. <br>2. Click the button above to import the wallet.\\n3. Bind the wallet to your Olares ID as instructed.',
login_and_bind_your_olares_space_account:
'Log in and bind your Olares Space account',
account: 'Account',
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/i18n/zh-CN/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ export default {
'若要使用 NFT 图片作为个人主页的专属头像，您需要绑定区块链钱包',
import: '导入',
you_need_to_bind_a_blockchain_wallet_to_obtain_the_corresponding_nft_image_message_more:
'" 1. 从 Chrome 应用商店安装 MetaMask 插件，创建或导入您的区块链钱包。\\n 2. 点击上方按钮导入钱包。\\n 3. 按照界面提示，将钱包绑定到您的 Olares ID。"',
'1. 从 Chrome 应用商店安装 MetaMask 插件，创建或导入您的区块链钱包。\\n 2. 点击上方按钮导入钱包。\\n 3. 按照界面提示，将钱包绑定到您的 Olares ID。',
login_and_bind_your_olares_space_account: '登录并绑定 Olares Space 账号',
account: '账户',
password: '密码',
Expand Down
41 changes: 25 additions & 16 deletions packages/frontend/src/pages/Integration/AccountDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<bt-scroll-area class="nav-height-scroll-area-conf">
<div class="mode-title-class q-mt-lg">{{ t('binding_info') }}</div>

<q-list class="q-list-class" v-if="load">
<q-item style="padding: 0">
<bt-list v-if="load">
<q-item style="padding: 0" class="item-margin-left q-my-sm">
<div class="terminus-info row items-center justify-between">
<div class="row items-center">
<setting-avatar :size="40" style="margin-left: 8px" />
Expand All @@ -32,7 +32,10 @@
</div>
</div>
</div>
<div class="row items-center" v-if="!bindTerminusName">
<div
class="row items-center item-margin-right"
v-if="!bindTerminusName"
>
<q-btn
dense
class="confirm-btn bound-btn"
Expand All @@ -43,7 +46,7 @@
</div>
<div
v-else
class="row items-center justify-end"
class="row items-center justify-end item-margin-right"
@click="unbindName(bindTerminusName.id)"
>
<div class="unbound-bg row items-center justify-center">
Expand All @@ -56,9 +59,9 @@
</div>
</div>
</q-item>
<bt-separator class="q-mt-sm" />
<bt-separator />
<q-item
class="text-body3 reminder-info row items-center"
class="text-body3 reminder-info row items-center item-margin-left item-margin-right"
v-if="!bindTerminusName"
>
{{
Expand All @@ -67,7 +70,10 @@
)
}}
</q-item>
<q-item v-else class="metamask-info q-mt-md">
<q-item
v-else
class="metamask-info q-my-md item-margin-left item-margin-right"
>
<div
class="metamask-info__content row items-center justify-between"
>
Expand All @@ -77,7 +83,7 @@
blockChainStore.account &&
blockChainStoreAddressAuthed
? 120
: 60
: 120
}px);`"
>
<q-img
Expand Down Expand Up @@ -173,20 +179,22 @@
"
/>
<q-item
class="text-body3 reminder-info row items-center q-mt-md"
class="text-body3 reminder-info q-my-md row items-center item-margin-left item-margin-right"
v-if="
bindTerminusName &&
blockChainStore.account &&
!blockChainStoreAddressAuthed
"
>
{{
t(
'you_need_to_bind_a_blockchain_wallet_to_obtain_the_corresponding_nft_image_message_more'
)
}}
<div
v-html="
t(
'you_need_to_bind_a_blockchain_wallet_to_obtain_the_corresponding_nft_image_message_more'
)
"
></div>
</q-item>
</q-list>
</bt-list>
<div
v-else
class="row items-center justify-center"
Expand All @@ -213,6 +221,7 @@ import AccountConnectStatus from '../../components/account/AccountConnectStatus.
import AccountRequestSignDialog from '../../components/account/AccountRequestSignDialog.vue';
import { notifyFailed, notifyWarning } from '../../utils/btNotify';
import BtSeparator from '../../components/base/BtSeparator.vue';
import BtList from '../../components/base/BtList.vue';

import { useI18n } from 'vue-i18n';
const { t } = useI18n();
Expand Down Expand Up @@ -504,7 +513,7 @@ const onRemoveSign = async () => {

.metamask-info {
padding: 0;
width: 100%;
width: calc(100% - 40px);

&__content {
width: 100%;
Expand Down
5 changes: 0 additions & 5 deletions packages/server/src/bfl/network.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,20 +137,15 @@ export class NetworkPolicyController {
this.logger.debug(data.data);
return data.data;
} catch (e) {
this.logger.debug('set reverse-proxy result error ===>', e);
return returnError(1, e.message || '');
}
}
@Get('/frp-servers')
async getFrpServers() {
try {
this.logger.debug('get frp-servers');
this.logger.debug('FRP_LIST_URL ====>', FRP_LIST_URL);
const olaresTunnels: any = await axios.get(FRP_LIST_URL + '/servers');
this.logger.debug('get frp-servers result ===>', olaresTunnels.data);
return returnSucceed(olaresTunnels.data);
} catch (e) {
this.logger.debug('frp-servers error ===>', e);
return returnError(1, e.message || '');
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/cloud.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class CloudController {
private verifyingContract =
process.env.APP_SERVICE_VERIFYING_CONTRACT ||
'0xe2eaba0979277a90511f8873ae1e8ca26b54e740';
private cloudUrl = process.env.APP_SERVICE_CLOUD_URL || Cloud_URL;
private cloudUrl = process.env.SPACE_URL || Cloud_URL;

constructor(
private secretService: SecretService,
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/init.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class InitService implements OnModuleInit {
// devVersion: OSVersion | null = null;
// noDevVersion: OSVersion | null = null;

private cloudUrl = process.env.APP_SERVICE_CLOUD_URL || Cloud_URL;
private cloudUrl = process.env.SPACE_URL || Cloud_URL;

constructor(private secretService: SecretService) {
//
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export class DropboxAccount extends IntegrationAccount {
export class SpaceAccount extends IntegrationAccount {
type = AccountType.Space;

private cloudUrl = process.env.APP_SERVICE_CLOUD_URL || Cloud_URL;
private cloudUrl = process.env.SPACE_URL || Cloud_URL;

async refresh() {
const data = this.raw_data as SpaceAccountData;
Expand Down
Loading