Merge branch 'development' into 'master'

0.5

See merge request b650/Deep-Lynx!334

AdminWebApp/src/pages/ContainerInvite.vue

@@ -7,8 +7,7 @@
             <v-col cols="5" class="pr-0">
               <v-container class="pa-0 d-flex">
                 <div class="align-self-center ma-auto">
-                  <h1 class="login-title text-center white--text mb-5">Deep Lynx</h1>
-                  <v-img max-height="165" max-width="165" src="../assets/data-white.png"></v-img>
+                  <v-img max-height="250" max-width="250" src="../assets/lynx-white.png"></v-img>
                 </div>
               </v-container>
             </v-col>

AdminWebApp/src/pages/ContainerSelect.vue

@@ -7,8 +7,7 @@
             <v-col cols="5" class="pr-0">
               <v-container class="pa-0 d-flex">
                 <div class="align-self-center ma-auto">
-                  <h1 class="login-title text-center white--text mb-5">Deep Lynx</h1>
-                  <v-img max-height="165" max-width="165" src="../assets/data-white.png"></v-img>
+                  <v-img max-height="250" max-width="250" src="../assets/lynx-white.png"></v-img>
                 </div>
               </v-container>
             </v-col>

AdminWebApp/src/pages/Home.vue

@@ -22,10 +22,9 @@
       class="grey--text text--darken-2"
     >
       <div class="logo-div d-flex align-center pa-1">
-        <v-avatar tile height="25" width="25">
-          <img src="../assets/data-white.png">
-        </v-avatar>
-        <h1 class="text-h1 d-inline white--text">Deep Lynx</h1>
+        <div style="margin-left:15px;" >
+          <v-img max-height="120" max-width="120"  src="../assets/lynx-white.png"></v-img>
+        </div>
       </div>
 
       <v-list dense class="nav-drawer-accordion pa-0">

AdminWebApp/src/pages/Login.vue

@@ -7,8 +7,7 @@
             <v-col cols="5" class="pr-0">
               <v-container class="pa-0 d-flex">
                 <div class="align-self-center ma-auto">
-                  <h1 class="login-title text-center white--text mb-5">Deep Lynx UI</h1>
-                  <v-img max-height="165" max-width="165" src="../assets/data-white.png"></v-img>
+                  <v-img max-height="250" max-width="250" src="../assets/lynx-white.png"></v-img>
                 </div>
               </v-container>
             </v-col>

readme.md

@@ -1,3 +1,5 @@
+![img.png](lynx.png)
+
 The construction of megaprojects has consistently demonstrated challenges for project managers in regard to meeting cost, schedule, and performance requirements. Megaproject construction challenges are common place within megaprojects with many active projects in the United States failing to meet cost and schedule efforts by significant margins. Currently, engineering teams operate in siloed tools and disparate teams where connections across design, procurement, and construction systems are translated manually or over brittle point-to-point integrations. The manual nature of data exchange increases the risk of silent errors in the reactor design, with each silent error cascading across the design. These cascading errors lead to uncontrollable risk during construction, resulting in significant delays and cost overruns. Deep Lynx allows for an integrated platform during design and operations of mega projects.
 
 ## **Documentation**

src/data_processing/edge_inserter.ts

@@ -31,10 +31,9 @@ export async function InsertEdge(edgeQueueItem: EdgeQueueItem): Promise<Result<b
         // if we failed, need to iterate the attempts and set the next attempt date, so we don't swamp the database - this
         // is an exponential backoff
         const currentTime = new Date().getTime();
+        const check = currentTime + Math.pow(Config.edge_insertion_backoff_multiplier, edgeQueueItem.attempts++) * 1000;
 
-        edgeQueueItem.next_attempt_at = new Date(
-            currentTime + (edgeQueueItem.next_attempt_at.getSeconds() + Math.pow(Config.edge_insertion_backoff_multiplier, edgeQueueItem.attempts++)) * 1000,
-        );
+        edgeQueueItem.next_attempt_at = new Date(check);
 
         const set = await queueMapper.SetNextAttemptAt(edgeQueueItem.id!, edgeQueueItem.next_attempt_at.toISOString(), inserted.error?.error);
         if (set.isError) {

src/http_server/views/authorize.hbs

@@ -3,8 +3,7 @@
         <div class='col-md-5'>
             <div id='color-background' class='pa-0 container h-100 d-flex'>
                 <div class='align-self-center justify-content-center mx-auto my-5'>
-                    <h1 class='login-title text-center text-white mb-4'>Deep Lynx</h1>
-                    <img src='/img/data-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' />
+                    <img src='/img/lynx-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' style="max-height:250; max-width:250" />
                 </div>
             </div>
         </div>

src/http_server/views/email_validate.hbs

@@ -3,8 +3,7 @@
         <div class='col-md-5'>
             <div id='color-background' class='pa-0 container h-100 d-flex'>
                 <div class='align-self-center justify-content-center mx-auto my-5'>
-                    <h1 class='login-title text-center text-white mb-4'>Deep Lynx</h1>
-                    <img src='/img/data-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' />
+                    <img src='/img/lynx-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' style="max-height:250; max-width:250" />
                 </div>
             </div>
         </div>

src/http_server/views/login.hbs

@@ -3,8 +3,7 @@
         <div class='col-md-5'>
             <div id='color-background' class='pa-0 container h-100 d-flex'>
                 <div class='align-self-center justify-content-center mx-auto my-5'>
-                    <h1 class='login-title text-center text-white mb-4'>Deep Lynx</h1>
-                    <img src='/img/data-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' />
+                    <img src='/img/lynx-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' style="max-height:250; max-width:250" />
                 </div>
             </div>
         </div>

src/http_server/views/register.hbs

@@ -13,8 +13,7 @@
         <div class='col-md-5'>
             <div id='color-background' class='pa-0 container h-100 d-flex'>
                 <div class='align-self-center justify-content-center mx-auto my-5'>
-                    <h1 class='login-title text-center text-white mb-4'>Deep Lynx</h1>
-                    <img src='/img/data-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' />
+                    <img src='/img/lynx-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' style="max-height:250; max-width:250" />
                 </div>
             </div>
         </div>

src/http_server/views/reset_password.hbs

@@ -3,8 +3,7 @@
         <div class='col-md-5'>
             <div id='color-background' class='pa-0 container h-100 d-flex'>
                 <div class='align-self-center justify-content-center mx-auto my-5'>
-                    <h1 class='login-title text-center text-white mb-4'>Deep Lynx</h1>
-                    <img src='img/data-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' />
+                    <img src='/img/lynx-white.png' class='card-img img-fluid' alt='Deep Lynx Logo' style="max-height:250; max-width:250" />
                 </div>
             </div>
         </div>