繋がるNotes
+ようこそ! MisskeyはTwitter風ミニブログSNSです――思ったこと、共有したいことをシンプルに書き残せます。タイムラインを見れば、皆の反応や皆がどう思っているのかもすぐにわかります。詳しく...
+ +diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 4ff2333e8..e91def521 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -38,7 +38,7 @@ export default class MiOS extends EventEmitter {
/**
* Whether signed in
*/
- public get isSignedin() {
+ public get isSignedIn() {
return this.i != null;
}
@@ -251,7 +251,7 @@ export default class MiOS extends EventEmitter {
if (!isSwSupported) return;
// Reject when not signed in to Misskey
- if (!this.isSignedin) return;
+ if (!this.isSignedIn) return;
// When service worker activated
navigator.serviceWorker.ready.then(registration => {
diff --git a/src/web/app/desktop/router.ts b/src/web/app/desktop/router.ts
index ce68c4f2d..6ba8bda12 100644
--- a/src/web/app/desktop/router.ts
+++ b/src/web/app/desktop/router.ts
@@ -23,7 +23,7 @@ export default (mios: MiOS) => {
route('*', notFound);
function index() {
- mios.isSignedin ? home() : entrance();
+ mios.isSignedIn ? home() : entrance();
}
function home() {
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
index 4aef69b07..e4e5f1914 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/web/app/desktop/script.ts
@@ -5,19 +5,17 @@
// Style
import './style.styl';
-import Vue from 'vue';
import init from '../init';
import fuckAdBlock from './scripts/fuck-ad-block';
-import MiOS from '../common/mios';
import HomeStreamManager from '../common/scripts/streaming/home-stream-manager';
import composeNotification from '../common/scripts/compose-notification';
-import MkIndex from './tags/pages/index.vue';
+import MkIndex from './views/pages/index.vue';
/**
* init
*/
-init(async (mios: MiOS, app: Vue) => {
+init(async (os, launch) => {
/**
* Fuck AD Block
*/
@@ -33,12 +31,17 @@ init(async (mios: MiOS, app: Vue) => {
}
if ((Notification as any).permission == 'granted') {
- registerNotifications(mios.stream);
+ registerNotifications(os.stream);
}
}
+ // Register components
+ require('./views/components');
+
+ const app = launch();
+
app.$router.addRoutes([{
- path: '/', component: MkIndex, props: { os: mios }
+ path: '/', component: MkIndex, props: { os }
}]);
}, true);
diff --git a/src/web/app/desktop/style.styl b/src/web/app/desktop/style.styl
index c893e2ed6..4d295035f 100644
--- a/src/web/app/desktop/style.styl
+++ b/src/web/app/desktop/style.styl
@@ -42,10 +42,10 @@
background rgba(0, 0, 0, 0.2)
html
+ height 100%
background #f7f7f7
- // ↓ workaround of https://github.com/riot/riot/issues/2134
- &[data-page='entrance']
- #wait
- right auto
- left 15px
+body
+ display flex
+ flex-direction column
+ min-height 100%
diff --git a/src/web/app/desktop/tags/pages/index.vue b/src/web/app/desktop/tags/pages/index.vue
deleted file mode 100644
index 6bd036fc2..000000000
--- a/src/web/app/desktop/tags/pages/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- ようこそ! MisskeyはTwitter風ミニブログSNSです――思ったこと、共有したいことをシンプルに書き残せます。タイムラインを見れば、皆の反応や皆がどう思っているのかもすぐにわかります。詳しく...hi
-
diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts
new file mode 100644
index 000000000..f628dee88
--- /dev/null
+++ b/src/web/app/desktop/views/components/index.ts
@@ -0,0 +1,5 @@
+import Vue from 'vue';
+
+import ui from './ui.vue';
+
+Vue.component('mk-ui', ui);
diff --git a/src/web/app/desktop/views/components/ui.vue b/src/web/app/desktop/views/components/ui.vue
new file mode 100644
index 000000000..34ac86f70
--- /dev/null
+++ b/src/web/app/desktop/views/components/ui.vue
@@ -0,0 +1,6 @@
+
+繋がるNotes
+