summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-08-22 09:31:35 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-08-22 09:31:35 +0900
commitdccc2c60e3e28bc2960d8e79a72ef91c9d53a271 (patch)
treeaa59d86d3c48018faf11dd9b4b8baf3412420cd2 /src
parentMerge branch 'master' of https://github.com/syuilo/misskey (diff)
downloadsharkey-dccc2c60e3e28bc2960d8e79a72ef91c9d53a271.tar.gz
sharkey-dccc2c60e3e28bc2960d8e79a72ef91c9d53a271.tar.bz2
sharkey-dccc2c60e3e28bc2960d8e79a72ef91c9d53a271.zip
Fix bugs
Closes #2367
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/nav.vue19
-rw-r--r--src/client/app/mobile/views/components/ui.nav.vue4
2 files changed, 13 insertions, 10 deletions
diff --git a/src/client/app/common/views/components/nav.vue b/src/client/app/common/views/components/nav.vue
index e25dbc78ca..1f745bf69d 100644
--- a/src/client/app/common/views/components/nav.vue
+++ b/src/client/app/common/views/components/nav.vue
@@ -6,7 +6,7 @@
<i>・</i>
<a :href="feedbackUrl" target="_blank">%i18n:@feedback%</a>
<i>・</i>
- <a :href="devUrl">%i18n:@develop%</a>
+ <a href="/dev">%i18n:@develop%</a>
<i>・</i>
<a href="https://twitter.com/misskey_xyz" target="_blank">Follow us on %fa:B twitter%</a>
</span>
@@ -14,18 +14,21 @@
<script lang="ts">
import Vue from 'vue';
-import { docsUrl, statsUrl, statusUrl, devUrl, repositoryUrl, feedbackUrl, lang } from '../../../config';
+import { lang } from '../../../config';
export default Vue.extend({
data() {
return {
- aboutUrl: `${docsUrl}/${lang}/about`,
- statsUrl,
- statusUrl,
- devUrl,
- repositoryUrl: repositoryUrl || `https://github.com/syuilo/misskey`,
- feedbackUrl: feedbackUrl || `https://github.com/syuilo/misskey/issues/new`
+ aboutUrl: `/docs/${lang}/about`,
+ repositoryUrl: 'https://github.com/syuilo/misskey',
+ feedbackUrl: 'https://github.com/syuilo/misskey/issues/new'
}
+ },
+ created() {
+ (this as any).os.getMeta().then(meta => {
+ if (meta.repositoryUrl) this.repositoryUrl = meta.repositoryUrl;
+ if (meta.feedbackUrl) this.feedbackUrl = meta.feedbackUrl;
+ });
}
});
</script>
diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue
index 5257dafd0e..74564a48bb 100644
--- a/src/client/app/mobile/views/components/ui.nav.vue
+++ b/src/client/app/mobile/views/components/ui.nav.vue
@@ -41,7 +41,7 @@
<script lang="ts">
import Vue from 'vue';
-import { docsUrl, lang } from '../../../config';
+import { lang } from '../../../config';
export default Vue.extend({
props: ['isOpen'],
@@ -50,7 +50,7 @@ export default Vue.extend({
hasGameInvitation: false,
connection: null,
connectionId: null,
- aboutUrl: `${docsUrl}/${lang}/about`
+ aboutUrl: `/docs/${lang}/about`
};
},
computed: {