Merge remote-tracking branch 'upstream/develop' into develop

README.md

@@ -1,5 +1,5 @@
 # MasterApp
-The Master App is an application layer that wraps the client-side web modules of the various Superalgos platform modules (Users, Teams, KeyVault, Financial Beings, Hosts, etc).
+The Master App is an application layer that wraps the client-side web modules of the various Superalgos platform modules (Users, Teams, KeyVault, Events, etc).
 It provides, to these modules, an authentication layer and GraphQL data layer, among other commonly used utilities and APIs.
 
 Each client-side module is published as an NPM package and their function is best described as a

client/.dockerignore

@@ -0,0 +1,14 @@
+# Ignore files to be uploaded to the image
+.env
+.env.dev
+.env.prod
+.git
+.gitignore
+Dockerfile
+Dockerfile.prod
+README.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+
+/coverage
+/.nyc_output

client/.env.example

@@ -1,20 +0,0 @@
-#General configuration
-PORT=3100
-NODE_ENV=development
-
-#Graphql API
-PLATFORM_API_URL=http://localhost:4100/graphql
-
-#Auth0 Server
-AUTH0_DOMAIN=superalgos.eu.auth0.com
-AUTH0_AUDIENCE=https://auth-dev.superalgos.org
-AUTH0_ISSUER=https://superalgos.eu.auth0.com/
-AUTH0_CLIENTID=<auth0-client-id>
-
-#Auth0 Client
-AUTH0_CALLBACK_URL=http://localhost:3100/callback
-AUTH0_LOGOUT_URL=http://localhost:3100
-
-#Storage account
-AZURE_STORAGE_URL_TEAMS=<azure-storage-url>
-AZURE_STORAGE_SAS_TEAMS=<azure-storage-sas>

client/.env.local

@@ -0,0 +1,6 @@
+NODE_ENV=production
+PORT=3100
+
+PLATFORM_API_URL=http://localhost:4100/graphql
+CANVAS_URL=http://localhost:4101/
+

client/.gitignore

@@ -11,6 +11,7 @@ node_modules/
 
 # dotenv environment variables file
 .env
+.env.dev
 .env.prod
 
 # Build folder js files

client/Dockerfile

@@ -0,0 +1,3 @@
+FROM duluca/minimal-nginx-web-server
+COPY ./default /etc/nginx/sites-enabled/default
+COPY ./build /var/www

client/Dockerfile.prod

@@ -0,0 +1,5 @@
+FROM duluca/minimal-nginx-web-server
+COPY ./default /etc/nginx/sites-enabled/default
+COPY . /var/www
+CMD 'nginx'
+

client/LICENSE

@@ -1,40 +1,201 @@
-COPYRIGHT NOTICE
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-© Copyright 2018 Superalgos.org
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
+   1. Definitions.
 
-LICENSE NOTICE
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-Superalgos.org is a startup, currently at a very early stage. Because certain aspects of
-the business are still not clearly defined, we have chosen to --temporarily-- grant a
-restrictive license for the use of this repository, until those business aspects are clarified
-and a proper open source license can be granted.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-Superalgos.org is publishing the code of this software for several reasons. However,
-it shall not be considered free software yet. Superalgos.org is a for-profit company
-in the crypto space and this module is still proprietary software.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-The reasons for opening up the code of this module at this stage are the following:
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-  * We believe that transparency is paramount to achieving our goals, so we want everyone
-    to be able to understand what this module does and how. Opening up the code of this module
-    allows anyone to take a close look.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-  * We welcome contributions from the community. Contributions are regarded as voluntary work.
-    There may be incentives in place for certain kinds of contributions. Contact us to learn more.
-    Contributors agree to provide an express grant of patent rights for their contributions.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-LICENSE WORDING
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-Superalgos.org grants a limited license for the following uses:
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-1. CODE REVIEW AND AUDITS. You are granted permission to clone this repository to analyze,
-   review or audit the code.
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-2. COLLABORATING WITH SUPERALGOS.ORG You are granted permission to fork this repository
-   with the sole purpose of correcting bugs and developing functionality in agreement with
-   Superalgos.org By contributing to this repository you explicitely agree to the terms
-   detailed in CONTRIBUTING.MD.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

client/default

