diff --git a/proxy.conf.json b/proxy.conf.json index 234cd6c..3e340aa 100644 --- a/proxy.conf.json +++ b/proxy.conf.json @@ -11,7 +11,7 @@ "ws": true }, - "/login": { + "/webservice": { "target": "http://localhost:8888", "secure": false } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d829e55..c8cddd0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,7 +10,7 @@ import { AppComponent } from './app.component'; import { DashboardComponent } from './dashboard/dashboard.component'; import { HeaderComponent } from './header/header.component'; import { SidebarComponent } from './sidebar/sidebar.component'; -import { LoginComponent } from './web/web.component'; +import { WebComponent } from './web/web.component'; import { MarkdownService } from './services/markdown.service'; import { TerminadoService } from './services/terminado.service'; import { IdeComponent } from './ide/ide.component'; @@ -22,6 +22,7 @@ import { ProcessManagerService } from './services/processmanager.service'; import { AppRoutingModule } from './app-routing.module'; import { TestmessengerComponent } from './testmessenger/testmessenger.component'; import { DeploymentNotificationService } from './services/deployment-notification.service'; +import { SafePipe } from './pipes/safe.pipe'; @NgModule({ @@ -29,12 +30,13 @@ import { DeploymentNotificationService } from './services/deployment-notificatio AppComponent, HeaderComponent, SidebarComponent, - LoginComponent, + WebComponent, IdeComponent, MessagesComponent, TerminalComponent, DashboardComponent, - TestmessengerComponent + TestmessengerComponent, + SafePipe ], imports: [ BrowserModule, diff --git a/src/app/config.ts b/src/app/config.ts index 44b3ab7..fb1847e 100644 --- a/src/app/config.ts +++ b/src/app/config.ts @@ -22,6 +22,7 @@ export const config = { 'ide-only', 'web-only' ], + iframeUrl: '/webservice', hide_messages: false }, ide: { @@ -29,7 +30,7 @@ export const config = { autoSaveInterval: 444, defaultCode: 'Loading your file...', defaultLanguage: 'text', - deployProcessName: 'login', + deployProcessName: 'webservice', showDeployButton: true }, terminal: { diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 677463a..40b3cdb 100755 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -4,11 +4,14 @@
Edit me if you want to write your own component in Angular!
diff --git a/src/app/web/web.component.ts b/src/app/web/web.component.ts index dd136b0..2f9b010 100644 --- a/src/app/web/web.component.ts +++ b/src/app/web/web.component.ts @@ -1,36 +1,12 @@ -import { HttpClient } from '@angular/common/http'; -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { Login } from './web'; -import { DeploymentNotificationService } from '../services/deployment-notification.service'; -import { Subscription } from 'rxjs/Subscription'; +// Edit me if you want to write your own component in Angular! +import { Component } from '@angular/core'; +import { config } from '../config' @Component({ selector: 'app-web', templateUrl: './web.component.html', styleUrls: ['./web.component.scss'] }) -export class LoginComponent { - model = new Login('', ''); - submitted = false; - is_admin: boolean; - logged_in_email: string; - - constructor( - private http: HttpClient - ) {} - - onSubmit() { - this.postLogin(this.model).subscribe( - res => { - this.logged_in_email = res['email']; - this.is_admin = res['is_admin']; - } - ); - this.submitted = true; - } - - postLogin(login: Login): Observable