From 94a6cd4ff632147e7da4d00f8e16adb6bac1b6a2 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Fri, 25 Feb 2022 17:19:14 -0700
Subject: [PATCH] add registries.json and use real marketplace name

---
 frontend/build-config.js                      | 20 ++++++
 frontend/config-sample.json                   |  6 +-
 frontend/package.json                         |  8 +--
 .../modals/os-welcome/os-welcome.page.html    | 63 +++++++++++++++----
 .../modals/os-welcome/os-welcome.page.scss    |  7 ++-
 .../marketplace-list.page.html                |  2 +-
 .../marketplace-routes/marketplace.service.ts | 20 +++---
 .../server-show/server-show.page.ts           |  1 -
 frontend/registries.json                      | 14 +++++
 frontend/update-git-hash.js                   | 27 --------
 patch-db                                      |  2 +-
 11 files changed, 111 insertions(+), 59 deletions(-)
 create mode 100755 frontend/build-config.js
 create mode 100644 frontend/registries.json
 delete mode 100755 frontend/update-git-hash.js

diff --git a/frontend/build-config.js b/frontend/build-config.js
new file mode 100755
index 000000000..f9c115249
--- /dev/null
+++ b/frontend/build-config.js
@@ -0,0 +1,20 @@
+// @ts-check
+const fs = require('fs')
+const childProcess = require('child_process')
+const { env } = require('process')
+
+const gitHash = String(
+  childProcess.execSync('git describe --always --abbrev=40 --dirty=-modified'),
+).trim()
+
+const origConfig = require('./config.json')
+
+const registries = require('./registries.json')
+
+origConfig['gitHash'] = gitHash
+if (/(^|-)beta($|-)/.test(env['ENVIRONMENT'] || '')) {
+  origConfig.ui['marketplace'] = registries.beta
+} else {
+  origConfig.ui['marketplace'] = registries.prod
+}
+fs.writeFileSync('./config.json', JSON.stringify(origConfig, null, 2))
diff --git a/frontend/config-sample.json b/frontend/config-sample.json
index 5c773e9ae..2f5f8a528 100644
--- a/frontend/config-sample.json
+++ b/frontend/config-sample.json
@@ -13,10 +13,6 @@
     "mocks": {
       "maskAs": "tor",
       "skipStartupAlerts": true
-    },
-    "marketplace": {
-      "url": "https://beta-registry-0-3.start9labs.com",
-      "name": "Start9"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/package.json b/frontend/package.json
index b4303e8cc..b0b2f740e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,10 +15,10 @@
     "build:setup-wizard": "ng run setup-wizard:build",
     "build:ui": "ng run ui:build && tsc projects/ui/postprocess.ts && node projects/ui/postprocess.js && git log | head -n1 > dist/ui/git-hash.txt",
     "build:all": "npm run build:deps && npm run build:diagnostic-ui && npm run build:setup-wizard && npm run build:ui",
-    "start:diagnostic-ui": "npm run copy-git-hash && ionic serve --project diagnostic-ui",
-    "start:setup-wizard": "npm run copy-git-hash && ionic serve --project setup-wizard",
-    "start:ui": "npm run-script copy-git-hash && ionic serve --project ui",
-    "copy-git-hash": "node update-git-hash.js"
+    "start:diagnostic-ui": "npm run-script build-config && ionic serve --project diagnostic-ui",
+    "start:setup-wizard": "npm run-script build-config && ionic serve --project setup-wizard",
+    "start:ui": "npm run-script build-config && ionic serve --project ui",
+    "build-config": "node build-config.js"
   },
   "dependencies": {
     "@angular/animations": "^13.2.0",
diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
index 3bdd31442..443a01149 100644
--- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -1,20 +1,61 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title>Welcome to {{ version }}!</ion-title>
+    <ion-title>{{ version }} Release Notes</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content class="ion-padding">
-  <div style="display: flex; flex-direction: column; justify-content: space-between; height: 100%">
-    <h2>A Whole New Embassy</h2>
-    <div class="main-content">
-      <p>New features and more new features!</p>
-    </div>
+  <h1>A whole new Embassy!</h1>
+  <p>
+    Check out the full
+    <a
+      href="https://start9labs.medium.com/embassyos-0-3-0-f3d2d2ea016f"
+      target="_blank"
+      noreferrer
+      >Release Notes</a
+    >.
+  </p>
+  <h2>Highlights</h2>
+  <ul class="spaced-list">
+    <li>
+      <b>SSD Support</b> - Embassy now requires an external SSD, offering more
+      storage, better reliability, and a faster experience.
+    </li>
+    <li><b>Websockets</b> - Provides a smooth, "real-time" feel.</li>
+    <li>
+      <b>Full Embassy Backups</b> - Create encrypted backups of your Embassy and
+      all its services with a single button.
+    </li>
+    <li>
+      <b>LAN Shared Folders (for backups)</b> - Easily perform "over-the-air"
+      backups on your desktop/laptop or a drive plugged into your
+      desktop/laptop.
+    </li>
+    <li>
+      <b>Revamped User Interface</b> - The user interface has been rewritten and
+      redesigned to be more performant, understandable, and beautiful.
+    </li>
+    <li>
+      <b>Session Management</b> - View your Embassy's active sessions and log
+      out remotely.
+    </li>
+    <li>
+      <b>Alt Marketplaces</b> - Optionally connect to and browse alternative
+      service marketplaces.
+    </li>
+    <li>
+      <b>Progress Reporting</b> - View live progress of services
+      installs/updates and EmbassyOS updates.
+    </li>
+    <li>
+      <b>Health Checks</b> - View the health of your services at a glance, along
+      with helpful messages if something is wrong.
+    </li>
+  </ul>
 
-    <div class="close-button">
-      <ion-button fill="outline" color="dark" (click)="dismiss()">
-        Begin
-      </ion-button>
-    </div>
+  <div class="ion-text-center ion-padding">
+    <ion-button fill="outline" color="dark" (click)="dismiss()">
+      Begin
+    </ion-button>
   </div>
 </ion-content>
diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss
index ecd4c542a..485a7432a 100644
--- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss
+++ b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.scss
@@ -7,6 +7,11 @@
 }
 
 .main-content {
-  height: 100%;
   color: var(--ion-color-dark);
+}
+
+.spaced-list {
+  li {
+    padding-bottom: 12px;
+  }
 }
