Merge branch 'master' of https://github.com/Cloud-CV/EvalAI-ngx into improve_coverage_ngx

Author: Kajol-Kumari

src/app/app-routing.module.ts

@@ -1,76 +1,72 @@
 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { HomeComponent } from './components/home/home.component';
-import { PubliclistsComponent } from './components/publiclists/publiclists.component';
-import { TeamlistComponent } from './components/publiclists/teamlist/teamlist.component';
-import { ContactComponent } from './components/contact/contact.component';
-import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
-import { GetInvolvedComponent } from './components/get-involved/get-involved.component';
-import { AboutComponent } from './components/about/about.component';
-import { ChallengeCreateComponent } from './components/challenge-create/challenge-create.component';
-import { DashboardComponent } from './components/dashboard/dashboard.component';
-import { ProfileComponent } from './components/profile/profile.component';
-import { OurTeamComponent } from './components/our-team/our-team.component';
+import { RouterModule, Routes, PreloadAllModules } from '@angular/router';
+
+// import component
 import { NotFoundComponent } from './components/not-found/not-found.component';
-import {AnalyticsComponent} from './components/analytics/analytics.component';
-import {HostAnalyticsComponent} from './components/analytics/host-analytics/host-analytics.component';
 
 const routes: Routes = [
   {
     path: '',
-    component: HomeComponent,
+    loadChildren: './components/home/home.module#HomeModule',
     data: {
       'title': 'EvalAI - Welcome'
     }
   },
   {
     path: 'about',
-    component: AboutComponent
+    loadChildren: './components/about/about.module#AboutModule',
+  },
+  {
+    path: 'auth',
+    loadChildren: './components/auth/auth.module#AuthModule',
+  },
+  {
+    path: 'challenge',
+    redirectTo: 'challenges'
+  },
+  {
+    path: 'challenge/:id',
+    loadChildren: './components/challenge/challenge.module#ChallengeModule',
+  },
+  {
+    path: 'challenges',
+    loadChildren: './components/publiclists/publiclist.module#PubliclistModule',
   },
   {
     path: 'challenge-create',
-    component: ChallengeCreateComponent
+    loadChildren: './components/challenge-create/challenge-create.module#ChallengeCreateModule',
   },
   {
     path: 'contact',
-    component: ContactComponent
+    loadChildren: './components/contact/contact.module#ContactModule',
   },
   {
     path: 'dashboard',
-    component: DashboardComponent,
+    loadChildren: './components/dashboard/dashboard.module#DashboardModule',
   },
   {
     path: 'analytics',
-    component: AnalyticsComponent,
-    children: [
-      {path: '', redirectTo: 'host-analytics', pathMatch: 'full'},
-      {path: 'host-analytics', component: HostAnalyticsComponent}
-    ]
+    loadChildren: './components/analytics/analytics.module#AnalyticsModule',
   },
   {
     path: 'get-involved',
-    component: GetInvolvedComponent
+    loadChildren: './components/get-involved/get-involved.module#GetInvolvedModule',
   },
   {
     path: 'our-team',
-    component: OurTeamComponent
+    loadChildren: './components/our-team/our-team.module#OurTeamModule',
   },
   {
     path: 'privacy-policy',
-    component: PrivacyPolicyComponent
+    loadChildren: './components/privacy-policy/privacy-policy.module#PrivacyPolicyModule',
   },
   {
     path: 'profile',
-    component: ProfileComponent
+    loadChildren: './components/profile/profile.module#ProfileModule',
   },
   {
     path: 'teams',
-    component: PubliclistsComponent,
-    children: [
-      {path: '', redirectTo: 'participants', pathMatch: 'full'},
-      {path: 'participants', component: TeamlistComponent},
-      {path: 'hosts', component: TeamlistComponent}
-    ]
+   loadChildren: './components/publiclists/publiclist.module#TeamlistsModule',
   },
   {
     path: '404',

src/app/app.module.ts

@@ -1,8 +1,8 @@
 import { BrowserModule } from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { HttpClientModule } from '@angular/common/http';
-import { EmailValidator, FormsModule } from '@angular/forms';
+import { FroalaEditorModule, FroalaViewModule } from 'angular-froala-wysiwyg';
 
 // Import services
 import { WindowService } from './services/window.service';
@@ -15,49 +15,31 @@ import { EndpointsService } from './services/endpoints.service';
 // Import Components
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { ContactComponent } from './components/contact/contact.component';
-import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
-import { GetInvolvedComponent } from './components/get-involved/get-involved.component';
-import { AboutComponent } from './components/about/about.component';
-import { ChallengeCreateComponent } from './components/challenge-create/challenge-create.component';
-import { ProfileComponent } from './components/profile/profile.component';
-import { NotFoundComponent } from './components/not-found/not-found.component';
-import { OurTeamComponent } from './components/our-team/our-team.component';
-import { NgxTwitterTimelineModule } from 'ngx-twitter-timeline';
-import { AnalyticsComponent } from './components/analytics/analytics.component';
-import { HostAnalyticsComponent } from './components/analytics/host-analytics/host-analytics.component';
-import { AuthModule } from './components/auth/auth.module';
-import { PubliclistModule } from './components/publiclists/publiclist.module';
-import { HomeModule } from './components/home/home.module';
 import { AuthService } from './services/auth.service';
-import { ChallengeModule } from './components/challenge/challenge.module';
-import { DashboardModule } from './components/dashboard/dashboard.module';
+import { ModalComponent } from './components/utility/modal/modal.component';
+import { ToastComponent } from './components/utility/toast/toast.component';
+import { EditphasemodalComponent } from './components/challenge/challengephases/editphasemodal/editphasemodal.component';
+import { TermsAndConditionsModalComponent } from './components/challenge/challengeparticipate/terms-and-conditions-modal/terms-and-conditions-modal.component';
+
+// import module
+import { SharedModule } from './shared/shared.module';
 
 @NgModule({
   declarations: [
     AppComponent,
-    PrivacyPolicyComponent,
-    ContactComponent,
-    GetInvolvedComponent,
-    AboutComponent,
-    ChallengeCreateComponent,
-    ProfileComponent,
-    NotFoundComponent,
-    OurTeamComponent,
-    AnalyticsComponent,
-    HostAnalyticsComponent
+    ModalComponent,
+    ToastComponent,
+    EditphasemodalComponent,
+    TermsAndConditionsModalComponent
   ],
   imports: [
-    AuthModule,
-    HomeModule,
-    PubliclistModule,
-    ChallengeModule,
-    DashboardModule,
     BrowserModule,
     BrowserAnimationsModule,
     AppRoutingModule,
+    SharedModule,
     HttpClientModule,
-    FormsModule
+    FroalaEditorModule.forRoot(),
+    FroalaViewModule.forRoot(),
   ],
   providers: [
     WindowService,
@@ -67,6 +49,7 @@ import { DashboardModule } from './components/dashboard/dashboard.module';
     ChallengeService,
     EndpointsService
   ],
+  schemas: [ CUSTOM_ELEMENTS_SCHEMA ],
   bootstrap: [AppComponent],
 })
 export class AppModule { }

src/app/components/about/about-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+// import component
+import { AboutComponent } from './about.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AboutComponent
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AboutRoutingModule { }

src/app/components/about/about.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+// import component
+import { AboutComponent } from './about.component';
+import { AboutRoutingModule } from './about-routing.module';
+
+// import module
+import { SharedModule } from '../../shared/shared.module';
+
+@NgModule({
+  declarations: [
+    AboutComponent
+  ],
+  imports: [
+    CommonModule,
+    AboutRoutingModule,
+    SharedModule
+  ],
+  exports: [
+    AboutComponent
+  ]
+})
+export class AboutModule { }

src/app/components/analytics/analytics-routing.module.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+// import component
+import { AnalyticsComponent} from './analytics.component';
+import { HostAnalyticsComponent } from './host-analytics/host-analytics.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AnalyticsComponent,
+    children: [
+      {path: '', redirectTo: 'host-analytics', pathMatch: 'full'},
+      {path: 'host-analytics', component: HostAnalyticsComponent}
+    ]
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AnalyticsRoutingModule { }

src/app/components/analytics/analytics.module.ts

@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+// import component
+import { AnalyticsComponent } from './analytics.component';
+import { HostAnalyticsComponent } from './host-analytics/host-analytics.component';
+
+// import module
+import { SharedModule } from '../../shared/shared.module';
+import { AnalyticsRoutingModule } from './analytics-routing.module';
+
+@NgModule({
+  declarations: [
+    AnalyticsComponent,
+    HostAnalyticsComponent
+  ],
+  imports: [
+    CommonModule,
+    AnalyticsRoutingModule,
+    SharedModule
+  ],
+  exports: [
+    AnalyticsComponent,
+    HostAnalyticsComponent
+  ],
+})
+export class AnalyticsModule { }

src/app/components/auth/auth-routing.module.ts

@@ -1,5 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+
+// import component
 import { AuthComponent } from './auth.component';
 import { LoginComponent } from './login/login.component';
 import { ResetPasswordComponent } from './reset-password/reset-password.component';
@@ -9,7 +11,7 @@ import { VerifyEmailComponent } from './verify-email/verify-email.component';
 
 const routes: Routes = [
   {
-    path: 'auth',
+    path: '',
     component: AuthComponent,
     children: [
       {path: '', redirectTo: 'login', pathMatch: 'full'},

src/app/components/auth/auth.module.ts

@@ -1,7 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
 
 // import components
 import { LoginComponent } from './login/login.component';
@@ -11,13 +9,13 @@ import { ResetPasswordComponent } from './reset-password/reset-password.componen
 import { VerifyEmailComponent } from './verify-email/verify-email.component';
 import { AuthComponent } from './auth.component';
 
-// import modules
-import { AuthRoutingModule } from './auth-routing.module';
-import { NavModule } from '../nav/nav.module';
-
-// import services
+// import service
 import { AuthService } from '../../services/auth.service';
 
+// import module
+import { SharedModule } from '../../shared/shared.module';
+import { AuthRoutingModule } from './auth-routing.module';
+
 
 @NgModule({
   declarations: [
@@ -30,19 +28,16 @@ import { AuthService } from '../../services/auth.service';
   ],
   imports: [
     CommonModule,
-    RouterModule,
     AuthRoutingModule,
-    FormsModule,
-    NavModule
+    SharedModule
   ],
   exports: [
+    AuthComponent,
     LoginComponent,
     SignupComponent,
-    ResetPasswordConfirmComponent,
     ResetPasswordComponent,
-    VerifyEmailComponent,
-    AuthComponent,
-    NavModule
+    ResetPasswordConfirmComponent,
+    VerifyEmailComponent
   ],
   providers: [
     AuthService

src/app/components/challenge-create/challenge-create-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+// import component
+import { ChallengeCreateComponent } from './challenge-create.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ChallengeCreateComponent
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ChallengeCreateRoutingModule { }

src/app/components/challenge-create/challenge-create.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+// import component
+import { ChallengeCreateComponent } from './challenge-create.component';
+
+// import module
+import { ChallengeCreateRoutingModule } from './challenge-create-routing.module';
+import { SharedModule } from '../../shared/shared.module';
+
+@NgModule({
+  declarations: [
+    ChallengeCreateComponent
+  ],
+  imports: [
+    CommonModule,
+    ChallengeCreateRoutingModule,
+    SharedModule
+  ],
+  exports: [
+    ChallengeCreateComponent
+  ]
+})
+export class ChallengeCreateModule { }