From 11ebb37b08568a0b0c9a7ac94b68258d5dd2a685 Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 14 Feb 2020 02:15:56 +0100 Subject: [PATCH] updated footer (fixes #1) --- ansible/ansible.yml | 3 +++ docker/Dockerfile | 1 + public/instances.json | 46 ++++++++++++++++++-------------- src/components/Footer.vue | 14 ++-------- src/components/InstanceCard.vue | 1 + src/locale/es/LC_MESSAGES/app.po | 4 +-- 6 files changed, 35 insertions(+), 34 deletions(-) diff --git a/ansible/ansible.yml b/ansible/ansible.yml index 8d95054..d570350 100644 --- a/ansible/ansible.yml +++ b/ansible/ansible.yml @@ -35,6 +35,9 @@ - { src: 'templates/docker-compose.yml', dest: '/joinpeertube/docker-compose.yml' } - { 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 local_action: shell cd .. && sudo docker build . -f docker/Dockerfile -t joinpeertube:latest register: image_build diff --git a/docker/Dockerfile b/docker/Dockerfile index 555ecd3..837efbc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,6 +6,7 @@ COPY package.json . RUN yarn install --pure-lockfile \ && yarn cache clean +# TODO: copy only the required files here COPY . . RUN yarn run build diff --git a/public/instances.json b/public/instances.json index 3de7dbc..2bd38ee 100644 --- a/public/instances.json +++ b/public/instances.json @@ -9,7 +9,13 @@ "version": "2.0.0", "signupAllowed": false, "userVideoQuota": -1, - "categories": [], + "categories": [ + 14, + 1, + 11, + 15, + 8 + ], "languages": [ "es", "de", @@ -23,9 +29,9 @@ "defaultNSFWPolicy": "do_not_list", "isNSFW": false, "totalUsers": 1977, - "totalVideos": 96066, - "totalLocalVideos": 4686, - "totalInstanceFollowers": 75, + "totalVideos": 96379, + "totalLocalVideos": 4704, + "totalInstanceFollowers": 82, "totalInstanceFollowing": 307, "health": null, "createdAt": null @@ -35,8 +41,8 @@ "host": "tube.tchncs.de", "name": "tchncs", "shortDescription": "PeerTube instance for your unique Vlogs and what not. \ud83d\ude09", - "version": "2.0.0", - "signupAllowed": false, + "version": "2.1.0", + "signupAllowed": true, "userVideoQuota": -1, "categories": [ 10, @@ -55,10 +61,10 @@ "autoBlacklistUserVideosEnabled": true, "defaultNSFWPolicy": "blur", "isNSFW": false, - "totalUsers": 230, - "totalVideos": 4129, - "totalLocalVideos": 573, - "totalInstanceFollowers": 84, + "totalUsers": 231, + "totalVideos": 4119, + "totalLocalVideos": 561, + "totalInstanceFollowers": 85, "totalInstanceFollowing": 6, "health": null, "createdAt": null @@ -97,7 +103,7 @@ "host": "video.deadsuperhero.com", "name": "DeadSuperHero Video", "shortDescription": "A federated PeerTube instance of all of Sean Tilley's video projects.", - "version": "2.0.0", + "version": "2.1.0", "signupAllowed": false, "userVideoQuota": -1, "categories": [ @@ -111,9 +117,9 @@ "defaultNSFWPolicy": "display", "isNSFW": false, "totalUsers": 4, - "totalVideos": 66880, + "totalVideos": 68605, "totalLocalVideos": 39, - "totalInstanceFollowers": 134, + "totalInstanceFollowers": 135, "totalInstanceFollowing": 61, "health": null, "createdAt": null @@ -138,10 +144,10 @@ "autoBlacklistUserVideosEnabled": false, "defaultNSFWPolicy": "blur", "isNSFW": false, - "totalUsers": 342, - "totalVideos": 4435, - "totalLocalVideos": 1146, - "totalInstanceFollowers": 89, + "totalUsers": 352, + "totalVideos": 4437, + "totalLocalVideos": 1148, + "totalInstanceFollowers": 93, "totalInstanceFollowing": 6, "health": null, "createdAt": null @@ -172,9 +178,9 @@ "defaultNSFWPolicy": "blur", "isNSFW": false, "totalUsers": 60, - "totalVideos": 4062, - "totalLocalVideos": 615, - "totalInstanceFollowers": 111, + "totalVideos": 4049, + "totalLocalVideos": 618, + "totalInstanceFollowers": 113, "totalInstanceFollowing": 6, "health": null, "createdAt": null diff --git a/src/components/Footer.vue b/src/components/Footer.vue index c3fc27c..5886dbc 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -2,20 +2,10 @@