diff --git a/backend/matefun/WebContent/WEB-INF/web.xml b/backend/matefun/WebContent/WEB-INF/web.xml
index 3678fa46cdd3fbfb602271117886f7533f37f68b..f33bc2fb1fefc944dea4a493d2b70394b7516f6f 100644
--- a/backend/matefun/WebContent/WEB-INF/web.xml
+++ b/backend/matefun/WebContent/WEB-INF/web.xml
@@ -16,7 +16,7 @@
</filter>
<filter-mapping>
<filter-name>javamelody</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>/matefun/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>ASYNC</dispatcher>
</filter-mapping>
diff --git a/backend/matefun/WebContent/index.html b/backend/matefun/WebContent/index.html
index 4271421a06c01306d5684810de72cac553fad2bf..4422f86efc26ee88c4dcbae2f1a1d4f9059cbeb4 100644
--- a/backend/matefun/WebContent/index.html
+++ b/backend/matefun/WebContent/index.html
@@ -12,7 +12,7 @@
<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>
-<link href="styles.b1148277d66fc16e21e2.bundle.css" rel="stylesheet"/></head>
+</head>
<body>
<app-root>
<div class="loading">
@@ -23,6 +23,6 @@
<div class="loading-bar"></div>
</div>
</app-root>
-<script type="text/javascript" src="inline.f11bdadae27a10eb14b0.bundle.js"></script><script type="text/javascript" src="polyfills.fea873d1973cf1b50182.bundle.js"></script><script type="text/javascript" src="scripts.dd03fe800ea834b08787.bundle.js"></script><script type="text/javascript" src="vendor.901ea4aab80b8257297b.bundle.js"></script><script type="text/javascript" src="main.83f666d7b3dd0127c272.bundle.js"></script></body>
+<script type="text/javascript" src="inline.bundle.js"></script><script type="text/javascript" src="polyfills.bundle.js"></script><script type="text/javascript" src="scripts.bundle.js"></script><script type="text/javascript" src="styles.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="main.bundle.js"></script></body>
</html>
diff --git a/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java b/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java
index f250a4b3d6581b9f939fffd19ee2e9a7be9ed860..480fde538cec70533741cc6a1d2c7d4622a0ec38 100644
--- a/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java
+++ b/backend/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java
@@ -133,6 +133,7 @@ public class LoginEJB{
root.setNombre("root");
root.setFechaCreacion(new Date());
root.setEditable(true);
+
root.setEstado(EstadoArchivo.Edicion);
em.persist(root);
em.persist(nuevoDesdeMoodle);
diff --git a/backend/matefun/src/main/resources/META-INF/persistence.xml b/backend/matefun/src/main/resources/META-INF/persistence.xml
index 11e083f174bcec8cd55c707944cc0238c8b940ba..ef06672b5da7134b107e4bf09780dd34ce0ecdb7 100644
--- a/backend/matefun/src/main/resources/META-INF/persistence.xml
+++ b/backend/matefun/src/main/resources/META-INF/persistence.xml
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
version="2.1">
-
- <!-- <persistence-unit name="matefunDS" transaction-type="JTA">
+ <!--
+ <persistence-unit name="matefunDS" transaction-type="JTA">
<jta-data-source>java:/matefun</jta-data-source>
<class>edu.proygrado.modelo.Alumno</class>
<class>edu.proygrado.modelo.Archivo</class>
@@ -20,7 +20,7 @@
<property name="javax.persistence.schema-generation.database.action" value="none" />
</properties>
</persistence-unit>
--->
+-->
<persistence-unit name="matefunDS" transaction-type="JTA">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
diff --git a/frontendAngular4/src/app/layout/archivos/archivos.component.html b/frontendAngular4/src/app/layout/archivos/archivos.component.html
index f48c66ebe3eeea6fb70e9d06e6dfdfafc5e1d9ee..76db9a3bcad7cb4d55258858ffc401737ceaf19a 100644
--- a/frontendAngular4/src/app/layout/archivos/archivos.component.html
+++ b/frontendAngular4/src/app/layout/archivos/archivos.component.html
@@ -60,8 +60,8 @@
<div class="loading-bar"></div>
</div>
<div *ngFor="let arch of directorioActual.archivos | filter: 'nombre': filtroNombre " (click)="seleccionarArchivo(arch)" class="col-sm-3 " style="text-align: center;">
- <i *ngIf="arch.directorio" class="fa fa-folder" style="font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
- <i *ngIf="!arch.directorio" class="fa fa-file-text" style="font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
+ <i *ngIf="arch.directorio" class="fa fa-folder" style="font-size: 3em; cursor: pointer;color:coral" aria-hidden="true"></i>
+ <i *ngIf="!arch.directorio" class="fa fa-file-text" style="font-size: 3em; cursor: pointer;color:orange" aria-hidden="true"></i>
<p style="cursor: pointer;">{{arch.nombre}}</p>
</div>
</div>
@@ -83,7 +83,7 @@
<div class="loading-bar"></div>
</div>
<div *ngFor="let arch of archivosCompartidosSinDuplicados | filter: 'nombre': filtroNombre " (click)="seleccionarArchivo(arch)" class="col-sm-3 " style="text-align: center;">
- <i class="fa fa-file-text" style="font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
+ <i class="fa fa-file-text" style="font-size: 3em; cursor: pointer;color:orange" aria-hidden="true"></i>
<p style="cursor: pointer;">{{arch.nombre}}</p>
</div>
</div>
diff --git a/frontendAngular4/src/app/layout/grupos/grupos.component.html b/frontendAngular4/src/app/layout/grupos/grupos.component.html
index e32f8af730eedfb895e3974127cb17d5b82566c3..7304b79718967a53f0553a88603ae4cabea932ab 100644
--- a/frontendAngular4/src/app/layout/grupos/grupos.component.html
+++ b/frontendAngular4/src/app/layout/grupos/grupos.component.html
@@ -25,7 +25,7 @@
<div class="loading-bar"></div>
</div>
<div *ngFor="let grupo of grupos" (click)="seleccionarGrupo(grupo)" class="col-sm-3 " style="text-align: center;">
- <i class="fa fa-users" style="font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
+ <i class="fa fa-users" style="font-size: 3em; cursor: pointer;color: rgb(29, 40, 204);" aria-hidden="true"></i>
<p style="cursor: pointer;">{{grupo.grado + '°' + grupo.grupo+" - "+grupo.anio}}</p>
</div>
</div>
@@ -44,7 +44,7 @@
<div class="card-block">
<div class="row" style="min-height: 100px">
<div *ngFor="let alumno of grupoSeleccionado.alumnos" (click)="seleccionarAlumno(alumno)" class="col-sm-3 " style="text-align: center;">
- <i class="fa fa-user" style="font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
+ <i class="fa fa-user" style="font-size: 3em; cursor: pointer;color: darkorange;" aria-hidden="true"></i>
<p style="cursor: pointer;">{{alumno.apellido +', ' + alumno.nombre}}</p>
</div>
</div>
@@ -64,7 +64,7 @@
<div class="card-block">
<div class="row" style="min-height: 100px">
<div *ngFor="let archivo of grupoSeleccionado.archivos " (click)="seleccionarArchivo(archivo)" class="col-sm-3 " style="text-align: center;">
- <i class="fa fa-file-text" style="font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
+ <i class="fa fa-file-text" style="font-size: 3em; cursor: pointer;color:orange" aria-hidden="true"></i>
<p style="cursor: pointer;">{{archivo.nombre}}</p>
</div>
</div>
@@ -79,7 +79,7 @@
<div class="card-block">
<div class="row" style="min-height: 100px" >
<div *ngFor="let entrega of alumnoSeleccionado.archivos" (click)="seleccionarEntrega(entrega)" class="col-sm-3 " style="text-align: center;">
- <i [ngStyle]="" class="fa fa-file-text" style="font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
+ <i [ngStyle]="" class="fa fa-file-text" style="color:orange;font-size: 3em; cursor: pointer;" aria-hidden="true"></i>
<p style="cursor: pointer;">{{entrega.nombre}}</p>
</div>
diff --git a/frontendAngular4/src/app/login/login.component.html b/frontendAngular4/src/app/login/login.component.html
index 0241798d943dcbe747d818e9611e1c8f927492dd..b545c3a0771a014865de27618a778797adb99557 100644
--- a/frontendAngular4/src/app/login/login.component.html
+++ b/frontendAngular4/src/app/login/login.component.html
@@ -1,11 +1,11 @@
-<div class="login-page">
+<div class="login-page" style="background: linear-gradient(#0085ff, #31dc7d);">
<div class="row">
- <div class="col-md-4 push-md-4">
+ <div class="col-md-4 push-md-4" style="padding: 55px 35px;background: rgba(255,255,255,0.15);border-radius: 8px;">
<h1>MateFun</h1>
<form role="form">
<div class="form-content">
<div class="form-group">
- <input type="text" [(ngModel)]=model.cedula name="cedula" class="form-control input-underline input-lg" placeholder="Cedula">
+ <input type="text" [(ngModel)]=model.cedula name="cedula" class="form-control input-underline input-lg" placeholder="Cédula">
</div>
<div class="form-group">
diff --git a/frontendAngular4/src/app/shared/components/header/header.component.html b/frontendAngular4/src/app/shared/components/header/header.component.html
index a7555033506477802caf6b8af4bc94be1a9276d7..29f26cbf83bb0f3df3cc356329bc26e472b472d2 100644
--- a/frontendAngular4/src/app/shared/components/header/header.component.html
+++ b/frontendAngular4/src/app/shared/components/header/header.component.html
@@ -1,5 +1,5 @@
-<div class="pos-f-t fixed-top header" style="z-index: 1100">
- <nav class="navbar navbar-inverse bg-inverse navbar-toggleable-md">
+<div class="pos-f-t fixed-top header" style="z-index: 1100;">
+ <nav class="navbar navbar-inverse bg-inverse navbar-toggleable-md" style="background: linear-gradient(to right, #0085ff, rgb(49, 220, 193)) !important;">
<button class="navbar-toggler navbar-toggler-left" style="display: block;" (click)="toggleSidebar()">
<span class="navbar-toggler-icon"></span>
</button>
diff --git a/frontendAngular4/src/app/shared/components/header/header.component.scss b/frontendAngular4/src/app/shared/components/header/header.component.scss
index c19c044c5ca3ff7c810e1706c083ebdad5d24d3f..0d36a4b544562ce09936353e4ec38c3827d23849 100644
--- a/frontendAngular4/src/app/shared/components/header/header.component.scss
+++ b/frontendAngular4/src/app/shared/components/header/header.component.scss
@@ -1,5 +1,7 @@
$topnav-background-color: #222;
.topnav {
+ background: linear-gradient(#0085ff, #31dc7d);
+
border-radius: 0;
background-color: $topnav-background-color;
padding : 6px;
diff --git a/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html b/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html
index d9e49dbd280121a61ae077ef55c555dcce321e75..850df37c4e49e51c28966f85302a5b60cb860d3d 100644
--- a/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html
+++ b/frontendAngular4/src/app/shared/components/sidebar/sidebar.component.html
@@ -1,12 +1,13 @@
-<nav class="sidebar" [ngClass]="{sidebarPushRight: isActive}">
+<nav class="sidebar" [ngClass]="{sidebarPushRight: isActive}" style="background: linear-gradient(#0085ff, rgb(49, 220, 193)) !important;">
<ul class="list-group">
- <a [routerLink]="['/matefun']" (click)=toggleSidebar() [routerLinkActive]="['router-link-active']" class="list-group-item">
+ <a [routerLink]="['/matefun']" (click)=toggleSidebar() [routerLinkActive]="['router-link-active']" class="list-group-item"
+ style="background: transparent;color: white;">
<i class="fa fa-fw fa-desktop"></i> Programa
</a>
- <a [routerLink]="['/archivos']" (click)=toggleSidebar() [routerLinkActive]="['router-link-active']" class="list-group-item">
+ <a [routerLink]="['/archivos']" (click)=toggleSidebar() [routerLinkActive]="['router-link-active']" class="list-group-item"style="background: transparent;color: white;">
<i class="fa fa-fw fa-file-o"></i> Archivos
</a>
- <a *ngIf="esDocente()" [routerLink]="['/grupos']" (click)=toggleSidebar() [routerLinkActive]="['router-link-active']" class="list-group-item">
+ <a *ngIf="esDocente()" [routerLink]="['/grupos']" (click)=toggleSidebar() [routerLinkActive]="['router-link-active']" class="list-group-item" style="background: transparent;color: white;">
<i class="fa fa-fw fa-file-o"></i> Grupos
</a>
diff --git a/frontendAngular4/src/app/shared/config.ts b/frontendAngular4/src/app/shared/config.ts
index 31198b7aa5d2b192ce564bfb0b31e822a0b9062b..62bd77a4f29fd3bc27e519cbdc64e3851ed59d15 100644
--- a/frontendAngular4/src/app/shared/config.ts
+++ b/frontendAngular4/src/app/shared/config.ts
@@ -1,8 +1,9 @@
-//export const SERVER = 'http://localhost:9080/matefun';
-//export const GHCI_URL = 'ws://localhost:9080/matefun/endpoint';
-//export const SERVER = 'http://192.168.1.46:9080';
-//export const GHCI_URL = 'ws://192.168.1.46:9080/endpoint';
-//export const SERVER = 'https://matefun.mybluemix.net';
-//export const GHCI_URL = 'wss://matefun.mybluemix.net/endpoint';
-export const SERVER = 'http://localhost:9080';
-export const GHCI_URL = 'ws://localhost:9080/endpoint';
+//export const SERVER = 'http://localhost:8080/matefun';
+//export const GHCI_URL = 'ws://localhost:8080/matefun/endpoint';
+
+//export const SERVER = 'http://192.168.43.192:9080';
+//export const GHCI_URL = 'ws://192.168.43.192:9080/endpoint';
+export const SERVER = 'https://matefun.mybluemix.net';
+export const GHCI_URL = 'wss://matefun.mybluemix.net/endpoint';
+//export const SERVER = 'http://localhost:9080';
+//export const GHCI_URL = 'ws://localhost:9080/endpoint';