Move app outside

.circleci/config.yml

@@ -2,15 +2,15 @@ version: 2
 job_common_node: &job_common_node
   docker:
     - image: circleci/node
-  working_directory: ~/torus-website/app
+  working_directory: ~/torus-website
 job_common_base: &job_common_base
   docker:
     - image: skyuppercut/buildpack-deps
-  working_directory: ~/torus-website/app
+  working_directory: ~/torus-website
 job_common: &job_common
   docker:
     - image: skyuppercut/node-puppeteer
-  working_directory: ~/torus-website/app
+  working_directory: ~/torus-website
 step_save_cache: &step_save_cache
   save_cache:
     key: dependency-cache-{{ checksum "package.json" }}
@@ -21,7 +21,7 @@ step_restore_cache: &step_restore_cache
     key: dependency-cache-{{ checksum "package.json" }}
 step_setup_global_packages: &step_setup_global_packages
   run:
-    name: "Set up global packages"
+    name: 'Set up global packages'
     command: |
       [ ! -d "node_modules" ] && rm package-lock.json && npm install && find ./node_modules/ -name ".git" -type d -exec rm -rf {} + || echo "node_modules exist"
 update_lambda_job: &update_lambda_job
@@ -31,7 +31,7 @@ update_lambda_job: &update_lambda_job
         at: ~/
     - add_ssh_keys
     - run:
-        name: "Update lambda version"
+        name: 'Update lambda version'
         command: |
           mkdir -p ~/.ssh 
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
@@ -43,7 +43,7 @@ update_iframeIntegrity: &update_iframeIntegrity
         at: ~/
     - add_ssh_keys
     - run:
-        name: "Update iframe integrity"
+        name: 'Update iframe integrity'
         command: |
           mkdir -p ~/.ssh
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
@@ -55,7 +55,7 @@ deploy_function: &deploy_function
         at: ~/
     - add_ssh_keys
     - run:
-        name: "Deploy Over SSH to AWS"
+        name: 'Deploy Over SSH to AWS'
         command: |
           . ./scripts/uploadToAws.sh
 jobs:
@@ -67,12 +67,12 @@ jobs:
       - <<: *step_restore_cache
       - <<: *step_setup_global_packages
       - run:
-          name: "Running unit tests with coverage"
+          name: 'Running unit tests with coverage'
           command: npm run test:coverage-codecov
       - <<: *step_save_cache
       # Save coverage artifacts
       - store_artifacts:
-          path: ~/torus-website/app/coverage
+          path: ~/torus-website/coverage
   build:
     <<: *job_common
     resource_class: large
@@ -82,7 +82,7 @@ jobs:
       - <<: *step_restore_cache
       - <<: *step_setup_global_packages
       - run:
-          name: "Build code for torus website"
+          name: 'Build code for torus website'
           command: |
             npm version patch -m 'Updating version to %s [skip ci]' && npm run build && . ./scripts/gitPush.sh
       - persist_to_workspace:
@@ -99,7 +99,7 @@ jobs:
       - <<: *step_restore_cache
       - <<: *step_setup_global_packages
       - run:
-          name: "Build code for torus binance website"
+          name: 'Build code for torus binance website'
           command: |
             npm version patch -m 'Updating version to %s [skip ci]' && npm run build:binance && . ./scripts/gitPush.sh
       - persist_to_workspace:
@@ -128,13 +128,13 @@ jobs:
       - <<: *step_restore_cache
       - <<: *step_setup_global_packages
       - run:
-          name: "Build code for torus testing website"
+          name: 'Build code for torus testing website'
           command: |
             npm run build:testing
       - persist_to_workspace:
           root: ~/
           paths:
-            - torus-website/app/dist
+            - torus-website/dist
       - <<: *step_save_cache
   deploy-testing:
     <<: *job_common_base
@@ -143,37 +143,37 @@ jobs:
           at: ~/
       - add_ssh_keys
       - run:
-          name: "Deploy Over SSH"
+          name: 'Deploy Over SSH'
           command: |
             ssh-keyscan -H testing.tor.us >> ~/.ssh/known_hosts
             tar czf - dist/ | ssh [email protected] "rm -rf ~/testing-torus-website/* && tar -zxf - -C ~/testing-torus-website/"
-# ------------------------
-# alpha configurations
-# ------------------------
+  # ------------------------
+  # alpha configurations
+  # ------------------------
   build-alpha:
-        <<: *job_common
-        steps:
-          - checkout:
-              path: ~/torus-website
-          - <<: *step_restore_cache
-          - <<: *step_setup_global_packages
-          - run:
-              name: "Build code for torus alpha website"
-              command: |
-                npm run build:alpha-branches
-          - persist_to_workspace:
-              root: ~/
-              paths:
-                - torus-website/app/dist
-          - <<: *step_save_cache
+    <<: *job_common
+    steps:
+      - checkout:
+          path: ~/torus-website
+      - <<: *step_restore_cache
+      - <<: *step_setup_global_packages
+      - run:
+          name: 'Build code for torus alpha website'
+          command: |
+            npm run build:alpha-branches
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - torus-website/dist
+      - <<: *step_save_cache
   deploy-alpha:
     <<: *job_common_base
     steps:
       - attach_workspace:
           at: ~/
       - add_ssh_keys
       - run:
-          name: "Deploy Over SSH"
+          name: 'Deploy Over SSH'
           command: |
             ssh-keyscan -H "$CIRCLE_BRANCH".tor.us >> ~/.ssh/known_hosts
             tar czf - dist/ | ssh ubuntu@"$CIRCLE_BRANCH".tor.us "rm -rf ~/"$CIRCLE_BRANCH"-torus-website/* && tar -zxf - -C ~/"$CIRCLE_BRANCH"-torus-website/"
@@ -253,9 +253,9 @@ workflows:
             branches:
               only:
                 - develop
-# ------------------------
-# alpha configurations
-# ------------------------
+      # ------------------------
+      # alpha configurations
+      # ------------------------
       - build-alpha:
           filters:
             branches:
@@ -270,4 +270,4 @@ workflows:
             branches:
               only:
                 - /^alpha.*/
-                - lrc
+                - lrc

.gitignore

@@ -1,9 +1,26 @@
-node_modules/
 .DS_Store
-dist/
-.env
-disc.html
-secrets.json
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+service-worker.js
+
+embed.min.js
 .nyc_output
 coverage
-sw.js
+src/plugins/i18n

.nvmrc

@@ -0,0 +1 @@
+v12.18.3

.vscode/settings.json

@@ -131,12 +131,6 @@
   },
   "eslint.lintTask.enable": true,
   "eslint.format.enable": true,
-  "eslint.workingDirectories": [
-    {
-      "changeProcessCWD": true,
-      "directory": "./app"
-    }
-  ],
   "prettier.jsxBracketSameLine": true,
   "prettier.printWidth": 150
 }

README.md

@@ -1,29 +1,70 @@
-## Torus Website
-[![Greenkeeper badge](https://badges.greenkeeper.io/torusresearch/torus-website.svg?token=891f5f5b782cc550f84cd6082f7b6059532f564030cc3a4e31989af9f0e56cc8&ts=1550579154562)](https://greenkeeper.io/)
+# app
 
-You will need to create an SSL directory in the main repo directory containing:
+[![CircleCI](https://circleci.com/gh/torusresearch/torus-website/tree/develop.svg?style=shield&circle-token=1ae4a7866d2585614a4c5803580cedf2405e87d2)](https://circleci.com/gh/torusresearch/torus-website/tree/develop)
+
+[![Greenkeeper badge](https://badges.greenkeeper.io/torusresearch/torus-website.svg?token=891f5f5b782cc550f84cd6082f7b6059532f564030cc3a4e31989af9f0e56cc8&ts=1548219309942)](https://greenkeeper.io/)
+
+[![codecov](https://codecov.io/gh/torusresearch/torus-website/branch/develop/graph/badge.svg?token=fzYfxUOTLd)](https://codecov.io/gh/torusresearch/torus-website)
+
+## Project setup
+
+```sh
+npm install
+find ./node_modules -name ".git" -type d -exec rm -rf {} +
 ```
-server.crt
-server.key
+
+### Compiles and hot-reloads for development
+
+```sh
+npm run serve
 ```
-Ask one of the developers for these keys.
 
-To install dependencies and build the website,
-see [README here](app/README.md)
+### Compiles and minifies for production
 
-For updates, see [Change Log](https://docs.tor.us/torus-wallet/changelog)
+```sh
+npm run build
+```
 
+### Run your tests
 
-To see the current production app, navigate to https://app.tor.us
+```sh
+npm run test:unit
+```
 
-## Torus Demo
-**Using chrome extension**
-- Go to *chrome://extensions*
-- Ensure *developer mode*
-- Drag *embed.user.js*
-- Navigate to any dapp which supports Metamask and sign-in
+### Run your E2E tests
+Start local application first before running the e2e test
+```sh
+npm run serve
+npm run test:e2e
+npm run test:e2e:mobile
+```
+
+### Lints and fixes files
+
+```sh
+npm run lint
+```
+
+### Customize configuration
+
+See [Configuration Reference](https://cli.vuejs.org/config/).
+
+### Current Issues
+To get rid of the websocket error,
+use the following command in the project root (where package.json lives)
+
+```sh
+find ./node_modules -name ".git" -type d -exec rm -rf {} +
+```
 
-**Using online vue-embed**
-- Go to https://vue-embed.tor.us
-- Set *Build Environment* to *Development*
+### Release notes
+Checklist: 
+Website: *.tor.us
 
+| Test/Browser                              | Chrome             | Safari             | Brave              | Firefox            | Edge               | iOS Safari         | iOS Chrome         | Android Chrome    |
+| ----------------------------------------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ----------------- |
+| Test login on google/discord oauths       | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:| 
+| Skale Network Change                      | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:|
+| Import Account                            | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:|
+| Test wallet transfer                      | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:|
+| Test on torus-embed vue-app all buttons   | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark:|