Merge branch 'develop' of https://github.com/GCE-NEIIST/GCE-NEIIST-webapp into develop

Author: facasaca

.gitignore

@@ -40,7 +40,7 @@ angular-src/scripts/set-env.env
 ### MEAN.Anglar Stack ###
 ## Angular ##
 # compiled output
-angular-src/src/assets
+#angular-src/src/assets
 client/assets/libs
 public
 /dist
@@ -135,3 +135,6 @@ typings/
 *.js___jb_tmp___
 
 # End of https://www.gitignore.io/api/mean
+
+package-lock.json
+angular-src/package-lock.json

angular-src/package-lock.json

@@ -10,50 +10,47 @@
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "postinstall": "npm run config && ng build --prod --build-optimizer=true"
+    "postinstall": "npm run config && ngcc",
+    "dist": "http-server dist --port 4200"
   },
   "private": true,
   "dependencies": {
-    "@agm/core": "^1.0.0-beta.3",
-    "@angular-devkit/build-angular": "^0.13.5",
-    "@angular/animations": "6.1.7",
-    "@angular/cli": "^6.2.1",
-    "@angular/common": "6.1.7",
-    "@angular/compiler": "6.1.7",
-    "@angular/compiler-cli": "^7.2.8",
-    "@angular/core": "6.1.7",
-    "@angular/forms": "6.1.7",
-    "@angular/http": "6.1.7",
-    "@angular/language-service": "6.1.7",
-    "@angular/material": "^6.4.7",
-    "@angular/platform-browser": "6.1.7",
-    "@angular/platform-browser-dynamic": "6.1.7",
-    "@angular/router": "6.1.7",
-    "@auth0/angular-jwt": "^2.0.0",
+    "@angular-devkit/build-angular": "^0.1002.0",
+    "@angular/cli": "^10.2.0",
+    "@angular/common": "^10.2.1",
+    "@angular/compiler": "^10.2.1",
+    "@angular/compiler-cli": "^10.2.1",
+    "@angular/core": "^10.2.1",
+    "@angular/forms": "^10.2.1",
+    "@angular/http": "^7.2.16",
+    "@angular/platform-browser": "^10.2.1",
+    "@angular/platform-browser-dynamic": "^10.2.1",
+    "@angular/router": "^10.2.1",
+    "@auth0/angular-jwt": "^5.0.1",
     "@ng-bootstrap/ng-bootstrap": "^4.1.0",
+    "@ngtools/webpack": "^10.2.0",
     "@types/node": "^6.0.117",
     "adm-zip": "^0.4.11",
-    "angular2-flash-messages": "^1.0.8",
     "bootstrap": "^4.3.1",
     "chart.js": "^2.7.1",
     "core-js": "^2.4.1",
     "dotenv": "^6.0.0",
     "font-awesome": "^4.7.0",
     "hoek": "^5.0.4",
     "jquery": "^3.4.1",
-    "ng2-charts": "^1.6.0",
     "parsejson": "0.0.3",
-    "rxjs": "^6.3.2",
+    "rxjs": "^6.6.3",
     "rxjs-compat": "^6.3.2",
     "ts-node": "^3.2.2",
-    "typescript": "3.1.1",
+    "typescript": "^4.0.5",
     "url-parse": "^1.4.3",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "codelyzer": "~3.1.1",
+    "http-server": "^0.12.3",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",
     "karma": "^4.0.1",

angular-src/package.json

@@ -2,8 +2,6 @@
 
 
 <app-navbar [navbarVisible]="navbarVisible"></app-navbar>
-<!--<app-feedback></app-feedback>-->
-<flash-messages></flash-messages>
 <router-outlet (activate)="onActivate($event)"></router-outlet>
 <app-footer *ngIf="controlVariable"></app-footer>
 

angular-src/src/app/app.component.html

@@ -2,7 +2,6 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { JwtModule, JWT_OPTIONS } from '@auth0/angular-jwt';
 import { AppComponent } from './app.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BaseRequestOptions, HttpModule } from '@angular/http';
 import { NavbarComponent } from './general/navbar/navbar.component';
 import { LoginComponent } from './general/login/login.component';
@@ -13,58 +12,36 @@ import { AuthService } from './services/auth.service';
 import { StudentService } from './services/student.service';
 import { ThesisService } from './services/thesis.service';
 import { ArticlesService } from './services/articles.service';
-import { FlashMessagesModule } from 'angular2-flash-messages';
-import { DashboardStudentComponent } from './user-student/student-dashboard/student-dashboard.component';
 import { AuthGuardService } from './services/auth-guard.service';
 import { FeedbackService } from './services/feedback.service';
 import { FooterComponent } from './general/footer/footer.component';
 import { StudentProfileComponent } from './user-student/student-profile/student-profile.component';
-import { InfoComponent } from './general/info/info.component';
 import { LoginStudentComponent } from './general/login/login-student/login-student.component';
 import {MockBackend} from '@angular/http/testing';
-import { FeedbackComponent } from './general/feedback/feedback.component';
-import { AgmCoreModule } from '@agm/core';
 import { ComingSoonComponent } from './general/coming-soon/coming-soon.component';
 import { PrivacyPolicyComponent } from './general/privacy-policy/privacy-policy.component';
-import { TermsUsageComponent } from './general/terms-usage/terms-usage.component';
-import { GceHashCodeComponent } from './general/gce-hash-code/gce-hash-code.component';
-import { GceHashCodeNextComponent } from './general/gce-hash-code-next/gce-hash-code-next.component';
 import { Vars } from  '../../.env';
-import { GceHashCodeProgramComponent } from './general/gce-hash-code-program/gce-hash-code-program.component';
-import { ChartsModule } from 'ng2-charts';
 import { GceThesisComponent } from './general/gce-thesis/gce-thesis.component';
-import { PartnersCarouselComponent } from './general/partners-carousel/partners-carousel.component';
-import {FilterResultsPipe} from './general/gce-thesis/filter-results.pipe';
-import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
-import { AboutUsComponent } from './general/about-us/about-us.component';
+import { FilterResultsPipe } from './general/gce-thesis/filter-results.pipe';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { GceArticlesComponent } from './general/gce-articles/gce-articles.component';
-import { GetAdviceComponent } from './general/get-advice/get-advice.component';
 import { AreasDump } from './general/gce-thesis/areas-dump';
-import { ChatModule } from './general/chat/chat.module';
-import { PinnedArticleComponent} from './general/gce-articles-pinned/gce-articles-pinned.component'
+import { PinnedArticleComponent } from './general/gce-articles-pinned/gce-articles-pinned.component'
 
 const appRoutes: Routes = [
-    {path: '', component: HomeComponent},
-    {path: 'login', children: [
-        {path: '', component: LoginComponent},
-        {path: 'student', component: LoginStudentComponent}
-    ]},
-    {path: 'dashboardStudent', component: DashboardStudentComponent, canActivate:[AuthGuardService]},
-    {path: 'profileStudent', component: StudentProfileComponent, canActivate:[AuthGuardService]},
-    {path: 'wip', component: ComingSoonComponent},
-    {path: 'terms-of-use', component: TermsUsageComponent},
-    {path: 'articles', component: GceArticlesComponent},
-    {path: 'chatbot', component: GetAdviceComponent, canActivate: [AuthGuardService]},
+    { path: '', component: HomeComponent },
+    {
+        path: 'login', children: [
+            { path: '', component: LoginComponent },
+            { path: 'student', component: LoginStudentComponent }
+        ]
+    },
+    { path: 'profileStudent', component: StudentProfileComponent, canActivate: [AuthGuardService] },
+    { path: 'wip', component: ComingSoonComponent },
+    { path: 'articles', component: GceArticlesComponent },
 
-    {path: 'privacy-policy', component: PrivacyPolicyComponent},
-    {path: 'aboutUs', component: AboutUsComponent},
-    {path: 'partners', component: PartnersCarouselComponent},
-    /**{path: 'hashcode', children: [
-    *    {path: '', component: GceHashCodeComponent,canActivate:[AuthGuardService]},
-    *    {path: 'faq', component: PrivacyPolicyComponent}
-    ]},
-    {path: 'next-steps', component: GceHashCodeNextComponent,canActivate:[AuthGuardService]},*/
-    {path: 'thesis', component: GceThesisComponent, canActivate:[AuthGuardService]}
+    { path: 'privacy-policy', component: PrivacyPolicyComponent },
+    { path: 'thesis', component: GceThesisComponent, canActivate: [AuthGuardService] }
 
 ];
 
@@ -74,48 +51,27 @@ const appRoutes: Routes = [
         NavbarComponent,
         LoginComponent,
         HomeComponent,
-        DashboardStudentComponent,
         FooterComponent,
         StudentProfileComponent,
-        InfoComponent,
         LoginStudentComponent,
-        FeedbackComponent,
         ComingSoonComponent,
         PrivacyPolicyComponent,
-        TermsUsageComponent,
-        GceHashCodeComponent,
-        GceHashCodeNextComponent,
-        GceHashCodeProgramComponent,
         GceThesisComponent,
         FilterResultsPipe,
-        PartnersCarouselComponent,
-        AboutUsComponent,
         GceArticlesComponent,
-        GetAdviceComponent,
-        PartnersCarouselComponent,
         PinnedArticleComponent
 
     ],
     imports: [
         BrowserModule,
-        ChatModule,
-        FormsModule,
         HttpModule,
         NgbModule,
-        ReactiveFormsModule,
-        ChartsModule,
         JwtModule.forRoot({
             config: {
-                whitelistedDomains: ['localhost:3001', 'localhost:8080', 'gce-neiist.org',
-                                    'gce-neiist-development.herokuapp.com', 'gce-neiist-staging.herokuapp.com/',
-                                    'fenix.tecnico.ulisboa.pt/oauth, maps.googleapis.com']
+                allowedDomains: ['localhost:8080', 'fenix.tecnico.ulisboa.pt/oauth'] 
             }
         }),
         RouterModule.forRoot(appRoutes),
-        AgmCoreModule.forRoot({
-            apiKey: Vars.GOOGLE_MAPS,
-        }),
-        FlashMessagesModule,
     ],
     providers: [
         ValidateService,