Merge branch 'master' into improve_coverage_ngx

.github/CONTRIBUTING.md

@@ -68,8 +68,28 @@ git checkout -b your-branch-name
 
     - If your checks have passed, your PR will be assigned a reviewer who will review your code and provide comments. Please address each review comment by pushing new commits to the same branch (the PR will automatically update, so you don’t need to submit a new one). Once you are done, comment below each review comment marking it as “Done”. Feel free to use the thread to have a discussion about comments that you don’t understand completely or don’t agree with.
 
-    - Once all comments are addressed, the reviewer will give an LGTM (‘looks good to me’) and merge the PR.
-4. Rules for great commit messages:
+    - Once all comments are addressed, the maintainer will approve the PR.
+
+4. Once you get reviewed by a mentor and done with all the required changes, squash all the commits:
+
+```
+git checkout <branch_name>
+git rebase -i HEAD~N (N is the number of commits to be squashed)
+```
+
+Then a screen will appear with all N commits having "pick" written in front of every commit.Change pick to s for the last N-1 commits and let it be pick for the first one.
+
+Press esc button and type ":wq" to save the change and close the screen. Now a new screen will appear asking you to change commit message. Change it accordingly and save it. 
+
+```
+git push origin <branch_name> --force
+```
+
+For further query regarding rebasing, visit https://github.com/todotxt/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit
+
+Once rebasing is done, the reviewer will approve and merge the PR.
+
+5. Rules for great commit messages:
 
     - Write your commit message in the imperative: "Fix bug" and not "Fixed bug" or "Fixes bug."
 
@@ -85,7 +105,7 @@ git checkout -b your-branch-name
 
     - Describe why a change is being made.
 
-5. Commit message is important as it should answers/should do the following:
+6. Commit message is important as it should answers/should do the following:
 
     - How does it address the issue?
 
@@ -95,7 +115,7 @@ git checkout -b your-branch-name
 
     - Provide concise explaination to the user about limitations of the current code, like a bug or an issue
 
-6. Examples of a great commit message:
+7. Examples of a great commit message:
 
     - Add CPU arch filter scheduler support
 

.travis.yml

@@ -2,6 +2,9 @@ sudo: required
 dist: trusty
 language: node_js
 addons:
+  apt:
+    packages:
+      - dpkg
   chrome: stable
 
 node_js:

src/app/app-routing.module.ts

@@ -1,39 +1,19 @@
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
 import { RouterModule, Routes } from '@angular/router';
 import { HomeComponent } from './components/home/home.component';
-import { AuthComponent } from './components/auth/auth.component';
-import { LoginComponent } from './components/auth/login/login.component';
-import { SignupComponent } from './components/auth/signup/signup.component';
-import { VerifyEmailComponent } from './components/auth/verify-email/verify-email.component';
 import { PubliclistsComponent } from './components/publiclists/publiclists.component';
