diff --git a/Dockerfile.btc b/Dockerfile.btc index f30294d3..d93c8cc6 100644 --- a/Dockerfile.btc +++ b/Dockerfile.btc @@ -11,7 +11,7 @@ COPY package*.json ./ RUN npm ci # Copy app -COPY *.js ./ +COPY src/*.js ./ # Run... CMD ["node", "btc-mediator.js"] diff --git a/Dockerfile.gatekeeper b/Dockerfile.gatekeeper index ccfe3d44..11d78d93 100644 --- a/Dockerfile.gatekeeper +++ b/Dockerfile.gatekeeper @@ -11,15 +11,15 @@ COPY package*.json ./ RUN npm ci # Copy the client build to the keymaster-app directory -COPY keymaster-app/package*.json ./keymaster-app/ +COPY src/keymaster-app/package*.json ./keymaster-app/ RUN cd keymaster-app && npm ci -COPY keymaster-app/public ./keymaster-app/public/ -COPY keymaster-app/src ./keymaster-app/src/ +COPY src/keymaster-app/public ./keymaster-app/public/ +COPY src/keymaster-app/src ./keymaster-app/src/ RUN cd keymaster-app && npm run build # Copy app -COPY *.js ./ +COPY src/*.js ./ # Run... CMD ["node", "gatekeeper-api.js"] diff --git a/Dockerfile.hyperswarm b/Dockerfile.hyperswarm index 78663cf8..a271d2c1 100644 --- a/Dockerfile.hyperswarm +++ b/Dockerfile.hyperswarm @@ -11,7 +11,7 @@ COPY package*.json ./ RUN npm ci # Copy app -COPY *.js ./ +COPY src/*.js ./ # Run... CMD ["node", "hyperswarm-mediator.js"] diff --git a/Dockerfile.keymaster b/Dockerfile.keymaster index 7f692b28..efce577c 100644 --- a/Dockerfile.keymaster +++ b/Dockerfile.keymaster @@ -11,15 +11,15 @@ COPY package*.json ./ RUN npm ci # Copy the client build to the kc-app directory -COPY kc-app/package*.json ./kc-app/ +COPY src/kc-app/package*.json ./kc-app/ RUN cd kc-app && npm ci -COPY kc-app/public ./kc-app/public/ -COPY kc-app/src ./kc-app/src/ +COPY src/kc-app/public ./kc-app/public/ +COPY src/kc-app/src ./kc-app/src/ RUN cd kc-app && npm run build # Copy app -COPY *.js ./ +COPY src/*.js ./ # Run... CMD ["node", "keymaster-api.js"] diff --git a/Dockerfile.tess b/Dockerfile.tess index dd70d120..d5000460 100644 --- a/Dockerfile.tess +++ b/Dockerfile.tess @@ -11,7 +11,7 @@ COPY package*.json ./ RUN npm ci # Copy app -COPY *.js ./ +COPY src/*.js ./ # Run... CMD ["node", "tess-mediator.js"] diff --git a/admin b/admin index 3ca6ef7c..ba58de51 100755 --- a/admin +++ b/admin @@ -1,3 +1,3 @@ #!/usr/bin/env sh -node admin-cli.js "$@" +node src/admin-cli.js "$@" diff --git a/kc b/kc index b82c333a..88384fd1 100755 --- a/kc +++ b/kc @@ -1,3 +1,3 @@ #!/usr/bin/env sh -node keychain-cli.js "$@" +node src/keychain-cli.js "$@" diff --git a/admin-cli.js b/src/admin-cli.js similarity index 100% rename from admin-cli.js rename to src/admin-cli.js diff --git a/btc-mediator.js b/src/btc-mediator.js similarity index 100% rename from btc-mediator.js rename to src/btc-mediator.js diff --git a/cipher-lib.js b/src/cipher-lib.js similarity index 100% rename from cipher-lib.js rename to src/cipher-lib.js diff --git a/clean-data.sh b/src/clean-data.sh similarity index 100% rename from clean-data.sh rename to src/clean-data.sh diff --git a/config.js b/src/config.js similarity index 100% rename from config.js rename to src/config.js diff --git a/db-benchmark.js b/src/db-benchmark.js similarity index 100% rename from db-benchmark.js rename to src/db-benchmark.js diff --git a/db-json.js b/src/db-json.js similarity index 100% rename from db-json.js rename to src/db-json.js diff --git a/db-mongodb.js b/src/db-mongodb.js similarity index 100% rename from db-mongodb.js rename to src/db-mongodb.js diff --git a/db-sqlite.js b/src/db-sqlite.js similarity index 100% rename from db-sqlite.js rename to src/db-sqlite.js diff --git a/db-wallet-json.js b/src/db-wallet-json.js similarity index 100% rename from db-wallet-json.js rename to src/db-wallet-json.js diff --git a/gatekeeper-api.js b/src/gatekeeper-api.js similarity index 100% rename from gatekeeper-api.js rename to src/gatekeeper-api.js diff --git a/gatekeeper-lib.js b/src/gatekeeper-lib.js similarity index 100% rename from gatekeeper-lib.js rename to src/gatekeeper-lib.js diff --git a/gatekeeper-sdk.js b/src/gatekeeper-sdk.js similarity index 100% rename from gatekeeper-sdk.js rename to src/gatekeeper-sdk.js diff --git a/gatekeeper.test.js b/src/gatekeeper.test.js similarity index 100% rename from gatekeeper.test.js rename to src/gatekeeper.test.js diff --git a/hyperswarm-mediator.js b/src/hyperswarm-mediator.js similarity index 100% rename from hyperswarm-mediator.js rename to src/hyperswarm-mediator.js diff --git a/kc-app/.gitignore b/src/kc-app/.gitignore similarity index 100% rename from kc-app/.gitignore rename to src/kc-app/.gitignore diff --git a/kc-app/README.md b/src/kc-app/README.md similarity index 100% rename from kc-app/README.md rename to src/kc-app/README.md diff --git a/kc-app/package-lock.json b/src/kc-app/package-lock.json similarity index 100% rename from kc-app/package-lock.json rename to src/kc-app/package-lock.json diff --git a/kc-app/package.json b/src/kc-app/package.json similarity index 100% rename from kc-app/package.json rename to src/kc-app/package.json diff --git a/kc-app/public/favicon.ico b/src/kc-app/public/favicon.ico similarity index 100% rename from kc-app/public/favicon.ico rename to src/kc-app/public/favicon.ico diff --git a/kc-app/public/index.html b/src/kc-app/public/index.html similarity index 100% rename from kc-app/public/index.html rename to src/kc-app/public/index.html diff --git a/kc-app/public/logo192.png b/src/kc-app/public/logo192.png similarity index 100% rename from kc-app/public/logo192.png rename to src/kc-app/public/logo192.png diff --git a/kc-app/public/logo512.png b/src/kc-app/public/logo512.png similarity index 100% rename from kc-app/public/logo512.png rename to src/kc-app/public/logo512.png diff --git a/kc-app/public/manifest.json b/src/kc-app/public/manifest.json similarity index 100% rename from kc-app/public/manifest.json rename to src/kc-app/public/manifest.json diff --git a/kc-app/public/robots.txt b/src/kc-app/public/robots.txt similarity index 100% rename from kc-app/public/robots.txt rename to src/kc-app/public/robots.txt diff --git a/kc-app/src/App.css b/src/kc-app/src/App.css similarity index 100% rename from kc-app/src/App.css rename to src/kc-app/src/App.css diff --git a/kc-app/src/App.js b/src/kc-app/src/App.js similarity index 100% rename from kc-app/src/App.js rename to src/kc-app/src/App.js diff --git a/kc-app/src/App.test.js b/src/kc-app/src/App.test.js similarity index 100% rename from kc-app/src/App.test.js rename to src/kc-app/src/App.test.js diff --git a/kc-app/src/KeymasterUI.js b/src/kc-app/src/KeymasterUI.js similarity index 100% rename from kc-app/src/KeymasterUI.js rename to src/kc-app/src/KeymasterUI.js diff --git a/kc-app/src/index.css b/src/kc-app/src/index.css similarity index 100% rename from kc-app/src/index.css rename to src/kc-app/src/index.css diff --git a/kc-app/src/index.js b/src/kc-app/src/index.js similarity index 100% rename from kc-app/src/index.js rename to src/kc-app/src/index.js diff --git a/kc-app/src/keymaster-sdk.js b/src/kc-app/src/keymaster-sdk.js similarity index 100% rename from kc-app/src/keymaster-sdk.js rename to src/kc-app/src/keymaster-sdk.js diff --git a/kc-app/src/logo.svg b/src/kc-app/src/logo.svg similarity index 100% rename from kc-app/src/logo.svg rename to src/kc-app/src/logo.svg diff --git a/kc-app/src/reportWebVitals.js b/src/kc-app/src/reportWebVitals.js similarity index 100% rename from kc-app/src/reportWebVitals.js rename to src/kc-app/src/reportWebVitals.js diff --git a/kc-app/src/setupTests.js b/src/kc-app/src/setupTests.js similarity index 100% rename from kc-app/src/setupTests.js rename to src/kc-app/src/setupTests.js diff --git a/kc-completion.bash b/src/kc-completion.bash similarity index 100% rename from kc-completion.bash rename to src/kc-completion.bash diff --git a/keychain-cli.js b/src/keychain-cli.js similarity index 100% rename from keychain-cli.js rename to src/keychain-cli.js diff --git a/keymaster-api.js b/src/keymaster-api.js similarity index 100% rename from keymaster-api.js rename to src/keymaster-api.js diff --git a/keymaster-app/.gitignore b/src/keymaster-app/.gitignore similarity index 100% rename from keymaster-app/.gitignore rename to src/keymaster-app/.gitignore diff --git a/keymaster-app/README.md b/src/keymaster-app/README.md similarity index 100% rename from keymaster-app/README.md rename to src/keymaster-app/README.md diff --git a/keymaster-app/package-lock.json b/src/keymaster-app/package-lock.json similarity index 100% rename from keymaster-app/package-lock.json rename to src/keymaster-app/package-lock.json diff --git a/keymaster-app/package.json b/src/keymaster-app/package.json similarity index 100% rename from keymaster-app/package.json rename to src/keymaster-app/package.json diff --git a/keymaster-app/public/favicon.ico b/src/keymaster-app/public/favicon.ico similarity index 100% rename from keymaster-app/public/favicon.ico rename to src/keymaster-app/public/favicon.ico diff --git a/keymaster-app/public/index.html b/src/keymaster-app/public/index.html similarity index 100% rename from keymaster-app/public/index.html rename to src/keymaster-app/public/index.html diff --git a/keymaster-app/public/logo192.png b/src/keymaster-app/public/logo192.png similarity index 100% rename from keymaster-app/public/logo192.png rename to src/keymaster-app/public/logo192.png diff --git a/keymaster-app/public/logo512.png b/src/keymaster-app/public/logo512.png similarity index 100% rename from keymaster-app/public/logo512.png rename to src/keymaster-app/public/logo512.png diff --git a/keymaster-app/public/manifest.json b/src/keymaster-app/public/manifest.json similarity index 100% rename from keymaster-app/public/manifest.json rename to src/keymaster-app/public/manifest.json diff --git a/keymaster-app/public/robots.txt b/src/keymaster-app/public/robots.txt similarity index 100% rename from keymaster-app/public/robots.txt rename to src/keymaster-app/public/robots.txt diff --git a/keymaster-app/src/App.css b/src/keymaster-app/src/App.css similarity index 100% rename from keymaster-app/src/App.css rename to src/keymaster-app/src/App.css diff --git a/keymaster-app/src/App.js b/src/keymaster-app/src/App.js similarity index 100% rename from keymaster-app/src/App.js rename to src/keymaster-app/src/App.js diff --git a/keymaster-app/src/App.test.js b/src/keymaster-app/src/App.test.js similarity index 100% rename from keymaster-app/src/App.test.js rename to src/keymaster-app/src/App.test.js diff --git a/keymaster-app/src/KeymasterUI.js b/src/keymaster-app/src/KeymasterUI.js similarity index 100% rename from keymaster-app/src/KeymasterUI.js rename to src/keymaster-app/src/KeymasterUI.js diff --git a/keymaster-app/src/cipher-lib.js b/src/keymaster-app/src/cipher-lib.js similarity index 100% rename from keymaster-app/src/cipher-lib.js rename to src/keymaster-app/src/cipher-lib.js diff --git a/keymaster-app/src/db-wallet-web.js b/src/keymaster-app/src/db-wallet-web.js similarity index 100% rename from keymaster-app/src/db-wallet-web.js rename to src/keymaster-app/src/db-wallet-web.js diff --git a/keymaster-app/src/gatekeeper-sdk.js b/src/keymaster-app/src/gatekeeper-sdk.js similarity index 100% rename from keymaster-app/src/gatekeeper-sdk.js rename to src/keymaster-app/src/gatekeeper-sdk.js diff --git a/keymaster-app/src/index.css b/src/keymaster-app/src/index.css similarity index 100% rename from keymaster-app/src/index.css rename to src/keymaster-app/src/index.css diff --git a/keymaster-app/src/index.js b/src/keymaster-app/src/index.js similarity index 100% rename from keymaster-app/src/index.js rename to src/keymaster-app/src/index.js diff --git a/keymaster-app/src/keymaster-lib.js b/src/keymaster-app/src/keymaster-lib.js similarity index 100% rename from keymaster-app/src/keymaster-lib.js rename to src/keymaster-app/src/keymaster-lib.js diff --git a/keymaster-app/src/logo.svg b/src/keymaster-app/src/logo.svg similarity index 100% rename from keymaster-app/src/logo.svg rename to src/keymaster-app/src/logo.svg diff --git a/keymaster-app/src/reportWebVitals.js b/src/keymaster-app/src/reportWebVitals.js similarity index 100% rename from keymaster-app/src/reportWebVitals.js rename to src/keymaster-app/src/reportWebVitals.js diff --git a/keymaster-app/src/setupTests.js b/src/keymaster-app/src/setupTests.js similarity index 100% rename from keymaster-app/src/setupTests.js rename to src/keymaster-app/src/setupTests.js diff --git a/keymaster-lib.js b/src/keymaster-lib.js similarity index 100% rename from keymaster-lib.js rename to src/keymaster-lib.js diff --git a/keymaster.test.js b/src/keymaster.test.js similarity index 100% rename from keymaster.test.js rename to src/keymaster.test.js diff --git a/rebuildGatekeeper b/src/rebuildGatekeeper similarity index 100% rename from rebuildGatekeeper rename to src/rebuildGatekeeper diff --git a/rebuildKeymaster b/src/rebuildKeymaster similarity index 100% rename from rebuildKeymaster rename to src/rebuildKeymaster diff --git a/release.sh b/src/release.sh similarity index 100% rename from release.sh rename to src/release.sh diff --git a/tess-cli b/src/tess-cli similarity index 100% rename from tess-cli rename to src/tess-cli diff --git a/tess-mediator.js b/src/tess-mediator.js similarity index 100% rename from tess-mediator.js rename to src/tess-mediator.js diff --git a/workflow.js b/src/workflow.js similarity index 100% rename from workflow.js rename to src/workflow.js