Re-org repo files

dappnode · May 18, 2022 · 9e6e11b · 9e6e11b
1 parent 598ea66
commit 9e6e11b
Show file tree

Hide file tree

Showing 112 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,8 +10,8 @@ WORKDIR /usr/src/app
 RUN apk add --update --no-cache \
     build-base python libpcap-dev linux-headers bash
 
-COPY build/src/package.json ./
-COPY build/src/yarn.lock ./
+COPY src/package.json ./
+COPY src/yarn.lock ./
 RUN yarn install --production
 # Reduces the app dir size from 94.5MB to 71.8MB
 RUN npm config set unsafe-perm true
@@ -25,7 +25,7 @@ RUN yarn global add modclean && modclean -r
 FROM build as build-src
 RUN yarn install
 # Install only --production first to cache them, then install the rest
-COPY build/src .
+COPY src .
 RUN yarn build
 # results in /usr/src/app/dist
 
@@ -39,7 +39,7 @@ WORKDIR /usr/src/app
 
 RUN apk add --no-cache git nodejs
 COPY .git .git
-COPY dappnode_package.json build/getGitData.js ./
+COPY dappnode_package.json scripts/getGitData.js ./
 RUN node getGitData /usr/src/app/.git-data.json
 # Results in /usr/src/app/.git-data.json
 
@@ -52,12 +52,12 @@ FROM --platform=${BUILDPLATFORM:-amd64} node:10.19.0-alpine as build-ui
 WORKDIR /usr/src/app
 
 # ensuring both package.json AND package-lock.json are copied
