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

updated footer (fixes #1)

Browse source
This commit is contained in:
Felix 2020-02-14 02:15:56 +01:00
parent ef90fd6f1e
commit 11ebb37b08
6 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ansible/ansible.yml
View file

@ -35,6 +35,9 @@
- { src: 'templates/docker-compose.yml', dest: '/joinpeertube/docker-compose.yml' } - { src: 'templates/docker-compose.yml', dest: '/joinpeertube/docker-compose.yml' }
- { src: 'templates/nginx.conf', dest: '/etc/nginx/sites-enabled/joinpeertube.conf' } - { src: 'templates/nginx.conf', dest: '/etc/nginx/sites-enabled/joinpeertube.conf' }
# TODO: add instances.json to .gitignore and generate it in here
- name: build the dev docker image - name: build the dev docker image
local_action: shell cd .. && sudo docker build . -f docker/Dockerfile -t joinpeertube:latest local_action: shell cd .. && sudo docker build . -f docker/Dockerfile -t joinpeertube:latest
register: image_build register: image_build

1
docker/Dockerfile
View file

@ -6,6 +6,7 @@ COPY package.json .
RUN yarn install --pure-lockfile \ RUN yarn install --pure-lockfile \
&& yarn cache clean && yarn cache clean
# TODO: copy only the required files here
COPY . . COPY . .
RUN yarn run build RUN yarn run build

46
public/instances.json
View file

@ -9,7 +9,13 @@
"version": "2.0.0", "version": "2.0.0",
"signupAllowed": false, "signupAllowed": false,
"userVideoQuota": -1, "userVideoQuota": -1,
"categories": [], "categories": [
14,
1,
11,
15,
8
],
"languages": [ "languages": [
"es", "es",
"de", "de",
@ -23,9 +29,9 @@
"defaultNSFWPolicy": "do_not_list", "defaultNSFWPolicy": "do_not_list",
"isNSFW": false, "isNSFW": false,
"totalUsers": 1977, "totalUsers": 1977,
"totalVideos": 96066, "totalVideos": 96379,
"totalLocalVideos": 4686, "totalLocalVideos": 4704,
"totalInstanceFollowers": 75, "totalInstanceFollowers": 82,
"totalInstanceFollowing": 307, "totalInstanceFollowing": 307,
"health": null, "health": null,
"createdAt": null "createdAt": null
@ -35,8 +41,8 @@
"host": "tube.tchncs.de", "host": "tube.tchncs.de",
"name": "tchncs", "name": "tchncs",
"shortDescription": "PeerTube instance for your unique Vlogs and what not. \ud83d\ude09", "shortDescription": "PeerTube instance for your unique Vlogs and what not. \ud83d\ude09",
"version": "2.0.0", "version": "2.1.0",
"signupAllowed": false, "signupAllowed": true,
"userVideoQuota": -1, "userVideoQuota": -1,
"categories": [ "categories": [
10, 10,
@ -55,10 +61,10 @@
"autoBlacklistUserVideosEnabled": true, "autoBlacklistUserVideosEnabled": true,
"defaultNSFWPolicy": "blur", "defaultNSFWPolicy": "blur",
"isNSFW": false, "isNSFW": false,
"totalUsers": 230, "totalUsers": 231,
"totalVideos": 4129, "totalVideos": 4119,
"totalLocalVideos": 573, "totalLocalVideos": 561,
"totalInstanceFollowers": 84, "totalInstanceFollowers": 85,
"totalInstanceFollowing": 6, "totalInstanceFollowing": 6,
"health": null, "health": null,
"createdAt": null "createdAt": null
@ -97,7 +103,7 @@
"host": "video.deadsuperhero.com", "host": "video.deadsuperhero.com",
"name": "DeadSuperHero Video", "name": "DeadSuperHero Video",
"shortDescription": "A federated PeerTube instance of all of Sean Tilley's video projects.", "shortDescription": "A federated PeerTube instance of all of Sean Tilley's video projects.",
"version": "2.0.0", "version": "2.1.0",
"signupAllowed": false, "signupAllowed": false,
"userVideoQuota": -1, "userVideoQuota": -1,
"categories": [ "categories": [
@ -111,9 +117,9 @@
"defaultNSFWPolicy": "display", "defaultNSFWPolicy": "display",
"isNSFW": false, "isNSFW": false,
"totalUsers": 4, "totalUsers": 4,
"totalVideos": 66880, "totalVideos": 68605,
"totalLocalVideos": 39, "totalLocalVideos": 39,
"totalInstanceFollowers": 134, "totalInstanceFollowers": 135,
"totalInstanceFollowing": 61, "totalInstanceFollowing": 61,
"health": null, "health": null,
"createdAt": null "createdAt": null
@ -138,10 +144,10 @@
"autoBlacklistUserVideosEnabled": false, "autoBlacklistUserVideosEnabled": false,
"defaultNSFWPolicy": "blur", "defaultNSFWPolicy": "blur",
"isNSFW": false, "isNSFW": false,
"totalUsers": 342, "totalUsers": 352,
"totalVideos": 4435, "totalVideos": 4437,
"totalLocalVideos": 1146, "totalLocalVideos": 1148,
"totalInstanceFollowers": 89, "totalInstanceFollowers": 93,
"totalInstanceFollowing": 6, "totalInstanceFollowing": 6,
"health": null, "health": null,
"createdAt": null "createdAt": null
@ -172,9 +178,9 @@
"defaultNSFWPolicy": "blur", "defaultNSFWPolicy": "blur",
"isNSFW": false, "isNSFW": false,
"totalUsers": 60, "totalUsers": 60,
"totalVideos": 4062, "totalVideos": 4049,
"totalLocalVideos": 615, "totalLocalVideos": 618,
"totalInstanceFollowers": 111, "totalInstanceFollowers": 113,
"totalInstanceFollowing": 6, "totalInstanceFollowing": 6,
"health": null, "health": null,
"createdAt": null "createdAt": null

14
src/components/Footer.vue
View file

@ -2,20 +2,10 @@
<footer id="main-footer"> <footer id="main-footer">
<div class="links"> <div class="links">
<div>
<a target="_blank" rel="noopener noreferrer" href="https://framasoft.org/en/legals/" v-translate>Legal notices</a>
<a target="_blank" rel="noopener noreferrer" href="https://contact.framasoft.org" v-translate>Contact</a>
<a target="_blank" rel="noopener noreferrer" href="https://framalistes.org/sympa/subscribe/peertube-newsletter" v-translate>Newsletter</a>
<a target="_blank" rel="noopener noreferrer" href="https://framacolibri.org/c/peertube" v-translate>Forum</a>
</div>
<div> <div>
<a target="_blank" rel="noopener noreferrer" v-bind:href="buildPublicUrl('press-kit.zip')" v-translate>Press kit</a> <a target="_blank" rel="noopener noreferrer" v-bind:href="buildPublicUrl('press-kit.zip')" v-translate>Press kit</a>
<a target="_blank" rel="noopener noreferrer" href="https://framagit.org/framasoft/peertube/joinpeertube" v-translate>JoinPeerTube Git</a> <a target="_blank" rel="noopener noreferrer" href="https://yerbamate.dev/nutomic/joinpeertube" v-translate>join.peertube.social Git</a>
<a target="_blank" rel="noopener noreferrer" href="https://github.com/Chocobozzz/PeerTube" v-translate>PeerTube Git</a> <a target="_blank" rel="noopener noreferrer" href="https://github.com/Chocobozzz/PeerTube" v-translate>PeerTube Git</a>
</div> </div>
@ -23,7 +13,7 @@
<div class="credits"> <div class="credits">
<div v-translate> <div v-translate>
Website developed by <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">Framasoft</a> and designed by <a target="_blank" rel="noopener noreferrer" href="https://www.maiwann.net/">Maiwann</a> Website hosted and maintained by <a rel="noopener noreferrer" href="https://radical.town/@felix">@felix@radical.town</a>, originally developed by <a rel="noopener noreferrer" href="https://framasoft.org">Framasoft</a> and designed by <a rel="noopener noreferrer" href="https://www.maiwann.net/">Maiwann</a>
</div> </div>
<div v-translate> <div v-translate>

1
src/components/InstanceCard.vue
View file

@ -47,6 +47,7 @@
<icon-followers></icon-followers> <icon-followers></icon-followers>
</div> </div>
<div> <div>
<!-- TODO: wtf is this bullshit why is there hardcoded english? -->
<translate :translate-n="instance.totalInstanceFollowers" <translate :translate-n="instance.totalInstanceFollowers"
translate-plural="%{ instance.totalInstanceFollowers } followers instances"> translate-plural="%{ instance.totalInstanceFollowers } followers instances">
%{ instance.totalInstanceFollowers } follower instance %{ instance.totalInstanceFollowers } follower instance