Merge branch 'rebase/integration/refactors' of github.com:Start9Labs/start-os into rebase/feat/domains

frontend/projects/setup-wizard/src/app/pages/embassy/embassy.page.ts

@@ -141,7 +141,6 @@ export class EmbassyPage {
       await this.navCtrl.navigateForward(`/loading`)
     } catch (e: any) {
       this.errorService.handleError(e)
-      console.error(e)
     } finally {
       loader.unsubscribe()
     }

frontend/projects/setup-wizard/src/app/pages/success/download-doc/download-doc.component.html

@@ -27,31 +27,15 @@
       <section
         style="
           padding: 1rem 3rem 2rem 3rem;
-          border: solid #c4c4c5 3px;
           margin-bottom: 24px;
+          border: solid #c4c4c5 3px;
+          border-radius: 20px;
         "
       >
-        <h2 style="font-variant-caps: all-small-caps">
-          Access from home (LAN)
-        </h2>
-        <p>
-          Visit the address below when you are connected to the same WiFi or
-          Local Area Network (LAN) as your server:
-        </p>
-        <p
-          style="
-            padding: 16px;
-            font-weight: bold;
-            font-size: 1.1rem;
-            overflow: auto;
-          "
-        >
-          <code id="lan-addr"></code>
-        </p>
         <div>
           <h3 style="color: #f8546a; font-weight: bold">Important!</h3>
           <p>
-            Be sure to
+            Download your server's Root CA and
             <a
               href="https://docs.start9.com/latest/user-manual/connecting/connecting-lan"
               target="_blank"
@@ -60,12 +44,10 @@
             >
               follow the instructions
             </a>
-            to establish a secure connection by installing your server's root
-            certificate authority.
+            to establish a secure connection with your server.
           </p>
         </div>
-
-        <div style="padding: 2rem; text-align: center">
+        <div style="text-align: center">
           <a
             id="cert"
             [download]="crtName"
@@ -88,12 +70,49 @@
           </a>
         </div>
       </section>
+      <section
+        style="
+          padding: 1rem 3rem 2rem 3rem;
+          border: solid #c4c4c5 3px;
+          border-radius: 20px;
+          margin-bottom: 24px;
+        "
+      >
+        <h2 style="font-variant-caps: all-small-caps">
+          Access from home (LAN)
+        </h2>
+        <p>
+          Visit the address below when you are connected to the same WiFi or
+          Local Area Network (LAN) as your server.
+        </p>
+        <p
+          style="
+            padding: 16px;
+            font-weight: bold;
+            font-size: 1.1rem;
+            overflow: auto;
+          "
+        >
+          <code id="lan-addr"></code>
+        </p>
 
-      <section style="padding: 1rem 3rem 2rem 3rem; border: solid #c4c4c5 3px">
         <h2 style="font-variant-caps: all-small-caps">
           Access on the go (Tor)
         </h2>
-        <p>Visit the address below when you are away from home:</p>
+        <p>Visit the address below when you are away from home.</p>
+        <p>
+          <span style="font-weight: bold">Note:</span>
+          This address will only work from a Tor-enabled browser.
+          <a
+            href="https://docs.start9.com/latest/user-manual/connecting/connecting-tor"
+            target="_blank"
+            rel="noreferrer"
+            style="color: #6866cc; font-weight: bold; text-decoration: none"
+          >
+            Follow the instructions
+          </a>
+          to get setup.
+        </p>
         <p
           style="
             padding: 16px;
@@ -104,21 +123,6 @@
         >
           <code id="tor-addr"></code>
         </p>
-        <div>
-          <h3 style="color: #f8546a; font-weight: bold">Important!</h3>
-          <p>
-            This address will only work from a Tor-enabled browser.
-            <a
-              href="https://docs.start9.com/latest/user-manual/connecting/connecting-tor"
-              target="_blank"
-              rel="noreferrer"
-              style="color: #6866cc; font-weight: bold; text-decoration: none"
-            >
-              Follow the instructions
-            </a>
-            to get setup.
-          </p>
-        </div>
       </section>
     </div>
   </body>

frontend/projects/setup-wizard/src/app/pages/success/success.page.ts

@@ -50,7 +50,7 @@ export class SuccessPage {
       const ret = await this.api.complete()
       if (!this.isKiosk) {
         this.torAddress = ret['tor-address']
-        this.lanAddress = ret['lan-address'].replace('https', 'http')
+        this.lanAddress = ret['lan-address'].replace(/^https:/, 'http:')
         this.cert = ret['root-ca']
 
         await this.api.exit()

frontend/projects/setup-wizard/src/app/services/api/mock-api.service.ts

@@ -7,10 +7,10 @@ import {
 } from '@start9labs/shared'
 import {
   ApiService,
-  CifsRecoverySource,
   AttachReq,
-  ExecuteReq,
+  CifsRecoverySource,
   CompleteRes,
+  ExecuteReq,
 } from './api.service'
 import * as jose from 'node-jose'
 import { interval, map, Observable } from 'rxjs'
@@ -151,7 +151,7 @@ export class MockApiService extends ApiService {
   async complete(): Promise<CompleteRes> {
     await pauseFor(1000)
     return {
-      'tor-address': 'http://asdafsadasdasasdasdfasdfasdf.onion',
+      'tor-address': 'https://asdafsadasdasasdasdfasdfasdf.onion',
       'lan-address': 'https://adjective-noun.local',
       'root-ca': encodeBase64(rootCA),
     }