Merge pull request #1 from ChauhanAbhinav/master

Edit Name

server/db/services/user.service.js

@@ -40,7 +40,22 @@ let createUser = (user)=>{
 
  return new Promise((resolve, reject)=>{
 
- db.collection('users').insert(user, function(err, data) {
+ db.collection('users').insertOne(user, function(err, data) {
+ if (err) {
+ reject(err);
+ } else {
+ resolve(data);
+ }
+ });
+
+});
+}
+
+let editDetails = (user)=>{
+
+ return new Promise((resolve, reject)=>{
+
+ db.collection('users').updateOne({mobile: user.mobile},{$set: {name: user.name}}, function(err, data) {
  if (err) {
  reject(err);
  } else {
@@ -331,4 +346,5 @@ service.getAllGroups = getAllGroups;
 service.deleteGroup = deleteGroup;
 service.saveChat = saveChat;
 service.getChat = getChat;
+service.editDetails = editDetails;
 module.exports = service;

server/routes/loginRoutes.js

@@ -71,6 +71,17 @@ router.post('/verifytoken', (req, res)=>{
 
 });
 
+router.post('/editdetails',(req, res)=>{
+ userService.editDetails(req.body)
+ .then(function (data) {
+ res.status(200).json('Update Successful');
+ }, function(err) {
+ // console.log(err);
+ // registration failed
+ res.status(400).json(err);
+ })
+
+})
 router.get('/',(req, res)=>{
  res.json('node is listening');
 });

src/app/app-routing.module.ts

@@ -9,9 +9,10 @@ import { UsersComponent } from './users/users.component';
 import { GroupComponent } from './group/group.component';
 import { AuthGuardService } from './services/auth-guard.service';
 import { GroupListComponent } from './group-list/group-list.component';
+import { EditComponent } from './edit/edit.component';
 
 const routes: Routes = [
-{ path: '', redirectTo: '/dashboard', pathMatch: 'full' },
+{ path: '', redirectTo: '/dashboard ', pathMatch: 'full' },
 { path: 'login', component: LoginComponent },
 { path: 'dashboard', component: DashboardComponent,
  children: [ // <---- child components declared here
@@ -22,6 +23,7 @@ const routes: Routes = [
  { path: 'contacts', component: ContactsComponent },
  { path: 'userlist', component: UsersComponent },
  { path: 'grouplist', component: GroupListComponent },
+ { path: 'edit', component: EditComponent },
  ]
 }
 ];

src/app/app.module.ts

@@ -17,6 +17,7 @@ import { ContactsComponent } from './contacts/contacts.component';
 import { UsersComponent } from './users/users.component';
 import { GroupComponent } from './group/group.component';
 import { GroupListComponent } from './group-list/group-list.component';
+import { EditComponent } from './edit/edit.component';
 
 @NgModule({
  declarations: [
@@ -29,6 +30,7 @@ import { GroupListComponent } from './group-list/group-list.component';
  UsersComponent,
  GroupComponent,
  GroupListComponent,
+ EditComponent,
  ],
  imports: [
  BrowserModule,

src/app/dashboard/dashboard.component.html

@@ -5,6 +5,9 @@
  <button mat-button routerLink="/dashboard" style="font-size:20px"> 
  {{loginService.name}}
  </button>
+ <button mat-button>
+ <mat-icon aria-hidden="false" aria-label="icon" [routerLink]="['edit']" routerLinkActive="router-link-active" style="color: #1d2f84">edit</mat-icon>
+ </button>
  <span class="spacer"></span>
 
  <button mat-button routerLink="contacts">Chats

src/app/edit/edit.component.html

@@ -0,0 +1,27 @@
+
+ <mat-card class="my-card card-center" [ngStyle]="{'margin-top': '30px'}">
+ <form class="my-form" [formGroup]="form" (ngSubmit)="onSubmit()"> 
+<mat-card-content>
+ <table class="example-full-width" cellspacing="0" class="center">
+ <tr >
+ <td></td>
+ <td>
+ <mat-form-field class="example-full-width">
+ <input matInput placeholder="Enter Name" formControlName="name" (keyup) = "update_error()"
+ type="text" name="name" > 
+ </mat-form-field>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <span #log></span>
+ </td>
+ </tr>
+ </table>
+</mat-card-content>
+<mat-card-actions class="text-center">
+ <button mat-raised-button color="primary" type="submit">Update</button>
+</mat-card-actions>
+ </form>
+</mat-card>

src/app/edit/edit.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EditComponent } from './edit.component';
+
+describe('EditComponent', () => {
+ let component: EditComponent;
+ let fixture: ComponentFixture<EditComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ EditComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(EditComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});

src/app/edit/edit.component.ts

@@ -0,0 +1,49 @@
+import { Component, OnInit, ViewChild, ElementRef} from '@angular/core';
+import {Validators, FormBuilder} from '@angular/forms';
+import { LoginService } from '../services/login.service';
+import {Router} from '@angular/router';
+
+@Component({
+ selector: 'app-edit',
+ templateUrl: './edit.component.html',
+ styleUrls: ['./edit.component.css']
+})
+export class EditComponent implements OnInit {
+ @ViewChild('log', {static: false}) error: ElementRef;
+ private form;
+ constructor(private fb: FormBuilder, private loginService: LoginService, private router: Router) {
+
+ this.form = this.fb.group({
+ name: [this.loginService.name, [Validators.required]],
+ });
+ }
+private onSubmit() {
+if (this.form.valid) {
+
+this.loginService.editDetails({mobile: this.loginService.user, name: this.form.value.name}).subscribe(
+ (res) => {
+ if (res.status === 200) {
+ this.loginService.updateUser({mobile: this.loginService.user, name: this.form.value.name});
+ this.router.navigateByUrl('/dashboard');
+ // alert('update success');
+ }
+ },
+ (err) => {
+ alert('Not success');
+ }
+);
+} else {
+
+}
+}
+// error updates
+private update_error() {
+ if (!this.form.valid) {
+ this.error.nativeElement.innerHTML = 'Invalid Fields';
+ } else { this.error.nativeElement.innerHTML = ''; }
+
+}
+ ngOnInit() {
+ }
+
+}

src/app/services/login.service.ts

@@ -69,7 +69,12 @@ export class LoginService {
  });
  }
  }
-
+public updateUser(user) {
+ this.cookieService.set('name', user.name, 1, '/');
+ this.name = user.name;
+ this.cookieService.set('user', String(user.mobile), 1, '/');
+ this.user = user.mobile;
+}
  logout() {
  this.cookieService.delete('user', '/');
  this.cookieService.delete('name', '/');
@@ -97,5 +102,9 @@ registerUser(data) {
  console.log(data);
  return this.http.post(this.baseurl + '/verifyToken', data, {observe: 'response'});
  }
-
+ editDetails(data) {
+ console.log(data);
+ return this.http.post(this.baseurl + '/editdetails', data, {observe: 'response'});
+ }
+
 }