Merge branch 'develop'

Origami-Lab · Jan 25, 2024 · 1403125 · 1403125
2 parents 3a553ea + 61a9c0e
commit 1403125
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...tails/experiment-details-content/experiment-conclusion/experiment-conclusion.component.ts b/...tails/experiment-details-content/experiment-conclusion/experiment-conclusion.component.ts
@@ -71,7 +71,7 @@ export class ExperimentConclusionComponent implements OnInit, OnDestroy, Resizab
             if (!this.conclusion.padid) {
               this.createGroupPad(conclusion);
             } else {
-              this.iframeURL = `https://etherpad.cobalt.origamilab.ch/p/${
+              this.iframeURL = `https://etherpad.cobalteln.com/p/${
                 this.conclusion.padid
               }?showChat=false&userName=${localStorage.getItem('userName')}`;
             }
@@ -101,7 +101,7 @@ export class ExperimentConclusionComponent implements OnInit, OnDestroy, Resizab
       } else {
         this.save(rs.data.padID);
       }
-      this.iframeURL = `https://etherpad.cobalt.origamilab.ch/p/${rs.data.padID}?showChat=false&userName=${localStorage.getItem(
+      this.iframeURL = `https://etherpad.cobalteln.com/p/${rs.data.padID}?showChat=false&userName=${localStorage.getItem(
         'userName'
       )}`;
     });

diff --git a/...t-details/experiment-details-content/experiment-protocol/experiment-protocol.component.ts b/...t-details/experiment-details-content/experiment-protocol/experiment-protocol.component.ts
@@ -71,7 +71,7 @@ export class ExperimentProtocolComponent implements OnInit, OnDestroy, Resizable
             if (!this.protocol.padid) {
               this.createGroupPad(protocol);
             } else {
-              this.iframeURL = `https://etherpad.cobalt.origamilab.ch/p/${
+              this.iframeURL = `https://etherpad.cobalteln.com/p/${
                 this.protocol.padid
               }?showChat=false&userName=${localStorage.getItem('userName')}`;
             }
@@ -102,7 +102,7 @@ export class ExperimentProtocolComponent implements OnInit, OnDestroy, Resizable
       } else {
         this.save(rs.data.padID as string);
       }
-      this.iframeURL = `https://etherpad.cobalt.origamilab.ch/p/${rs.data.padID}?showChat=false&userName=${localStorage.getItem(
+      this.iframeURL = `https://etherpad.cobalteln.com/p/${rs.data.padID}?showChat=false&userName=${localStorage.getItem(
         'userName'
       )}`;
     });

diff --git a/...periments/experiment-details/experiment-details-page/experiment-details-page.component.ts b/...periments/experiment-details/experiment-details-page/experiment-details-page.component.ts
@@ -51,7 +51,7 @@ export class ExperimentDetailsPageComponent implements OnInit, OnDestroy {
         this.experiment = experiment;
         this.loading = false;
         if (experiment.padid) {
-          this.iframeURL = `https://etherpad.cobalt.origamilab.ch/p/${
+          this.iframeURL = `https://etherpad.cobalteln.com/p/${
             this.experiment.padid
           }?showChat=true&lang=en&userName=${localStorage.getItem('userName')}`;
         } else {
@@ -95,7 +95,7 @@ export class ExperimentDetailsPageComponent implements OnInit, OnDestroy {
     };
     this.http.post(`${environment.padUrl}createGroupPad`, params, options).subscribe((rs: any) => {
       this.updateExperiments(rs.data.padID);
-      this.iframeURL = `https://etherpad.cobalt.origamilab.ch/p/${rs.data.padID}?showChat=true&lang=en&userName=${localStorage.getItem(
+      this.iframeURL = `https://etherpad.cobalteln.com/p/${rs.data.padID}?showChat=true&lang=en&userName=${localStorage.getItem(
         'userName'
       )}`;
     });

diff --git a/src/app/platform/platform-layout/platform-header/platform-header.component.ts b/src/app/platform/platform-layout/platform-header/platform-header.component.ts
@@ -85,7 +85,7 @@ export class PlatformHeaderComponent implements OnInit {
     const isSession = localStorage.getItem('isSession');
     // const sessionId = localStorage.getItem('sessionID');
     // if (sessionId) {
-    //   this.iframeURl = `https://etherpad.cobalt.origamilab.ch/auth_session?sessionID=${sessionId}`;
+    //   this.iframeURl = `https://etherpad.cobalteln.com/auth_session?sessionID=${sessionId}`;
     // }
     if (isSession) {
       return;
@@ -103,7 +103,7 @@ export class PlatformHeaderComponent implements OnInit {
 
     this.http.post(`${environment.padUrl}createSession`, params, options).subscribe((rs: any) => {
       localStorage.setItem('sessionID', rs.data.sessionID);
-      this.iframeURl = `https://etherpad.cobalt.origamilab.ch/auth_session?sessionID=${rs.data.sessionID}`;
+      this.iframeURl = `https://etherpad.cobalteln.com/auth_session?sessionID=${rs.data.sessionID}`;
     });
   }
 }