+
+
+ {{ $t('@.customization-tips.title') }}
+
+
+
+
+
+
+
+
+
+
+ 
+
+### Explore users
+
+
:new: What's new
----------------------------------------------------------------
Please see the [Release notes](./CHANGELOG.md).
@@ -94,19 +102,17 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
| weep | -negao | +naga_rus | Melilot | 見当かなみ | Xeltica | -べすれい | gutfuckllc |
| Takumi Sugita | nemu | YUKIMOCHI | +Sampot | Damillora | Acid Chicken | natalie | @@ -142,7 +150,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).Takashi Shibuya |
npm i web-push -g
web-push generate-vapid-keysCode: {{ inviteCode }}
+ {{ $t('@.home') }}
{{ $t('dark') }}
@@ -97,12 +96,14 @@ import MkFollowRequestsWindow from './received-follow-requests-window.vue';
import MkSettingsWindow from './settings-window.vue';
import MkDriveWindow from './drive-window.vue';
import contains from '../../../common/scripts/contains';
+import { faHome, faColumns } from '@fortawesome/free-solid-svg-icons';
export default Vue.extend({
i18n: i18n('desktop/views/components/ui.header.account.vue'),
data() {
return {
- isOpen: false
+ isOpen: false,
+ faHome, faColumns
};
},
computed: {
@@ -161,7 +162,11 @@ export default Vue.extend({
key: 'darkmode',
value: !this.$store.state.device.darkmode
});
- }
+ },
+ toggleDeckMode() {
+ this.$store.commit('device/set', { key: 'deckMode', value: !this.$store.state.device.inDeckMode });
+ location.replace('/');
+ },
}
});
diff --git a/src/client/app/desktop/views/components/ui.header.messaging.vue b/src/client/app/desktop/views/components/ui.header.messaging.vue
new file mode 100644
index 000000000..fc41144d1
--- /dev/null
+++ b/src/client/app/desktop/views/components/ui.header.messaging.vue
@@ -0,0 +1,68 @@
+
+
@@ -27,8 +26,8 @@
{{ $t('add-widget') }} {{ $t('@.trash') }}
- {{ $t('@.empty-timeline-info.follow-users-to-make-your-timeline') }} @{{ friend | acct }} {{ $t('no-description') }} {{ $t('no-photos') }} {{ $t('no-photos') }} {{ $t('not-available') }} {{ $t('follows-you') }} {{ $t('nothing') }} @{{ $store.state.i | acct }} {{ $t('nothing') }} {{ $t('no-one') }}
+
+
+
+
+
+
+
diff --git a/src/client/app/desktop/views/components/ui.header.nav.vue b/src/client/app/desktop/views/components/ui.header.nav.vue
index 8e78829de..2bd3cf877 100644
--- a/src/client/app/desktop/views/components/ui.header.nav.vue
+++ b/src/client/app/desktop/views/components/ui.header.nav.vue
@@ -1,38 +1,22 @@
@@ -40,22 +24,18 @@
-
-
diff --git a/src/client/app/desktop/views/components/user-list-timeline.vue b/src/client/app/desktop/views/components/user-list-timeline.vue
index 8afd95a68..6fc75d73f 100644
--- a/src/client/app/desktop/views/components/user-list-timeline.vue
+++ b/src/client/app/desktop/views/components/user-list-timeline.vue
@@ -1,6 +1,10 @@
-
@@ -13,10 +17,28 @@ export default Vue.extend({
props: ['list'],
data() {
return {
- fetching: true,
- moreFetching: false,
- existMore: false,
- connection: null
+ connection: null,
+ makePromise: cursor => this.$root.api('notes/user-list-timeline', {
+ listId: this.list.id,
+ limit: fetchLimit + 1,
+ untilId: cursor ? cursor : undefined,
+ includeMyRenotes: this.$store.state.settings.showMyRenotes,
+ includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
+ includeLocalRenotes: this.$store.state.settings.showLocalRenotes
+ }).then(notes => {
+ if (notes.length == fetchLimit + 1) {
+ notes.pop();
+ return {
+ notes: notes,
+ cursor: notes[notes.length - 1].id
+ };
+ } else {
+ return {
+ notes: notes,
+ cursor: null
+ };
+ }
+ })
};
},
watch: {
@@ -37,63 +59,15 @@ export default Vue.extend({
this.connection.on('note', this.onNote);
this.connection.on('userAdded', this.onUserAdded);
this.connection.on('userRemoved', this.onUserRemoved);
-
- this.fetch();
- },
- fetch() {
- this.fetching = true;
-
- (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
- this.$root.api('notes/user-list-timeline', {
- listId: this.list.id,
- limit: fetchLimit + 1,
- includeMyRenotes: this.$store.state.settings.showMyRenotes,
- includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
- includeLocalRenotes: this.$store.state.settings.showLocalRenotes
- }).then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- this.existMore = true;
- }
- res(notes);
- this.fetching = false;
- this.$emit('loaded');
- }, rej);
- }));
- },
- more() {
- this.moreFetching = true;
-
- const promise = this.$root.api('notes/user-list-timeline', {
- listId: this.list.id,
- limit: fetchLimit + 1,
- untilId: (this.$refs.timeline as any).tail().id,
- includeMyRenotes: this.$store.state.settings.showMyRenotes,
- includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
- includeLocalRenotes: this.$store.state.settings.showLocalRenotes
- });
-
- promise.then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- } else {
- this.existMore = false;
- }
- for (const n of notes) (this.$refs.timeline as any).append(n);
- this.moreFetching = false;
- });
-
- return promise;
},
onNote(note) {
- // Prepend a note
(this.$refs.timeline as any).prepend(note);
},
onUserAdded() {
- this.fetch();
+ (this.$refs.timeline as any).reload();
},
onUserRemoved() {
- this.fetch();
+ (this.$refs.timeline as any).reload();
}
}
});
diff --git a/src/client/app/desktop/views/components/user-list-window.vue b/src/client/app/desktop/views/components/user-list-window.vue
index 054a133a4..afece9fe8 100644
--- a/src/client/app/desktop/views/components/user-list-window.vue
+++ b/src/client/app/desktop/views/components/user-list-window.vue
@@ -1,6 +1,6 @@
diff --git a/src/client/app/desktop/views/components/widget-container.vue b/src/client/app/desktop/views/components/widget-container.vue
deleted file mode 100644
index 13a460c92..000000000
--- a/src/client/app/desktop/views/components/widget-container.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/client/app/desktop/views/pages/deck/deck.column-core.vue b/src/client/app/desktop/views/deck/deck.column-core.vue
similarity index 100%
rename from src/client/app/desktop/views/pages/deck/deck.column-core.vue
rename to src/client/app/desktop/views/deck/deck.column-core.vue
diff --git a/src/client/app/desktop/views/pages/deck/deck.column.vue b/src/client/app/desktop/views/deck/deck.column.vue
similarity index 96%
rename from src/client/app/desktop/views/pages/deck/deck.column.vue
rename to src/client/app/desktop/views/deck/deck.column.vue
index 2acd2d0ed..52bd8732b 100644
--- a/src/client/app/desktop/views/pages/deck/deck.column.vue
+++ b/src/client/app/desktop/views/deck/deck.column.vue
@@ -14,7 +14,7 @@
+
+
+
+
+
+
+
+
+
@@ -18,10 +18,10 @@
diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/deck/deck.notes.vue
similarity index 77%
rename from src/client/app/desktop/views/pages/deck/deck.notes.vue
rename to src/client/app/desktop/views/deck/deck.notes.vue
index 54e01a001..810addd50 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/deck/deck.notes.vue
@@ -1,6 +1,8 @@
@@ -21,20 +17,17 @@
diff --git a/src/client/app/desktop/views/home/home.vue b/src/client/app/desktop/views/home/home.vue
new file mode 100644
index 000000000..9897cb82e
--- /dev/null
+++ b/src/client/app/desktop/views/home/home.vue
@@ -0,0 +1,404 @@
+
+
-
{{ $t('@.no-notes') }}
+
+
@@ -8,8 +10,6 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/client/app/desktop/views/home/search.vue b/src/client/app/desktop/views/home/search.vue
new file mode 100644
index 000000000..1632e730d
--- /dev/null
+++ b/src/client/app/desktop/views/home/search.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
diff --git a/src/client/app/desktop/views/home/tag.vue b/src/client/app/desktop/views/home/tag.vue
new file mode 100644
index 000000000..4f9bc66e7
--- /dev/null
+++ b/src/client/app/desktop/views/home/tag.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
diff --git a/src/client/app/desktop/views/components/timeline.core.vue b/src/client/app/desktop/views/home/timeline.core.vue
similarity index 60%
rename from src/client/app/desktop/views/components/timeline.core.vue
rename to src/client/app/desktop/views/home/timeline.core.vue
index 63bc20dc2..e306ac873 100644
--- a/src/client/app/desktop/views/components/timeline.core.vue
+++ b/src/client/app/desktop/views/home/timeline.core.vue
@@ -1,11 +1,13 @@
-
-
+
@@ -18,6 +20,7 @@ const fetchLimit = 10;
export default Vue.extend({
i18n: i18n('desktop/views/components/timeline.core.vue'),
+
props: {
src: {
type: String,
@@ -30,9 +33,6 @@ export default Vue.extend({
data() {
return {
- fetching: true,
- moreFetching: false,
- existMore: false,
connection: null,
date: null,
baseQuery: {
@@ -41,21 +41,18 @@ export default Vue.extend({
includeLocalRenotes: this.$store.state.settings.showLocalRenotes
},
query: {},
- endpoint: null
+ endpoint: null,
+ makePromise: null
};
},
computed: {
alone(): boolean {
return this.$store.state.i.followingCount == 0;
- },
-
- canFetchMore(): boolean {
- return !this.moreFetching && !this.fetching && this.existMore;
}
},
- mounted() {
+ created() {
const prepend = note => {
(this.$refs.timeline as any).prepend(note);
};
@@ -106,7 +103,25 @@ export default Vue.extend({
this.connection.on('mention', onNote);
}
- this.fetch();
+ this.makePromise = cursor => this.$root.api(this.endpoint, {
+ limit: fetchLimit + 1,
+ untilDate: cursor ? undefined : (this.date ? this.date.getTime() : undefined),
+ untilId: cursor ? cursor : undefined,
+ ...this.baseQuery, ...this.query
+ }).then(notes => {
+ if (notes.length == fetchLimit + 1) {
+ notes.pop();
+ return {
+ notes: notes,
+ cursor: notes[notes.length - 1].id
+ };
+ } else {
+ return {
+ notes: notes,
+ cursor: null
+ };
+ }
+ });
},
beforeDestroy() {
@@ -114,82 +129,22 @@ export default Vue.extend({
},
methods: {
- fetch() {
- this.fetching = true;
-
- (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
- this.$root.api(this.endpoint, Object.assign({
- limit: fetchLimit + 1,
- untilDate: this.date ? this.date.getTime() : undefined
- }, this.baseQuery, this.query)).then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- this.existMore = true;
- }
- res(notes);
- this.fetching = false;
- this.$emit('loaded');
- }, rej);
- }));
- },
-
- more() {
- if (!this.canFetchMore) return;
-
- this.moreFetching = true;
-
- const promise = this.$root.api(this.endpoint, Object.assign({
- limit: fetchLimit + 1,
- untilId: (this.$refs.timeline as any).tail().id
- }, this.baseQuery, this.query));
-
- promise.then(notes => {
- if (notes.length == fetchLimit + 1) {
- notes.pop();
- } else {
- this.existMore = false;
- }
- for (const n of notes) {
- (this.$refs.timeline as any).append(n);
- }
- this.moreFetching = false;
- });
-
- return promise;
- },
-
focus() {
(this.$refs.timeline as any).focus();
- },
-
- warp(date) {
- this.date = date;
- this.fetch();
}
}
});
-
-
diff --git a/src/client/app/desktop/views/components/timeline.vue b/src/client/app/desktop/views/home/timeline.vue
similarity index 61%
rename from src/client/app/desktop/views/components/timeline.vue
rename to src/client/app/desktop/views/home/timeline.vue
index edeb30d9c..573cc95a9 100644
--- a/src/client/app/desktop/views/components/timeline.vue
+++ b/src/client/app/desktop/views/home/timeline.vue
@@ -1,27 +1,24 @@
-
+
+
-
+
@@ -30,7 +27,7 @@ import Vue from 'vue';
import i18n from '../../../i18n';
import XCore from './timeline.core.vue';
import Menu from '../../../common/views/components/menu.vue';
-import MkSettingsWindow from './settings-window.vue';
+import MkSettingsWindow from '../components/settings-window.vue';
export default Vue.extend({
i18n: i18n('desktop/views/components/timeline.vue'),
@@ -48,6 +45,16 @@ export default Vue.extend({
};
},
+ computed: {
+ options(): any {
+ return {
+ ...(this.src == 'list' ? { list: this.list } : { src: this.src }),
+ ...(this.src == 'tag' ? { tagTl: this.tagTl } : {}),
+ key: this.src == 'list' ? this.list.id : this.src
+ }
+ }
+ },
+
watch: {
src() {
this.saveSrc();
@@ -65,9 +72,13 @@ export default Vue.extend({
},
created() {
- this.$root.getMeta().then(meta => {
- this.enableLocalTimeline = !meta.disableLocalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin;
- this.enableGlobalTimeline = !meta.disableGlobalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin;
+ this.$root.getMeta().then((meta: Record
+
diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/home/user/user.header.vue
similarity index 74%
rename from src/client/app/desktop/views/pages/user/user.header.vue
rename to src/client/app/desktop/views/home/user/user.header.vue
index c33ca84eb..5271c28d0 100644
--- a/src/client/app/desktop/views/pages/user/user.header.vue
+++ b/src/client/app/desktop/views/home/user/user.header.vue
@@ -1,5 +1,5 @@
-
-
+
+ {{ $t('follows-you') }}
+
+
+
-
@@ -33,7 +40,7 @@
- {{ user.notesCount | number }}{{ $t('posts') }}
+
@@ -45,9 +52,14 @@
import Vue from 'vue';
import i18n from '../../../../i18n';
import * as age from 's-age';
+import XUserMenu from '../../../../common/views/components/user-menu.vue';
+import XIntegrations from '../../../../common/views/components/integrations.vue';
export default Vue.extend({
i18n: i18n('desktop/views/pages/user/user.header.vue'),
+ components: {
+ XIntegrations
+ },
props: ['user'],
computed: {
style(): any {
@@ -99,6 +111,13 @@ export default Vue.extend({
this.$updateBanner().then(i => {
this.user.bannerUrl = i.bannerUrl;
});
+ },
+
+ menu() {
+ this.$root.new(XUserMenu, {
+ source: this.$refs.menu,
+ user: this.user
+ });
}
}
});
@@ -111,20 +130,6 @@ export default Vue.extend({
border-radius var(--round)
overflow hidden
- &[data-is-dark-background]
- > .banner-container
- > .banner
- background-color #383838
-
- > .fade
- background linear-gradient(transparent, rgba(#000, 0.7))
-
- > .title
- color #fff
-
- > .name
- text-shadow 0 0 8px #000
-
> .banner-container
height 250px
overflow hidden
@@ -133,9 +138,10 @@ export default Vue.extend({
> .banner
height 100%
- background-color #bfccd0
+ background-color #383838
background-size cover
background-position center
+ box-shadow 0 0 128px rgba(0, 0, 0, 0.5) inset
> .fade
position absolute
@@ -143,6 +149,31 @@ export default Vue.extend({
left 0
width 100%
height 78px
+ background linear-gradient(transparent, rgba(#000, 0.7))
+
+ > .followed
+ position absolute
+ top 12px
+ left 12px
+ padding 4px 6px
+ color #fff
+ background rgba(0, 0, 0, 0.7)
+ font-size 12px
+
+ > .actions
+ position absolute
+ top 12px
+ right 12px
+
+ > .menu
+ height 100%
+ display block
+ position absolute
+ left -42px
+ padding 0 14px
+ color #fff
+ text-shadow 0 0 8px #000
+ font-size 16px
> .title
position absolute
@@ -150,7 +181,7 @@ export default Vue.extend({
left 0
width 100%
padding 0 0 8px 154px
- color #5e6367
+ color #fff
> .name
display block
@@ -158,6 +189,7 @@ export default Vue.extend({
line-height 32px
font-weight bold
font-size 1.8em
+ text-shadow 0 0 8px #000
> div
> *
@@ -187,6 +219,13 @@ export default Vue.extend({
padding 16px 16px 16px 154px
color var(--text)
+ > .description
+ font-size 15px
+
+ > .empty
+ margin 0
+ opacity 0.5
+
> .fields
margin-top 16px
@@ -219,6 +258,10 @@ export default Vue.extend({
margin-top 16px
padding-top 16px
border-top solid 1px var(--faceDivider)
+ font-size 15px
+
+ &:empty
+ display none
> *
margin-right 16px
diff --git a/src/client/app/desktop/views/home/user/user.home.vue b/src/client/app/desktop/views/home/user/user.home.vue
new file mode 100644
index 000000000..ec533efd3
--- /dev/null
+++ b/src/client/app/desktop/views/home/user/user.home.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
diff --git a/src/client/app/desktop/views/pages/user/user.photos.vue b/src/client/app/desktop/views/home/user/user.photos.vue
similarity index 51%
rename from src/client/app/desktop/views/pages/user/user.photos.vue
rename to src/client/app/desktop/views/home/user/user.photos.vue
index 13645b931..aff1c96c9 100644
--- a/src/client/app/desktop/views/pages/user/user.photos.vue
+++ b/src/client/app/desktop/views/home/user/user.photos.vue
@@ -1,20 +1,29 @@
-
+
+
-
-
+
+
+
+
diff --git a/src/client/app/desktop/views/pages/deck/deck.direct.vue b/src/client/app/desktop/views/pages/deck/deck.direct.vue
deleted file mode 100644
index c6c2b9923..000000000
--- a/src/client/app/desktop/views/pages/deck/deck.direct.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
+
-
+
+
-
-
-
-
-
-
-
-
-
- {{ $t('@.view-on-remote') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ user.notesCount | number }}
- {{ $t('posts') }}
-
-
- {{ user.followingCount | number }}
- {{ $t('following') }}
-
-
- {{ user.followersCount | number }}
- {{ $t('followers') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ q }}
- #{{ $route.params.tag }}
-
-
-
-
-
-
- {{ text }}
-
-
-
-
diff --git a/src/client/app/desktop/views/pages/user/user.profile.vue b/src/client/app/desktop/views/pages/user/user.profile.vue
deleted file mode 100644
index 026f84dc8..000000000
--- a/src/client/app/desktop/views/pages/user/user.profile.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/client/app/desktop/views/pages/user/user.timeline.vue b/src/client/app/desktop/views/pages/user/user.timeline.vue
deleted file mode 100644
index 0571ce76f..000000000
--- a/src/client/app/desktop/views/pages/user/user.timeline.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue
deleted file mode 100644
index 19f646927..000000000
--- a/src/client/app/desktop/views/pages/user/user.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/client/app/desktop/views/widgets/index.ts b/src/client/app/desktop/views/widgets/index.ts
index 7c074080c..38a661671 100644
--- a/src/client/app/desktop/views/widgets/index.ts
+++ b/src/client/app/desktop/views/widgets/index.ts
@@ -9,6 +9,7 @@ import wPolls from './polls.vue';
import wPostForm from './post-form.vue';
import wMessaging from './messaging.vue';
import wProfile from './profile.vue';
+import wCustomize from './customize.vue';
Vue.component('mkw-notifications', wNotifications);
Vue.component('mkw-timemachine', wTimemachine);
@@ -19,3 +20,4 @@ Vue.component('mkw-polls', wPolls);
Vue.component('mkw-post-form', wPostForm);
Vue.component('mkw-messaging', wMessaging);
Vue.component('mkw-profile', wProfile);
+Vue.component('mkw-customize', wCustomize);
diff --git a/src/client/app/desktop/views/widgets/messaging.vue b/src/client/app/desktop/views/widgets/messaging.vue
index 77088d8ad..1cb4f0a67 100644
--- a/src/client/app/desktop/views/widgets/messaging.vue
+++ b/src/client/app/desktop/views/widgets/messaging.vue
@@ -1,11 +1,11 @@
-
diff --git a/src/client/app/desktop/views/widgets/notifications.vue b/src/client/app/desktop/views/widgets/notifications.vue
index b4d1241e0..2eaa6a2fe 100644
--- a/src/client/app/desktop/views/widgets/notifications.vue
+++ b/src/client/app/desktop/views/widgets/notifications.vue
@@ -1,11 +1,11 @@
-
diff --git a/src/client/app/desktop/views/widgets/polls.vue b/src/client/app/desktop/views/widgets/polls.vue
index 6dc7ffb19..3567cae5e 100644
--- a/src/client/app/desktop/views/widgets/polls.vue
+++ b/src/client/app/desktop/views/widgets/polls.vue
@@ -1,11 +1,13 @@
-
diff --git a/src/client/app/desktop/views/widgets/users.vue b/src/client/app/desktop/views/widgets/users.vue
index ce8d8aa25..85902fc20 100644
--- a/src/client/app/desktop/views/widgets/users.vue
+++ b/src/client/app/desktop/views/widgets/users.vue
@@ -1,11 +1,13 @@
diff --git a/src/client/app/desktop/views/widgets/post-form.vue b/src/client/app/desktop/views/widgets/post-form.vue
index 57c167b2a..3fcf811eb 100644
--- a/src/client/app/desktop/views/widgets/post-form.vue
+++ b/src/client/app/desktop/views/widgets/post-form.vue
@@ -1,7 +1,7 @@
@@ -16,7 +18,7 @@
-
+
-
diff --git a/src/client/app/desktop/views/widgets/profile.vue b/src/client/app/desktop/views/widgets/profile.vue
index 16990dc41..57a604ff4 100644
--- a/src/client/app/desktop/views/widgets/profile.vue
+++ b/src/client/app/desktop/views/widgets/profile.vue
@@ -1,6 +1,6 @@
{{ $t('note') }}
-
-
diff --git a/src/client/app/desktop/views/widgets/trends.vue b/src/client/app/desktop/views/widgets/trends.vue
index a195580dc..c51294589 100644
--- a/src/client/app/desktop/views/widgets/trends.vue
+++ b/src/client/app/desktop/views/widgets/trends.vue
@@ -1,8 +1,8 @@
-
-
-
-
diff --git a/src/client/app/init.ts b/src/client/app/init.ts
index 2f18030f0..83ec30952 100644
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@@ -11,10 +11,11 @@ import VueI18n from 'vue-i18n';
import SequentialEntrance from 'vue-sequential-entrance';
import VueHotkey from './common/hotkey';
+import VueSize from './common/size';
import App from './app.vue';
import checkForUpdate from './common/scripts/check-for-update';
import MiOS from './mios';
-import { clientVersion as version, codename, lang, locale } from './config';
+import { version, codename, lang, locale } from './config';
import { builtinThemes, lightTheme, applyTheme } from './theme';
import Dialog from './common/views/components/dialog.vue';
@@ -291,6 +292,7 @@ Vue.use(VueRouter);
Vue.use(VAnimateCss);
Vue.use(VModal);
Vue.use(VueHotkey);
+Vue.use(VueSize);
Vue.use(VueI18n);
Vue.use(SequentialEntrance);
@@ -350,7 +352,7 @@ if (localStorage.getItem('should-refresh') == 'true') {
}
// MiOSを初期化してコールバックする
-export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void, sw = false) => {
+export default (callback: (launch: (router: VueRouter) => [Vue, MiOS], os: MiOS) => void, sw = false) => {
const os = new MiOS(sw);
os.init(() => {
@@ -436,11 +438,6 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void,
});
//#endregion
- // Navigation hook
- router.beforeEach((to, from, next) => {
- next(os.store.state.navHook && os.store.state.navHook(to) ? false : undefined);
- });
-
document.addEventListener('visibilitychange', () => {
if (!document.hidden) {
os.store.commit('clearBehindNotes');
@@ -507,6 +504,6 @@ export default (callback: (launch: (router: VueRouter) => [Vue, MiOS]) => void,
return [app, os] as [Vue, MiOS];
};
- callback(launch);
+ callback(launch, os);
});
};
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index 83f62a502..4d6f8a824 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -4,7 +4,7 @@ import { EventEmitter } from 'eventemitter3';
import * as uuid from 'uuid';
import initStore from './store';
-import { apiUrl, clientVersion as version } from './config';
+import { apiUrl, version } from './config';
import Progress from './common/scripts/loading';
import Err from './common/views/components/connect-failed.vue';
diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts
index bbbdc0ebb..fbe117c4a 100644
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -12,7 +12,6 @@ import init from '../init';
import MkIndex from './views/pages/index.vue';
import MkSignup from './views/pages/signup.vue';
-import MkUser from './views/pages/user.vue';
import MkSelectDrive from './views/pages/selectdrive.vue';
import MkDrive from './views/pages/drive.vue';
import MkNotifications from './views/pages/notifications.vue';
@@ -22,8 +21,6 @@ import MkMessagingRoom from './views/pages/messaging-room.vue';
import MkReceivedFollowRequests from './views/pages/received-follow-requests.vue';
import MkNote from './views/pages/note.vue';
import MkSearch from './views/pages/search.vue';
-import MkFollowers from './views/pages/followers.vue';
-import MkFollowing from './views/pages/following.vue';
import MkFavorites from './views/pages/favorites.vue';
import MkUserLists from './views/pages/user-lists.vue';
import MkUserList from './views/pages/user-list.vue';
@@ -134,11 +131,15 @@ init((launch) => {
{ path: '/selectdrive', component: MkSelectDrive },
{ path: '/search', component: MkSearch },
{ path: '/tags/:tag', component: MkTag },
+ { path: '/featured', name: 'featured', component: () => import('./views/pages/featured.vue').then(m => m.default) },
+ { path: '/explore', name: 'explore', component: () => import('./views/pages/explore.vue').then(m => m.default) },
+ { path: '/explore/tags/:tag', name: 'explore-tag', props: true, component: () => import('./views/pages/explore.vue').then(m => m.default) },
{ path: '/share', component: MkShare },
{ path: '/games/reversi/:game?', name: 'reversi', component: MkReversi },
- { path: '/@:user', component: () => import('./views/pages/user.vue').then(m => m.default) },
- { path: '/@:user/followers', component: MkFollowers },
- { path: '/@:user/following', component: MkFollowing },
+ { path: '/@:user', name: 'user', component: () => import('./views/pages/user/index.vue').then(m => m.default), children: [
+ { path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) },
+ { path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) },
+ ]},
{ path: '/notes/:note', component: MkNote },
{ path: '/authorize-follow', component: MkFollow },
{ path: '*', component: MkNotFound }
diff --git a/src/client/app/mobile/style.styl b/src/client/app/mobile/style.styl
index 095e5266f..3a4fc9c0c 100644
--- a/src/client/app/mobile/style.styl
+++ b/src/client/app/mobile/style.styl
@@ -9,3 +9,15 @@
html
height 100%
background var(--bg)
+
+main
+ width 100%
+ max-width 680px
+ margin 0 auto
+ padding 8px
+
+ @media (min-width 500px)
+ padding 16px
+
+ @media (min-width 600px)
+ padding 32px
diff --git a/src/client/app/mobile/views/components/drive.vue b/src/client/app/mobile/views/components/drive.vue
index 5fb160f91..477233386 100644
--- a/src/client/app/mobile/views/components/drive.vue
+++ b/src/client/app/mobile/views/components/drive.vue
@@ -399,7 +399,7 @@ export default Vue.extend({
this.moveFolder();
break;
case '6':
- alert(this.$t('deletion-alert'));
+ this.deleteFolder();
break;
}
},
@@ -421,7 +421,10 @@ export default Vue.extend({
renameFolder() {
if (this.folder == null) {
- alert(this.$t('root-rename-alert'));
+ this.$root.dialog({
+ type: 'error',
+ text: this.$t('here-is-root')
+ });
return;
}
const name = window.prompt(this.$t('folder-name'), this.folder.name);
@@ -436,7 +439,10 @@ export default Vue.extend({
moveFolder() {
if (this.folder == null) {
- alert(this.$t('root-move-alert'));
+ this.$root.dialog({
+ type: 'error',
+ text: this.$t('here-is-root')
+ });
return;
}
this.$chooseDriveFolder().then(folder => {
@@ -456,13 +462,31 @@ export default Vue.extend({
url: url,
folderId: this.folder ? this.folder.id : undefined
});
- alert(this.$t('uploading'));
+ this.$root.dialog({
+ type: 'info',
+ text: this.$t('uploading')
+ });
},
onChangeLocalFile() {
for (const f of Array.from((this.$refs.file as any).files)) {
(this.$refs.uploader as any).upload(f, this.folder);
}
+ },
+
+ deleteFolder() {
+ if (this.folder == null) {
+ this.$root.dialog({
+ type: 'error',
+ text: this.$t('here-is-root')
+ });
+ return;
+ }
+ this.$root.api('drive/folders/delete', {
+ folderId: this.folder.id
+ }).then(folder => {
+ this.cd(this.folder.parentId);
+ });
}
}
});
diff --git a/src/client/app/mobile/views/components/friends-maker.vue b/src/client/app/mobile/views/components/friends-maker.vue
deleted file mode 100644
index c04152c59..000000000
--- a/src/client/app/mobile/views/components/friends-maker.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/client/app/mobile/views/components/index.ts b/src/client/app/mobile/views/components/index.ts
index 351aaea9f..4df347ef4 100644
--- a/src/client/app/mobile/views/components/index.ts
+++ b/src/client/app/mobile/views/components/index.ts
@@ -7,17 +7,13 @@ import mediaVideo from './media-video.vue';
import notePreview from './note-preview.vue';
import subNoteContent from './sub-note-content.vue';
import noteCard from './note-card.vue';
-import userCard from './user-card.vue';
import noteDetail from './note-detail.vue';
-import friendsMaker from './friends-maker.vue';
import notification from './notification.vue';
import notifications from './notifications.vue';
import notificationPreview from './notification-preview.vue';
-import usersList from './users-list.vue';
-import userPreview from './user-preview.vue';
import userTimeline from './user-timeline.vue';
import userListTimeline from './user-list-timeline.vue';
-import widgetContainer from './widget-container.vue';
+import uiContainer from './ui-container.vue';
import postForm from './post-form.vue';
Vue.component('mk-ui', ui);
@@ -27,15 +23,11 @@ Vue.component('mk-media-video', mediaVideo);
Vue.component('mk-note-preview', notePreview);
Vue.component('mk-sub-note-content', subNoteContent);
Vue.component('mk-note-card', noteCard);
-Vue.component('mk-user-card', userCard);
Vue.component('mk-note-detail', noteDetail);
-Vue.component('mk-friends-maker', friendsMaker);
Vue.component('mk-notification', notification);
Vue.component('mk-notifications', notifications);
Vue.component('mk-notification-preview', notificationPreview);
-Vue.component('mk-users-list', usersList);
-Vue.component('mk-user-preview', userPreview);
Vue.component('mk-user-timeline', userTimeline);
Vue.component('mk-user-list-timeline', userListTimeline);
-Vue.component('mk-widget-container', widgetContainer);
+Vue.component('ui-container', uiContainer);
Vue.component('mk-post-form', postForm);
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index e00ecd5ff..9450b3a17 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -123,18 +123,26 @@ export default Vue.extend({
},
mounted() {
- // Get replies
- if (!this.compact) {
+ this.fetchReplies();
+ },
+
+ watch: {
+ note() {
+ this.fetchReplies();
+ }
+ },
+
+ methods: {
+ fetchReplies() {
+ if (this.compact) return;
this.$root.api('notes/replies', {
noteId: this.appearNote.id,
limit: 8
}).then(replies => {
this.replies = replies;
});
- }
- },
+ },
- methods: {
fetchConversation() {
this.conversationFetching = true;
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 1d0375cfa..0d85e321d 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -1,8 +1,8 @@
-
-
-
+ {{ $t('@.no-notes') }}
-
@@ -10,8 +10,6 @@
-