\ No newline at end of file
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
index 77860c5a8..2f6704847 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
+++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
@@ -19,7 +19,7 @@
       style="font-family: 'Montserrat'; font-size: 42px; margin: 32px 0"
       class="ion-text-center"
     >
-      Embassy Marketplace
+      {{ marketplaceService.marketplace.name }}
     </h1>
 
     <ion-grid style="padding-bottom: 32px">
diff --git a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts
index 3ae9554d0..18e198118 100644
--- a/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts
+++ b/frontend/projects/ui/src/app/pages/marketplace-routes/marketplace.service.ts
@@ -22,7 +22,10 @@ export class MarketplaceService {
       [version: string]: string
     }
   } = {}
-  marketplaceUrl: string
+  marketplace: {
+    url: string
+    name: string
+  }
 
   constructor(
     private readonly api: ApiService,
@@ -34,10 +37,11 @@ export class MarketplaceService {
   init(): Subscription {
     return this.patch.watch$('ui', 'marketplace').subscribe(marketplace => {
       if (!marketplace || !marketplace['selected-id']) {
-        this.marketplaceUrl = this.config.marketplace.url
+        console.log('**MARKETPLACE', this.config)
+        this.marketplace = this.config.marketplace
       } else {
-        this.marketplaceUrl =
-          marketplace['known-hosts'][marketplace['selected-id']].url
+        this.marketplace =
+          marketplace['known-hosts'][marketplace['selected-id']]
       }
     })
   }
@@ -68,7 +72,7 @@ export class MarketplaceService {
   }
 
   async installPackage(req: Omit<RR.InstallPackageReq, 'marketplace-url'>) {
-    req['marketplace-url'] = this.marketplaceUrl
+    req['marketplace-url'] = this.marketplace.url
     return this.api.installPackage(req as RR.InstallPackageReq)
   }
 
@@ -121,7 +125,7 @@ export class MarketplaceService {
     params: RR.GetMarketplaceDataReq,
     url?: string,
   ): Promise<RR.GetMarketplaceDataRes> {
-    url = url || this.marketplaceUrl
+    url = url || this.marketplace.url
     return this.api.marketplaceProxy('/package/v0/info', params, url)
   }
 
@@ -140,7 +144,7 @@ export class MarketplaceService {
     return this.api.marketplaceProxy(
       '/package/v0/index',
       qp,
-      this.marketplaceUrl,
+      this.marketplace.url,
     )
   }
 
@@ -150,7 +154,7 @@ export class MarketplaceService {
     return this.api.marketplaceProxy(
       `/package/v0/release-notes/${params.id}`,
       {},
-      this.marketplaceUrl,
+      this.marketplace.url,
     )
   }
 }
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
index 7d96a68a5..bf4ef89e0 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-show/server-show.page.ts
@@ -17,7 +17,6 @@ import { wizardModal } from 'src/app/components/install-wizard/install-wizard.co
 import { exists, isEmptyObject } from '@start9labs/shared'
 import { EOSService } from 'src/app/services/eos.service'
 import { ServerStatus } from 'src/app/services/patch-db/data-model'
-import { SnakePage } from 'src/app/modals/snake/snake.page'
 
 @Component({
   selector: 'server-show',
diff --git a/frontend/registries.json b/frontend/registries.json
new file mode 100644
index 000000000..07170e1d2
--- /dev/null
+++ b/frontend/registries.json
@@ -0,0 +1,14 @@
+{
+  "prod": {
+    "url": "https://registry.start9.com",
+    "name": "Embassy Marketplace"
+  },
+  "beta": {
+    "url": "https://beta-registry-0-3.start9labs.com",
+    "name": "Embassy Marketplace (Beta)"
+  },
+  "alpha": {
+    "url": "https://alpha-registry-0-3.start9labs.com",
+    "name": "Embassy Marketplace (Alpha)"
+  }
+}
diff --git a/frontend/update-git-hash.js b/frontend/update-git-hash.js
deleted file mode 100755
index 39244b65f..000000000
--- a/frontend/update-git-hash.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @ts-check
-const fs = require('fs')
-const childProcess = require('child_process')
-
-const gitHash = String(childProcess.execSync('git rev-parse HEAD')).trim()
-
-/**
- * @template T
- * @param {() => T} fn
- * @param {T} defaultValue
- * @returns
- */
-function catchDefault(fn, defaultValue) {
-  try {
-    return fn()
-  } catch {
-    return defaultValue
-  }
-}
-
-const origConfig = catchDefault(
-  /** @returns {{gitHash?: string}} */
-  () => JSON.parse(fs.readFileSync('./config.json')),
-  {},
-)
-origConfig.gitHash = gitHash
-fs.writeFileSync('./config.json', JSON.stringify(origConfig, null, 2))
diff --git a/patch-db b/patch-db
index 6478f0b16..d3426671a 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit 6478f0b16b90193f330377bc00128fc204010168
+Subproject commit d3426671a1e77f9f636847aee965892eb6b4b177