Merge branch 'feature/filter-nsfw-instances' into 'master'

Hide instances displaying nsfw from reg table

See merge request framasoft/peertube/joinpeertube!48
This commit is contained in:
Chocobozzz 2019-02-08 14:12:44 +01:00
commit 30963bc89a
3 changed files with 12 additions and 6 deletions

View file

@ -29,9 +29,9 @@
<img :src="`${$root['/']}img/notebook.jpg`" class="img-responsive" alt=""> <img :src="`${$root['/']}img/notebook.jpg`" class="img-responsive" alt="">
</div> </div>
<p> <p>
<a href="#getting-started" v-html="$t('home.intro.getting-started')"></a> <a href="#getting-started" v-html="$t('home.intro.getting-started')"></a>
<a href="#how-it-works" v-html="$t('home.intro.how-it-works')"></a> <a href="#how-it-works" v-html="$t('home.intro.how-it-works')"></a>
</p> </p>
</div> </div>
</div> </div>
</section> </section>

View file

@ -39,7 +39,7 @@
</a> </a>
</li> </li>
<li> <li>
<a :href="$root.link.instancesPT" <a href="#register"
v-html="$t('menu.instances')"> v-html="$t('menu.instances')">
</a> </a>
</li> </li>

View file

@ -1,5 +1,5 @@
<template> <template>
<div > <div>
<div v-if="error" id="instances-list-error" class="alert alert-danger" v-html="$t('home.getting-started.register.error')"></div> <div v-if="error" id="instances-list-error" class="alert alert-danger" v-html="$t('home.getting-started.register.error')"></div>
<div id="instances-list" class="list-group" > <div id="instances-list" class="list-group" >
@ -21,6 +21,11 @@
<li v-if="instance.userVideoQuota">{{ instance.userVideoQuotaBytes }} {{ $t('home.getting-started.register.instances.per_user') }}</li> <li v-if="instance.userVideoQuota">{{ instance.userVideoQuotaBytes }} {{ $t('home.getting-started.register.instances.per_user') }}</li>
</div> </div>
</a> </a>
<!-- TODO: add link to instances list webpage -->
<!--<a v-bind:href="$root.link.instancesPT" class="list-group-item" target="_blank">-->
<!--{{ $t('home.getting-started.register.instances.see-more') }}-->
<!--</a>-->
</div> </div>
</div> </div>
</template> </template>
@ -72,7 +77,8 @@ export default {
start: 0, start: 0,
count: 100, count: 100,
signup: true, signup: true,
healthy: true healthy: true,
nsfwPolicy: [ 'do_not_list', 'blur' ]
} }
} }
axios('https://instances.joinpeertube.org/api/v1/instances', options) axios('https://instances.joinpeertube.org/api/v1/instances', options)