diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue index 0c3cceb1b..cf3e5c8ac 100644 --- a/src/client/app/common/views/components/signin.vue +++ b/src/client/app/common/views/components/signin.vue @@ -12,13 +12,13 @@ {{ signing ? '%i18n:@signing-in%' : '%i18n:@signin%' }} -

%i18n:@or% %i18n:@signin-with-twitter%

+

%i18n:@or% %i18n:@signin-with-twitter%

diff --git a/src/client/app/config.ts b/src/client/app/config.ts index 04486ea23..76cd536a4 100644 --- a/src/client/app/config.ts +++ b/src/client/app/config.ts @@ -1,51 +1,22 @@ -declare const _HOST_: string; -declare const _HOSTNAME_: string; -declare const _URL_: string; -declare const _NAME_: string; -declare const _DESCRIPTION_: string; -declare const _API_URL_: string; -declare const _WS_URL_: string; -declare const _DOCS_URL_: string; -declare const _STATS_URL_: string; -declare const _STATUS_URL_: string; -declare const _DEV_URL_: string; -declare const _REPOSITORY_URL_: string; -declare const _FEEDBACK_URL_: string; declare const _LANG_: string; declare const _LANGS_: string; -declare const _RECAPTCHA_SITEKEY_: string; -declare const _SW_PUBLICKEY_: string; declare const _THEME_COLOR_: string; declare const _COPYRIGHT_: string; declare const _VERSION_: string; declare const _CODENAME_: string; declare const _LICENSE_: string; -declare const _GOOGLE_MAPS_API_KEY_: string; -declare const _WELCOME_BG_URL_: string; -declare const _TWITTER_INTEGRATION_: boolean; -export const host = _HOST_; -export const hostname = _HOSTNAME_; -export const url = _URL_; -export const name = _NAME_; -export const description = _DESCRIPTION_; -export const apiUrl = _API_URL_; -export const wsUrl = _WS_URL_; -export const docsUrl = _DOCS_URL_; -export const statsUrl = _STATS_URL_; -export const statusUrl = _STATUS_URL_; -export const devUrl = _DEV_URL_; -export const repositoryUrl = _REPOSITORY_URL_; -export const feedbackUrl = _FEEDBACK_URL_; +const address = new URL(location.href); + +export const host = address.host; +export const hostname = address.hostname; +export const url = address.origin; +export const apiUrl = url + '/api'; +export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://'); export const lang = _LANG_; export const langs = _LANGS_; -export const recaptchaSitekey = _RECAPTCHA_SITEKEY_; -export const swPublickey = _SW_PUBLICKEY_; export const themeColor = _THEME_COLOR_; export const copyright = _COPYRIGHT_; export const version = _VERSION_; export const codename = _CODENAME_; export const license = _LICENSE_; -export const googleMapsApiKey = _GOOGLE_MAPS_API_KEY_; -export const welcomeBgUrl = _WELCOME_BG_URL_; -export const twitterIntegration = _TWITTER_INTEGRATION_; diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index efb9db70f..a1c1207a7 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -193,7 +193,7 @@ export default Vue.extend({ clearNotification() { this.unreadCount = 0; - document.title = config.name; + document.title = (this as any).os.instanceName; }, onVisibilitychange() { diff --git a/src/client/app/desktop/views/pages/home-customize.vue b/src/client/app/desktop/views/pages/home-customize.vue index 4318e8982..174fbf45e 100644 --- a/src/client/app/desktop/views/pages/home-customize.vue +++ b/src/client/app/desktop/views/pages/home-customize.vue @@ -4,11 +4,10 @@ diff --git a/src/client/app/desktop/views/pages/home.vue b/src/client/app/desktop/views/pages/home.vue index 3d3c24bfa..c7ff0904e 100644 --- a/src/client/app/desktop/views/pages/home.vue +++ b/src/client/app/desktop/views/pages/home.vue @@ -7,7 +7,6 @@