Use Ganymede as a Submodule and Admin account changes in Artemis

Signed-off-by: Bala Siva Sai Akhil Malepati <[email protected]>
vmware-samples · Oct 27, 2022 · e515a17 · e515a17
1 parent 1ee8f12
commit e515a17
Show file tree

Hide file tree

Showing 57 changed files with 87,141 additions and 18,300 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "artemis/clarity/src/app/ganymede"]
+	path = artemis/clarity/src/app/ganymede
+	url = https://github.com/jovians/ganymede.git
diff --git a/artemis/.gitignore b/artemis/.gitignore
@@ -0,0 +1,4 @@
+# Generated contract ABIs need not be committed
+src/abis/**/*
+/src/abis/**/*
+node_modules
diff --git a/artemis/README.md b/artemis/README.md
@@ -18,33 +18,40 @@ Follow the below link to get VMware Blockchain running on your local computer.
 
 ## Setup
 
-Install application dependencies
+Install application dependencies (node v14 preferred)
 
 ```bash
-npm i -g @jovian/ganymede-clr
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 ```
+
+Close the session and reopen and `nvm` command will be available to your system.
+
 ```bash
-npm install
+nvm install 14  # installs node v14
+nvm alias default 14 # sets default system node version to 14
+```
+
+Install depedencies for contracts and UI:
+
+```bash
+npm i  # in project root
+
+cd clarity; # in clarity folder (main UI)
+npm i
 ```
+
 Deploy contracts on Concord or any network by specifying network instead of development can use Ganaches or any other network.
 ```bash
 truffle migrate --reset --network=development
 ```
 
 Deploy contracts on VMware Blockchain
 ```bash
-truffle migrate --reset //Since default network is Concord
+truffle migrate --reset  # Since default network is Concord
 ```
 Run NFT Platform on clarity directory
 ```bash
-gany set
-```
-```bash
-npm install
-```
-```bash
 npm run start
 ```
 
 Finally go to http://localhost:4200 to interact with the platform. 
-
diff --git a/artemis/clarity/.gitignore b/artemis/clarity/.gitignore
@@ -0,0 +1,75 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/dist-modules
+/dist-server
+/dist-server-deps
+/dist-electron
+/dist-electron-src
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+# electron temp
+/electron/**/*.js
+/electron.js
+/electron-*.js
+
+# Ganymede
+.build.uuid
+.ganymede.topology.json
+/ganymede.js
+ganymede.app.js
+ganymede.app.interface.js
+ganymede.app.interface.ts
+ganymede.patch.ts
+
+# node.js profiles
+/isolate-*
+
+# Angular cache
+/.angular
+
+# secrets should not be committed
+ganymede.secrets.json
+
diff --git a/artemis/clarity/angular.json b/artemis/clarity/angular.json
@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "clarity": {
+    "artemis": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -17,12 +17,15 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/clarity",
+            "outputPath": "dist/artemis",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "aot": false,
+            "optimization": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
             "assets": [
               "src/assets",
               "src/favicon.ico",
@@ -33,17 +36,11 @@
               }
             ],
             "styles": [
-              "node_modules/@clr/icons/clr-icons.min.css",
-              "node_modules/@clr/ui/clr-ui.min.css",
               "src/styles.scss"
             ],
-            "scripts": [
-              "node_modules/@webcomponents/custom-elements/custom-elements.min.js",
-              "node_modules/@clr/icons/clr-icons.min.js"
-            ],
+            "scripts": [],
             "allowedCommonJsDependencies": [
-              "web3",
-              "@ethersproject/signing-key"
+
             ]
           },
           "configurations": {
@@ -54,7 +51,11 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "fonts": { "inline": true },
+                "styles": false
+              },
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
@@ -80,18 +81,18 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "clarity:build"
+            "browserTarget": "artemis:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "clarity:build:production"
+              "browserTarget": "artemis:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "clarity:build"
+            "browserTarget": "artemis:build"
           }
         },
         "test": {
@@ -133,18 +134,18 @@
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "clarity:serve"
+            "devServerTarget": "artemis:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "clarity:serve:production"
+              "devServerTarget": "artemis:serve:production"
             }
           }
         }
       }
     }
   },
