Update

.travis.yml

@@ -35,13 +35,8 @@ jobs:
       language: node_js
       node_js: "12.14.1"
 
-      services:
-        - xvfb
-      addons:
-        chrome: stable
-
       install:
-        - npm install -g ionic firebase-tools
+        - npm install -g ionic
         - npm install
         - ionic info
 

package.json

@@ -28,6 +28,7 @@
     "@ionic-native/device": "^5.0.0",
     "@ionic-native/geolocation": "^5.0.0",
     "@ionic-native/google-maps": "^5.0.0",
+    "@ionic-native/http": "^5.22.0",
     "@ionic-native/in-app-browser": "^5.0.0",
     "@ionic-native/market": "^5.0.0",
     "@ionic-native/network": "^5.0.0",
@@ -40,9 +41,11 @@
     "@types/node": "^12.12.27",
     "cordova": "^9.0.0",
     "cordova-android": "^8.1.0",
+    "cordova-plugin-advanced-http": "^2.4.1",
     "cordova-plugin-appavailability": "^0.4.2",
     "cordova-plugin-calendar": "~5.1.5",
     "cordova-plugin-device": "^2.0.3",
+    "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-googlemaps": "git+https://github.com/mapsplugin/cordova-plugin-googlemaps.git#multiple_maps",
     "cordova-plugin-googlemaps-sdk": "git+https://github.com/mapsplugin/cordova-plugin-googlemaps-sdk.git",
     "cordova-plugin-market": "^1.2.0",
@@ -55,7 +58,6 @@
     "ionic-cache": "^4.1.0",
     "ionicons": "^5.0.1",
     "rxjs": "^6.5.4",
-    "sw-toolbox": "^3.6.0",
     "timers": "^0.1.1",
     "zone.js": "^0.10.2"
   },
@@ -73,9 +75,8 @@
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.5.2",
     "karma-spec-reporter": "0.0.32",
-    "node-sass": "^4.13.1",
     "protractor": "^5.4.3",
-    "typescript": "~3.4.5",
+    "typescript": "~3.5.3",
     "webpack": "^4.42.0"
   },
   "description": "Stud.UCLouvain : an app for UCLouvain students made by UCLouvain students",
@@ -97,7 +98,8 @@
       "cordova-support-google-services": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-calendar": {},
