timer works

Author: amar1995

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

@@ -21,7 +21,7 @@
         <a class="btn btn-light dropdown-toggle"
          role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true"
           aria-expanded="false">
-          Welcome {{user?.username}}
+          Welcome {{user}}
         </a>
 
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">

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

@@ -24,16 +24,22 @@ import { ContestService } from '../../services/contest.service';
 export class NavbarComponent implements OnInit{
 
   user: any;
+  users;
   toggle = true;
   constructor(
     public authService: AuthService,
     private router: Router,
     private contestService: ContestService
   ) {
-    this.authService.name.subscribe(value => {
-      this.user = value;
-    });
-  }
+    /*this.authService.name.subscribe(value => {
+      this.user = value ;
+    });*/
+    this.users = authService.getProfile().subscribe(profile => {
+      this.user = profile.msg.username;
+      //console.log(this.user);
+  });
+  //console.log(this.user);
+}
 
   ngOnInit() {
     this.contestService.toggle.subscribe(toggle => this.toggle = toggle);
@@ -43,7 +49,7 @@ export class NavbarComponent implements OnInit{
     this.authService.logout(); // Logout user
     this.router.navigate(['/']); // Navigate back to home page
   }
-  onUndefined() {
+  undefined() {
 
   }
   onToggle(){

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

@@ -61,8 +61,8 @@
           <span id="day"></span>days
           <span id="hour"></span>hours
           <span id="minute"></span>minutes
-          <span id="second"></span>seconds
-          {{times}}-->
+          <span id="second"></span>seconds-->
+          {{times}}
         </div>
       </div>
       <div class="ranking">

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

@@ -58,11 +58,11 @@ export class ProblemsComponent implements OnInit {
         //compareDate.setDate(this.end.getDate()); //just for this demo today + 7 days
 
         //console.log(compareDate);
-        timer = setInterval(function() {
+       /* timer = setInterval(function() {
           timeBetweenDates(compareDate);
-        }, 1000);
-        function timeBetweenDates(compareDate){
-          var dateEntered = compareDate;
+        }, 1000);*/
+          setInterval((()=>{
+            var dateEntered = compareDate;
           var now = new Date();
           var difference = dateEntered.getTime() - now.getTime();
 
@@ -82,20 +82,22 @@ export class ProblemsComponent implements OnInit {
             minute %= 60;
             second %= 60;
             //console.log(day,hour,minute,second);
-              /*this.days = day;
-              this.hours = hour;
-              this.minutes = minute;
-              this.seconds = second;
-              $("#day").text(day);
+              // this.days = day;
+              // this.hours = hour;
+              // this.minutes = minute;
+              // this.seconds = second;
+              /*$("#day").text(day);
               $("#hour").text(hour);
               $("#minute").text(minute);
               $("#second").text(second);
               var temp = String(day) + ' days ' + String(hour) + ' hr ' +String(minute) + ' min ' +String(second) + ' sec';
               ////this.contestService.time.next(temp);
               //this.contestService.time.subscribe(value => this.times = value);*/
+              this.times = String(day) + ' days ' + String(hour) + ' hr ' +String(minute) + ' min ' +String(second) + ' sec';
 
           }
-        }
+        }),1000);
+        
 
     });
     this.contestService.currentContest.subscribe(contest => this.contestname = contest);

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

@@ -22,7 +22,7 @@ export class ProfileComponent implements OnInit {
   }
 
   ngOnInit() {
-
+    console.log(this.user);
     }
     onSubmitSel() {
       this.router.navigate([this.user.username, 'edit-profile']);

codecamp-front/src/app/services/auth.service.ts

@@ -12,7 +12,7 @@ import { Subject } from 'rxjs/Subject';
 export class AuthService {
   public authToken: any;
   public user: any;
-  // public domain = 'http://localhost:80/';
+  public domain = 'http://localhost:80/';
   public options;
 
   constructor(
@@ -34,12 +34,12 @@ export class AuthService {
     this.authToken = localStorage.getItem('token'); // Get tokens and asssign to variable to be used elsewhere
   }
   public registerUser(user) {
-    return this.http.post(/*this.domain + */'users/signup', user)
+    return this.http.post(this.domain + 'users/signup', user)
       .map(res => res.json());
   }
 
   public loginUser(user) {
-    return this.http.post(/*this.domain + */'users/signin', user)
+    return this.http.post(this.domain + 'users/signin', user)
     .map(res => res.json());
   }
 
@@ -78,6 +78,6 @@ export class AuthService {
   }
   getProfile() {
     this.createAuthenticationHeaders();
-    return this.http.get(/*this.domain + */'users/profile', this.options).map(res => res.json());
+    return this.http.get(this.domain + 'users/profile', this.options).map(res => res.json());
   }
 }

codecamp-front/src/app/services/contest.service.ts

@@ -15,7 +15,7 @@ export class ContestService {
   public authToken: any;
   public user: any;
   public contest: any;
-  // public domain = 'http://localhost:80/';
+   public domain = 'http://localhost:80/';
   public options;
   public sol;
   public toggler: boolean;
@@ -50,36 +50,36 @@ export class ContestService {
 
   public addContest(contest) {
     return this.http
-      .post( /*this.domain + */ 'contest', contest)
+      .post( this.domain +  'contest', contest)
         .map(res => res.json());
   }
 
   public getContest(): Observable<any> {
-    return this.http.get( /*this.domain + */ 'contest')
+    return this.http.get( this.domain +  'contest')
         .map(res => res.json());
   }
 
   public addProblem(problem, contest): Observable<any> {
-    return this.http.post(/*this.domain + */ 'contest/' + contest, problem)
+    return this.http.post(this.domain + 'contest/' + contest, problem)
       .map(res => res.json());
   }
 
   public getProblems(contest): Observable<any> {
-    return this.http.get( /*this.domain + */'contest/' + contest)
+    return this.http.get( this.domain + 'contest/' + contest)
         .map(res => res.json());
   }
 
   public getProblem(code, contest): Observable<any> {
-    return this.http.get(/*this.domain + */ 'contest/' + contest + '/problems/' + code)
+    return this.http.get(this.domain +  'contest/' + contest + '/problems/' + code)
       .map(res => res.json());
   }
 
   public addSolution(solution): Observable<any> {
-    return this.http.post(/*this.domain + */'solution', solution)
+    return this.http.post(this.domain + 'solution', solution)
       .map(res => res.json());
   }
   public deleteContest(contest) {
-    return this.http.delete(/*this.domain + */ 'contest/' + contest)
+    return this.http.delete(this.domain +  'contest/' + contest)
       .map(res => res.json());
   }
   public setSolution(sol) {
@@ -94,7 +94,7 @@ export class ContestService {
   }
 
   getRankings(contest) {
-    return this.http.get(/*this.domain + */'rankings/' + contest)
+    return this.http.get(this.domain + 'rankings/' + contest)
       .map(res => res.json());
   }
   ontoggle(value: boolean) {