@@ -0,0 +1,27 @@
+server {
+    listen 3100;
+
+    root /var/www;
+    index index.html index.htm;
+
+    # Make site accessible from http://localhost/
+    server_name localhost;
+
+    # Add 1 week expires header for static assets
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+        expires 1w;
+    }
+
+    location / {
+        # First attempt to serve request as file, then
+        # as directory, then fall back to redirecting to index.html
+        try_files $uri $uri/ /index.html;
+    }
+
+    # If nginx can't find a file, fallback to the homepage.
+    location @root {
+        rewrite .* / redirect;
+    }
+
+    include /etc/nginx/basic.conf;
+}

client/docker-compose.prod.yml

@@ -0,0 +1,30 @@
+version: '3'
+services:
+  node:
+    image: masterapp-client-dev:v1
+    build:
+      context: .
+      dockerfile: ./Dockerfile.prod
+      args:
+        APP_PATH: /var/www
+    environment:
+      - NODE_ENV=production
+      - APP_PATH=/var/www
+      - PROD_GRAPHQL=https://platform-api-dev.advancedalgos.net/graphql
+      - VIRTUAL_HOST=platform-dev.advancedalgos.net
+      - LETSENCRYPT_HOST=platform-dev.advancedalgos.net
+      - LETSENCRYPT_EMAIL=ssl-certificates@advancedalgos.org
+      - VIRTUAL_PORT=3100
+    container_name: masterapp-client-dev
+    tty: true
+    stdin_open: true
+    working_dir: ${APP_PATH}
+    command: ['nginx']
+    restart: always
+    expose:
+      - 3100
+    network_mode: webproxy
+networks:
+  default:
+    external:
+      name: webproxy

client/html/index.html

@@ -15,7 +15,7 @@
     rel="stylesheet">
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"
     integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-  <link rel="shortcut icon" type="image/png/ico" href="/html/favicon.ico" />
+  <link rel="shortcut icon" type="image/png/ico" href="/favicon.ico" />
   <script src="https://unpkg.com/apollo-client-browser@1.7.0"></script>
 
   <script type="text/javascript" src="<%= process.env.CANVAS_URL %>Scripts/require.js"></script>
@@ -64,4 +64,4 @@
 
 </body>
 
-</html>
+</html>

client/package.json