-import { ChallengelistComponent } from './components/publiclists/challengelist/challengelist.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 { ChallengeComponent } from './components/challenge/challenge.component';
-import { ChallengesettingsComponent } from './components/challenge/challengesettings/challengesettings.component';
-import { ChallengeoverviewComponent} from './components/challenge/challengeoverview/challengeoverview.component';
-import { ChallengeevaluationComponent } from './components/challenge/challengeevaluation/challengeevaluation.component';
-import { ChallengephasesComponent} from './components/challenge/challengephases/challengephases.component';
-import { ChallengeparticipateComponent } from './components/challenge/challengeparticipate/challengeparticipate.component';
-import { ChallengeleaderboardComponent } from './components/challenge/challengeleaderboard/challengeleaderboard.component';
-import { ChallengesubmitComponent } from './components/challenge/challengesubmit/challengesubmit.component';
-import { ChallengesubmissionsComponent } from './components/challenge/challengesubmissions/challengesubmissions.component';
-import {
-  ChallengeviewallsubmissionsComponent
-} from './components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.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 { 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';
-import {ResetPasswordComponent} from './components/auth/reset-password/reset-password.component';
-import {ResetPasswordConfirmComponent} from './components/auth/reset-password-confirm/reset-password-confirm.component';
 
 const routes: Routes = [
   {
@@ -47,52 +27,6 @@ const routes: Routes = [
     path: 'about',
     component: AboutComponent
   },
-  {
-    path: 'auth',
-    component: AuthComponent,
-    children: [
-      {path: '', redirectTo: 'login', pathMatch: 'full'},
-      {path: 'login', component: LoginComponent},
-      {path: 'reset-password', component: ResetPasswordComponent},
-      {path: 'reset-password/confirm/:user_id/:reset_token', component: ResetPasswordConfirmComponent},
-      {path: 'signup', component: SignupComponent},
-      {path: 'verify-email/:token', component: VerifyEmailComponent},
-      {path: '**', redirectTo: 'login'}
-    ]
-  },
-  {
-    path: 'challenge',
-    redirectTo: 'challenges'
-  },
-  {
-    path: 'challenge/:id',
-    component: ChallengeComponent,
-    children: [
-      {path: '', redirectTo: 'overview', pathMatch: 'full'},
-      {path: 'overview', component: ChallengeoverviewComponent},
-      {path: 'evaluation', component: ChallengeevaluationComponent},
-      {path: 'phases', component: ChallengephasesComponent},
-      {path: 'participate', component: ChallengeparticipateComponent},
-      {path: 'submit', component: ChallengesubmitComponent},
-      {path: 'my-submissions', component: ChallengesubmissionsComponent},
-      {path: 'my-submissions/:phase', component: ChallengesubmissionsComponent},
-      {path: 'mysubmissions/:phase/:submission', component: ChallengesubmissionsComponent},
-      {path: 'view-all-submissions', component: ChallengeviewallsubmissionsComponent},
-      {path: 'leaderboard', component: ChallengeleaderboardComponent},
-      {path: 'leaderboard/:split', component: ChallengeleaderboardComponent},
-      {path: 'leaderboard/:split/:entry', component: ChallengeleaderboardComponent},
-      {path: 'settings', component: ChallengesettingsComponent}
-    ]
-  },
-  {
-    path: 'challenges',
-    component: PubliclistsComponent,
-    children: [
-      {path: '', redirectTo: 'all', pathMatch: 'full'},
-      {path: 'all', component: ChallengelistComponent},
-      {path: 'me', component: ChallengelistComponent}
-    ]
-  },
   {
     path: 'challenge-create',
     component: ChallengeCreateComponent

src/app/app.module.ts

@@ -3,17 +3,8 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
 import { HttpClientModule } from '@angular/common/http';
 import { EmailValidator, FormsModule } from '@angular/forms';
-import { FroalaEditorModule, FroalaViewModule } from 'angular-froala-wysiwyg';
-import { TextareaAutosizeModule } from 'ngx-textarea-autosize';
-import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime';
-import { MatSelectModule } from '@angular/material/select';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatIconModule } from '@angular/material/icon';
-import { MatCheckboxModule } from '@angular/material';
 
-// Import serivces
-import { AuthService } from './services/auth.service';
+// Import services
 import { WindowService } from './services/window.service';
 import { ApiService } from './services/api.service';
 import { GlobalService } from './services/global.service';
@@ -23,159 +14,59 @@ import { EndpointsService } from './services/endpoints.service';
 
 // Import Components
 import { AppComponent } from './app.component';
-import { HomeComponent } from './components/home/home.component';
 import { AppRoutingModule } from './app-routing.module';
-import { HeaderStaticComponent } from './components/nav/header-static/header-static.component';
 import { ContactComponent } from './components/contact/contact.component';
-import { FooterComponent } from './components/nav/footer/footer.component';
 import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
-import { InputComponent } from './components/utility/input/input.component';
-import { AuthComponent } from './components/auth/auth.component';
-import { LoginComponent } from './components/auth/login/login.component';
-import { SignupComponent } from './components/auth/signup/signup.component';
-import { ToastComponent } from './components/utility/toast/toast.component';
 import { GetInvolvedComponent } from './components/get-involved/get-involved.component';
 import { AboutComponent } from './components/about/about.component';
-import { CardlistComponent } from './components/utility/cardlist/cardlist.component';
-import { ChallengecardComponent } from './components/publiclists/challengelist/challengecard/challengecard.component';
-import { ChallengelistComponent } from './components/publiclists/challengelist/challengelist.component';
-import { TeamcardComponent } from './components/publiclists/teamlist/teamcard/teamcard.component';
-import { TeamlistComponent } from './components/publiclists/teamlist/teamlist.component';
-import { PubliclistsComponent } from './components/publiclists/publiclists.component';
-import { ForceloginComponent } from './components/utility/forcelogin/forcelogin.component';
-import { ChallengeComponent } from './components/challenge/challenge.component';
-import { ChallengeoverviewComponent } from './components/challenge/challengeoverview/challengeoverview.component';
-import { ChallengeevaluationComponent } from './components/challenge/challengeevaluation/challengeevaluation.component';
-import { ChallengephasesComponent } from './components/challenge/challengephases/challengephases.component';
-import { ChallengeparticipateComponent } from './components/challenge/challengeparticipate/challengeparticipate.component';
-import { ChallengeleaderboardComponent } from './components/challenge/challengeleaderboard/challengeleaderboard.component';
-import { ChallengesubmitComponent } from './components/challenge/challengesubmit/challengesubmit.component';
-import { ChallengesubmissionsComponent } from './components/challenge/challengesubmissions/challengesubmissions.component';
-import { PhasecardComponent } from './components/challenge/challengephases/phasecard/phasecard.component';
-import { ConfirmComponent } from './components/utility/confirm/confirm.component';
-import { LoadingComponent } from './components/utility/loading/loading.component';
-import { SelectphaseComponent } from './components/utility/selectphase/selectphase.component';
-import { HomemainComponent } from './components/home/homemain/homemain.component';
 import { ChallengeCreateComponent } from './components/challenge-create/challenge-create.component';
-import { VerifyEmailComponent } from './components/auth/verify-email/verify-email.component';
-import { ModalComponent } from './components/utility/modal/modal.component';
-import { DashboardComponent } from './components/dashboard/dashboard.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 { TwitterFeedComponent } from './components/home/twitter-feed/twitter-feed.component';
 import { NgxTwitterTimelineModule } from 'ngx-twitter-timeline';
-import { PartnersComponent } from './components/home/partners/partners.component';
-import { RulesComponent } from './components/home/rules/rules.component';
-import { TestimonialsComponent } from './components/home/testimonials/testimonials.component';
-import { FeaturedChallengesComponent } from './components/home/featured-challenges/featured-challenges.component';
-import { ChallengesettingsComponent } from './components/challenge/challengesettings/challengesettings.component';
 import { AnalyticsComponent } from './components/analytics/analytics.component';
 import { HostAnalyticsComponent } from './components/analytics/host-analytics/host-analytics.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 {
-  ChallengeviewallsubmissionsComponent
-} from './components/challenge/challengeviewallsubmissions/challengeviewallsubmissions.component';
-import { SideBarComponent } from './components/utility/side-bar/side-bar.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 { MatTableModule } from '@angular/material/table';
-import { MatDividerModule } from '@angular/material/divider';
-import { DashboardContentComponent } from './components/dashboard/dashboard-content/dashboard-content.component';
-import {PasswordMismatchValidatorDirective} from './Directives/password.validator';
-import { ResetPasswordComponent } from './components/auth/reset-password/reset-password.component';
-import { EmailValidatorDirective } from './Directives/email.validator';
-import { ResetPasswordConfirmComponent } from './components/auth/reset-password-confirm/reset-password-confirm.component';
 @NgModule({
   declarations: [
     AppComponent,
-    HomeComponent,
-    HeaderStaticComponent,
-    FooterComponent,
     PrivacyPolicyComponent,
-    InputComponent,
-    AuthComponent,
-    LoginComponent,
-    SignupComponent,
     ContactComponent,
-    ToastComponent,
     GetInvolvedComponent,
     AboutComponent,
-    CardlistComponent,
-    ChallengecardComponent,
-    ChallengelistComponent,
-    TeamcardComponent,
-    TeamlistComponent,
-    PubliclistsComponent,
-    ForceloginComponent,
-    ChallengeComponent,
-    ChallengeoverviewComponent,
-    ChallengeevaluationComponent,
-    ChallengephasesComponent,
-    ChallengeparticipateComponent,
-    ChallengeleaderboardComponent,
-    ChallengesubmitComponent,
-    ChallengesubmissionsComponent,
-    PhasecardComponent,
-    ConfirmComponent,
-    LoadingComponent,
-    SelectphaseComponent,
-    HomemainComponent,
     ChallengeCreateComponent,
-    VerifyEmailComponent,
-    ModalComponent,
-    DashboardComponent,
     ProfileComponent,
     NotFoundComponent,
     OurTeamComponent,
-    TwitterFeedComponent,
-    PartnersComponent,
-    RulesComponent,
-    TestimonialsComponent,
-    ChallengesettingsComponent,
-    SideBarComponent,
     AnalyticsComponent,
-    FeaturedChallengesComponent,
-    DashboardContentComponent,
-    HostAnalyticsComponent,
-    PasswordMismatchValidatorDirective,
-    EmailValidatorDirective,
-    ResetPasswordComponent,
-    EditphasemodalComponent,
-    ResetPasswordConfirmComponent,
-    ChallengeviewallsubmissionsComponent,
-    TermsAndConditionsModalComponent
+    HostAnalyticsComponent
   ],
   imports: [
+    AuthModule,
+    HomeModule,
+    PubliclistModule,
+    ChallengeModule,
+    DashboardModule,
     BrowserModule,
     BrowserAnimationsModule,
     AppRoutingModule,
     HttpClientModule,
-    FormsModule,
-    NgxTwitterTimelineModule,
-    FroalaEditorModule.forRoot(),
-    FroalaViewModule.forRoot(),
-    TextareaAutosizeModule,
-    OwlDateTimeModule,
-    OwlNativeDateTimeModule,
-    MatSelectModule,
-    MatChipsModule,
-    MatMenuModule,
-    MatIconModule,
-    MatTableModule,
-    MatDividerModule,
-    MatCheckboxModule
+    FormsModule
   ],
   providers: [
-    AuthService,
     WindowService,
+    AuthService,
     ApiService,
     GlobalService,
     ChallengeService,
     EndpointsService
   ],
-  bootstrap: [AppComponent]
+  bootstrap: [AppComponent],
 })
 export class AppModule { }

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

@@ -0,0 +1,29 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { AuthComponent } from './auth.component';
+import { LoginComponent } from './login/login.component';
+import { ResetPasswordComponent } from './reset-password/reset-password.component';
+import { ResetPasswordConfirmComponent } from './reset-password-confirm/reset-password-confirm.component';
+import { SignupComponent } from './signup/signup.component';
+import { VerifyEmailComponent } from './verify-email/verify-email.component';
+
+const routes: Routes = [
+  {
+    path: 'auth',
+    component: AuthComponent,
+    children: [
+      {path: '', redirectTo: 'login', pathMatch: 'full'},
+      {path: 'login', component: LoginComponent},
+      {path: 'reset-password', component: ResetPasswordComponent},
+      {path: 'reset-password/confirm/:user_id/:reset_token', component: ResetPasswordConfirmComponent},
+      {path: 'signup', component: SignupComponent},
+      {path: 'verify-email/:token', component: VerifyEmailComponent},
+      {path: '**', redirectTo: 'login'}
+    ]
+  },
+];
+@NgModule({
+  imports: [ RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AuthRoutingModule {}