Remove contributors list from /about/peertube

Some contributors don't want to be associated to a particular peertube
instance

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 (file)
index 4e7d238..0000000
--- a/client/src/app/+about/about-peertube/about-peertube-contributors.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="peertube-contributors">
-  <p class="framasoft">
-    <strong i18n>Developed with &#10084; by <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">Framasoft</a></strong>
-  </p>
-
-  <p>
-    <a target="_blank" rel="noopener noreferrer" href="https://framasoft.org">
-      <img width="150px" src="/client/assets/images/framasoft.png" alt="Framasoft logo"/>
-    </a>
-  </p>
-
-  <div [innerHTML]="creditsHtml"></div>
-</div>

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 (file)
index 41e5ff0..0000000
--- 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 (file)
index dd774a4..0000000
--- 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 27dd0f6090404177d431b7e94cb9954d400a3378..62689e3aeb229d34bf49218f985f0d89aef1d19e 100644 (file)
--- 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 @@
 <div class="root">
   <h1 i18n class="about-peertube-title">
-    What is PeerTube?
+    This website is powered by PeerTube
   </h1>
 
   <img class="mascot" width="121px" height="147px" src="/client/assets/images/mascot/default.svg" alt="mascot"/>
@@ -63,8 +63,6 @@
   </div>
 
   <div class="privacy-contributors">
-    <my-about-peertube-contributors></my-about-peertube-contributors>
-
     <div class="p2p-privacy">
       <h2 class="section-title">
         <div class="anchor" id="privacy"></div> <!-- privacy anchor -->

diff --git a/client/src/app/+about/about.module.ts b/client/src/app/+about/about.module.ts
index dfea52fb88f212239e34522a02732258df945a71..6a3d72290376e4e889679df099c8fa9d4be137a9 100644 (file)
--- 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 86ac5fbbc30dd0f44427c5b93698a32e7e0ebcf9..0a27ace76ccdbf1a16a6dae88f7514ca67ce669d 100644 (file)
--- 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 6c32c81db813851dc7184c5796c907dd454db66d..a91bec9068988ee1ffc835bd9d104bc27e65735d 100644 (file)
--- 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 () {