@@ -1,7 +1,17 @@
 {
-  "name": "master-app-client",
+  "name": "@superalgos/master-app",
   "version": "0.1.6",
   "description": "Responsible for loading all web modules and running them.",
+  "author": "Superalgos, ltd.",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Superalgos/MasterApp.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Superalgos/MasterApp/issues"
+  },
+  "homepage": "https://github.com/Superalgos/MasterApp#readme",
   "main": "src/index.js",
   "scripts": {
     "dev": "NODE_ENV=development webpack-dev-server --hot --port 3100 --config ./webpack.config.js",
@@ -14,18 +24,7 @@
     "flow-coverage:open": "concurrently \"cd flow-coverage && http-server -c-1 \" \"open http://127.0.0.1:8080\"",
     "flow": "flow"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Algoteers/MasterApp.git"
-  },
-  "author": "Superalgos.org",
-  "license": "SEE LICENSE IN LICENSE.MD",
-  "bugs": {
-    "url": "https://github.com/Algoteers/MasterApp/issues"
-  },
-  "homepage": "https://github.com/Algoteers/MasterApp#readme",
   "devDependencies": {
-    "@advancedalgos/financial-beings-client": "0.0.5",
     "@babel/core": "^7.1.2",
     "@babel/plugin-proposal-class-properties": "^7.1.0",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
@@ -39,7 +38,7 @@
     "@superalgos/operations-client": "0.0.34",
     "@superalgos/strategizer-client": "0.0.15",
     "@superalgos/teams-client": "0.0.38",
-    "@superalgos/users-client": "0.0.25",
+    "@superalgos/users-client": "0.0.26",
     "@superalgos/web-components": "0.0.22",
     "autoprefixer": "^9.2.0",
     "babel-loader": "^8.0.4",
@@ -62,7 +61,7 @@
     "html-webpack-harddisk-plugin": "^0.2.0",
     "html-webpack-plugin": "^3.2.0",
     "koa-connect": "^2.0.1",
-    "node-sass": "^4.10.0",
+    "node-sass": "^4.12.0",
     "postcss-loader": "^3.0.0",
     "prettier-standard": "^8.0.1",
     "react-hot-loader": "^4.3.11",
@@ -99,7 +98,7 @@
     "graphql-tag": "^2.10.0",
     "jwt-decode": "^2.2.0",
     "mini-css-extract-plugin": "^0.4.4",
-    "npm": "^6.4.1",
+    "npm": "^6.9.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "prop-types": "^15.6.2",
     "query-string": "^6.2.0",

client/src/App.js

@@ -18,11 +18,9 @@ import Users from '@superalgos/users-client'
 import Teams from '@superalgos/teams-client'
 import Events from '@superalgos/events-client'
 import KeyVault from '@superalgos/key-vault-client'
-import FinancialBeings from '@advancedalgos/financial-beings-client'
 import Operations from '@superalgos/operations-client'
 import Strategizer from '@superalgos/strategizer-client'
 import Logs from '@superalgos/logs-client'
-// import Miners from '@superalgos/miners-client'
 import Cockpit from '@superalgos/cockpit-client'
 
 export const auth = new Auth(
@@ -73,10 +71,6 @@ export const MasterApp = props => (
               path='/events'
               render={props => <Events {...props} auth={auth} />}
             />
-            <Route
-              path='/financial-beings'
-              render={props => <FinancialBeings {...props} auth={auth} />}
-            />
             <Route
               path='/keys'
               render={props => <KeyVault {...props} auth={auth} />}

client/src/views/layout/header/imports.js

@@ -74,16 +74,6 @@ const operationsMenus = {
   ]
 }
 
-const minersMenus = {
-  title: 'Miners',
-  to: '/miners',
-  icon: Home,
-  authenticated: false,
-  submenus: [
-    { title: 'Report a Bug', to: 'https://github.com/Superalgos/minersClient/issues/new', icon: BugReport, externalLink: true }
-  ]
-}
-
 const cockpitMenus = {
   title: 'Cockpit',
   to: '/cockpit',
@@ -95,16 +85,6 @@ const cockpitMenus = {
   ]
 }
 
-// const financialBeingsMenus = {
-//   title: 'FBs',
-//   to: '/financial-beings',
-//   icon: Home,
-//   authenticated: false,
-//   submenus: [
-//     { title: 'Directory', to: '/financial-beings', icon: ImportContacts }
-//   ]
-// }
-
 const strategizerMenus = {
   title: 'Strategizer',
   to: '/strategizer',
@@ -117,10 +97,8 @@ const allMenus = [
   usersMenus,
   teamsMenus,
   eventsMenus,
-  // financialBeingsMenus,
   keyvaultMenus,
   operationsMenus,
-  // minersMenus,
   strategizerMenus,
   cockpitMenus
 ]

docker-compose.yml

@@ -0,0 +1,227 @@
+version: '3'
+
+services:
+  postgres:
+    image: postgres:11-alpine
+    restart: always
+    environment:
+      POSTGRES_USER: prisma
+      POSTGRES_PASSWORD: prisma
+      POSTGRES_DB: prisma
+    volumes:
+      - postgresdb_data:/var/lib/postgresql/data-teams
+    networks:
+      - superalgos_net
+
+  prisma:
+    image: prismagraphql/prisma:1.27
+    restart: always
+    environment:
+      PRISMA_CONFIG: |
+        port: 4466
+        # uncomment the next line and provide the env var PRISMA_MANAGEMENT_API_SECRET=my-secret to activate cluster security
+        managementApiSecret: prisma_secret
+        databases:
+          default:
+            connector: postgres
+            host: postgres
+            port: 5432
+            user: prisma
+            password: prisma
+            migrations: true
+    ports:
+      - "4466:4466"
+    volumes:
+      - postgresdb_data:/data/db
+    networks:
+      - superalgos_net
+    depends_on:
+      - postgres
+
+  teams-prisma:
+    image: superalgos/teams-prisma:0.1.0
+    restart: "no"
+    build: ../TeamsPrisma
+    env_file: ../TeamsPrisma/.env
+    command: ["./wait-for-it.sh", "prisma:4466", "--", "prisma", "deploy"]
+    networks:
+      - superalgos_net
+    depends_on:
+      - prisma
+
+  mongo:
+    image: mongo:4.0.9
+    restart: always
+    volumes:
+      - mongodb_data:/data/db
+    ports:
+      - "27017:27017"
+    networks:
+      - superalgos_net
+
+  mongo-express:
+    image: mongo-express
+    restart: always
+    ports:
+      - "8081:8081"
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo
+
+  logs-api:
+    image: superalgos/logs-api:0.1.0
+    restart: always
+    build: ../LogsServerModule
+    env_file: ../LogsServerModule/.env.local
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  clones-api:
+    image: superalgos/clones-api:0.1.0
+    restart: always
+    build: ../OperationsModule/server
+    env_file: ../OperationsModule/server/.env.local
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  cockpit-api:
+    image: superalgos/cockpit-api:1.0.0
+    restart: always
+    build: ../CockpitServerModule
+    env_file: ../CockpitServerModule/.env.local
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  strategizer-api:
+    image: superalgos/strategizer-api:0.1.0
+    restart: always
+    build: ../StrategizerServerModule
+    env_file: ../StrategizerServerModule/.env.local
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  events-api:
+    image: superalgos/events-api:0.1.0
+    restart: always
+    build: ../EventsServerModule
+    env_file: ../EventsServerModule/.env.local
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  users-api:
+    image: superalgos/users-api:0.1.0
+    restart: always
+    build: ../UsersModule/server
+    env_file: ../UsersModule/server/.env.local
+    command: npm start
+    ports:
+      - "4000:4000"
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  keyvault-api:
+    image: superalgos/keyvault-api:0.1.0
+    restart: always
+    build: ../KeyVaultModule/server
+    env_file: ../KeyVaultModule/server/.env.local
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo-express
+
+  teams-api:
+    image: superalgos/teams-api:0.1.0
+    restart: always
+    build: ../TeamsModule/api
+    env_file: ../TeamsModule/api/.env.local
+    command: npm start
+    ports:
+      - "4001:4001"
+    networks:
+      - superalgos_net
+    depends_on:
+      - prisma
+
+  notifications-api:
+    image: superalgos/notifications-api:0.1.0
+    restart: always
+    build: ../NotificationsModule/server
+    env_file: ../NotificationsModule/server/.env.local
+    command: npm start
+    networks:
+      - superalgos_net
+    depends_on:
+      - prisma
+
+  master-app:
+    image: master-app:0.1.6
+    restart: always
+    build: ./client
+    env_file: ./client/.env.local
+    command: ['nginx']
+    ports:
+      - "3100:3100"
+    networks:
+      - superalgos_net
+    depends_on:
+      - keyvault-api
+      - clones-api
+      - users-api
+      - events-api
+      - strategizer-api
+      - logs-api
+      - cockpit-api
+      - teams-api
+      - notifications-api
+
+  master-app-api:
+    image: superalgos/master-app-api:0.1.0
+    restart: always
+    build: ./server
+    env_file: ./server/.env.local
+    command: npm start
+    ports:
+      - "4100:4100"
+    networks:
+      - superalgos_net
+    depends_on:
+      - master-app
+
+  saweb:
+    image: superalgos/saweb:0.1.0
+    restart: always
+    build: ../AAWeb
+    env_file: ../AAWeb/.env.local
+    command: node server
+    ports:
+      - "4101:4101"
+    networks:
+      - superalgos_net
+    depends_on:
+      - master-app-api
+
+networks:
+  superalgos_net:
+
+volumes:
+  mongodb_data:
+  postgresdb_data:

package-lock.json

@@ -1,5 +0,0 @@
-{
-  "name": "master-app",
-  "version": "0.1.3",
-  "lockfileVersion": 1
-}

package.json

@@ -1,19 +0,0 @@
-{
-  "name": "master-app",
-  "version": "0.1.3",
-  "description": "Responsible for loading all web modules and running them.",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Algoteers/MasterApp.git"
-  },
-  "author": "Superalgos, ltd.",
-  "license": "SEE LICENSE IN LICENSE.MD",
-  "bugs": {
-    "url": "https://github.com/Algoteers/MasterApp/issues"
-  },
-  "homepage": "https://github.com/Algoteers/MasterApp#readme"
-}

server/.dockerignore

@@ -0,0 +1,14 @@
+# Ignore files to be uploaded to the image
+.env
+.env.dev
+.env.prod
+.git
+.gitignore
+Dockerfile
+Dockerfile.prod
+README.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+
+/coverage
+/.nyc_output

server/.env.example

@@ -1,29 +0,0 @@
-NODE_ENV=development
-
-TEAMS_API_PRESHARED=THIS_IS_VERY_SECRET
-USERS_API_PRESHARED=THIS_IS_VERY_SECRET
-EVENTS_API_PRESHARED=THIS_IS_VERY_SECRET
-KEYVAULT_API_PRESHARED=THIS_IS_VERY_SECRET
-FINANCIAL_BEINGS_API_PRESHARED=THIS_IS_VERY_SECRET
-NOTIFICATIONS_API_PRESHARED=THIS_IS_VERY_SECRET
-
-# PROJECT_SITE_URL=https://superalgos.org
-PROJECT_SITE_URL=http://localhost:3999
-# PLATFORM_URL=https://platform.superalgos.org
-PLATFORM_URL=http://localhost:3100
-
-GRAPHQL_API_URL=https://platform-api-dev.superalgos.org/graphql
-TEAMS_API_URL=https://teams-api-dev.superalgos.org/graphql
-USERS_API_URL=https://users-api-dev.superalgos.org/graphql
-EVENTS_API_URL=https://events-api-dev.superalgos.org/graphql
-KEYVAULT_API_URL=https://keyvault-api-dev.superalgos.org/graphql
-FINANCIAL_BEINGS_API_URL=https://financialbeings-api-dev.superalgos.org/graphql
-NOTIFICATIONS_API_URL=https://notifications-api-dev.superalgos.org/graphql
-
-AUTH0_DOMAIN=auth0-domain
-AUTH0_AUDIENCE=auth0-audience
-AUTH0_ISSUER=auth0-issuer
-
-AACLOUD_ID=aacloud-id
-
-RECAPTCHA=<RECAPTCHA_KEY>

server/.env.local

@@ -0,0 +1,23 @@
+TEAMS_API_PRESHARED=teams_key
+USERS_API_PRESHARED=users_key
+EVENTS_API_PRESHARED=events_key
+KEYVAULT_API_PRESHARED=keyvault_key
+NOTIFICATIONS_API_PRESHARED=notifications_key
+OPERATIONS_API_PRESHARED=clones_key
+LOGS_API_PRESHARED=logs_key
+STRATEGIZER_API_PRESHARED=strategizer_keys
+COCKPIT_API_PRESHARED=cockpit_key
+
+GRAPHQL_API_URL=http://localhost:4100/graphql
+
+TEAMS_API_URL=http://teams-api:4001/graphql
+USERS_API_URL=http://users-api:4000/graphql
+EVENTS_API_URL=http://events-api:4005/graphql
+KEYVAULT_API_URL=http://keyvault-api:4002/graphql
+NOTIFICATIONS_API_URL=http://notifications-api:4004/graphql
+OPERATIONS_API_URL=http://clones-api:4003/graphql
+LOGS_API_URL=http://logs-api:4007/graphql
+STRATEGIZER_API_URL=http://strategizer-api:4008/graphql
+COCKPIT_API_URL=http://cockpit-api:4009/graphql
+
+

server/.gitignore

@@ -12,6 +12,7 @@ node_modules/
 # dotenv environment variables file
 .env
 .env.prod
+.env.dev
 
 # Build folder js files
 build/

server/Dockerfile

@@ -0,0 +1,19 @@
+FROM mhart/alpine-node:12
+
+# Directory where the service will be installed
+ARG API_DIR=/usr/src/master-app-api
+
+# Prepare required directories
+RUN mkdir -p ${API_DIR}
+
+# Use app directory as current workdir
+WORKDIR ${API_DIR}
+
+# Copy package.json to workdir
+COPY . ${API_DIR}/
+
+# Install dependencies
+RUN npm install --production
+
+# Expose Port
+EXPOSE $PORT

server/Dockerfile.prod

@@ -0,0 +1,21 @@
+FROM mhart/alpine-node:8
+
+ENV PORT=4100
+
+RUN mkdir -p /var/www/app && \
+    mkdir -p /var/www/app/node_modules
+
+# Use app directory as current workdir
+WORKDIR /var/www/app
+ENV PATH /var/www/app/node_modules/.bin:$PATH
+# Copy package.json to workdir
+COPY package.json /var/www/app/package.json
+
+# Install dependencies
+RUN npm install
+
+# Copy application code
+COPY . /var/www/app
+
+# Expose Port
+EXPOSE $PORT

server/LICENSE

@@ -1,43 +1,201 @@
-COPYRIGHT NOTICE
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-© Copyright 2018 Superalgos.org
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
+   1. Definitions.
 
-LICENSE NOTICE
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-Superalgos.org is a startup, currently at a very early stage. Because certain aspects of 
-the business are still not clearly defined, we have chosen to --temporarily-- grant a 
-restrictive license for the use of this module, until those business aspects are clarified 
-and a proper open source license can be granted.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-Superalgos.org is publishing the code of this software for several reasons. However, 
-it shall not be considered free software yet. Superalgos.org is a for-profit company 
-in the crypto space and this module is still proprietary software.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-The reasons for opening up the code of this module at this stage are the following:
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-  * We believe that transparency is paramount to achieving our goals, so we want everyone 
-    to be able to understand what this module does and how. Opening up the code of this module 
-    allows anyone to take a close look.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-  * We welcome contributions from the community. Contributions may be compensated on a case 
-    by case basis with ALGO tokens. Contributors     agree to provide an express grant of patent
-    rights for their contributions.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-LICENSE WORDING
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-Superalgos.org grants a limited license for the following uses:
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-1. CODE REVIEW AND AUDITS. You are granted permission to clone this repository to analyze, 
-   review or audit the code.
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-2. COLLABORATING WITH SUPERALGOS.ORG You are granted permission to fork the this repository 
-   with the sole purpose of correcting bugs and developing functionality in agreement with 
-   Superalgos.org By contributing to this repository you explicitely agree to the terms 
-   detailed in CONTRIBUTING.MD.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS 
-TO THIS REPOSITORY.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

server/docker-compose.mongo.yml

@@ -0,0 +1,28 @@
+version: '3'
+
+services:
+  mongo:
+    image: mongo:4.0.9
+    restart: always
+    volumes:
+      - data-volume:/data/db
+    # ports:
+    #   - "27017:27017"
+    networks:
+      - superalgos_net
+
+  mongo-express:
+    image: mongo-express
+    restart: always
+    ports:
+      - "8081:8081"
+    networks:
+      - superalgos_net
+    depends_on:
+      - mongo
+
+networks:
+  superalgos_net:
+
+volumes:
+  data-volume:

server/docker-compose.prod.yml

@@ -0,0 +1,24 @@
+version: '3'
+services:
+  node:
+    image: masterappapi-dev:v1
+    build:
+      context: .
+      dockerfile: ./Dockerfile.prod
+    env_file: ./.env
+    container_name: masterappapi
+    tty: true
+    stdin_open: true
+    volumes:
+      - ./:/var/www/app
+      - /var/www/app/node_modules
+    working_dir: /var/www/app
+    restart: always
+    command: npm start
+    expose:
+      - 4100
+    network_mode: webproxy
+networks:
+  default:
+    external:
+      name: webproxy

server/package.json

@@ -1,22 +1,22 @@
 {
-  "name": "master-app-server",
-  "version": "0.0.1",
+  "name": "@superalgos/master-app-api",
+  "version": "0.1.0",
   "description": "Responsible for loading all web modules and running them.",
+  "author": "Superalgos, ltd.",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Superalgos/MasterApp.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Superalgos/MasterApp/issues"
+  },
+  "homepage": "https://github.com/Superalgos/MasterApp#readme",
   "main": "index.js",
   "scripts": {
     "start": "nodemon --exec babel-node --presets env,stage-2 src/index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Algoteers/MasterApp.git"
-  },
-  "author": "Superalgos, ltd.",
-  "license": "SEE LICENSE IN LICENSE.MD",
-  "bugs": {
-    "url": "https://github.com/Algoteers/MasterApp/issues"
-  },
-  "homepage": "https://github.com/Algoteers/MasterApp#readme",
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-preset-env": "^1.7.0",

server/src/index.js

@@ -58,10 +58,6 @@ async function run () {
     'events_',
     process.env.EVENTS_API_URL,
     process.env.EVENTS_API_PRESHARED)
-  const transformedFinancialBeingsSchema = await createTransformedRemoteSchema(
-    'financialBeings_',
-    process.env.FINANCIAL_BEINGS_API_URL,
-    process.env.FINANCIAL_BEINGS_API_PRESHARED)
   const transformedOperationsSchema = await createTransformedRemoteSchema(
     'operations_',
     process.env.OPERATIONS_API_URL,
@@ -74,10 +70,6 @@ async function run () {
     'logs_',
     process.env.LOGS_API_URL,
     process.env.LOGS_API_PRESHARED)
-  // const transformedMinersSchema = await createTransformedRemoteSchema(
-  //     'miners_',
-  //     process.env.MINERS_API_URL,
-  //     process.env.MINERS_PRESHARED)
   const transformeStrategizerSchema = await createTransformedRemoteSchema(
     'strategizer_',
     process.env.STRATEGIZER_API_URL,
@@ -110,9 +102,6 @@ async function run () {
   if (transformedKeyVaultSchema) {
     schemas.push(transformedKeyVaultSchema)
   }
-  if (transformedFinancialBeingsSchema) {
-    schemas.push(transformedFinancialBeingsSchema)
-  }
   if (transformedOperationsSchema) {
     schemas.push(transformedOperationsSchema)
     if (transformedTeamsSchema && transformeCockpitSchema) {