diff --git a/.env.example b/.env.example index 2375f5e..e0c9195 100644 --- a/.env.example +++ b/.env.example @@ -1 +1 @@ -MTM_VPN_APK_URL=https://git.vdb.to/cerc-io/mtm-vpn-client-public/releases/download/mtm-vpn-android-v1.8.0-mtm-0.1.0/mtmvpn-general-release-v1.8.0-mtm-0.1.1.apk +MTM_VPN_APK_URL=https://git.vdb.to/cerc-io/mtm-vpn-client-public/releases/download/mtm-vpn-android-v1.8.0-mtm-0.1.1/mtmvpn-general-release-v1.8.0-mtm-0.1.1.apk diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a7300ff..6761fe3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,7 +1,6 @@ name: Build the Webapp on: - release: - types: [published] + pull_request: env: CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }} @@ -17,16 +16,8 @@ jobs: uses: actions/setup-node@v3 with: node-version: 20 - - name: "Install Yarn" - run: npm install -g yarn - - name: "Install registry CLI" - run: | - npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/ - yarn global add @cerc-io/laconic-registry-cli - - name: "Install jq" - run: apt -y update && apt -y install jq - name: "Install dependencies" - run: yarn install + run: npm install - name: "Lint code" run: npm run lint - name: "Build application" diff --git a/README.md b/README.md index 634585c..83b7e29 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ # mtm-vpn-client-public Download the latest APK from the [Releases page](https://git.vdb.to/cerc-io/mtm-vpn-client-public/releases) and install it on your Android device to start using MTM VPN. + +## Deploy the Webapp + +Steps to deploy the webapp: [Deploy Webapp Readme](./deploy/README.md) \ No newline at end of file diff --git a/components/LandingPage.tsx b/components/LandingPage.tsx index f6b4bc9..f8507ef 100644 --- a/components/LandingPage.tsx +++ b/components/LandingPage.tsx @@ -24,7 +24,13 @@ const LandingPage = () => { diff --git a/deploy/.gitignore b/deploy/.gitignore new file mode 100644 index 0000000..d729ef6 --- /dev/null +++ b/deploy/.gitignore @@ -0,0 +1,2 @@ +.app.env +.registry.env diff --git a/deploy/README.md b/deploy/README.md index 14c5969..5d3d344 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -5,7 +5,7 @@ - Clone the repo: ```bash - git clone https://github.com/deep-stack/mtm-vpn-client-public.git + git clone https://git.vdb.to/cerc-io/mtm-vpn-client-public.git cd mtm-vpn-client-public/deploy ``` diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 94d3a7a..84aae4d 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -9,13 +9,13 @@ echo "Using DEPLOYER_LRN: $DEPLOYER_LRN" echo "Using AUTHORITY: $AUTHORITY" # Repository URL -REPO_URL="https://github.com/deep-stack/mtm-vpn-client-public" +REPO_URL="https://git.vdb.to/cerc-io/mtm-vpn-client-public" # Get the latest commit hash for a branch BRANCH_NAME="main" LATEST_HASH=$(git ls-remote $REPO_URL refs/heads/$BRANCH_NAME | awk '{print $1}') -PACKAGE_VERSION=$(curl -s $REPO_URL/raw/main/package.json | jq -r .version) +PACKAGE_VERSION=$(curl -s $REPO_URL/raw/branch/main/package.json | jq -r .version) APP_NAME=mtm-vpn diff --git a/public/mtm-vpn-name-logo.png b/public/mtm-vpn-name-logo.png new file mode 100644 index 0000000..37f0f1a Binary files /dev/null and b/public/mtm-vpn-name-logo.png differ diff --git a/styles/LandingPage.module.css b/styles/LandingPage.module.css index 8fa9197..478383c 100644 --- a/styles/LandingPage.module.css +++ b/styles/LandingPage.module.css @@ -56,9 +56,8 @@ } .logo { - font-size: 1.5rem; - font-weight: bold; color: white; + filter: brightness(0) invert(1); } .main {