-  "defaultProject": "clarity",
+  "defaultProject": "artemis",
   "cli": {
     "analytics": "<ANGULAR_APP_CLI_ANALYTICS_TOKEN>"
   }

diff --git a/artemis/clarity/ganymede.app.interface.ts b/artemis/clarity/ganymede.app.interface.ts
@@ -7,11 +7,10 @@ const baseVidPath = '/assets/vid';
 
 const self = new Function('return this')();
 const isNodeJs = self.btoa === undefined;
-
+const useDestor = true;
 export interface GanymedeSecretsResolver {
-  type: 'local-json-file' | 'server';
+  type: 'local-json-file' | 'source-from-destor';
   jsonFile?: string;
-  serverUrl?: string;
 }
 
 export class GanymedeAppData {
@@ -48,9 +47,10 @@ export class GanymedeAppData {
 
   extensions: GanymedeAppExtensions = {};
 
-  secretsResolution: GanymedeSecretsResolver = {
-    type: 'local-json-file',
-    jsonFile: 'ganymede.secrets.json'
+  secretsResolution: GanymedeSecretsResolver = useDestor ? {
+    type: 'source-from-destor',
+  } : {
+    type: 'local-json-file', jsonFile: 'ganymede.secrets.json'
   };
 
   logger: any = null;
@@ -72,6 +72,8 @@ export class GanymedeAppData {
 
   conf: any; // ganymede.conf.json content
 
+  theme = { base: 'CLARITY', type: 'LIGHT' };
+
   constructor(initializer?: Partial<GanymedeAppData>) {
     if (initializer) {
       const defaultFeatures = this.features;
@@ -107,8 +109,8 @@ export interface GanymedeAppBase {
   modules?: {
     auth?: {
       type: string;
-      host: string;
-      port: number;
+      host?: string;
+      port?: number;
     },
     mailer?: {
       type: string;
@@ -127,8 +129,7 @@ export interface GanymedeAppExtensions {
         gcp?: { type?: string; list: any[]; };
         azure?: { type?: string; list: any[]; };
         vcenter?: { type?: string; list: any[]; };
-        otherVms?: { type?: string; list: any[]; };
-      };
+      }
     }
   };
   external?: {

diff --git a/artemis/clarity/ganymede.app.ui.ts b/artemis/clarity/ganymede.app.ui.ts
@@ -1,6 +1,6 @@
 import { ganymedeAppData } from './ganymede.app';
-import { HttpWrap } from './src/app/ganymede/components/util/http.wrapper';
-import { rx } from './src/app/ganymede/components/util/ngrx.stores';
+import { HttpWrap } from './src/app/ganymede/components/util/common/http.wrapper';
+import { rx } from './src/app/ganymede/components/util/common/ngrx.stores';
 import { BasicContentsComponent } from './src/app/ganymede/components/pages/basic-contents/basic-contents.component';
 import { DigitalArtsComponent } from 'src/app/routes/digital-arts/digital-arts.component';
 import { LandingComponent } from 'src/app/routes/landing/landing.component';
@@ -35,6 +35,7 @@ ganymedeAppData.routes = [
   { path: '**', component: BasicContentsComponent, data: { templateData: { layout: 'full' } }, }
 ];
 
+
 export const appRoutes = ganymedeAppData.routes;
 
 export const ngrxStores = rx.NgrxStoreRoot.getStores({
@@ -57,6 +58,10 @@ export const otherProviders = [
 
 ];
 
+export const otherClarityIcons = [
+
+];
+
 HttpWrap.loadInitialIntercepts(http => {
 
 });