laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1859 from xps2/repurl

Browse Source 
リポジトリとフィードバックのURLをconfigから指定できるように変更
This commit is contained in:
syuilo 2018-07-07 21:17:29 +09:00 committed by GitHub
commit e85ac32c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.config/example.yml
View File

@ -12,6 +12,12 @@ maintainer:
# メンテナの連絡先(URLかmailto形式のURL) # メンテナの連絡先(URLかmailto形式のURL)
url: url:
# レポジトリのURL
repository_url:
# フィードバックのURL(issueなど)
feedback_url:
# (Misskeyを動かす)URL # (Misskeyを動かす)URL
url: url:

10
src/client/app/common/views/components/nav.vue
View File

@ -2,9 +2,9 @@
<span class="mk-nav"> <span class="mk-nav">
<a :href="aboutUrl">%i18n:@about%</a> <a :href="aboutUrl">%i18n:@about%</a>
<i>・</i> <i>・</i>
<a href="https://github.com/syuilo/misskey">%i18n:@repository%</a> <a :href="repositoryUrl">%i18n:@repository%</a>
<i>・</i> <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> <i>・</i>
<a :href="devUrl">%i18n:@develop%</a> <a :href="devUrl">%i18n:@develop%</a>
<i>・</i> <i>・</i>
@ -14,7 +14,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; 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({ export default Vue.extend({
data() { data() {
@ -22,7 +22,9 @@ export default Vue.extend({
aboutUrl: `${docsUrl}/${lang}/about`, aboutUrl: `${docsUrl}/${lang}/about`,
statsUrl, statsUrl,
statusUrl, statusUrl,
devUrl devUrl,
repositoryUrl: repositoryUrl || `https://github.com/syuilo/misskey`,
feedbackUrl: feedbackUrl || `https://github.com/syuilo/misskey/issues/new`
} }
} }
}); });

4
src/client/app/config.ts
View File

@ -9,6 +9,8 @@ declare const _DOCS_URL_: string;
declare const _STATS_URL_: string; declare const _STATS_URL_: string;
declare const _STATUS_URL_: string; declare const _STATUS_URL_: string;
declare const _DEV_URL_: string; declare const _DEV_URL_: string;
declare const _REPOSITORY_URL_: string;
declare const _FEEDBACK_URL_: string;
declare const _LANG_: string; declare const _LANG_: string;
declare const _LANGS_: string; declare const _LANGS_: string;
declare const _RECAPTCHA_SITEKEY_: string; declare const _RECAPTCHA_SITEKEY_: string;
@ -32,6 +34,8 @@ export const docsUrl = _DOCS_URL_;
export const statsUrl = _STATS_URL_; export const statsUrl = _STATS_URL_;
export const statusUrl = _STATUS_URL_; export const statusUrl = _STATUS_URL_;
export const devUrl = _DEV_URL_; export const devUrl = _DEV_URL_;
export const repositoryUrl = _REPOSITORY_URL_;
export const feedbackUrl = _FEEDBACK_URL_;
export const lang = _LANG_; export const lang = _LANG_;
export const langs = _LANGS_; export const langs = _LANGS_;
export const recaptchaSitekey = _RECAPTCHA_SITEKEY_; export const recaptchaSitekey = _RECAPTCHA_SITEKEY_;

2
src/config/types.ts
View File

@ -14,6 +14,8 @@ export type Source = {
* メンテナの連絡先(URLかmailto形式のURL) * メンテナの連絡先(URLかmailto形式のURL)
*/ */
url: string; url: string;
repository_url?: string;
feedback_url?: string;
}; };
name?: string; name?: string;
description?: string; description?: string;

2
webpack.config.ts
View File

@ -84,6 +84,8 @@ const consts = {
_API_URL_: config.api_url, _API_URL_: config.api_url,
_WS_URL_: config.ws_url, _WS_URL_: config.ws_url,
_DEV_URL_: config.dev_url, _DEV_URL_: config.dev_url,
_REPOSITORY_URL_: config.maintainer.repository_url,
_FEEDBACK_URL_: config.maintainer.feedback_url,
_LANG_: '%lang%', _LANG_: '%lang%',
_LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]), _LANGS_: Object.keys(locales).map(l => [l, locales[l].meta.lang]),
_NAME_: config.name, _NAME_: config.name,