From c9de5b65d4d234899725ba2c7f884041bd3d463b Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 19 Aug 2018 19:15:29 +0900 Subject: [PATCH] wip --- .../app/common/views/components/signup.vue | 23 +++++----- src/client/app/config.ts | 43 +++---------------- src/server/api/endpoints/meta.ts | 7 ++- webpack.config.ts | 23 +--------- 4 files changed, 24 insertions(+), 72 deletions(-) diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue index 1d3370215..810b85083 100644 --- a/src/client/app/common/views/components/signup.vue +++ b/src/client/app/common/views/components/signup.vue @@ -34,7 +34,7 @@

%fa:exclamation-triangle .fw% %i18n:@password-not-matched%

-
+
%i18n:@create% @@ -42,7 +42,7 @@ 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/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 000a56024..505ff6006 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -20,6 +20,9 @@ export default () => new Promise(async (res, rej) => { version: pkg.version, clientVersion: client.version, + name: config.name || 'Misskey', + description: config.description, + secure: config.https != null, machine: os.hostname(), os: os.platform(), @@ -29,6 +32,8 @@ export default () => new Promise(async (res, rej) => { cores: os.cpus().length }, broadcasts: meta.broadcasts, - disableRegistration: meta.disableRegistration + disableRegistration: meta.disableRegistration, + recaptchaSitekey: config.recaptcha.site_key, + swPublickey: config.sw.public_key }); }); diff --git a/webpack.config.ts b/webpack.config.ts index 8dca4c0ee..4c6da768d 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -16,7 +16,6 @@ import I18nReplacer from './src/misc/i18n'; import { pattern as i18nPattern, replacement as i18nReplacement } from './webpack/i18n'; import { pattern as faPattern, replacement as faReplacement } from './src/misc/fa'; const constants = require('./src/const.json'); -import config from './src/config'; import { licenseHtml } from './src/misc/license'; const locales = require('./locales'); @@ -58,8 +57,6 @@ const isProduction = process.env.NODE_ENV == 'production'; const entry = { desktop: './src/client/app/desktop/script.ts', mobile: './src/client/app/mobile/script.ts', - //stats: './src/client/app/stats/script.ts', - //status: './src/client/app/status/script.ts', dev: './src/client/app/dev/script.ts', auth: './src/client/app/auth/script.ts', sw: './src/client/app/sw.js' @@ -72,31 +69,13 @@ const output = { //#region Define consts const consts = { - _RECAPTCHA_SITEKEY_: config.recaptcha ? config.recaptcha.site_key : null, - _SW_PUBLICKEY_: config.sw ? config.sw.public_key : null, _THEME_COLOR_: constants.themeColor, _COPYRIGHT_: constants.copyright, _VERSION_: version, _CODENAME_: codename, - _STATUS_URL_: config.status_url, - _STATS_URL_: config.stats_url, - _DOCS_URL_: config.docs_url, - _API_URL_: config.api_url, - _WS_URL_: config.ws_url, - _DEV_URL_: config.dev_url, - _REPOSITORY_URL_: config.maintainer.repository_url, - _FEEDBACK_URL_: config.maintainer.feedback_url, _LANG_: '%lang%', _LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]), - _NAME_: config.name, - _DESCRIPTION_: config.description, - _HOST_: config.host, - _HOSTNAME_: config.hostname, - _URL_: config.url, - _LICENSE_: licenseHtml, - _GOOGLE_MAPS_API_KEY_: config.google_maps_api_key, - _WELCOME_BG_URL_: config.welcome_bg_url, - _TWITTER_INTEGRATION_: config.twitter != null + _LICENSE_: licenseHtml }; const _consts: { [ key: string ]: any } = {};