Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

move login hint into the main content

Browse source
This commit is contained in:
Xiaofeng An 2019-02-06 05:01:32 -05:00
parent e4c0bbddd9
commit f512ee2c3c
4 changed files with 47 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/App.scss
View file

@ -719,3 +719,17 @@ nav {
margin-right: 0.8em; margin-right: 0.8em;
} }
} }
.login-hint {
text-align: center;
@media all and (min-width: 801px) {
display: none;
}
a {
display: inline-block;
padding: 1em 0px;
width: 100%;
}
}

7
src/App.vue
View file

@ -37,6 +37,13 @@
</div> </div>
</div> </div>
<div class="main"> <div class="main">
<div v-if="!currentUser" class="login-hint panel panel-default">
<div class="panel-body">
<router-link :to="{ name: 'login' }">
{{ $t("login.hint") }}
</router-link>
</div>
</div>
<transition name="fade"> <transition name="fade">
<router-view></router-view> <router-view></router-view>
</transition> </transition>

3
src/components/timeline/timeline.js
View file

@ -39,8 +39,7 @@ const Timeline = {
body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []), body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []),
footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : []) footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : [])
} }
}, }
currentUser () { return this.$store.state.users.currentUser }
}, },
components: { components: {
Status, Status,

73
src/components/timeline/timeline.vue
View file

@ -1,42 +1,33 @@
<template> <template>
<div> <div :class="classes.root">
<div v-if="!currentUser" class="login-hint panel panel-default"> <div :class="classes.header">
<div class="panel-body"> <div class="title">
<router-link :to="{ name: 'login' }"> {{title}}
{{ $t("login.hint") }} </div>
</router-link> <div @click.prevent class="loadmore-error alert error" v-if="timelineError">
{{$t('timeline.error_fetching')}}
</div>
<button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.show_new')}}{{newStatusCountStr}}
</button>
<div @click.prevent class="loadmore-text faint" v-if="!timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.up_to_date')}}
</div> </div>
</div> </div>
<div :class="classes.root"> <div :class="classes.body">
<div :class="classes.header"> <div class="timeline">
<div class="title"> <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status" class="status-fadein"></status-or-conversation>
{{title}}
</div>
<div @click.prevent class="loadmore-error alert error" v-if="timelineError">
{{$t('timeline.error_fetching')}}
</div>
<button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.show_new')}}{{newStatusCountStr}}
</button>
<div @click.prevent class="loadmore-text faint" v-if="!timeline.newStatusCount > 0 && !timelineError">
{{$t('timeline.up_to_date')}}
</div>
</div> </div>
<div :class="classes.body"> </div>
<div class="timeline"> <div :class="classes.footer">
<status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status" class="status-fadein"></status-or-conversation> <div v-if="bottomedOut" class="new-status-notification text-center panel-footer faint">
</div> {{$t('timeline.no_more_statuses')}}
</div> </div>
<div :class="classes.footer"> <a v-else-if="!timeline.loading" href="#" v-on:click.prevent='fetchOlderStatuses()'>
<div v-if="bottomedOut" class="new-status-notification text-center panel-footer faint"> <div class="new-status-notification text-center panel-footer">{{$t('timeline.load_older')}}</div>
{{$t('timeline.no_more_statuses')}} </a>
</div> <div v-else class="new-status-notification text-center panel-footer">
<a v-else-if="!timeline.loading" href="#" v-on:click.prevent='fetchOlderStatuses()'> <i class="icon-spin3 animate-spin"/>
<div class="new-status-notification text-center panel-footer">{{$t('timeline.load_older')}}</div>
</a>
<div v-else class="new-status-notification text-center panel-footer">
<i class="icon-spin3 animate-spin"/>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -65,18 +56,4 @@
background-color: $fallback--fg; background-color: $fallback--fg;
background-color: var(--panel, $fallback--fg); background-color: var(--panel, $fallback--fg);
} }
.login-hint {
text-align: center;
@media all and (min-width: 801px) {
display: none;
}
a {
display: inline-block;
padding: 1em 0px;
width: 100%;
}
}
</style> </style>