diff --git a/Frontend Angular 4/.gitignore b/Frontend Angular 4/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..7f32e4b89087b8f025d4b80ffca1a51e98825c61 --- /dev/null +++ b/Frontend Angular 4/.gitignore @@ -0,0 +1,2 @@ +.vscode +node_modules \ No newline at end of file diff --git a/Frontend Angular 4/custom codemirror/jump-to-line.js b/Frontend Angular 4/custom codemirror/jump-to-line.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/custom codemirror/search.js b/Frontend Angular 4/custom codemirror/search.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/e2e/app.e2e-spec.ts b/Frontend Angular 4/e2e/app.e2e-spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/e2e/app.po.ts b/Frontend Angular 4/e2e/app.po.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/e2e/tsconfig.e2e.json b/Frontend Angular 4/e2e/tsconfig.e2e.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/karma.conf.js b/Frontend Angular 4/karma.conf.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/package.json b/Frontend Angular 4/package.json old mode 100644 new mode 100755 index 95d1e855724e415188c696dfa9aec0e355d827a0..8da84009857ea18ee6c5c4c6fa0ca0fb4d147df5 --- a/Frontend Angular 4/package.json +++ b/Frontend Angular 4/package.json @@ -22,10 +22,13 @@ "@angular/router": "^4.0.0", "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.26", "core-js": "^2.4.1", + "d3": "^4.12.2", "font-awesome": "^4.7.0", + "function-plot": "git+https://github.com/diego-rey/function-plot.git#feature/shape-type", "ionicons": "^3.0.0", "jq-console": "^2.13.2", "jquery": "^3.2.1", + "mathjs": "1.6.0", "ng2-bootstrap-modal": "^1.0.1", "ng2-codemirror": "^1.1.1", "ng2-slider-component": "^1.0.9", diff --git a/Frontend Angular 4/protractor.conf.js b/Frontend Angular 4/protractor.conf.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/.htaccess b/Frontend Angular 4/src/.htaccess old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/Thumbs.db b/Frontend Angular 4/src/Thumbs.db new file mode 100755 index 0000000000000000000000000000000000000000..65ec48f72348e4e35238a8bb7e8560b90e7693fc Binary files /dev/null and b/Frontend Angular 4/src/Thumbs.db differ diff --git a/Frontend Angular 4/src/app/app-routing.module.ts b/Frontend Angular 4/src/app/app-routing.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/app.component.html b/Frontend Angular 4/src/app/app.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/app.component.scss b/Frontend Angular 4/src/app/app.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/app.component.spec.ts b/Frontend Angular 4/src/app/app.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/app.component.ts b/Frontend Angular 4/src/app/app.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/app.module.ts b/Frontend Angular 4/src/app/app.module.ts old mode 100644 new mode 100755 index 084f634a68ef5c67a0b66e483b4fa78d954826aa..7cac3deb343446316fb9671c625072fa24869fb5 --- a/Frontend Angular 4/src/app/app.module.ts +++ b/Frontend Angular 4/src/app/app.module.ts @@ -8,6 +8,7 @@ import { AuthGuard } from './shared/guards/auth.guard'; import { SessionService } from './shared/services/session.service'; import { NotificacionService } from './shared/services/notificacion.service'; import {NotificacionModule} from './notificacion/notificacion.module' + @NgModule({ declarations: [ AppComponent, diff --git a/Frontend Angular 4/src/app/layout/archivos/archivos-routing.module.ts b/Frontend Angular 4/src/app/layout/archivos/archivos-routing.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/archivos.component.html b/Frontend Angular 4/src/app/layout/archivos/archivos.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/archivos.component.ts b/Frontend Angular 4/src/app/layout/archivos/archivos.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/archivos.module.ts b/Frontend Angular 4/src/app/layout/archivos/archivos.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/compartirArchivo.component.ts b/Frontend Angular 4/src/app/layout/archivos/compartirArchivo.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/confirmarEliminar.component.ts b/Frontend Angular 4/src/app/layout/archivos/confirmarEliminar.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/index.ts b/Frontend Angular 4/src/app/layout/archivos/index.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/nuevoArchivo.component.ts b/Frontend Angular 4/src/app/layout/archivos/nuevoArchivo.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/seleccionarDirectorio.component.ts b/Frontend Angular 4/src/app/layout/archivos/seleccionarDirectorio.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/archivos/verCalificacion.component.ts b/Frontend Angular 4/src/app/layout/archivos/verCalificacion.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/canvas/canvas.component.html b/Frontend Angular 4/src/app/layout/canvas/canvas.component.html old mode 100644 new mode 100755 index 3dd9554db347a23a9fada4516d2da31fb29f66b1..45d17064db794e6c1423436205e57d6e85b2df2f --- a/Frontend Angular 4/src/app/layout/canvas/canvas.component.html +++ b/Frontend Angular 4/src/app/layout/canvas/canvas.component.html @@ -23,7 +23,7 @@ <div class="form-group"> <label> <input type="checkbox" style="width: 15px; display: inline-block;" name="evaluacionVertical" class="form-control form-control-sm" [checked]=evaluacionVertical (click)="mostrarEvaluacionVertical()"> - Evaluacion + Evaluacions </label> <br> <label> diff --git a/Frontend Angular 4/src/app/layout/canvas/canvas.component.ts b/Frontend Angular 4/src/app/layout/canvas/canvas.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/canvas/canvas.module.ts b/Frontend Angular 4/src/app/layout/canvas/canvas.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/canvas/canvas.routes.ts b/Frontend Angular 4/src/app/layout/canvas/canvas.routes.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/canvas/index.ts b/Frontend Angular 4/src/app/layout/canvas/index.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/grupos/calificarEntrega.component.ts b/Frontend Angular 4/src/app/layout/grupos/calificarEntrega.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/grupos/grupos-routing.module.ts b/Frontend Angular 4/src/app/layout/grupos/grupos-routing.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/grupos/grupos.component.html b/Frontend Angular 4/src/app/layout/grupos/grupos.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/grupos/grupos.component.ts b/Frontend Angular 4/src/app/layout/grupos/grupos.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/grupos/grupos.module.ts b/Frontend Angular 4/src/app/layout/grupos/grupos.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/layout-routing.module.ts b/Frontend Angular 4/src/app/layout/layout-routing.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/layout.component.html b/Frontend Angular 4/src/app/layout/layout.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/layout.component.scss b/Frontend Angular 4/src/app/layout/layout.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/layout.component.spec.ts b/Frontend Angular 4/src/app/layout/layout.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/layout.component.ts b/Frontend Angular 4/src/app/layout/layout.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/layout.module.ts b/Frontend Angular 4/src/app/layout/layout.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/codemirror-matefun-mode.js b/Frontend Angular 4/src/app/layout/matefun/codemirror-matefun-mode.js old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/confirm.component.ts b/Frontend Angular 4/src/app/layout/matefun/confirm.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/index.ts b/Frontend Angular 4/src/app/layout/matefun/index.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun-routing.module.ts b/Frontend Angular 4/src/app/layout/matefun/matefun-routing.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html old mode 100644 new mode 100755 index 07a5f6a4ccfc5fbf0b6363db862f68b4a548c023..114b1f3e170818d8472dfadb564fd08226864ec8 --- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html +++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html @@ -84,6 +84,12 @@ <graph3d-component (graph3DComp)=graph3DComp></graph3d-component> </ng-template> </ngb-tab> + + <ngb-tab id="FigurasBtn2" title="Figuras New"> + <ng-template ngbTabContent> + <plotter-component (plotterComp)=plotterC></plotter-component> + </ng-template> + </ngb-tab> </ngb-tabset> </div> diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.scss b/Frontend Angular 4/src/app/layout/matefun/matefun.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts b/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts old mode 100644 new mode 100755 index 7a45f4c2148ad1cc4947af688bd6dfe1539b86ba..a9494a7db869d644fef65d44d513d77e32800e62 --- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts +++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts @@ -1,6 +1,8 @@ import { Component, NgModule, ViewChild, HostListener, ElementRef, ComponentRef, TemplateRef } from '@angular/core'; import { CanvasModule} from '../canvas/canvas.module'; import { CanvasComponent } from '../canvas/canvas.component'; +import { PlotterModule } from '../plotter/plotter.module'; +import { PlotterComponent } from '../plotter/plotter.component'; import { Http, JsonpModule } from '@angular/http'; import { Headers, RequestOptions } from '@angular/http'; import { HaskellService } from '../../shared/services/haskell.service'; @@ -354,6 +356,8 @@ export class MateFunComponent { @ViewChild(CanvasComponent) canvasC: CanvasComponent; @ViewChild(Graph3DComponent) graph3DComp: Graph3DComponent; + @ViewChild(PlotterComponent) plotterC: PlotterComponent; + funcionSTR: string = 'Math.sin(x)*x*x-20'; consola: string = ''; command: string = ''; diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.module.ts b/Frontend Angular 4/src/app/layout/matefun/matefun.module.ts old mode 100644 new mode 100755 index bad4eed34065e757b990e6eea5ee894582ca0459..a021aaca087eaa12fbac4d2f0c6b19b7f58cd9d1 --- a/Frontend Angular 4/src/app/layout/matefun/matefun.module.ts +++ b/Frontend Angular 4/src/app/layout/matefun/matefun.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CanvasModule } from '../canvas/canvas.module' +import { PlotterModule } from '../plotter/plotter.module' import { MateFunComponent } from './matefun.component'; import { BootstrapModalModule } from 'ng2-bootstrap-modal'; import { ConfirmComponent } from './confirm.component'; @@ -17,6 +18,7 @@ import { Graph3DModule } from '../plotter/graph3D/graph3D.module'; CommonModule, FormsModule, CanvasModule, + PlotterModule, Graph3DModule, NotificacionModule, MateFunRoutingModule, diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.routes.ts b/Frontend Angular 4/src/app/layout/matefun/matefun.routes.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/matefun/seleccionarDirectorio.component.ts b/Frontend Angular 4/src/app/layout/matefun/seleccionarDirectorio.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/layout/plotter/index.ts b/Frontend Angular 4/src/app/layout/plotter/index.ts new file mode 100755 index 0000000000000000000000000000000000000000..86b4caa06fbca8c98995b157a541aa3ef0496473 --- /dev/null +++ b/Frontend Angular 4/src/app/layout/plotter/index.ts @@ -0,0 +1,6 @@ +/** + * This barrel file provides the export for the lazy loaded BlankpageComponent. + */ +export * from './plotter.component'; + +export * from './plotter.routes'; diff --git a/Frontend Angular 4/src/app/layout/plotter/plotter.component.html b/Frontend Angular 4/src/app/layout/plotter/plotter.component.html new file mode 100755 index 0000000000000000000000000000000000000000..f813a5601c8bf1ac2f17dd2dae8be24c158c55c7 --- /dev/null +++ b/Frontend Angular 4/src/app/layout/plotter/plotter.component.html @@ -0,0 +1,6 @@ +<div class="card"> + <div class="card-block contenedor-canvas" > + <div id="plotter-container" style="height: 100%; width: 100%;"> + </div> + </div> +</div> \ No newline at end of file diff --git a/Frontend Angular 4/src/app/layout/plotter/plotter.component.ts b/Frontend Angular 4/src/app/layout/plotter/plotter.component.ts new file mode 100755 index 0000000000000000000000000000000000000000..38c7d4fea285ff84463c320ee482d9f309cced15 --- /dev/null +++ b/Frontend Angular 4/src/app/layout/plotter/plotter.component.ts @@ -0,0 +1,125 @@ +import { Component } from '@angular/core'; +import { GHCIService } from '../../shared/services/ghci.service'; +import functionPlot from 'function-plot'; + +@Component({ + moduleId: module.id, + selector: 'plotter-component', + templateUrl: './plotter.component.html', + host: { + + } +}) +export class PlotterComponent { + public constructor(private ghciService: GHCIService) { + ghciService.messages.subscribe( + canvas=>{ + if (canvas.tipo == 'graph'){ + var jsonCanvas = JSON.parse(canvas.resultado); + let fun = eval(this.generarFuncion(jsonCanvas)); + + + functionPlot({ + target: '#plotter-container', + width: 770, + height: 720, + tip: { + color: 'green' + }, + xAxis: { + label: 'x - axis', + scale: 'linear', + domain: { + initial: [-4, 4], + type: 'discrete' + } + }, + data: [{ + graphType: 'scatter', + fn: function (scope) { + // scope.x = Number + return fun(scope.x) + } + }] + }) + + // functionPlot({ + // target: '#plotter-container', + // width: 620, + // height: 450, + // data: [{ + // sampler: 'builtIn', + // fn: function(scope) { + // return fun(scope.x) + // }, + // graphType: 'polyline' + // }] + // }) + } + }, + error=>{ + + }) + } + + + + generarFuncion = function(graph) { + var funcionString = ''; + var grafica; + for (var fun of graph.funs) { + funcionString = 'var ' + fun.fun + ' = function(' + fun.args.join() + '){\n return ' + this.generarExpresion(fun.bdy) + '}\n' + funcionString; + + if (fun.fun == graph.graph) { + funcionString += 'return ' + fun.fun + '(' + fun.args.join() + ');\n' + grafica = fun; + } + } + funcionString = '(' + grafica.args.join() + ',delta,hayPunto)=>{\n' + funcionString + '}'; + + console.log('funcion string', funcionString); + return funcionString; + } + + generarExpresion = function(exp) { + var expresion = ''; + if (exp.kind == 'cnd') { + expresion = ' (' + this.generarExpresion(exp.cond) + '?' + this.generarExpresion(exp.exp1) + ':' + this.generarExpresion(exp.exp2) + ') '; + } else if (exp.kind == 'bop') { + if (exp.op == '==') { + expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) < delta && hayPunto() '; + } else if (exp.op == '/=') { + expresion = ' Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) > delta || Math.abs((' + this.generarExpresion(exp.exp1) + ') - (' + this.generarExpresion(exp.exp2) + ')) < delta && !hayPunto() '; + } else if (exp.op == '^') { + expresion = ' Math.pow(' + this.generarExpresion(exp.exp1) + ',' + this.generarExpresion(exp.exp2) + ') '; + } else { + expresion = ' (' + this.generarExpresion(exp.exp1) + ')' + exp.op + '(' + this.generarExpresion(exp.exp2) + ') '; + } + } else if (exp.kind == 'uop') { + expresion = ' ' + exp.op + ' ' + this.generarExpresion(exp.exp) + ' '; + } else if (exp.kind == 'app') { + if (exp.fun == 'cos') { + exp.fun = 'Math.cos' + } else if (exp.fun == 'sen') { + exp.fun = 'Math.sin' + } else if (exp.fun == 'red') { + exp.fun = 'Math.round' + } + expresion = ' ' + exp.fun + '(' + exp.args.map(e => this.generarExpresion(e)).join() + ') '; + } else if (exp.kind == 'tup') { + expresion = ' (' + exp.exps.map(e => this.generarExpresion(e)).join() + ') '; + } else if (exp.kind == 'lit') { + expresion = ' ' + exp.val + ' '; + } else if (exp.kind == 'var') { + expresion = ' ' + exp.var+' '; + } else { + expresion = ' undefined '; + } + + return expresion; + } + + + +} + diff --git a/Frontend Angular 4/src/app/layout/plotter/plotter.module.ts b/Frontend Angular 4/src/app/layout/plotter/plotter.module.ts new file mode 100755 index 0000000000000000000000000000000000000000..4ae25cee7c0f11c64f409e9f05da70a9a8fbf279 --- /dev/null +++ b/Frontend Angular 4/src/app/layout/plotter/plotter.module.ts @@ -0,0 +1,14 @@ +import { NgModule} from '@angular/core'; +import { CommonModule } from '@angular/common' +import { RouterModule } from '@angular/router'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { FormsModule } from '@angular/forms'; +import { PlotterComponent } from './plotter.component'; + +@NgModule({ + imports: [FormsModule, RouterModule, CommonModule, NgbModule], + declarations: [PlotterComponent], + exports: [PlotterComponent] +}) + +export class PlotterModule { } \ No newline at end of file diff --git a/Frontend Angular 4/src/app/layout/plotter/plotter.routes.ts b/Frontend Angular 4/src/app/layout/plotter/plotter.routes.ts new file mode 100755 index 0000000000000000000000000000000000000000..489f72a2b381ee6cf697eaf48a714e4df398ae8e --- /dev/null +++ b/Frontend Angular 4/src/app/layout/plotter/plotter.routes.ts @@ -0,0 +1,9 @@ +import { RouteĆ } from '@angular/router'; +import { PlotterComponent } from './index'; + +export const PlotterRoutes: Route[] = [ + { + path: 'plotter', + component: PlotterComponent + } +]; diff --git a/Frontend Angular 4/src/app/login/login-routing.module.ts b/Frontend Angular 4/src/app/login/login-routing.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/login/login.component.html b/Frontend Angular 4/src/app/login/login.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/login/login.component.scss b/Frontend Angular 4/src/app/login/login.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/login/login.component.spec.ts b/Frontend Angular 4/src/app/login/login.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/login/login.component.ts b/Frontend Angular 4/src/app/login/login.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/login/login.module.ts b/Frontend Angular 4/src/app/login/login.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/not-found/not-found-routing.module.ts b/Frontend Angular 4/src/app/not-found/not-found-routing.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/not-found/not-found.component.html b/Frontend Angular 4/src/app/not-found/not-found.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/not-found/not-found.component.scss b/Frontend Angular 4/src/app/not-found/not-found.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/not-found/not-found.component.ts b/Frontend Angular 4/src/app/not-found/not-found.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/not-found/not-found.module.ts b/Frontend Angular 4/src/app/not-found/not-found.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/notificacion/notificacion.component.html b/Frontend Angular 4/src/app/notificacion/notificacion.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/notificacion/notificacion.component.ts b/Frontend Angular 4/src/app/notificacion/notificacion.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/notificacion/notificacion.module.ts b/Frontend Angular 4/src/app/notificacion/notificacion.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/header/header.component.html b/Frontend Angular 4/src/app/shared/components/header/header.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/header/header.component.scss b/Frontend Angular 4/src/app/shared/components/header/header.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/header/header.component.spec.ts b/Frontend Angular 4/src/app/shared/components/header/header.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/header/header.component.ts b/Frontend Angular 4/src/app/shared/components/header/header.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/index.ts b/Frontend Angular 4/src/app/shared/components/index.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.html b/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.scss b/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.spec.ts b/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.ts b/Frontend Angular 4/src/app/shared/components/sidebar/sidebar.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts old mode 100644 new mode 100755 index 269b0832a942fff97480651e814f48f506bb2fa2..85af34a7927b7193fcd816725361aa4465e248eb --- a/Frontend Angular 4/src/app/shared/config.ts +++ b/Frontend Angular 4/src/app/shared/config.ts @@ -4,6 +4,12 @@ //export const SERVER = 'http://localhost:9090'; //export const GHCI_URL = 'ws://localhost:9090/endpoint'; +export const SERVER = 'http://localhost:8080'; +export const GHCI_URL = 'ws://localhost:8080/endpoint'; + //Configuracion dinamica pensando en servidor con ip dinamica -export const SERVER = window.location.protocol + '//' + window.location.host;//'http://localhost:9090'; -export const GHCI_URL = window.location.protocol == 'http:'? 'ws://'+window.location.host+'/endpoint': 'wss://'+window.location.host+'/endpoint'; +//export const SERVER = window.location.protocol + '//' + window.location.host;//'http://localhost:9090'; +//export const GHCI_URL = window.location.protocol == 'http:'? 'ws://'+window.location.host+'/endpoint': 'wss://'+window.location.host+'/endpoint'; + +//export const SERVER = 'http://ec2-52-15-74-22.us-east-2.compute.amazonaws.com:9090'; +//export const GHCI_URL = 'ws://ec2-52-15-74-22.us-east-2.compute.amazonaws.com:9090/endpoint'; \ No newline at end of file diff --git a/Frontend Angular 4/src/app/shared/guards/auth.guard.spec.ts b/Frontend Angular 4/src/app/shared/guards/auth.guard.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/guards/auth.guard.ts b/Frontend Angular 4/src/app/shared/guards/auth.guard.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/index.ts b/Frontend Angular 4/src/app/shared/index.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modal/confirm.component.ts b/Frontend Angular 4/src/app/shared/modal/confirm.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/index.ts b/Frontend Angular 4/src/app/shared/modules/index.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.html b/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.scss b/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.spec.ts b/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.ts b/Frontend Angular 4/src/app/shared/modules/page-header/page-header.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/page-header/page-header.module.ts b/Frontend Angular 4/src/app/shared/modules/page-header/page-header.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/stat/stat.component.html b/Frontend Angular 4/src/app/shared/modules/stat/stat.component.html old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/stat/stat.component.scss b/Frontend Angular 4/src/app/shared/modules/stat/stat.component.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/stat/stat.component.spec.ts b/Frontend Angular 4/src/app/shared/modules/stat/stat.component.spec.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/stat/stat.component.ts b/Frontend Angular 4/src/app/shared/modules/stat/stat.component.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/modules/stat/stat.module.ts b/Frontend Angular 4/src/app/shared/modules/stat/stat.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/objects/archivo.ts b/Frontend Angular 4/src/app/shared/objects/archivo.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/objects/grupo.ts b/Frontend Angular 4/src/app/shared/objects/grupo.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/objects/usuario.ts b/Frontend Angular 4/src/app/shared/objects/usuario.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/pipes/filter.pipe.ts b/Frontend Angular 4/src/app/shared/pipes/filter.pipe.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/pipes/shared-pipes.module.ts b/Frontend Angular 4/src/app/shared/pipes/shared-pipes.module.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/services/authentication.service.ts b/Frontend Angular 4/src/app/shared/services/authentication.service.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/services/ghci.service.ts b/Frontend Angular 4/src/app/shared/services/ghci.service.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/services/haskell.service.ts b/Frontend Angular 4/src/app/shared/services/haskell.service.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/services/notificacion.service.ts b/Frontend Angular 4/src/app/shared/services/notificacion.service.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/services/session.service.ts b/Frontend Angular 4/src/app/shared/services/session.service.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/services/usuario.service.ts b/Frontend Angular 4/src/app/shared/services/usuario.service.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/services/websocket.service.ts b/Frontend Angular 4/src/app/shared/services/websocket.service.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/app/shared/utils/sha1.ts b/Frontend Angular 4/src/app/shared/utils/sha1.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/environments/environment.prod.ts b/Frontend Angular 4/src/environments/environment.prod.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/environments/environment.ts b/Frontend Angular 4/src/environments/environment.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/favicon.ico b/Frontend Angular 4/src/favicon.ico old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/index.html b/Frontend Angular 4/src/index.html old mode 100644 new mode 100755 index 1fccac3c133148367c45a6177348ebab925d15d8..870ebc1b1fbb6f5b02b43596176c8286081047f3 --- a/Frontend Angular 4/src/index.html +++ b/Frontend Angular 4/src/index.html @@ -11,7 +11,12 @@ <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script> +<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script> +<!-- + <script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script> + + --> </head> <body> <app-root> diff --git a/Frontend Angular 4/src/main.ts b/Frontend Angular 4/src/main.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/polyfills.ts b/Frontend Angular 4/src/polyfills.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/styles/_responsive.scss b/Frontend Angular 4/src/styles/_responsive.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/styles/_rtl.scss b/Frontend Angular 4/src/styles/_rtl.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/styles/_spinner.scss b/Frontend Angular 4/src/styles/_spinner.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/styles/_utils.scss b/Frontend Angular 4/src/styles/_utils.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/styles/app.scss b/Frontend Angular 4/src/styles/app.scss old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/styles/console.css b/Frontend Angular 4/src/styles/console.css old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/test.ts b/Frontend Angular 4/src/test.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/tsconfig.app.json b/Frontend Angular 4/src/tsconfig.app.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/tsconfig.spec.json b/Frontend Angular 4/src/tsconfig.spec.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/src/typings.d.ts b/Frontend Angular 4/src/typings.d.ts old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/tsconfig.json b/Frontend Angular 4/tsconfig.json old mode 100644 new mode 100755 diff --git a/Frontend Angular 4/tslint.json b/Frontend Angular 4/tslint.json old mode 100644 new mode 100755