-COPY build/ui_openvpn/package*.json ./
-COPY build/ui_openvpn/*lock* ./
+COPY ui_openvpn/package*.json ./
+COPY ui_openvpn/*lock* ./
 # install dependencies
 RUN yarn install --production
 # copy the contents of the app
-COPY build/ui_openvpn .
+COPY ui_openvpn .
 # build for production
 ENV REACT_APP_CRED_URL_PATHNAME=/cred \
     REACT_APP_CRED_URL_QUERY_PARAM=id
@@ -118,7 +118,7 @@ COPY --from=build /usr/src/app/node_modules /usr/src/app/node_modules
 COPY --from=build-src /usr/src/app/dist /usr/src/app/src
 COPY --from=build-ui /usr/src/app/build/ui_openvpn.html $UI_OPENVPN_PATH
 COPY --from=git-data /usr/src/app/.git-data.json $GIT_DATA_PATH
-COPY build/bin /usr/local/bin
+COPY bin /usr/local/bin
 
 VOLUME ["/etc/openvpn"]
 

diff --git a/build/bin/easyrsa_vars → bin/easyrsa_vars b/build/bin/easyrsa_vars → bin/easyrsa_vars
diff --git a/build/bin/ovpn_copy_server_files → bin/ovpn_copy_server_files b/build/bin/ovpn_copy_server_files → bin/ovpn_copy_server_files
diff --git a/build/bin/ovpn_genconfig → bin/ovpn_genconfig b/build/bin/ovpn_genconfig → bin/ovpn_genconfig
diff --git a/build/bin/ovpn_getclient → bin/ovpn_getclient b/build/bin/ovpn_getclient → bin/ovpn_getclient
diff --git a/build/bin/ovpn_getclient_all → bin/ovpn_getclient_all b/build/bin/ovpn_getclient_all → bin/ovpn_getclient_all
diff --git a/build/bin/ovpn_initpki → bin/ovpn_initpki b/build/bin/ovpn_initpki → bin/ovpn_initpki
diff --git a/build/bin/ovpn_listclients → bin/ovpn_listclients b/build/bin/ovpn_listclients → bin/ovpn_listclients
diff --git a/build/bin/ovpn_revokeclient → bin/ovpn_revokeclient b/build/bin/ovpn_revokeclient → bin/ovpn_revokeclient
diff --git a/build/bin/ovpn_run → bin/ovpn_run b/build/bin/ovpn_run → bin/ovpn_run
diff --git a/build/bin/ovpn_status → bin/ovpn_status b/build/bin/ovpn_status → bin/ovpn_status
diff --git a/build/getGitData.js → scripts/getGitData.js b/build/getGitData.js → scripts/getGitData.js
diff --git a/build/src/.eslintrc → src/.eslintrc b/build/src/.eslintrc → src/.eslintrc
diff --git a/build/src/.prettierrc → src/.prettierrc b/build/src/.prettierrc → src/.prettierrc
diff --git a/build/src/README.md → src/README.md b/build/src/README.md → src/README.md
diff --git a/build/src/index.ts → src/index.ts b/build/src/index.ts → src/index.ts
diff --git a/build/src/package.json → src/package.json b/build/src/package.json → src/package.json
diff --git a/build/src/src/api/auth.ts → src/src/api/auth.ts b/build/src/src/api/auth.ts → src/src/api/auth.ts
diff --git a/build/src/src/api/clientConnect.ts → src/src/api/clientConnect.ts b/build/src/src/api/clientConnect.ts → src/src/api/clientConnect.ts
diff --git a/build/src/src/api/getRpcCall.ts → src/src/api/getRpcCall.ts b/build/src/src/api/getRpcCall.ts → src/src/api/getRpcCall.ts
diff --git a/build/src/src/api/getRpcHandler.ts → src/src/api/getRpcHandler.ts b/build/src/src/api/getRpcHandler.ts → src/src/api/getRpcHandler.ts
diff --git a/build/src/src/api/index.ts → src/src/api/index.ts b/build/src/src/api/index.ts → src/src/api/index.ts
diff --git a/build/src/src/api/routes.ts → src/src/api/routes.ts b/build/src/src/api/routes.ts → src/src/api/routes.ts
diff --git a/build/src/src/api/utils.ts → src/src/api/utils.ts b/build/src/src/api/utils.ts → src/src/api/utils.ts
diff --git a/build/src/src/calls/addDevice.ts → src/src/calls/addDevice.ts b/build/src/src/calls/addDevice.ts → src/src/calls/addDevice.ts
diff --git a/build/src/src/calls/getCredFile.ts → src/src/calls/getCredFile.ts b/build/src/src/calls/getCredFile.ts → src/src/calls/getCredFile.ts
diff --git a/build/src/src/calls/getDeviceCredentials.ts → src/src/calls/getDeviceCredentials.ts b/build/src/src/calls/getDeviceCredentials.ts → src/src/calls/getDeviceCredentials.ts
diff --git a/build/src/src/calls/getMasterAdminCred.ts → src/src/calls/getMasterAdminCred.ts b/build/src/src/calls/getMasterAdminCred.ts → src/src/calls/getMasterAdminCred.ts
diff --git a/build/src/src/calls/getStatus.ts → src/src/calls/getStatus.ts b/build/src/src/calls/getStatus.ts → src/src/calls/getStatus.ts
diff --git a/build/src/src/calls/getVersionData.ts → src/src/calls/getVersionData.ts b/build/src/src/calls/getVersionData.ts → src/src/calls/getVersionData.ts
diff --git a/build/src/src/calls/index.ts → src/src/calls/index.ts b/build/src/src/calls/index.ts → src/src/calls/index.ts
diff --git a/build/src/src/calls/listDevices.ts → src/src/calls/listDevices.ts b/build/src/src/calls/listDevices.ts → src/src/calls/listDevices.ts
diff --git a/build/src/src/calls/removeDevice.ts → src/src/calls/removeDevice.ts b/build/src/src/calls/removeDevice.ts → src/src/calls/removeDevice.ts
diff --git a/build/src/src/calls/resetDevice.ts → src/src/calls/resetDevice.ts b/build/src/src/calls/resetDevice.ts → src/src/calls/resetDevice.ts
diff --git a/build/src/src/config.ts → src/src/config.ts b/build/src/src/config.ts → src/src/config.ts
diff --git a/build/src/src/credentials/credentialsFile.ts → src/src/credentials/credentialsFile.ts b/build/src/src/credentials/credentialsFile.ts → src/src/credentials/credentialsFile.ts
diff --git a/build/src/src/credentials/formatCredUrl.ts → src/src/credentials/formatCredUrl.ts b/build/src/src/credentials/formatCredUrl.ts → src/src/credentials/formatCredUrl.ts
diff --git a/build/src/src/credentials/index.ts → src/src/credentials/index.ts b/build/src/src/credentials/index.ts → src/src/credentials/index.ts
diff --git a/build/src/src/credentials/webserver.ts → src/src/credentials/webserver.ts b/build/src/src/credentials/webserver.ts → src/src/credentials/webserver.ts
diff --git a/build/src/src/dappmanager/fetchHostname.ts → src/src/dappmanager/fetchHostname.ts b/build/src/src/dappmanager/fetchHostname.ts → src/src/dappmanager/fetchHostname.ts
diff --git a/build/src/src/dappmanager/fetchInternalIp.ts → src/src/dappmanager/fetchInternalIp.ts b/build/src/src/dappmanager/fetchInternalIp.ts → src/src/dappmanager/fetchInternalIp.ts
diff --git a/build/src/src/getAdminCredentials.ts → src/src/getAdminCredentials.ts b/build/src/src/getAdminCredentials.ts → src/src/getAdminCredentials.ts
diff --git a/build/src/src/index.ts → src/src/index.ts b/build/src/src/index.ts → src/src/index.ts
diff --git a/build/src/src/logs.ts → src/src/logs.ts b/build/src/src/logs.ts → src/src/logs.ts
diff --git a/build/src/src/openvpn/buildClient.ts → src/src/openvpn/buildClient.ts b/build/src/src/openvpn/buildClient.ts → src/src/openvpn/buildClient.ts
diff --git a/build/src/src/openvpn/getClient.ts → src/src/openvpn/getClient.ts b/build/src/src/openvpn/getClient.ts → src/src/openvpn/getClient.ts
diff --git a/build/src/src/openvpn/getUserList.ts → src/src/openvpn/getUserList.ts b/build/src/src/openvpn/getUserList.ts → src/src/openvpn/getUserList.ts
diff --git a/build/src/src/openvpn/index.ts → src/src/openvpn/index.ts b/build/src/src/openvpn/index.ts → src/src/openvpn/index.ts
diff --git a/build/src/src/openvpn/openvpnBinary.ts → src/src/openvpn/openvpnBinary.ts b/build/src/src/openvpn/openvpnBinary.ts → src/src/openvpn/openvpnBinary.ts
diff --git a/build/src/src/openvpn/openvpnConfig.ts → src/src/openvpn/openvpnConfig.ts b/build/src/src/openvpn/openvpnConfig.ts → src/src/openvpn/openvpnConfig.ts
diff --git a/build/src/src/openvpn/removeClient.ts → src/src/openvpn/removeClient.ts b/build/src/src/openvpn/removeClient.ts → src/src/openvpn/removeClient.ts
diff --git a/build/src/src/ovpn_client_connect.ts → src/src/ovpn_client_connect.ts b/build/src/src/ovpn_client_connect.ts → src/src/ovpn_client_connect.ts
diff --git a/build/src/src/params.ts → src/src/params.ts b/build/src/src/params.ts → src/src/params.ts
diff --git a/build/src/src/types.ts → src/src/types.ts b/build/src/src/types.ts → src/src/types.ts
diff --git a/build/src/src/utils/crypto.ts → src/src/utils/crypto.ts b/build/src/src/utils/crypto.ts → src/src/utils/crypto.ts
diff --git a/build/src/src/utils/domain.ts → src/src/utils/domain.ts b/build/src/src/utils/domain.ts → src/src/utils/domain.ts
diff --git a/build/src/src/utils/encrypt.ts → src/src/utils/encrypt.ts b/build/src/src/utils/encrypt.ts → src/src/utils/encrypt.ts
diff --git a/build/src/src/utils/fs.ts → src/src/utils/fs.ts b/build/src/src/utils/fs.ts → src/src/utils/fs.ts
diff --git a/build/src/src/utils/gitData.ts → src/src/utils/gitData.ts b/build/src/src/utils/gitData.ts → src/src/utils/gitData.ts
diff --git a/build/src/src/utils/ip.ts → src/src/utils/ip.ts b/build/src/src/utils/ip.ts → src/src/utils/ip.ts
diff --git a/build/src/src/utils/renderQrCode.ts → src/src/utils/renderQrCode.ts b/build/src/src/utils/renderQrCode.ts → src/src/utils/renderQrCode.ts
diff --git a/build/src/src/utils/shell.ts → src/src/utils/shell.ts b/build/src/src/utils/shell.ts → src/src/utils/shell.ts
diff --git a/build/src/src/utils/supervisor.ts → src/src/utils/supervisor.ts b/build/src/src/utils/supervisor.ts → src/src/utils/supervisor.ts
diff --git a/build/src/src/vpncli.ts → src/src/vpncli.ts b/build/src/src/vpncli.ts → src/src/vpncli.ts
diff --git a/build/src/test/calls/addDevice.test.ts → src/test/calls/addDevice.test.ts b/build/src/test/calls/addDevice.test.ts → src/test/calls/addDevice.test.ts
diff --git a/build/src/test/calls/listDevices.test.ts → src/test/calls/listDevices.test.ts b/build/src/test/calls/listDevices.test.ts → src/test/calls/listDevices.test.ts
diff --git a/build/src/test/calls/removeDevice.test.ts → src/test/calls/removeDevice.test.ts b/build/src/test/calls/removeDevice.test.ts → src/test/calls/removeDevice.test.ts
diff --git a/build/src/test/client.test.int.ts → src/test/client.test.int.ts b/build/src/test/client.test.int.ts → src/test/client.test.int.ts
diff --git a/...rc/test/credentials/formatCredUrl.test.ts → src/test/credentials/formatCredUrl.test.ts b/...rc/test/credentials/formatCredUrl.test.ts → src/test/credentials/formatCredUrl.test.ts
diff --git a/build/src/test/utils/crypto.test.ts → src/test/utils/crypto.test.ts b/build/src/test/utils/crypto.test.ts → src/test/utils/crypto.test.ts
diff --git a/build/src/test/utils/domain.test.ts → src/test/utils/domain.test.ts b/build/src/test/utils/domain.test.ts → src/test/utils/domain.test.ts
diff --git a/build/src/tsconfig.json → src/tsconfig.json b/build/src/tsconfig.json → src/tsconfig.json
diff --git a/build/src/yarn.lock → src/yarn.lock b/build/src/yarn.lock → src/yarn.lock
diff --git a/build/ui_openvpn/.eslintrc → ui_openvpn/.eslintrc b/build/ui_openvpn/.eslintrc → ui_openvpn/.eslintrc
diff --git a/build/ui_openvpn/LICENSE → ui_openvpn/LICENSE b/build/ui_openvpn/LICENSE → ui_openvpn/LICENSE
diff --git a/build/ui_openvpn/README.md → ui_openvpn/README.md b/build/ui_openvpn/README.md → ui_openvpn/README.md
diff --git a/build/ui_openvpn/injectToHtml.js → ui_openvpn/injectToHtml.js b/build/ui_openvpn/injectToHtml.js → ui_openvpn/injectToHtml.js
diff --git a/build/ui_openvpn/package.json → ui_openvpn/package.json b/build/ui_openvpn/package.json → ui_openvpn/package.json
diff --git a/build/ui_openvpn/public/favicon.ico → ui_openvpn/public/favicon.ico b/build/ui_openvpn/public/favicon.ico → ui_openvpn/public/favicon.ico
diff --git a/build/ui_openvpn/public/index.html → ui_openvpn/public/index.html b/build/ui_openvpn/public/index.html → ui_openvpn/public/index.html
diff --git a/build/ui_openvpn/src/App.js → ui_openvpn/src/App.js b/build/ui_openvpn/src/App.js → ui_openvpn/src/App.js
diff --git a/build/ui_openvpn/src/App.test.js → ui_openvpn/src/App.test.js b/build/ui_openvpn/src/App.test.js → ui_openvpn/src/App.test.js
diff --git a/build/ui_openvpn/src/Header.js → ui_openvpn/src/Header.js b/build/ui_openvpn/src/Header.js → ui_openvpn/src/Header.js
diff --git a/build/ui_openvpn/src/HiddenRedirector.js → ui_openvpn/src/HiddenRedirector.js b/build/ui_openvpn/src/HiddenRedirector.js → ui_openvpn/src/HiddenRedirector.js
diff --git a/build/ui_openvpn/src/Instructions/Android.js → ui_openvpn/src/Instructions/Android.js b/build/ui_openvpn/src/Instructions/Android.js → ui_openvpn/src/Instructions/Android.js
diff --git a/...ui_openvpn/src/Instructions/Chromebook.js → ui_openvpn/src/Instructions/Chromebook.js b/...ui_openvpn/src/Instructions/Chromebook.js → ui_openvpn/src/Instructions/Chromebook.js
diff --git a/..._openvpn/src/Instructions/Instructions.js → ui_openvpn/src/Instructions/Instructions.js b/..._openvpn/src/Instructions/Instructions.js → ui_openvpn/src/Instructions/Instructions.js
diff --git a/build/ui_openvpn/src/Instructions/Linux.js → ui_openvpn/src/Instructions/Linux.js b/build/ui_openvpn/src/Instructions/Linux.js → ui_openvpn/src/Instructions/Linux.js
diff --git a/build/ui_openvpn/src/Instructions/MacOS.js → ui_openvpn/src/Instructions/MacOS.js b/build/ui_openvpn/src/Instructions/MacOS.js → ui_openvpn/src/Instructions/MacOS.js
diff --git a/build/ui_openvpn/src/Instructions/Others.js → ui_openvpn/src/Instructions/Others.js b/build/ui_openvpn/src/Instructions/Others.js → ui_openvpn/src/Instructions/Others.js
diff --git a/build/ui_openvpn/src/Instructions/Windows.js → ui_openvpn/src/Instructions/Windows.js b/build/ui_openvpn/src/Instructions/Windows.js → ui_openvpn/src/Instructions/Windows.js
diff --git a/build/ui_openvpn/src/Instructions/iOS.js → ui_openvpn/src/Instructions/iOS.js b/build/ui_openvpn/src/Instructions/iOS.js → ui_openvpn/src/Instructions/iOS.js
diff --git a/build/ui_openvpn/src/icons/FaAndroid.js → ui_openvpn/src/icons/FaAndroid.js b/build/ui_openvpn/src/icons/FaAndroid.js → ui_openvpn/src/icons/FaAndroid.js
diff --git a/build/ui_openvpn/src/icons/FaApple.js → ui_openvpn/src/icons/FaApple.js b/build/ui_openvpn/src/icons/FaApple.js → ui_openvpn/src/icons/FaApple.js
diff --git a/build/ui_openvpn/src/icons/FaChrome.js → ui_openvpn/src/icons/FaChrome.js b/build/ui_openvpn/src/icons/FaChrome.js → ui_openvpn/src/icons/FaChrome.js
diff --git a/build/ui_openvpn/src/icons/FaLinux.js → ui_openvpn/src/icons/FaLinux.js b/build/ui_openvpn/src/icons/FaLinux.js → ui_openvpn/src/icons/FaLinux.js
diff --git a/build/ui_openvpn/src/icons/FaMobile.js → ui_openvpn/src/icons/FaMobile.js b/build/ui_openvpn/src/icons/FaMobile.js → ui_openvpn/src/icons/FaMobile.js
diff --git a/build/ui_openvpn/src/icons/FaWindows.js → ui_openvpn/src/icons/FaWindows.js b/build/ui_openvpn/src/icons/FaWindows.js → ui_openvpn/src/icons/FaWindows.js
diff --git a/build/ui_openvpn/src/icons/icon-size.json → ui_openvpn/src/icons/icon-size.json b/build/ui_openvpn/src/icons/icon-size.json → ui_openvpn/src/icons/icon-size.json
diff --git a/.../img/dappnode-execute-instruccion-min.png → .../img/dappnode-execute-instruccion-min.png b/.../img/dappnode-execute-instruccion-min.png → .../img/dappnode-execute-instruccion-min.png
diff --git a/build/ui_openvpn/src/img/error.png → ui_openvpn/src/img/error.png b/build/ui_openvpn/src/img/error.png → ui_openvpn/src/img/error.png
diff --git a/build/ui_openvpn/src/img/loading.gif → ui_openvpn/src/img/loading.gif b/build/ui_openvpn/src/img/loading.gif → ui_openvpn/src/img/loading.gif
diff --git a/build/ui_openvpn/src/img/logo.png → ui_openvpn/src/img/logo.png b/build/ui_openvpn/src/img/logo.png → ui_openvpn/src/img/logo.png
diff --git a/build/ui_openvpn/src/img/ok.png → ui_openvpn/src/img/ok.png b/build/ui_openvpn/src/img/ok.png → ui_openvpn/src/img/ok.png
diff --git a/build/ui_openvpn/src/index.css → ui_openvpn/src/index.css b/build/ui_openvpn/src/index.css → ui_openvpn/src/index.css
diff --git a/build/ui_openvpn/src/index.js → ui_openvpn/src/index.js b/build/ui_openvpn/src/index.js → ui_openvpn/src/index.js
diff --git a/...d/ui_openvpn/src/registerServiceWorker.js → ui_openvpn/src/registerServiceWorker.js b/...d/ui_openvpn/src/registerServiceWorker.js → ui_openvpn/src/registerServiceWorker.js
diff --git a/build/ui_openvpn/src/utils/decrypt.js → ui_openvpn/src/utils/decrypt.js b/build/ui_openvpn/src/utils/decrypt.js → ui_openvpn/src/utils/decrypt.js
diff --git a/.../ui_openvpn/src/utils/getParamsFromUrl.js → ui_openvpn/src/utils/getParamsFromUrl.js b/.../ui_openvpn/src/utils/getParamsFromUrl.js → ui_openvpn/src/utils/getParamsFromUrl.js
diff --git a/build/ui_openvpn/src/utils/getServerName.js → ui_openvpn/src/utils/getServerName.js b/build/ui_openvpn/src/utils/getServerName.js → ui_openvpn/src/utils/getServerName.js
diff --git a/build/ui_openvpn/src/utils/isBase64.js → ui_openvpn/src/utils/isBase64.js b/build/ui_openvpn/src/utils/isBase64.js → ui_openvpn/src/utils/isBase64.js
diff --git a/build/ui_openvpn/yarn.lock → ui_openvpn/yarn.lock b/build/ui_openvpn/yarn.lock → ui_openvpn/yarn.lock