summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxps2 <9610872+xps2@users.noreply.github.com>2018-07-07 21:08:22 +0900
committerxps2 <9610872+xps2@users.noreply.github.com>2018-07-07 21:08:22 +0900
commita7e27c24194b21637088971f8167952b652190c9 (patch)
treebc425abce72a56342c482fdcd5711ff064cf3068
parent:v: (diff)
downloadsharkey-a7e27c24194b21637088971f8167952b652190c9.tar.gz
sharkey-a7e27c24194b21637088971f8167952b652190c9.tar.bz2
sharkey-a7e27c24194b21637088971f8167952b652190c9.zip
リポジトリとフィードバックのURLをconfigから指定できるように変更
-rw-r--r--.config/example.yml6
-rw-r--r--src/client/app/common/views/components/nav.vue10
-rw-r--r--src/client/app/config.ts4
-rw-r--r--src/config/types.ts2
-rw-r--r--webpack.config.ts2
5 files changed, 20 insertions, 4 deletions
diff --git a/.config/example.yml b/.config/example.yml
index 427377a694..98dcd29c28 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -12,6 +12,12 @@ maintainer:
# メンテナの連絡先(URLかmailto形式のURL)
url:
+ # レポジトリのURL
+ repository_url:
+
+ # フィードバックのURL(issueなど)
+ feedback_url:
+
# (Misskeyを動かす)URL
url:
diff --git a/src/client/app/common/views/components/nav.vue b/src/client/app/common/views/components/nav.vue
index cd1f99288a..e25dbc78ca 100644
--- a/src/client/app/common/views/components/nav.vue
+++ b/src/client/app/common/views/components/nav.vue
@@ -2,9 +2,9 @@
<span class="mk-nav">
<a :href="aboutUrl">%i18n:@about%</a>
<i>・</i>
- <a href="https://github.com/syuilo/misskey">%i18n:@repository%</a>
+ <a :href="repositoryUrl">%i18n:@repository%</a>
<i>・</i>
- <a href="https://github.com/syuilo/misskey/issues/new" target="_blank">%i18n:@feedback%</a>
+ <a :href="feedbackUrl" target="_blank">%i18n:@feedback%</a>
<i>・</i>
<a :href="devUrl">%i18n:@develop%</a>
<i>・</i>
@@ -14,7 +14,7 @@
<script lang="ts">
import Vue from 'vue';
-import { docsUrl, statsUrl, statusUrl, devUrl, lang } from '../../../config';
+import { docsUrl, statsUrl, statusUrl, devUrl, repositoryUrl, feedbackUrl, lang } from '../../../config';
export default Vue.extend({
data() {
@@ -22,7 +22,9 @@ export default Vue.extend({
aboutUrl: `${docsUrl}/${lang}/about`,
statsUrl,
statusUrl,
- devUrl
+ devUrl,
+ repositoryUrl: repositoryUrl || `https://github.com/syuilo/misskey`,
+ feedbackUrl: feedbackUrl || `https://github.com/syuilo/misskey/issues/new`
}
}
});
diff --git a/src/client/app/config.ts b/src/client/app/config.ts
index c6efe26cd5..ceee0a2d62 100644
--- a/src/client/app/config.ts
+++ b/src/client/app/config.ts
@@ -9,6 +9,8 @@ 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;
@@ -32,6 +34,8 @@ 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_;
export const lang = _LANG_;
export const langs = _LANGS_;
export const recaptchaSitekey = _RECAPTCHA_SITEKEY_;
diff --git a/src/config/types.ts b/src/config/types.ts
index b0776fd9c1..28eaa50346 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -14,6 +14,8 @@ export type Source = {
* メンテナの連絡先(URLかmailto形式のURL)
*/
url: string;
+ repository_url?: string;
+ feedback_url?: string;
};
name?: string;
description?: string;
diff --git a/webpack.config.ts b/webpack.config.ts
index 1e49043764..103b423ecb 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -84,6 +84,8 @@ const consts = {
_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,