nutomic/joinpeertube
1
1
Fork 1
Code Issues 5 Pull requests Releases Wiki Activity

Correctly redirect to instances list

Browse source
This commit is contained in:
Chocobozzz 2019-09-23 11:34:57 +02:00
parent abc4dfd4f1
commit ddeae6bd26
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/InstancesList.vue
View file

@ -105,7 +105,7 @@
<div class="instances-list"> <div class="instances-list">
<div v-translate class="title">Instances list</div> <div v-translate class="title">Instances list</div>
<div class="list"> <div class="list" v-bind:class="{ unloaded: instances.length === 0 && noResults === false }">
<div v-for="instance of instances" class="instance" :key="instance.host"> <div v-for="instance of instances" class="instance" :key="instance.host">
<instance-card <instance-card
:instance="instance" :isVideoMaker="isVideoMaker()" :instance="instance" :isVideoMaker="isVideoMaker()"
@ -234,6 +234,10 @@
.instance { .instance {
margin-bottom: 40px; margin-bottom: 40px;
} }
.list.unloaded {
min-height: 400px;
}
} }
</style> </style>

9
src/main.js
View file

@ -93,7 +93,14 @@ for (const locale of allLocales) {
const router = new VueRouter({ const router = new VueRouter({
mode: 'history', mode: 'history',
base: process.env.BASE_URL, base: process.env.BASE_URL,
routes routes,
scrollBehavior (to, from, savedPosition) {
if (to.hash) {
return { selector: to.hash }
} else {
return { x: 0, y: 0 }
}
}
}) })
// Stats Matomo // Stats Matomo

34
src/views/Home.vue
View file

@ -20,7 +20,7 @@
<span v-translate>What is PeerTube?</span> <span v-translate>What is PeerTube?</span>
</a> </a>
<router-link to="/instances" hash="instances-list" class="jpt-button jpt-big-button-icon instances-list"> <router-link :to="{ path: '/instances', hash: 'instances-list' }" class="jpt-button jpt-big-button-icon instances-list">
<icon-instance></icon-instance> <icon-instance></icon-instance>
<translate>See the instances list</translate> <translate>See the instances list</translate>
@ -43,7 +43,7 @@
</div> </div>
<div class="bottom-link-wrapper"> <div class="bottom-link-wrapper">
<router-link to="/instances" hash="instances-list" class="bottom-link"> <router-link :to="{ path: '/instances', hash: 'instances-list' }" class="bottom-link">
<span class="text" v-translate>Discover PeerTube instances</span> <span class="text" v-translate>Discover PeerTube instances</span>
<icon-right></icon-right> <icon-right></icon-right>
</router-link> </router-link>
@ -100,7 +100,7 @@
</p> </p>
<div class="bottom-link-wrapper"> <div class="bottom-link-wrapper">
<router-link to="/instances" hash="instances-list" class="bottom-link"> <router-link :to="{ path: '/instances', hash: 'instances-list' }" class="bottom-link">
<span class="text" v-translate>Discover PeerTube instances</span> <span class="text" v-translate>Discover PeerTube instances</span>
<icon-right></icon-right> <icon-right></icon-right>
</router-link> </router-link>
@ -131,12 +131,13 @@
<strong>ou même de commenter une vidéo hébergée sur PeerTube directement depuis Mastodon.</strong> <strong>ou même de commenter une vidéo hébergée sur PeerTube directement depuis Mastodon.</strong>
</p> </p>
<div class="bottom-link-wrapper"> <!-- TODO: find interesting resource regarding federation-->
<a href="#" class="bottom-link"> <!-- <div class="bottom-link-wrapper">-->
<span class="text" v-translate>En savoir plus sur la fédération</span> <!-- <a href="#" class="bottom-link">-->
<icon-right></icon-right> <!-- <span class="text" v-translate>En savoir plus sur la fédération</span>-->
</a> <!-- <icon-right></icon-right>-->
</div> <!-- </a>-->
<!-- </div>-->
</div> </div>
<div class="free-software one-column"> <div class="free-software one-column">
@ -171,12 +172,13 @@
permet à de nombreux contributeur⋅ices de proposer des évolutions et de nouvelles fonctionnalités.</strong> permet à de nombreux contributeur⋅ices de proposer des évolutions et de nouvelles fonctionnalités.</strong>
</p> </p>
<div class="bottom-link-wrapper"> <!-- TODO: find interesting resource regarding free softwares -->
<a href="#" class="bottom-link"> <!-- <div class="bottom-link-wrapper">-->
<span class="text" v-translate>En savoir plus sur les logiciels libres</span> <!-- <a href="#" class="bottom-link">-->
<icon-right></icon-right> <!-- <span class="text" v-translate>En savoir plus sur les logiciels libres</span>-->
</a> <!-- <icon-right></icon-right>-->
</div> <!-- </a>-->
<!-- </div>-->
</div> </div>
<div id="you-are-a-video-maker" class="one-column"> <div id="you-are-a-video-maker" class="one-column">
@ -215,7 +217,7 @@
besoin, une envie... besoin, une envie...
</div> </div>
<router-link to="/instances" hash="instances-list" class="jpt-button discover-instances"> <router-link :to="{ path: '/instances', hash: 'instances-list' }" class="jpt-button discover-instances">
<translate>Découvrir les instances PeerTube</translate> <translate>Découvrir les instances PeerTube</translate>
</router-link> </router-link>
</div> </div>

5
src/views/Instances.vue
View file

@ -10,9 +10,9 @@
then all you have to do is <strong>create an account on the PeerTube instance of your choice.</strong> then all you have to do is <strong>create an account on the PeerTube instance of your choice.</strong>
</p> </p>
<button class="jpt-button"> <a href="#instances-list" class="jpt-button">
<span v-translate>See the instances list</span> <span v-translate>See the instances list</span>
</button> </a>
</div> </div>
<div class="block-with-image"> <div class="block-with-image">
@ -81,6 +81,7 @@
img { img {
width: 370px; width: 370px;
height: 210px;
} }
} }