-      "cordova-plugin-network-information": {}
+      "cordova-plugin-network-information": {},
+      "cordova-plugin-advanced-http": {}
     },
     "platforms": [
       "android"

src/app/app.component.ts

@@ -81,7 +81,6 @@ export class MyApp {
     this.initializeApp();
     this.getPages();
     platform.ready().then(() => {
-      this.wso2Service.getToken();
       translateService.setDefaultLang('fr');
       this.user.storage.get('lan').then(data => {
         translateService.use(data !== null ? data : 'fr');

src/app/app.module.ts

@@ -59,7 +59,6 @@ import { SettingsProvider } from "../services/utils-services/settings-service";
 import { HomePage } from "../pages/home/home";
 import { TutoPage } from "../pages/tuto/tuto";
 import { FormsModule } from "@angular/forms";
-import { CommonModule } from "@angular/common";
 import { AppRoutingModule } from "./app-routing.module";
 import { ServiceWorkerModule } from '@angular/service-worker';
 
@@ -79,7 +78,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     IonicStorageModule.forRoot(),
     HttpClientModule,
     AppRoutingModule,
-    CommonModule,
     FormsModule,
     TranslateModule.forRoot({
       loader: {

src/index.html

@@ -11,22 +11,13 @@
   <meta content="no" name="msapplication-tap-highlight">
 
   <link href="assets/icon/favicon.ico" rel="icon" type="image/x-icon">
-  <!--  <link href="manifest.json" rel="manifest">-->
+    <link href="manifest.webmanifest" rel="manifest">
   <meta content="#4e8ef7" name="theme-color">
 
   <!-- cordova.js required for cordova apps -->
 <!--  <script async src="cordova.js"></script>-->
 
-  <!-- un-comment this code to enable service worker-->
-  <script>
-    if ('serviceWorker' in navigator) {
-      navigator.serviceWorker.register('service-worker.js')
-        .then(() => console.log('service worker installed'))
-        .catch(err => console.error('Error', err));
-    }
-  </script>
-
-  <link href="build/main.css" rel="stylesheet">
+<!--  <link href="build/main.css" rel="stylesheet">-->
 
   <link rel="manifest" href="manifest.webmanifest">
   <meta name="theme-color" content="#1976d2">
@@ -47,8 +38,8 @@
 
   <noscript>Please enable JavaScript to continue using this application.</noscript>
 </body>
-<noscript>
-  <h1>You must enable JavaScript to view this page.</h1>
-</noscript>
+<!--<noscript>-->
+<!--  <h1>You must enable JavaScript to view this page.</h1>-->
+<!--</noscript>-->
 
 </html>

src/pages/events/events.html

@@ -83,7 +83,7 @@ <h3>{{event.title}}</h3>
 
           <ion-button (click)="utilsService.addFavorite(eventsList, event, 'EVENTS')" *ngIf="segment === 'all'"
                   class="large-icon" fill="outline">
-            <ion-icon name="star-outline="></ion-icon>
+            <ion-icon name="star-outline"></ion-icon>
           </ion-button>
 
           <ion-button (click)="removeFavorite(event, 'Remove Favorite')" *ngIf="segment === 'favorites'"

src/pages/home/home.html

@@ -20,7 +20,6 @@
 
 -->
 <!--EN-TETE-->
-<script src="../../../../StudUCLouvain_ionic-v4/src/app/home/home.page.ts"></script>
 <ion-header *ngIf="(userS.hasCampus() === true)">
   <ion-toolbar color="home">
     <ion-title>

src/pages/home/home.ts

@@ -66,8 +66,10 @@ export class HomePage {
     private utilsService: UtilsService,
     private settings: SettingsProvider
   ) {
+        console.log("start home constructor", this.selectedTheme);
     this.settings.getActiveTheme().subscribe(val => this.selectedTheme = val);
     document.title = this.title;
+    console.log("end home constructor", this.selectedTheme);
     // this.userS.addCampus('');
   }
 

src/pages/sports/sports.html

@@ -82,7 +82,7 @@ <h3>{{sport.sport}} {{sport.sexe}} {{sport.type}}</h3>
           <ion-button (click)="utilsService.addFavorite(sport, 'SPORTS')"
                   *ngIf="segment === 'all' || segment === 'team'"
                   class="large-icon">
-            <ion-icon name="star-outline="></ion-icon>
+            <ion-icon name="star-outline"></ion-icon>
           </ion-button>
           <ion-button (click)="removeFavorite(sport, 'Remove Favorite')" *ngIf="segment === 'favorites'"
                   class="large-icon">

src/pages/studies/studies.html

@@ -114,7 +114,6 @@ <h4 *ngIf="prog" text-center>{{prog}}</h4>
         <ion-item-sliding #slidingItem>
           <ion-item>
             <ion-label>{{activity.sigle}}</ion-label>
-            <!-- - {{activity.name}}-->
           </ion-item>
           <ion-item-options>
             <ion-button (click)="addCourseFromProgram(activity.sigle)" class="large-icon" fill="outline">
@@ -125,10 +124,7 @@ <h4 *ngIf="prog" text-center>{{prog}}</h4>
       </ion-list>
       <p *ngIf="activities.length <= 0">{{'STUDY.NO' | translate}}</p>
     </ion-list>
-
   </ng-container>
-
-
 </ion-content>
 
 <!-------------------------------- BUTTON TO ADD COURSE ---------------------------------------------------->

src/pages/tuto/tuto.scss

@@ -18,16 +18,27 @@
     You should have received a copy of the GNU General Public License
     along with UCLCampus.  If not, see <http://www.gnu.org/licenses/>.
 */
-
-#slides {
+ion-slides {
   background: var(--ion-color-uclouvain) !important;
-}
+  height: 100%;
 
-ion-slide img {
-  height: 50vh !important;
-}
+  ion-slide {
+    height: 100%;
 
-ion-slide p {
-  color: white;
-}
+    ion-row {
+      justify-content: center;
 
+      p {
+        color: white;
+      }
+
+      img {
+        height: 70vh;
+      }
+
+      .descr p {
+        height: 20vh;
+      }
+    }
+  }
+}

src/services/utils-services/settings-service.ts

@@ -2,7 +2,9 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class SettingsProvider {
 
   private theme: BehaviorSubject<string>;

src/services/utils-services/user-service.ts

@@ -22,7 +22,9 @@
 import { Injectable } from '@angular/core';
 import { Storage } from '@ionic/storage';
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class UserService {
 
   favorites: string[] = [];

src/services/utils-services/utils-service.ts

@@ -39,7 +39,9 @@ import { Page } from "../../app/entity/page";
 import { NavigationExtras } from "@angular/router";
 import * as xml2js from 'xml2js';
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class UtilsService {
   loading: any;
   shownGroup = null;

src/services/wso2-services/wso2-service.ts

@@ -13,7 +13,9 @@ import { wso2HeaderStudent } from '../../app/variables-config';
   See https://angular.io/docs/ts/latest/guide/dependency-injection.html
   for more info on services and Angular 2 DI.
 */
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class Wso2Service {
 
   wso2ServiceBaseUrl = 'https://api.sgsi.ucl.ac.be:8243/';
@@ -44,14 +46,14 @@ export class Wso2Service {
     // this.optionsToken = new RequestOptions({headers: headers});
 
     const finalUrl = this.wso2ServiceBaseUrl + 'token';
-    this.http.post(finalUrl, body, {headers: headers}).pipe(
+    return this.http.post(finalUrl, body, {headers: headers}).pipe(
       map(res => {
         this.token = 'Bearer ' + res['access_token'];
       })).subscribe(res => {
       return 'OK';
     }, error => {
       console.log('Token error');
-      error;
+      return error;
     });
   }
 

tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "baseUrl": "./",
     "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,