Updated architecture of the project & new buttons design

functions/scheduled/dailyMembership.f.js

@@ -39,10 +39,10 @@ exports=module.exports=functions.runWith(runtimeOpts).pubsub.schedule('every 24
     })
     const results=await Promise.all(verifyMessageBatch)
     results.forEach((result)=>{
-      if (result.wallet.shareBalance>0)statistics.emailsContributorsAuth.push(result.emails.auth)
-      statistics.wallet.shareBalance=((statistics.wallet||{}).shareBalance||0)+result.wallet.shareBalance
+      if (result.wallet.balance>0)statistics.emailsContributorsAuth.push(result.emails.auth)
+      statistics.wallet.balance=((statistics.wallet||{}).balance||0)+result.wallet.balance
       statistics.interest.amount=((statistics.interest||{}).amount||0)+result.interest.amount
-      statistics.interest.rateDay=statistics.wallet.shareBalance*(Math.exp(result.interest.rateYear/365)-1)
+      statistics.interest.rateDay=statistics.wallet.balance*(Math.exp(result.interest.rateYear/365)-1)
       statistics.interest.amountCummulate=((statistics.interest||{}).amountCummulate||0)+result.interest.amountCummulate
       statistics.contract.amount=((statistics.contract||{}).amount||0)+result.contract.amount
       statistics.contract.amountCummulate=((statistics.contract||{}).amountCummulate||0)+result.contract.amountCummulate

functions/utils/verifyMessage.js

@@ -280,7 +280,6 @@ module.exports = {
         interest.amount=Math.max(0,interest.amountBase*(Math.exp(interest.rateYear/365*interest.days)-1))
         interest.amountCummulate=(((userPreviousMessageData.interest||{}).amountCummulate)||0)+interest.amount
         wallet.balance=Math.round((Number(wallet.balance)+Number((interest.amount)||0))*100000)/100000
-        wallet.shareBalance=wallet.balance
 
       //*******MESSAGE WRITES**********************
         //message event

src/app/app-routing.module.ts

@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { LoginComponent } from './login.component';
-import { ChatComponent } from './chat.component';
-import { ProfileComponent } from './profile.component';
-import { SettingsComponent } from './settings.component';
-import { DirectoryComponent } from './directory.component';
-import { buyPRNComponent } from './buyPRN.component';
+import { LoginComponent } from './login/login.component';
+import { ChatComponent } from './chat/chat.component';
+import { ProfileComponent } from './profile/profile.component';
+import { SettingsComponent } from './settings/settings.component';
+import { DirectoryComponent } from './directory/directory.component';
+import { buyPRNComponent } from './buyPRN/buyPRN.component';
 
 const appRoutes: Routes = [
   { path: 'chat/:id', component: ChatComponent },

src/app/app.component.html

@@ -0,0 +1,24 @@
+<img class="fullScreenImage" id="fullScreenImage" (click)="hideFullScreenImage()">
+    <progress value='0' max='100' id='uploader'>0%</progress>
+    <div class='menu'>
+      <div style="width:320px;display:block;margin: 0 auto">
+        <img src="./../assets/App icons/Perrinn_02.png" style="cursor:pointer;float:left;width:30px;margin:5px 45px 5px 5px" (click)="router.navigate(['profile','all'])">
+        <span class="material-icons" style="float:left;margin:5px 45px 5px 45px;font-size:30px;cursor:pointer" (click)="router.navigate(['directory'])">list</span>
+        <span class="material-icons-outlined" style="float:left;margin:5px 45px 5px 45px;font-size:30px;height:30px;cursor:pointer" onclick="window.open('https://discover.perrinn.com','_blank')">info</span>
+      </div>
+      <div class="seperator" style="width:100%;margin:0px"></div>
+    </div>
+    <div style="user-select:none">
+      <div style="max-width:800px;margin:0 auto">
+        <div *ngIf="!UI.currentUser" class="buttonWhite" style="float:left;line-height:20px;width:75px;margin:7px" (click)="router.navigate(['login'])">Login</div>
+        <div *ngIf="UI.currentUser" style="float:left;cursor:pointer" (click)="router.navigate(['profile',UI.currentUser])">
+          <img [src]="UI.currentUserLastMessageObj?.imageUrlThumbUser" style="display:inline;float:left;margin:5px;object-fit:cover;width:35px;height:35px">
+          <span style="margin:11px;font-size:14px;line-height:40px">{{UI.formatSharesToPRNCurrency(null,UI.currentUserLastMessageObj?.wallet?.balance||0)}}</span>
+        </div>
+        <div class="buttonBlack" style="float:right;line-height:20px;width:100px;margin:7px" (click)="router.navigate(['buyPRN'])">Buy PRN</div>
+      </div>
+      <div class="seperator" style="width:100%;margin:0px"></div>
+    </div>
+    <div id='main_container'>
+      <router-outlet></router-outlet>
+    </div>

src/app/app.component.ts

@@ -5,33 +5,9 @@ import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/comp
 
 @Component({
   selector: 'app-root',
-  template: `
-    <img class="fullScreenImage" id="fullScreenImage" (click)="hideFullScreenImage()">
-    <progress value='0' max='100' id='uploader'>0%</progress>
-    <div class='menu'>
-      <div style="width:320px;display:block;margin: 0 auto">
-        <img src="./../assets/App icons/Perrinn_02.png" style="cursor:pointer;float:left;width:30px;margin:5px 45px 5px 5px" (click)="router.navigate(['profile','all'])">
-        <span class="material-icons" style="float:left;margin:5px 45px 5px 45px;font-size:30px;cursor:pointer" (click)="router.navigate(['directory'])">list</span>
-        <span class="material-icons-outlined" style="float:left;margin:5px 45px 5px 45px;font-size:30px;height:30px;cursor:pointer" onclick="window.open('https://discover.perrinn.com','_blank')">info</span>
-      </div>
-      <div class="seperator" style="width:100%;margin:0px"></div>
-    </div>
-    <div style="user-select:none">
-      <div style="max-width:800px;margin:0 auto">
-        <div *ngIf="!UI.currentUser" class="buttonWhite" style="float:left;line-height:20px;width:75px;margin:7px" (click)="router.navigate(['login'])">Login</div>
-        <div *ngIf="UI.currentUser" style="float:left;cursor:pointer" (click)="router.navigate(['profile',UI.currentUser])">
-          <img [src]="UI.currentUserLastMessageObj?.imageUrlThumbUser" style="display:inline;float:left;margin:5px;object-fit:cover;width:35px;height:35px">
-          <span style="margin:11px;font-size:14px;line-height:40px">{{UI.formatSharesToPRNCurrency(null,UI.currentUserLastMessageObj?.wallet.shareBalance||0)}}</span>
-        </div>
-        <div class="buttonBlack" style="float:right;line-height:20px;width:100px;margin:7px" (click)="router.navigate(['buyPRN'])">Buy PRN</div>
-      </div>
-      <div class="seperator" style="width:100%;margin:0px"></div>
-    </div>
-    <div id='main_container'>
-      <router-outlet></router-outlet>
-    </div>
-  `,
+  templateUrl: './app.component.html',
 })
+
 export class AppComponent {
 
   constructor(

src/app/app.module.ts

@@ -5,12 +5,12 @@ import { HttpClientModule } from '@angular/common/http';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { ChatComponent }  from './chat.component';
-import { LoginComponent }  from './login.component';
-import { ProfileComponent }  from './profile.component';
-import { SettingsComponent }  from './settings.component';
-import { DirectoryComponent }  from './directory.component';
-import { buyPRNComponent }  from './buyPRN.component';
+import { ChatComponent }  from './chat/chat.component';
+import { LoginComponent }  from './login/login.component';
+import { ProfileComponent }  from './profile/profile.component';
+import { SettingsComponent }  from './settings/settings.component';
+import { DirectoryComponent }  from './directory/directory.component';
+import { buyPRNComponent }  from './buyPRN/buyPRN.component';
 import { LinkyModule } from 'angular-linky';
 
 import { PipeModule }    from './pipes.module';