From 8db19c959e437521db195e3cce96cb4386ed51c1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 12 Nov 2021 11:00:51 +0100 Subject: Remove contributors list from /about/peertube Some contributors don't want to be associated to a particular peertube instance --- .../about-peertube-contributors.component.html | 13 ---------- .../about-peertube-contributors.component.scss | 30 ---------------------- .../about-peertube-contributors.component.ts | 19 -------------- .../about-peertube/about-peertube.component.html | 4 +-- client/src/app/+about/about.module.ts | 2 -- server/controllers/client.ts | 6 ----- server/tests/client.ts | 10 -------- 7 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 client/src/app/+about/about-peertube/about-peertube-contributors.component.html delete mode 100644 client/src/app/+about/about-peertube/about-peertube-contributors.component.scss delete mode 100644 client/src/app/+about/about-peertube/about-peertube-contributors.component.ts diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html b/client/src/app/+about/about-peertube/about-peertube-contributors.component.html deleted file mode 100644 index 4e7d2389b..000000000 --- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
-

- Developed with ❤ by Framasoft -

- -

- - Framasoft logo - -

- -
-
diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss deleted file mode 100644 index 41e5ff0c2..000000000 --- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss +++ /dev/null @@ -1,30 +0,0 @@ -@use '_variables' as *; -@use '_mixins' as *; - -.peertube-contributors { - .framasoft { - font-size: 18px; - } - - > p { - text-align: center; - } - - ::ng-deep h1 { - font-size: 1rem; - text-align: center; - font-weight: $font-semibold; - margin-top: 20px; - } - - ::ng-deep ul { - padding: 0; - text-align: center; - - li { - @include margin-right(10px); - - display: inline-block; - } - } -} diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts b/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts deleted file mode 100644 index dd774a4ef..000000000 --- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core' -import { MarkdownService } from '@app/core' - -@Component({ - selector: 'my-about-peertube-contributors', - templateUrl: './about-peertube-contributors.component.html', - styleUrls: [ './about-peertube-contributors.component.scss' ] -}) -export class AboutPeertubeContributorsComponent implements OnInit { - creditsHtml: string - - private markdown = require('raw-loader!../../../../../CREDITS.md').default - - constructor (private markdownService: MarkdownService) { } - - async ngOnInit () { - this.creditsHtml = await this.markdownService.unsafeMarkdownToHTML(this.markdown, true) - } -} diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html index 27dd0f609..62689e3ae 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.html +++ b/client/src/app/+about/about-peertube/about-peertube.component.html @@ -1,6 +1,6 @@

- What is PeerTube? + This website is powered by PeerTube

mascot @@ -63,8 +63,6 @@
- -

diff --git a/client/src/app/+about/about.module.ts b/client/src/app/+about/about.module.ts index dfea52fb8..6a3d72290 100644 --- a/client/src/app/+about/about.module.ts +++ b/client/src/app/+about/about.module.ts @@ -3,7 +3,6 @@ import { AboutFollowsComponent } from '@app/+about/about-follows/about-follows.c import { AboutInstanceComponent } from '@app/+about/about-instance/about-instance.component' import { AboutInstanceResolver } from '@app/+about/about-instance/about-instance.resolver' import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component' -import { AboutPeertubeContributorsComponent } from '@app/+about/about-peertube/about-peertube-contributors.component' import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertube.component' import { SharedCustomMarkupModule } from '@app/shared/shared-custom-markup' import { SharedFormModule } from '@app/shared/shared-forms' @@ -29,7 +28,6 @@ import { AboutComponent } from './about.component' AboutInstanceComponent, AboutPeertubeComponent, AboutFollowsComponent, - AboutPeertubeContributorsComponent, ContactAdminModalComponent ], diff --git a/server/controllers/client.ts b/server/controllers/client.ts index 86ac5fbbc..0a27ace76 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts @@ -84,12 +84,6 @@ clientsRouter.use('/client/*', (req: express.Request, res: express.Response) => res.status(HttpStatusCode.NOT_FOUND_404).end() }) -// No index exceptions -clientsRouter.all('/about/peertube', - disableRobots, - asyncMiddleware(serveIndexHTML) -) - // Always serve index client page (the client is a single page application, let it handle routing) // Try to provide the right language index.html clientsRouter.use('/(:language)?', asyncMiddleware(serveIndexHTML)) diff --git a/server/tests/client.ts b/server/tests/client.ts index 6c32c81db..a91bec906 100644 --- a/server/tests/client.ts +++ b/server/tests/client.ts @@ -482,16 +482,6 @@ describe('Test a client controllers', function () { } } }) - - it('Should add noindex header for some paths', async function () { - const paths = [ '/about/peertube' ] - - for (const path of paths) { - const { headers } = await makeHTMLRequest(servers[0].url, path) - - expect(headers['x-robots-tag']).to.equal('noindex') - } - }) }) describe('Embed HTML', function () { -- cgit v1.2.3