diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28163ac81..bc700f248 100644
--- a/.circleci/config.yml
+++ b/.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,29 +143,29 @@ 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 ubuntu@testing.tor.us "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:
@@ -173,7 +173,7 @@ jobs:
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
\ No newline at end of file
+ - lrc
diff --git a/app/.editorconfig b/.editorconfig
similarity index 100%
rename from app/.editorconfig
rename to .editorconfig
diff --git a/app/.env.basealpha b/.env.basealpha
similarity index 100%
rename from app/.env.basealpha
rename to .env.basealpha
diff --git a/app/.env.binance b/.env.binance
similarity index 100%
rename from app/.env.binance
rename to .env.binance
diff --git a/app/.env.development b/.env.development
similarity index 100%
rename from app/.env.development
rename to .env.development
diff --git a/app/.env.lrc b/.env.lrc
similarity index 100%
rename from app/.env.lrc
rename to .env.lrc
diff --git a/app/.env.production b/.env.production
similarity index 100%
rename from app/.env.production
rename to .env.production
diff --git a/app/.env.testing b/.env.testing
similarity index 100%
rename from app/.env.testing
rename to .env.testing
diff --git a/app/.eslintignore b/.eslintignore
similarity index 100%
rename from app/.eslintignore
rename to .eslintignore
diff --git a/app/.eslintrc.json b/.eslintrc.json
similarity index 100%
rename from app/.eslintrc.json
rename to .eslintrc.json
diff --git a/.gitignore b/.gitignore
index 2a0a088bd..c64ca0057 100644
--- a/.gitignore
+++ b/.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
\ No newline at end of file
+src/plugins/i18n
\ No newline at end of file
diff --git a/app/.mocharc.json b/.mocharc.json
similarity index 100%
rename from app/.mocharc.json
rename to .mocharc.json
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..83f2a92e9
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v12.18.3
diff --git a/app/.prettierignore b/.prettierignore
similarity index 100%
rename from app/.prettierignore
rename to .prettierignore
diff --git a/app/.prettierrc.yaml b/.prettierrc.yaml
similarity index 100%
rename from app/.prettierrc.yaml
rename to .prettierrc.yaml
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 88ab26340..bc3fe3e9c 100644
--- a/.vscode/settings.json
+++ b/.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
}
diff --git a/README.md b/README.md
index b0d2ba755..d96da12cc 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,70 @@
-## Torus Website
-[](https://greenkeeper.io/)
+# app
-You will need to create an SSL directory in the main repo directory containing:
+[](https://circleci.com/gh/torusresearch/torus-website/tree/develop)
+
+[](https://greenkeeper.io/)
+
+[](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:|
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index c64ca0057..000000000
--- a/app/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-.DS_Store
-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
-src/plugins/i18n
\ No newline at end of file
diff --git a/app/.nvmrc b/app/.nvmrc
deleted file mode 100644
index d8865d659..000000000
--- a/app/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-v10.22.0
diff --git a/app/README.md b/app/README.md
deleted file mode 100644
index d96da12cc..000000000
--- a/app/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# app
-
-[](https://circleci.com/gh/torusresearch/torus-website/tree/develop)
-
-[](https://greenkeeper.io/)
-
-[](https://codecov.io/gh/torusresearch/torus-website)
-
-## Project setup
-
-```sh
-npm install
-find ./node_modules -name ".git" -type d -exec rm -rf {} +
-```
-
-### Compiles and hot-reloads for development
-
-```sh
-npm run serve
-```
-
-### Compiles and minifies for production
-
-```sh
-npm run build
-```
-
-### Run your tests
-
-```sh
-npm run test:unit
-```
-
-### 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 {} +
-```
-
-### 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:|
\ No newline at end of file
diff --git a/app/server.js b/app/server.js
deleted file mode 100644
index 09d32ade5..000000000
--- a/app/server.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-const express = require('express')
-
-const app = express()
-const fs = require('fs')
-const path = require('path')
-const https = require('https')
-const http = require('http')
-const log = require('loglevel')
-
-const APP_PORT = process.env.PORT || 3000
-const certOptions = {
- key: fs.readFileSync(path.resolve('../ssl/server.key')),
- cert: fs.readFileSync(path.resolve('../ssl/server.crt')),
-}
-// app.all(/^(?!(\/notsupported)).*$/, ensureCompatibleBrowser)
-// Prevents cross-frame clickjacking attacks from external websites
-const securityHeaderMiddleware = (request, response, next) => {
- // response.setHeader('Content-Security-Policy', 'default-src https: "unsafe-inline"')
- response.setHeader('Strict-Transport-Security', 'max-age=63072000; includeSubDomains; preload')
- response.setHeader('X-XSS-Protection', '1; mode=block')
- response.setHeader('X-Content-Type-Options', 'nosniff')
- response.setHeader('Access-Control-Allow-Origin', '*')
- if (request.originalUrl.startsWith('/popup')) {
- // skip any /popup routes for x-frame-options for it to function properly
- next()
- return
- }
- response.setHeader('X-Frame-Options', 'sameorigin')
- next()
-}
-
-const cacheControlHeaderMiddleware = (request, repsonse, next) => {
- repsonse.setHeader('Cache-Control', 'max-age=3600')
- next()
-}
-
-app.use(securityHeaderMiddleware)
-app.use(cacheControlHeaderMiddleware)
-
-app.get('/service-worker.js', (request, response) => {
- response.setHeader('Content-Type', 'application/javascript')
- response.setHeader('Cache-Control', 'max-age=3600')
- response.setHeader('Service-Worker-Allowed', '/')
- response.sendFile(path.resolve('./dist/service-worker.js'))
-})
-app.use(express.static('dist'))
-
-app.get('/redirect', (request, response) => {
- response.sendFile(path.join(__dirname, '/dist/redirect.html'))
-})
-app.get('*', (request, response) => {
- response.sendFile(path.join(__dirname, '/dist/index.html'))
-})
-
-https.createServer(certOptions, app).listen(APP_PORT)
-// http.createServer(app).listen(APP_PORT)
-// http.createServer(app).listen(APP_PORT)
-log.info(`listening to port ${APP_PORT}`)
-
-if (process.env.NODE_ENV === 'production') {
- const redirectApp = express()
- redirectApp.get('*', (request, response) => {
- response.redirect(301, 'https://app.tor.us')
- })
- log.info('listening to port 80')
- http.createServer(redirectApp).listen(80)
-}
diff --git a/app/babel.config.js b/babel.config.js
similarity index 100%
rename from app/babel.config.js
rename to babel.config.js
diff --git a/greenkeeper.json b/greenkeeper.json
index 3df48c709..aa52f049c 100644
--- a/greenkeeper.json
+++ b/greenkeeper.json
@@ -1,9 +1,7 @@
{
"groups": {
"default": {
- "packages": [
- "app/package.json"
- ]
+ "packages": ["package.json"]
}
}
}
diff --git a/app/package-lock.json b/package-lock.json
similarity index 100%
rename from app/package-lock.json
rename to package-lock.json
diff --git a/app/package.json b/package.json
similarity index 99%
rename from app/package.json
rename to package.json
index dcc8f0b00..a45f3fff0 100644
--- a/app/package.json
+++ b/package.json
@@ -170,7 +170,7 @@
"not ie <= 8"
],
"engines": {
- "node": ">=10.0.0"
+ "node": ">=12.0.0"
},
"husky": {
"hooks": {
diff --git a/app/public/css/error-page.css b/public/css/error-page.css
similarity index 100%
rename from app/public/css/error-page.css
rename to public/css/error-page.css
diff --git a/app/public/css/skeleton.css b/public/css/skeleton.css
similarity index 100%
rename from app/public/css/skeleton.css
rename to public/css/skeleton.css
diff --git a/app/public/css/widget.css b/public/css/widget.css
similarity index 100%
rename from app/public/css/widget.css
rename to public/css/widget.css
diff --git a/app/public/error-pages/404-notfound.html b/public/error-pages/404-notfound.html
similarity index 100%
rename from app/public/error-pages/404-notfound.html
rename to public/error-pages/404-notfound.html
diff --git a/app/public/favicon.png b/public/favicon.png
similarity index 100%
rename from app/public/favicon.png
rename to public/favicon.png
diff --git a/app/public/images/close.svg b/public/images/close.svg
similarity index 100%
rename from app/public/images/close.svg
rename to public/images/close.svg
diff --git a/app/public/images/footer_waves.png b/public/images/footer_waves.png
similarity index 100%
rename from app/public/images/footer_waves.png
rename to public/images/footer_waves.png
diff --git a/app/public/images/login-with-torus.png b/public/images/login-with-torus.png
similarity index 100%
rename from app/public/images/login-with-torus.png
rename to public/images/login-with-torus.png
diff --git a/app/public/images/login.png b/public/images/login.png
similarity index 100%
rename from app/public/images/login.png
rename to public/images/login.png
diff --git a/app/public/images/logos/eth.svg b/public/images/logos/eth.svg
similarity index 100%
rename from app/public/images/logos/eth.svg
rename to public/images/logos/eth.svg
diff --git a/app/public/images/people_error.svg b/public/images/people_error.svg
similarity index 100%
rename from app/public/images/people_error.svg
rename to public/images/people_error.svg
diff --git a/app/public/images/person.jpeg b/public/images/person.jpeg
similarity index 100%
rename from app/public/images/person.jpeg
rename to public/images/person.jpeg
diff --git a/app/public/images/torus-logo-blue.svg b/public/images/torus-logo-blue.svg
similarity index 100%
rename from app/public/images/torus-logo-blue.svg
rename to public/images/torus-logo-blue.svg
diff --git a/app/public/images/torus-logo-white.svg b/public/images/torus-logo-white.svg
similarity index 100%
rename from app/public/images/torus-logo-white.svg
rename to public/images/torus-logo-white.svg
diff --git a/app/public/images/torus_icon-blue.svg b/public/images/torus_icon-blue.svg
similarity index 100%
rename from app/public/images/torus_icon-blue.svg
rename to public/images/torus_icon-blue.svg
diff --git a/app/public/images/torus_logo.png b/public/images/torus_logo.png
similarity index 100%
rename from app/public/images/torus_logo.png
rename to public/images/torus_logo.png
diff --git a/app/public/img/icons/android-chrome-128x128.png b/public/img/icons/android-chrome-128x128.png
similarity index 100%
rename from app/public/img/icons/android-chrome-128x128.png
rename to public/img/icons/android-chrome-128x128.png
diff --git a/app/public/img/icons/android-chrome-144x144.png b/public/img/icons/android-chrome-144x144.png
similarity index 100%
rename from app/public/img/icons/android-chrome-144x144.png
rename to public/img/icons/android-chrome-144x144.png
diff --git a/app/public/img/icons/android-chrome-152x152.png b/public/img/icons/android-chrome-152x152.png
similarity index 100%
rename from app/public/img/icons/android-chrome-152x152.png
rename to public/img/icons/android-chrome-152x152.png
diff --git a/app/public/img/icons/android-chrome-192x192.png b/public/img/icons/android-chrome-192x192.png
similarity index 100%
rename from app/public/img/icons/android-chrome-192x192.png
rename to public/img/icons/android-chrome-192x192.png
diff --git a/app/public/img/icons/android-chrome-384x384.png b/public/img/icons/android-chrome-384x384.png
similarity index 100%
rename from app/public/img/icons/android-chrome-384x384.png
rename to public/img/icons/android-chrome-384x384.png
diff --git a/app/public/img/icons/android-chrome-512x512.png b/public/img/icons/android-chrome-512x512.png
similarity index 100%
rename from app/public/img/icons/android-chrome-512x512.png
rename to public/img/icons/android-chrome-512x512.png
diff --git a/app/public/img/icons/android-chrome-72x72.png b/public/img/icons/android-chrome-72x72.png
similarity index 100%
rename from app/public/img/icons/android-chrome-72x72.png
rename to public/img/icons/android-chrome-72x72.png
diff --git a/app/public/img/icons/android-chrome-96x96.png b/public/img/icons/android-chrome-96x96.png
similarity index 100%
rename from app/public/img/icons/android-chrome-96x96.png
rename to public/img/icons/android-chrome-96x96.png
diff --git a/app/public/img/icons/apple-touch-icon-120x120.png b/public/img/icons/apple-touch-icon-120x120.png
similarity index 100%
rename from app/public/img/icons/apple-touch-icon-120x120.png
rename to public/img/icons/apple-touch-icon-120x120.png
diff --git a/app/public/img/icons/apple-touch-icon-152x152.png b/public/img/icons/apple-touch-icon-152x152.png
similarity index 100%
rename from app/public/img/icons/apple-touch-icon-152x152.png
rename to public/img/icons/apple-touch-icon-152x152.png
diff --git a/app/public/img/icons/apple-touch-icon-180x180.png b/public/img/icons/apple-touch-icon-180x180.png
similarity index 100%
rename from app/public/img/icons/apple-touch-icon-180x180.png
rename to public/img/icons/apple-touch-icon-180x180.png
diff --git a/app/public/img/icons/apple-touch-icon-60x60.png b/public/img/icons/apple-touch-icon-60x60.png
similarity index 100%
rename from app/public/img/icons/apple-touch-icon-60x60.png
rename to public/img/icons/apple-touch-icon-60x60.png
diff --git a/app/public/img/icons/apple-touch-icon-76x76.png b/public/img/icons/apple-touch-icon-76x76.png
similarity index 100%
rename from app/public/img/icons/apple-touch-icon-76x76.png
rename to public/img/icons/apple-touch-icon-76x76.png
diff --git a/app/public/img/icons/apple-touch-icon.png b/public/img/icons/apple-touch-icon.png
similarity index 100%
rename from app/public/img/icons/apple-touch-icon.png
rename to public/img/icons/apple-touch-icon.png
diff --git a/app/public/img/icons/discord.svg b/public/img/icons/discord.svg
similarity index 100%
rename from app/public/img/icons/discord.svg
rename to public/img/icons/discord.svg
diff --git a/app/public/img/icons/facebook.svg b/public/img/icons/facebook.svg
similarity index 100%
rename from app/public/img/icons/facebook.svg
rename to public/img/icons/facebook.svg
diff --git a/app/public/img/icons/favicon-16x16.png b/public/img/icons/favicon-16x16.png
similarity index 100%
rename from app/public/img/icons/favicon-16x16.png
rename to public/img/icons/favicon-16x16.png
diff --git a/app/public/img/icons/favicon-32x32.png b/public/img/icons/favicon-32x32.png
similarity index 100%
rename from app/public/img/icons/favicon-32x32.png
rename to public/img/icons/favicon-32x32.png
diff --git a/app/public/img/icons/google.svg b/public/img/icons/google.svg
similarity index 100%
rename from app/public/img/icons/google.svg
rename to public/img/icons/google.svg
diff --git a/app/public/img/icons/home.svg b/public/img/icons/home.svg
similarity index 100%
rename from app/public/img/icons/home.svg
rename to public/img/icons/home.svg
diff --git a/app/public/img/icons/indent-increase.svg b/public/img/icons/indent-increase.svg
similarity index 100%
rename from app/public/img/icons/indent-increase.svg
rename to public/img/icons/indent-increase.svg
diff --git a/app/public/img/icons/msapplication-icon-144x144.png b/public/img/icons/msapplication-icon-144x144.png
similarity index 100%
rename from app/public/img/icons/msapplication-icon-144x144.png
rename to public/img/icons/msapplication-icon-144x144.png
diff --git a/app/public/img/icons/mstile-150x150.png b/public/img/icons/mstile-150x150.png
similarity index 100%
rename from app/public/img/icons/mstile-150x150.png
rename to public/img/icons/mstile-150x150.png
diff --git a/app/public/img/icons/reddit.svg b/public/img/icons/reddit.svg
similarity index 100%
rename from app/public/img/icons/reddit.svg
rename to public/img/icons/reddit.svg
diff --git a/app/public/img/icons/safari-pinned-tab.svg b/public/img/icons/safari-pinned-tab.svg
similarity index 100%
rename from app/public/img/icons/safari-pinned-tab.svg
rename to public/img/icons/safari-pinned-tab.svg
diff --git a/app/public/img/icons/torus-icon-dark.svg b/public/img/icons/torus-icon-dark.svg
similarity index 100%
rename from app/public/img/icons/torus-icon-dark.svg
rename to public/img/icons/torus-icon-dark.svg
diff --git a/app/public/img/icons/torus-icon-light.svg b/public/img/icons/torus-icon-light.svg
similarity index 100%
rename from app/public/img/icons/torus-icon-light.svg
rename to public/img/icons/torus-icon-light.svg
diff --git a/app/public/img/icons/twitch.svg b/public/img/icons/twitch.svg
similarity index 100%
rename from app/public/img/icons/twitch.svg
rename to public/img/icons/twitch.svg
diff --git a/app/public/index.html b/public/index.html
similarity index 100%
rename from app/public/index.html
rename to public/index.html
diff --git a/app/public/redirect.html b/public/redirect.html
similarity index 100%
rename from app/public/redirect.html
rename to public/redirect.html
diff --git a/app/public/sw-base.js b/public/sw-base.js
similarity index 100%
rename from app/public/sw-base.js
rename to public/sw-base.js
diff --git a/public/sw.js b/public/sw.js
new file mode 100644
index 000000000..21f55ad90
--- /dev/null
+++ b/public/sw.js
@@ -0,0 +1,891 @@
+/* eslint-disable */
+// import pre-cache manifest
+
+// workbox port
+var precacheController
+var listenerAdded = false
+var _cacheNameDetails = {
+ precache: 'precache-v2',
+ prefix: 'workbox',
+ suffix: registration.scope,
+}
+function getScope() {
+ return self.registration.scope
+}
+function getIframeURL() {
+ return getScope() + 'popup'
+}
+var serviceWorkerScriptPath = '/service-worker.js'
+function isOrigin() {
+ try {
+ var newURL = new URL(getScope())
+ return newURL.href === newURL.origin
+ } catch (err) {
+ return false
+ }
+}
+
+function storeIframeResponseText(url) {
+ return caches.open('torus' + getScope()).then(function (cache) {
+ return cache.add(url)
+ })
+}
+
+function getIframeResponseText() {
+ return caches.open('torus' + getScope()).then(function (cache) {
+ return cache.match(getIframeURL())
+ })
+}
+
+function precacheAndRoute(entries, opts) {
+ precache(entries)
+ addRoute(opts)
+}
+
+function addRoute(opts) {
+ if (!listenerAdded) {
+ addFetchListener(opts)
+ listenerAdded = true
+ }
+}
+function addFetchListener(opts) {
+ var ignoreURLParametersMatching = opts.ignoreURLParametersMatching || [/^utm_/]
+ var directoryIndex = opts.directoryIndex || 'index.html'
+ var cleanURLs = opts.cleanURLs === undefined ? true : opts.cleanURLs
+ var urlManipulation = opts.urlManipulation
+ var cacheName = _createCacheName(_cacheNameDetails.precache)
+ addEventListener('fetch', function (event) {
+ var precachedURL = getCacheKeyForURL(event.request.url, {
+ cleanURLs: cleanURLs,
+ directoryIndex: directoryIndex,
+ ignoreURLParametersMatching: ignoreURLParametersMatching,
+ urlManipulation: urlManipulation,
+ })
+ if (!precachedURL) {
+ // console.log('Precacher did not find a match for', event.request.url)
+ return
+ }
+ var responsePromise = caches
+ .open(cacheName)
+ .then(function (cache) {
+ return cache.match(precachedURL)
+ })
+ .then(function (cachedResponse) {
+ if (cachedResponse) {
+ return cachedResponse
+ }
+ console.warn('Precached response not found ', precachedURL)
+ return fetch(precachedURL)
+ })
+ event.respondWith(responsePromise)
+ })
+}
+
+function _createCacheName(cacheName) {
+ return [_cacheNameDetails.prefix, cacheName, _cacheNameDetails.suffix].filter((value) => value && value.length > 0).join('-')
+}
+
+function getCacheKeyForURL(url, opts) {
+ var precacheController = getOrCreatePrecacheController()
+ var urlsToCacheKeys = precacheController.getURLsToCacheKeys()
+ var variations = generateURLVariations(url, opts)
+ for (var i = 0; i < variations.length; i++) {
+ var variation = variations[i]
+ if (urlsToCacheKeys[variation]) {
+ return urlsToCacheKeys[variation]
+ }
+ }
+}
+
+function generateURLVariations(url, opts) {
+ var variations = []
+ var ignoreURLParametersMatching = opts.ignoreURLParametersMatching
+ var directoryIndex = opts.directoryIndex
+ var cleanURLs = opts.cleanURLs
+ var urlManipulation = opts.urlManipulation
+ var urlObject = new URL(url, location.href)
+ urlObject.hash = ''
+ variations.push(urlObject.href)
+ var urlWithoutIgnoredParams = removeIgnoredSearchParams(urlObject)
+ variations.push(urlWithoutIgnoredParams.href)
+ if (directoryIndex && urlWithoutIgnoredParams.pathname.endsWith('/')) {
+ var directoryURL = new URL(urlWithoutIgnoredParams.href)
+ directoryURL.pathname += directoryIndex
+ variations.push(directoryURL.href)
+ }
+ if (cleanURLs) {
+ var cleanURL = new URL(urlWithoutIgnoredParams.href)
+ cleanURL.pathname += '.html'
+ variations.push(cleanURL.href)
+ }
+ if (urlManipulation) {
+ var additionalURLs = urlManipulation({ url: urlObject })
+ additionalURLs.map(function (item) {
+ variations.push(item)
+ })
+ }
+ return variations
+}
+
+function removeIgnoredSearchParams(urlObject, ignoreURLParametersMatching) {
+ Object.keys(urlObject.searchParams).map(function (paramName) {
+ if (
+ ignoreURLParametersMatching.some(function (regExp) {
+ regExp.test(paramName)
+ })
+ ) {
+ urlObject.searchParams.delete(paramName)
+ }
+ })
+ return urlObject
+}
+
+function precache(entries) {
+ var precacheController = getOrCreatePrecacheController()
+ precacheController.addToCacheList(entries)
+ if (entries.length > 0) {
+ addEventListener('install', function (event) {
+ self.skipWaiting()
+ var precacheController = getOrCreatePrecacheController()
+ event.waitUntil(
+ Promise.all([
+ storeIframeResponseText(getIframeURL()),
+ precacheController.install({ event: event }).catch(function (err) {
+ console.error(err)
+ throw err
+ }),
+ ])
+ )
+ })
+ addEventListener('activate', function (event) {
+ var precacheController = getOrCreatePrecacheController()
+ event.waitUntil(precacheController.activate())
+ })
+ }
+}
+
+function createCacheKey(entry) {
+ if (!entry) {
+ throw new Error('entry undefined')
+ }
+ if (typeof entry === 'string') {
+ var urlObject = new URL(entry, location.href)
+ return {
+ cacheKey: urlObject.href,
+ url: urlObject.href,
+ }
+ }
+ var revision = entry.revision
+ var url = entry.url
+ if (!url) {
+ throw new Error('No url')
+ }
+ if (!revision) {
+ var urlObject = new URL(url, location.href)
+ return {
+ cacheKey: urlObject.href,
+ url: urlObject.href,
+ }
+ }
+ var cacheKeyURL = new URL(url, location.href)
+ var originalURL = new URL(url, location.href)
+ cacheKeyURL.searchParams.set('__WB_REVISION__', revision)
+ return {
+ cacheKey: cacheKeyURL.href,
+ url: originalURL.href,
+ }
+}
+
+function PrecacheController() {
+ this._cacheName = _createCacheName(_cacheNameDetails.precache)
+ this._urlsToCacheKeys = {}
+ this._urlsToCacheModes = {}
+ this._cacheKeysToIntegrities = {}
+}
+
+PrecacheController.prototype.constructor = PrecacheController
+
+PrecacheController.prototype.addToCacheList = function (entries) {
+ var context = this
+ try {
+ entries.map(function (entry) {
+ var obj = createCacheKey(entry)
+ var cacheKey = obj.cacheKey
+ var url = obj.url
+ var cacheMode = typeof entry !== 'string' && entry.revision ? 'reload' : 'default'
+ if (context._urlsToCacheKeys[url] && context._urlsToCacheKeys[url] !== cacheKey) {
+ throw new Error('Conflicting cache key entries ', context._urlsToCacheKeys[url], cacheKey)
+ }
+ if (typeof entry !== 'string' && entry.integrity) {
+ if (context._cacheKeysToIntegrities[cacheKey] && context._cacheKeysToIntegrities[cacheKey] !== entry.integrity) {
+ throw new Error('Conflicting integrities ', context._cacheKeysToIntegrities[cacheKey], entry.integrity, url)
+ }
+ context._cacheKeysToIntegrities[cacheKey] = entry.integrity
+ }
+ context._urlsToCacheKeys[url] = cacheKey
+ context._urlsToCacheModes[url] = cacheMode
+ })
+ } catch (e) {
+ console.error(e)
+ }
+}
+
+PrecacheController.prototype.install = function (opts) {
+ var resolve, reject
+ var promise = new Promise(function (res, rej) {
+ resolve = res
+ reject = rej
+ })
+ var context = this
+ var event = opts.event
+ var toBePrecached = []
+ var alreadyPrecached = []
+ caches
+ .open(context._cacheName)
+ .then(function (cache) {
+ return cache.keys()
+ })
+ .then(function (alreadyCachedRequests) {
+ var existingCacheKeys = alreadyCachedRequests.map(function (req) {
+ return req.url
+ })
+ for (var url in context._urlsToCacheKeys) {
+ var cacheKey = context._urlsToCacheKeys[url]
+ if (existingCacheKeys[cacheKey]) {
+ alreadyPrecached.push(url)
+ } else {
+ toBePrecached.push({ cacheKey: cacheKey, url: url })
+ }
+ }
+ var precacheRequests = toBePrecached.map(function (obj) {
+ var cacheKey = obj.cacheKey
+ var url = obj.url
+ var integrity = context._cacheKeysToIntegrities[cacheKey]
+ var cacheMode = context._urlsToCacheModes[url]
+ return context._addURLToCache({
+ cacheKey: cacheKey,
+ cacheMode: cacheMode,
+ event: event,
+ integrity: integrity,
+ url: url,
+ })
+ })
+
+ Promise.all(precacheRequests).then(function () {
+ var updatedURLs = toBePrecached.map(function (item) {
+ return item.url
+ })
+ resolve({
+ updatedURLs: updatedURLs,
+ notUpdatedURLs: alreadyPrecached,
+ })
+ })
+ })
+
+ return promise
+}
+
+PrecacheController.prototype.activate = function () {
+ var resolve, reject
+ var promise = new Promise(function (res, rej) {
+ resolve = res
+ reject = rej
+ })
+ var context = this
+ var c
+ var deletedURLs = []
+ caches
+ .open(context._cacheName)
+ .then(function (cache) {
+ c = cache
+ return cache.keys()
+ })
+ .then(function (currentlyCachedRequests) {
+ var promises = []
+ for (var req in currentlyCachedRequests) {
+ if (!context._urlsToCacheKeys[req.url]) {
+ promises.push(c.delete(req))
+ deletedURLs.push(req.url)
+ }
+ }
+ return Promise.all(promises)
+ })
+ .then(function () {
+ resolve(deletedURLs)
+ })
+
+ return promise
+}
+
+PrecacheController.prototype._addURLToCache = function (opts) {
+ var cacheKey = opts.cacheKey
+ var url = opts.url
+ var cacheMode = opts.cacheMode
+ var event = opts.event
+ var integrity = opts.integrity
+ var context = this
+
+ var request = new Request(url, {
+ integrity: integrity,
+ cache: cacheMode,
+ credentials: 'same-origin',
+ })
+
+ wrappedFetch({
+ event: event,
+ request: request,
+ })
+ .then(function (response) {
+ if (response.status >= 400) {
+ throw new Error('Invalid response', url, response.status)
+ }
+ if (response.redirected) {
+ return copyResponse(response)
+ }
+ return Promise.resolve(response)
+ })
+ .then(function (response) {
+ putWrapper({
+ event: event,
+ response: response,
+ request: cacheKey === url ? request : new Request(cacheKey),
+ cacheName: context._cacheName,
+ matchOptions: {
+ ignoreSearch: true,
+ },
+ })
+ })
+}
+
+PrecacheController.prototype.getURLsToCacheKeys = function () {
+ return this._urlsToCacheKeys
+}
+
+PrecacheController.prototype.getCachedURLs = function () {
+ return Object.keys(this._urlsToCacheKeys)
+}
+
+PrecacheController.prototype.getCacheKeyForURL = function (url) {
+ var urlObject = new URL(url, location.href)
+ return this._urlsToCacheKeys[urlObject.href]
+}
+
+PrecacheController.prototype.createHandlerForURL = function (url) {
+ var resolve, reject
+ var promies = new Promise(function (res, rej) {
+ resolve = res
+ reject = rej
+ })
+ var context = this
+ var cacheKey = context.getCacheKeyForURL(url)
+ if (!cacheKey) {
+ throw new Error('Non-precached URL', url)
+ }
+ caches
+ .open(context._cacheName)
+ .then(function (cache) {
+ return cache.match(cacheKey)
+ })
+ .then(function (response) {
+ if (response) {
+ resolve(response)
+ } else {
+ reject(new Error('The cache did not have this entry for cacheKey', cacheKey))
+ }
+ })
+ .catch(function (err) {
+ console.error('Failed to respond with cached response', err)
+ fetch(cacheKey).then(resolve).catch(reject)
+ })
+ return promise
+}
+
+function wrappedFetch(opts) {
+ var resolve, reject
+ var promise = new Promise(function (res, rej) {
+ resolve = res
+ reject = rej
+ })
+ var request = opts.request
+ var fetchOptions = opts.fetchOptions
+ var event = opts.event
+ if (typeof request === 'string') {
+ request = new Request(request)
+ }
+ try {
+ var fetchResponse
+ if (request.mode === 'navigate') {
+ fetch(request).then(resolve).catch(reject)
+ } else {
+ fetch(request, fetchOptions).then(resolve).catch(reject)
+ }
+ } catch (e) {
+ throw e
+ }
+ return promise
+}
+
+function copyResponse(response) {
+ var resolve, reject
+ var promise = new Promise(function (res, rej) {
+ resolve = res
+ reject = rej
+ })
+ var supportStatus
+ function canConstructResponseFromBodyStream() {
+ if (supportStatus === undefined) {
+ const testResponse = new Response('')
+ if ('body' in testResponse) {
+ try {
+ new Response(testResponse.body)
+ supportStatus = true
+ } catch (error) {
+ supportStatus = false
+ }
+ }
+ supportStatus = false
+ }
+ return supportStatus
+ }
+ var clonedResponse = response.clone()
+ var responseInit = {
+ headers: new Headers(clonedResponse.headers),
+ status: clonedResponse.status,
+ statusText: clonedResponse.statusText,
+ }
+ var body
+ if (canConstructResponseFromBodyStream()) {
+ body = clonedResponse.body
+ resolve(new Response(body, responseInit))
+ } else {
+ clonedResponse
+ .blob()
+ .then(function (b) {
+ body = b
+ resolve(new Response(body, responseInit))
+ })
+ .catch(reject)
+ }
+ return promise
+}
+
+function putWrapper(opts) {
+ var resolve, reject
+ var promise = new Promise(function (res, rej) {
+ resolve = res
+ reject = rej
+ })
+ var cacheName = opts.cacheName
+ var request = opts.request
+ var response = opts.response
+ if (response.status !== 200) {
+ console.warn('Request not cached')
+ resolve()
+ }
+ caches
+ .open(cacheName)
+ .then(function (cache) {
+ cache.put(request, response).then(resolve)
+ })
+ .catch(reject)
+ return promise
+}
+
+function matchWrapper(opts) {
+ var resolve, reject
+ var promise = new Promise(function (res, rej) {
+ resolve = res
+ reject = rej
+ })
+ var cacheName = opts.cacheName
+ var request = opts.request
+ var event = opts.event
+ var matchOptions = opts.matchOptions
+ caches
+ .open(cacheName)
+ .then(function (cache) {
+ return cache.match(request, matchOptions)
+ })
+ .then(function (cachedResponse) {
+ resolve(cachedResponse)
+ })
+ .catch(reject)
+ return promise
+}
+
+function getOrCreatePrecacheController() {
+ if (!precacheController) {
+ precacheController = new PrecacheController()
+ }
+ return precacheController
+}
+
+// service worker logic
+
+self.addEventListener('message', function (event) {
+ if (event.data && event.data.type === 'SKIP_WAITING') {
+ self.skipWaiting()
+ }
+})
+
+self.addEventListener('fetch', function (event) {
+ try {
+ const url = new URL(event.request.url)
+ const integrityParam = url.searchParams.get('integrity')
+ if (url.pathname.includes('/redirect') && url.href.includes(getScope())) {
+ event.respondWith(
+ new Response(
+ new Blob(
+ [
+ `
+
+
+
+
+
+
+ Redirect
+
+
+
+
+
+
+
You can close this window now
+