App Build

Author: iamsaquib8

codecamp-front/package.json

@@ -23,7 +23,7 @@
     "@angular/platform-server": "5.2.7",
     "@angular/router": "5.2.7",
     "@types/jquery": "3.3.0",
-    "angular2-flash-messages": "2.0.5",
+    "angular2-flash-messages": "^2.0.5",
     "angular2-jwt": "0.2.3",
     "bootstrap": "4.0.0-beta.2",
     "core-js": "2.4.1",

codecamp-front/src/app/app-routing.module.ts

@@ -37,11 +37,13 @@ const appRoutes: Routes = [
     },
     {
       path: 'register',
-      component: RegisterComponent
+      component: RegisterComponent,
+      canActivate: [NotAuthGuard]
     },
     {
       path: 'login',
-      component: LoginComponent
+      component: LoginComponent,
+      canActivate: [NotAuthGuard]
     },
     {
       path: 'practice',
@@ -66,7 +68,8 @@ const appRoutes: Routes = [
     },
     {
       path: ':contest/submit/:code',
-      component: SolultionSubmitComponent
+      component: SolultionSubmitComponent,
+      canActivate: [AuthGuard]
     },
     {
       path: 'submit/complete',
@@ -103,11 +106,12 @@ const appRoutes: Routes = [
       path: 'contest/edit/:edit-contest',
       component: EditContestComponent,
       canActivate: [AuthGuard]
-    }
+    },
+      { path: '**', component: HomeComponent }
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(appRoutes)],
+  imports: [RouterModule.forRoot(appRoutes, {useHash: true})],
   exports: [RouterModule]
 })
 export class AppRoutingModule  {

codecamp-front/src/app/app.component.html

@@ -11,6 +11,7 @@
 <div class="container-fluid">
     <app-sidebar></app-sidebar>
     <div class="wrapper" [@panelInOut]="panelVisible">
+        <flash-messages></flash-messages>
         <router-outlet></router-outlet>
     </div>
 </div>

codecamp-front/src/app/app.module.ts

@@ -38,6 +38,7 @@ import { SidebarComponent } from './components/sidebar/sidebar.component';
 import { NgProgressModule, NgProgressBrowserXhr } from 'ngx-progressbar';
 import { BrowserXhr } from '@angular/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { FlashMessagesModule } from 'angular2-flash-messages';
 
 @NgModule({
   declarations: [
@@ -71,10 +72,11 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
     AppRoutingModule,
     AceEditorModule,
     NgProgressModule,
-    BrowserAnimationsModule
+    BrowserAnimationsModule,
+    FlashMessagesModule.forRoot()
   ],
   providers: [ AuthService, AuthGuard, NotAuthGuard, ContestService,
-    {provide: BrowserXhr, useClass: NgProgressBrowserXhr}],
+    {provide: BrowserXhr, useClass: NgProgressBrowserXhr}, ],
   bootstrap: [AppComponent]
 })
 export class AppModule { }

codecamp-front/src/app/components/add-problem/add-problem.component.css

@@ -1,14 +0,0 @@
-.file-input, .file-output{
-    padding: 10px;
-    background: red; 
-    display: table;
-    color: #fff;
-}
-
-.file-output{
-    background: green;
-}
-
-input[type="file"] {
-   display: none;
-}

codecamp-front/src/app/components/add-problem/add-problem.component.html

@@ -89,9 +89,9 @@
         <div class="form-group">
           <label for="Constraint">Constraint</label>
           <textarea 
-          name="constraint" 
-          formControlName="constraint" 
-          class="form-control" placeholder="Enter Constraint" autocomplete="off" rows="10"> 
+          name="constraints" 
+          formControlName="constraints" 
+          class="form-control" placeholder="Enter Constraints" autocomplete="off" rows="10"> 
           </textarea>
         </div>
         <div class="row">
@@ -147,11 +147,10 @@
                   </textarea>
                   </div>
                 </div>
