Fairoj : registern and payment success msg and merge issue fixes

ng8-seed/angular.json

@@ -9,6 +9,7 @@
       "projectType": "application",
       "architect": {
         "build": {
+          "showCircularDependencies": false,
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist",

ng8-seed/src/app/app.module.ts

@@ -48,7 +48,7 @@ import { PaymentConfirmationComponent } from './components/payment-confirmation/
 import { MyAccountComponent } from './components/my-account/my-account.component';
 import { TokenInterceptorService } from './shared/guards/token-interceptor.service';
 import { AuthGuardService } from './shared/guards/auth-guard.service';
-import { MatTableDataSource, MatTableModule } from '@angular/material';
+import { MatTableDataSource, MatTableModule, MatSlideToggleModule, MatRadioModule, MatButtonModule } from '@angular/material';
 import { SchoolDetailsService } from './shared/school-details.service';
 // import { AddEventModule } from './add-event.module';
 import {HashLocationStrategy,LocationStrategy} from '@angular/common';
@@ -120,7 +120,14 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
     }),
     FlexLayoutModule,
     SlideshowModule,
-   
+    MatCardModule,
+    MatIconModule,
+    MatInputModule,
+    MatRadioModule,
+    MatButtonModule,
+    ReactiveFormsModule,
+    MatSlideToggleModule,
+    MatProgressBarModule,
     // MDBBootstrapModule.forRoot()
   ],
   providers: [

ng8-seed/src/app/components/contribute/contribute.component.html

@@ -176,7 +176,7 @@
                     <mat-form-field dividerColor="warn" class="ml-xs mr-xs" style="width: 100%;">
                             <textarea matInput placeholder="Remarks" [(ngModel)]="gen_dev_fund_remarks"></textarea>
                           </mat-form-field>  
-                    <button class="mat-green" mat-raised-button style="color:white" (click)="storeData_session()">Proceed for Payment</button>                      
+                    <button class="mat-green" mat-raised-button style="color:white" (click)="storeData_session()">Proceed to Contribute</button>                      
                 </div>
     </mat-card-content>
 </mat-card>

ng8-seed/src/app/components/contribute/contribute.component.ts

@@ -29,11 +29,12 @@ export class ContributeComponent implements OnInit {
   Total: any = [];
   grandTotal: any = [];
   finalData: any = [];
+  schRquId:any ;
   sponsor_qty:any=[]
   gen_dev_fund_remarks:string
   general_devlop_amt:string='';
   whole_contribute_list: any=[];
-  constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService) {
+  constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService,public schInfo:SchoolDetailsService) {
      // Create 100 users
    
    }
@@ -60,12 +61,12 @@ export class ContributeComponent implements OnInit {
     this.getSchoolReqList();
     this.getSchoolReqList2();
 
-    // this.schInfo.schReqId.subscribe(res=>
+     this.schInfo.schReqId.subscribe(res=>
-    //   {
+       {
-    //       this.schRquId = res;
+           this.schRquId = res;
-    //       // console.log(res);
+           // console.log(res);
           
-    //   })
+       })
     // window.localStorage.clear();
   }
 
@@ -90,19 +91,28 @@ export class ContributeComponent implements OnInit {
     {
         if(schDet.dataStatus==true)
         {
-          this.dataLength  = schDet.records.length;
+          let data ='';
-          this.dataSource.data = schDet.records;
+          // console.log(schDet.records);
+          if(this.schRquId.sch_req_id !='')
+          {
+           data = schDet.records.filter(sch=>sch.school_id==this.schRquId);
+          }else
+          {
+            data = schDet.records;
+          }
+            this.dataLength  = data.length;
+          this.dataSource.data = data
           console.log("data",this.dataSource)
           let store:any
            store=sessionStorage.getItem('contribute')
           store=JSON.parse(store)
           console.log(store)
           if(store.records){
-            if(store.records.contributions){
+            // if(store.records.contributions){
-              let indexes = Object.keys(store.records.contributions)
+            //   let indexes = Object.keys(store.records.contributions)
-              console.log(indexes)
+            //   console.log(indexes)
-              // this.sponsor_qty[]
+            //   // this.sponsor_qty[]
-            }
+            // }
           }
 
           // console.log(this.material_category);
@@ -229,7 +239,7 @@ export class ContributeComponent implements OnInit {
         "cont_type":flag,   //1-funds 2-materials
         "cont_towards":"",   //1-State Fund not needed here
         "amount":this.grandTotal,
-        "payment_mode":"offline", 
+        "payment_mode":"", 
         "payment_ref":"",
         "contributions":this.finalData,
     }};
@@ -240,12 +250,13 @@ export class ContributeComponent implements OnInit {
         this.apiService.csrContribute(data).subscribe(result=>{
           if(result['dataStatus']){
             data.records.id=result['records']
+            data.records.contributions=[]
             // if(flag == 1){
               sessionStorage.setItem('contribute-selected-list',JSON.stringify(this.whole_contribute_list))
               sessionStorage.setItem('contribute-params',JSON.stringify(data))
               sessionStorage.setItem('contribute_final_total',this.grandTotal)
 
-              this.router.navigate(['payment'])
+              this.router.navigate(['payment'],{replaceUrl:true})
             // }
           }
           else{
@@ -273,7 +284,7 @@ export class ContributeComponent implements OnInit {
         "cont_type":1,   //1-funds 2-materials
         "cont_towards":"1",   //1-State Fund
         "amount":this.general_devlop_amt,
-        "payment_mode":"offline", 
+        "payment_mode":"", 
         "payment_ref":"",
         "gen_dev_fund_remarks":this.gen_dev_fund_remarks,
         "contributions":[]
@@ -283,10 +294,11 @@ export class ContributeComponent implements OnInit {
     this.apiService.csrContribute(data).subscribe(result=>{
       if(result['dataStatus']){
         data.records.id=result['records']
+        data.records.contributions=[]
         
         sessionStorage.setItem('contribute-params',JSON.stringify(data))
         sessionStorage.setItem('contribute_final_total',this.general_devlop_amt)
-        this.router.navigate(['payment'])
+        this.router.navigate(['payment'],{replaceUrl:true})
       }
       else{
         

ng8-seed/src/app/components/payment-confirmation/payment-confirmation.component.html

@@ -4,13 +4,22 @@
         <mat-card-content>
                 <div fxLayout="row wrap">
                         <div class="pt-2" fxLayoutAlign="center" fxFlex.sm="100" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
-                            <h1>Thank You</h1><br>
+                            <h1>Thank You for your Support</h1><br>
                             <!-- <p>We have received confirmation of your payment as detailed below</p> -->
                         </div> 
+                        <div fxLayoutAlign="center" fxFlex.sm="100" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
+                                
+                                <h4>Redirecting to Home Page Please Wait.. </h4><br>
+                               
+                        </div>
+                        <div fxLayoutAlign="center" fxFlex.sm="100" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
+                        <h5>Do not Refresh this Page</h5>
+                        </div>
                 </div>
-                <div fxLayout="row wrap">
+               
+                <!-- <div fxLayout="row wrap">
                         <div class="pt-2" fxLayoutAlign="center" fxFlex.sm="100" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
-                            <!-- <h1>Thank You</h1><br> -->
+                          
                             <p>We have received confirmation of your payment as detailed below</p>
                         </div> 
                 </div>
@@ -38,7 +47,7 @@
                                         <span class="button-text">Print Receipt</span>
                                         </button>
                         </div> 
-                </div>
+                </div> -->
     
         </mat-card-content>
     </mat-card>

ng8-seed/src/app/components/payment-confirmation/payment-confirmation.component.scss

@@ -0,0 +1,3 @@
+mat-card{
+    height: 500px;
+}

ng8-seed/src/app/components/payment-confirmation/payment-confirmation.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-payment-confirmation',
@@ -7,9 +8,12 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PaymentConfirmationComponent implements OnInit {
 
-  constructor() { }
+  constructor(private router:Router) { }
 
   ngOnInit() {
+    setTimeout(()=>{
+      this.router.navigate(['/'],{replaceUrl:true})
+    },7000)
   }
 
 }

ng8-seed/src/app/components/payment/payment.component.html

@@ -69,8 +69,8 @@
                          <input matInput placeholder = "Delivery Point" type="text" formControlName="delivery_point">
                      </mat-form-field>&nbsp;&nbsp;&nbsp; -->
                            <mat-form-field appearance="outline">
-                                 <input matInput [matDatepicker]="picker" placeholder="Delivery date" formControlName="do_delivery">
+                                 <input matInput [matDatepicker]="picker" [min]="maxDate" placeholder="Delivery date" formControlName="do_delivery">
-                                 <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+                                 <mat-datepicker-toggle matSuffix  [for]="picker"></mat-datepicker-toggle>
                                  <mat-datepicker #picker></mat-datepicker>
                                </mat-form-field>&nbsp;&nbsp;&nbsp;<br/>
                                <mat-form-field appearance="outline" >

ng8-seed/src/app/components/payment/payment.component.ts

@@ -48,6 +48,7 @@ export class PaymentComponent implements OnInit {
   contributeKind: FormGroup;
   contribute_params: any;
   payment_mode:any='offline';
+  maxDate=new Date()
   constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private apiService:ApiService) {
     this.isToken();
     
@@ -110,7 +111,7 @@ export class PaymentComponent implements OnInit {
     params.records.payment_mode=this.payment_mode
        this.apiService.csrContribute(params).subscribe(result=>{
           if(result['dataStatus']){
-            this.router.navigate(['/'],{replaceUrl:true})
+            this.router.navigate(['paymentconfirmation'],{replaceUrl:true})
           }
           else{
             console.log("something went wrong")

ng8-seed/src/app/components/project-detail/project-detail.component.ts

@@ -27,7 +27,8 @@ export class ProjectDetailComponent implements OnInit {
     console.log("State",data)
     this.schInfo.SchoolDetails.subscribe(schDetl=>this.schoolInfo = schDetl); 
     this.imageSources = this.schoolInfo.images;
-    if( data != ''){
+    console.log("param",data)
+    if( data != '' && data != null){
       this.getIndividualSchoolReqData(data)
       this.getSchoolReqList(data)
     }

ng8-seed/src/app/components/register/register-component.html

@@ -6,7 +6,7 @@
                         <div class="close_icon" (click)="closeDialog()">
                                 <mat-icon  >close</mat-icon>
                             </div>
-                        <p class="mb-0" style="text-align: right;">Already Registered ? <a [routerLink]="['/login']" class="mat-text-primary">Login Here</a></p>
+                        <p class="mb-0" style="text-align: right;">Already Registered ? <a (click)="loginScreen()" class="mat-text-primary">Login Here</a></p>
                     <div>
                         <h2 class="base-border">Register as a new user</h2>
                         <p>We would need some of your information to facilitate your contributions and keep you updated on the progress of the projects or new projects</p>
@@ -36,18 +36,44 @@
                                
                             </div>
                             <hr>
+                            <div class="mt-1 mb-1">
+                                <label class="mr-1">Registering as on Organisation ?</label>
+                                <mat-slide-toggle name="slideToggle" required (change)="change_fun($event)"> 
+                                </mat-slide-toggle>
+                              
+                            </div>
                             <div fxLayout="column" fxLayoutAlign="start stretch" formGroupName="org_info">
-                              <mat-form-field style="width: 100%">
+                             <div *ngIf="slide1">
+                                <mat-form-field style="width: 100%">
                                     <input matInput placeholder="Organisation Name" type="text" name="orgname" formControlName="orgname" required>
                               </mat-form-field>
                               <mat-form-field style="width: 100%;">
                                     <textarea matInput placeholder="Register Address" name="org_address" formControlName="org_address" required></textarea>
                               </mat-form-field> 
-                              <mat-form-field style="width: 100%">
-                                    <input matInput placeholder="Pan of the Organisation" type="number" name="org_pan" formControlName="org_pan" required>
-                              </mat-form-field>     
-                              <button class="mat-red" mat-raised-button (click)="csrUserRegistration()">Register</button>                        
                             </div>
+                              <div class="mt-1 mb-1">
+                                    <label class="mr-1">Do you want to avail 80G Exemption</label>
+                                    <mat-slide-toggle name="slideToggle" (change)="change_fun2($event)" required> 
+                                    </mat-slide-toggle>
+                                </div>
+                                <div *ngIf="slide2">
+                              <mat-form-field style="width: 100%">
+                                    <input matInput placeholder="PAN of the Organisation" type="number" name="org_pan" formControlName="org_pan" required>
+                              </mat-form-field>  
+                            </div> 
+                        </div>  
+                            <mat-label>Conscent profile share to public</mat-label>
+                            <mat-radio-group placeholder="Conscent profile share to public" formControlName="profile_share">
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  <mat-radio-button value="yes" >Yes</mat-radio-button>&nbsp;
+                                <mat-radio-button value="no">No</mat-radio-button>
+                              </mat-radio-group><br/><br/>
+                              <mat-label>Conscent Receive updates via Email</mat-label>
+                              <mat-radio-group aria-label="Conscent Receive updates via Email" formControlName="notify_pref">
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <mat-radio-button value="yes" >Yes</mat-radio-button>&nbsp;
+                                <mat-radio-button value="no">No</mat-radio-button>
+                              </mat-radio-group><br/>
+                              <button class="mat-red" mat-raised-button (click)="csrUserRegistration()">Register</button>                        
+                           
                             <!-- <div>
                                 <p>Sign Up Using</p> <a href="#" class="shared-icon mr-1 mat-blue"><i class="fa fa-facebook fa-lg mr-1"></i> Facebook</a><a href="#" class="shared-icon mat-red"><i class="fa fa-google fa-lg mr-1"></i>Google</a>
                             </div> -->

ng8-seed/src/app/components/register/register.component.ts

@@ -3,7 +3,8 @@ import {Router} from "@angular/router";
 import { environment } from '../../../environments/environment';
 import { ApiService } from '../../shared/api.service';
 import { FormBuilder, FormControl } from '@angular/forms';
-import { MatDialog } from '@angular/material';
+import { MatDialog, DialogRole, MatDialogRef, MatDialogConfig } from '@angular/material';
+import { LoginComponent } from '../login/login.component';
 
 @Component({
    selector: 'ms-register-session',
@@ -18,8 +19,10 @@ export class RegisterComponent {
   password: string;
   passwordConfirm: string;
   go_reg: any; 
+  slide1: boolean;
+  slide2: boolean;
 
-  constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private matDialog:MatDialog) { }
+  constructor(public restApi:ApiService,public fb:FormBuilder,public router:Router,private matDialog:MatDialog,private dialog_ref:MatDialogRef<RegisterComponent>) { }
 
   ngOnInit() {
     // this.getSchoolReqList();
@@ -39,14 +42,48 @@ export class RegisterComponent {
         org_info: this.fb.group({
         orgname: new FormControl(''),
         org_address: new FormControl(''),
-        org_pan: new FormControl('')
+        org_pan: new FormControl(''),
         }),
+        profile_share:new FormControl(''),
+        notify_pref:new FormControl(''),
         "created_by":"1",
 			  "updated_by":"1"
 
       })
   }
+  change_fun(value){
+    console.log(value)
+    if(value.checked == true){
+      this.slide1=true
+    }
+    else{
+      this.slide1=false
+    }
+  }
 
+  change_fun2(value){
+    console.log(value)
+    if(value.checked == true){
+      this.slide2=true
+    }
+    else{
+      this.slide2=false
+    }
+  }
+  loginScreen(){
+    this.dialog_ref.close();
+    const dialogConfig = new MatDialogConfig();
+
+    dialogConfig.disableClose = true;
+    dialogConfig.autoFocus = true;
+    this.matDialog.open(LoginComponent,{
+      height: '450px',
+      width: '400px',
+      panelClass: 'custom-modalbox',
+      
+    })
+    
+  }
   csrUserRegistration()
   {
     // console.log(this.go_reg.value);return false;
@@ -54,7 +91,8 @@ export class RegisterComponent {
   let data = this.go_reg.value;
   this.restApi.post(url,data).subscribe(schDet=>
     {       
-      this.router.navigate(['/authentication/login']); 
+      // this.router.navigate(['/authentication/login']); 
+      this.loginScreen()
     })
   }
   register() {

ng8-seed/src/app/layouts/admin/admin-layout.component.html

@@ -98,8 +98,8 @@
                      <ul class="main-h-list" style="font-size: 16px;">
                         <li *ngFor="let menuitem of horizontalMenuItems.getAll()">
                            <a [routerLink]="['/'+menuitem.state]" *ngIf="menuitem.type === 'link'">
-                           <mat-icon>{{ menuitem.icon }}</mat-icon>
+                           <!--<mat-icon>{{ menuitem.icon }}</mat-icon>-->
-                           <span>{{ menuitem.name | translate }}</span>
+                           <span><strong>{{ menuitem.name == 'Login' ? user_name == '' ? menuitem.name : user_name : menuitem.name  | translate }}</strong></span>
                            </a>
                            <a [routerLink]="['/'+menuitem.state]" *ngIf="menuitem.type === 'sub'">
                            <mat-icon>{{ menuitem.icon }}</mat-icon>

ng8-seed/src/app/layouts/admin/admin-layout.component.ts

@@ -9,6 +9,7 @@ import {TranslateService} from '@ngx-translate/core';
 import PerfectScrollbar from 'perfect-scrollbar';
 import { PerfectScrollbarConfigInterface,
 PerfectScrollbarComponent, PerfectScrollbarDirective } from 'ngx-perfect-scrollbar';
+import { ApiService } from 'app/shared/api.service';
 
 @Component({
   selector: 'app-layout-admin',
@@ -37,13 +38,19 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
 
   @ViewChild('sidemenu', { static: true }) sidemenu;
   public config: PerfectScrollbarConfigInterface = {};
-
+  user_name:any='';
-  constructor(private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService ) {
+  constructor(private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService,private apiService:ApiService ) {
     const browserLang: string = translate.getBrowserLang();
     translate.use(browserLang.match(/en|fr/) ? browserLang : 'en');
   }
 
   ngOnInit(): void {
+    if(localStorage.getItem('token')){
+    this.user_name= this.apiService.jwtDecode(localStorage.getItem('token'))
+      this.user_name=this.user_name.payload.username
+    }
+      console.log("user",this.user_name)
+    
     const elemSidebar = <HTMLElement>document.querySelector('.sidebar-container ');
 
     if (window.matchMedia(`(min-width: 960px)`).matches && !this.isMac() && !this.compactSidebar && this.layoutDir != 'rtl') {

ng8-seed/src/app/session/login/login.component.ts

@@ -27,6 +27,7 @@ export class LoginComponent {
 
   ngOnInit() {
     console.log("d",sessionStorage.getItem('contribute'))
+    localStorage.clear();
     // this.getSchoolReqList();
     this.initForm();
     // console.log(this.router.events);
@@ -69,7 +70,8 @@ this.previousUrl =  this.restApi.getPreviousUrl();
          this.router.navigate(['/home']);
         //  this.matDialog.closeAll()
         }else{
-          this.router.navigate([this.previousUrl]);
+          // this.router.navigate([this.previousUrl]);
+          this.router.navigate(['/home']);
           // this.location.back();
           // this.matDialog.closeAll()
         }

ng8-seed/src/app/session/register/register-component.html

@@ -3,7 +3,7 @@
         <div fxLayout="row" fxLayoutAlign="center start" class="pt-2">
             <div fxLayout="column" fxFlex.xl="40" fxFlex.lg="40" fxFlex.md="50" fxFlex.sm="80" fxFlex.xs="90">
                 <mat-card class="login-session">
-                        <p class="mb-0" style="text-align: right;">Already Registered ? <a [routerLink]="['/login']" class="mat-text-primary">Login Here</a></p>
+                        <p class="mb-0" style="text-align: right;">Already Registered ? <a (click)="login_screen()" class="mat-text-primary">Login Here</a></p>
                     <div>
                         <h2 class="base-border">Register as a new user</h2>
                         <p>We would need some of your information to facilitate your contributions and keep you updated on the progress of the projects or new projects</p>
@@ -57,9 +57,21 @@
                               <mat-form-field style="width: 100%">
                                     <input matInput placeholder="PAN of the Organisation" type="number" name="org_pan" formControlName="org_pan" required>
                               </mat-form-field>  
-                            </div>   
-                              <button class="mat-red" mat-raised-button (click)="csrUserRegistration()">Register</button>                        
                             </div>
+                        </div>
+                              <mat-label>Conscent profile share to public</mat-label>
+                              <mat-radio-group placeholder="Conscent profile share to public" formControlName="profile_share">
+                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <mat-radio-button value="yes" >Yes</mat-radio-button>&nbsp;
+                                  <mat-radio-button value="no">No</mat-radio-button>
+                                </mat-radio-group><br/><br/>
+                                <mat-label>Conscent Receive updates via Email</mat-label>
+                                <mat-radio-group aria-label="Conscent Receive updates via Email" formControlName="notify_pref">
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<mat-radio-button value="yes" >Yes</mat-radio-button>&nbsp;
+                                  <mat-radio-button value="no">No</mat-radio-button>
+                                </mat-radio-group><br/><br/>
+                               
+                              <button class="mat-red" mat-raised-button (click)="csrUserRegistration()">Register</button>                        
+                            
                             <!-- <div>
                                 <p>Sign Up Using</p> <a href="#" class="shared-icon mr-1 mat-blue"><i class="fa fa-facebook fa-lg mr-1"></i> Facebook</a><a href="#" class="shared-icon mat-red"><i class="fa fa-google fa-lg mr-1"></i>Google</a>
                             </div> -->

ng8-seed/src/app/session/register/register.component.ts

@@ -46,8 +46,9 @@ export class RegisterComponent {
         org_other_details: new FormControl(''),
         user_id: new FormControl(''),
         isactive: new FormControl(''),
-        
         }),
+        profile_share:new FormControl(''),
+        notify_pref: new FormControl(''),
         "created_by":"1",
 			  "updated_by":"1"
 
@@ -86,6 +87,9 @@ export class RegisterComponent {
   register() {
     this.router.navigate(['/']);
   }
+  login_screen(){
+    this.router.navigate(['authentication','login'])
+  }
 	
 }
 

ng8-seed/src/app/shared/api.service.ts

@@ -136,7 +136,7 @@ export class ApiService {
   csrContribute(DATA){
     let token_decode=this.jwtDecode(localStorage.getItem('token'))
     if(token_decode){
-    DATA.records.user_id=token_decode['payload'].username
+    DATA.records.user_id=token_decode['payload'].userid
     }
     console.log("dd",token_decode)
     return this.http.post(apiUrl+'csrContribute',DATA).pipe

ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts

@@ -32,7 +32,7 @@ const HORIZONTALMENUITEMS = [
     state: 'contribute',
     name: 'Contribute',
     type: 'link',
-    icon: 'error_outline'
+    icon: 'list'
   },
   // {
   //   state: 'apps',

ng8-seed/src/app/shared/menu-items/menu-items.ts

@@ -59,7 +59,7 @@ const MENUITEMS : Menu[] = [
     state: 'contribute',
     name: 'Contribute',
     type: 'link',
-    icon: 'error_outline'
+    icon: 'list'
   },
   // {
   //   state: 'apps',

ng8-seed/src/environments/environment.prod.ts

@@ -1,4 +1,4 @@
 export const environment = {
   production: true,
-  apiUrl:'https://lms.venbainfotech.com/csr/api/',
+  apiUrl:'https://contribute.tnschools.gov.in/csrb/api/',
 };

ng8-seed/src/environments/environment.ts

@@ -6,4 +6,5 @@
 export const environment = {
   production: false,
   apiUrl:'https://lms.venbainfotech.com/csr/api/',
+  //apiUrl:'https://contribute.tnschools.gov.in/csrb/api/'
 };