-            </div>
-            <div class="row">
+            </div><div class="row">
               <div class="col-md-6">
                 <div class="form-group">
-                  <label for="Input TestCase">Input File</label>
+                  <label for="Input File">Input File</label>
                   <textarea 
                   name="Input" 
                   formControlName="Input" 
@@ -164,9 +163,9 @@
                 </div>
                 <div class="col-md-6">
                 <div class="form-group">
-                    <label for="output_example">Output File</label>
+                    <label for="output File">Output File</label>
                     <textarea
-                    name="Output"
+                    name="Output" 
                     formControlName="Output" 
                     class="form-control" 
                     placeholder="Output Test case" 
@@ -176,13 +175,12 @@
                   </div>
                 </div>
             </div>
-            
         <div class="form-group">
             <label for="Explanation Example">Explanation Example</label>
             <textarea 
             name="explanation_example" 
             formControlName="explanation_example" 
-            class="form-control" placeholder="Explanation Example" autocomplete="off" rows="10"> 
+            class="form-control" placehzolder="Explanation Example" autocomplete="off" rows="10"> 
             </textarea>
           </div>
 

codecamp-front/src/app/components/add-problem/add-problem.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { ContestService } from '../../services/contest.service';
 import { Router, ActivatedRoute } from '@angular/router';
+import { FlashMessagesService } from 'angular2-flash-messages';
 @Component({
   selector: 'app-add-problem',
   templateUrl: './add-problem.component.html',
@@ -14,7 +15,8 @@ export class AddProblemComponent implements OnInit {
     private contestService: ContestService,
     private router: Router,
     private formBuilder: FormBuilder,
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
+    private _flashMessagesService: FlashMessagesService
   ) { }
 
   ngOnInit() {
@@ -63,8 +65,9 @@ export class AddProblemComponent implements OnInit {
 
     this.contestService.addProblem(problem, this.contest).subscribe(data => {
       if (!data.success) {
-        console.log(data.msg);
+        this._flashMessagesService.show(data.msg, { cssClass: 'alert-danger' } );
       } else {
+        this._flashMessagesService.show(data.msg, { cssClass: 'alert-success' } );
         this.router.navigate(['/contest', this.contest]);
       }
     });

codecamp-front/src/app/components/login/login.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { AuthService } from '../../services/auth.service';
 import { Router } from '@angular/router';
+import { FlashMessagesService } from 'angular2-flash-messages';
 
 @Component({
   selector: 'app-login',
@@ -16,7 +17,8 @@ export class LoginComponent implements OnInit {
   constructor(
     private authService: AuthService,
     private router: Router,
-    private formBuilder: FormBuilder
+    private formBuilder: FormBuilder,
+    private _flashMessagesService: FlashMessagesService
   ) {
     this.createForm();
   }
@@ -41,7 +43,7 @@ export class LoginComponent implements OnInit {
     };
     this.authService.loginUser(user).subscribe(data => {
       if(!data.success){
-        this.message = data.msg;
+        this._flashMessagesService.show(data.msg, { cssClass: 'alert-danger', timeout: 2000});
       }
       else{
         this.authService.storeUserData(data.token, data.user);

codecamp-front/src/app/components/problem/problem.component.ts

@@ -24,7 +24,6 @@ export class ProblemComponent implements OnInit {
     this.contest = this.route.snapshot.params['contest'];
     this.contestService.getProblem(this.code, this.contest).subscribe(data => {
       this.problem = data.problem;
-      console.log(this.problem);
     });
   }
 

codecamp-front/src/app/components/problems/problems.component.ts

@@ -25,7 +25,6 @@ export class ProblemsComponent implements OnInit {
     this.contest = this.route.snapshot.params['contest'];
     this.contestService.getProblems(this.contest).subscribe(contest => {
       this.problems = contest.msg[0].questions;
-      console.log(contest.msg);
     });
     this.contestService.currentContest.subscribe(contest => this.contestname=contest);
   }