Skip to content

Commit

Permalink
feat(vpn-ui): init frontend NC-134 (#4160)
Browse files Browse the repository at this point in the history
  • Loading branch information
doums authored Nov 22, 2023
1 parent 8ee31d9 commit 809fabf
Show file tree
Hide file tree
Showing 32 changed files with 1,801 additions and 850 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-nym-vpn-ui-rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --manifest-path ${{ env.CARGOTOML_PATH }} --lib --features custom-protocol
args: --manifest-path ${{ env.CARGOTOML_PATH }} --features custom-protocol

# - name: Run all tests
# uses: actions-rs/cargo@v1
Expand Down
12 changes: 0 additions & 12 deletions nym-vpn/ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,6 @@ Generated TS types will be located in `src-tauri/bindings/`

## Build

To build as a **shared library**

```
yarn build && cd src-tauri && cargo build --release --lib --features custom-protocol
#alias
yarn build:app
```

You can build for a different platform using [Cross](https://github.com/cross-rs/cross).
For example, to build for Windows on Linux:

```
cross build --target x86_64-pc-windows-gnu --release --lib --features custom-protocol
```
6 changes: 3 additions & 3 deletions nym-vpn/ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Tauri + React + TS</title>
<title>NymVPN</title>
</head>

<body>
<div id="root" class="bg-gray-900"></div>
<body class="h-screen">
<div id="root" class="h-full bg-gray-900 text-gray-400"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
16 changes: 10 additions & 6 deletions nym-vpn/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dev:app": "RUST_LOG=nymvpn_ui=trace tauri dev",
"dev:browser": "vite --mode dev-browser",
"build": "tsc && vite build",
"build:app": "yarn build && cd src-tauri && cargo build --release --lib --features custom-protocol",
"build:app": "yarn tauri build",
"preview": "vite preview",
"lint": "eslint --ext .ts,.tsx src/",
"lint:fix": "eslint --ext .js,.ts --fix src/",
Expand All @@ -18,17 +18,21 @@
"tauri": "tauri"
},
"dependencies": {
"@mui/base": "^5.0.0-beta.20",
"@mui/base": "^5.0.0-beta.24",
"@mui/material": "^5.14.14",
"@tauri-apps/api": "^1.5.0",
"clsx": "^2.0.0",
"i18next": "^23.7.6",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"react-i18next": "^13.5.0",
"react-router-dom": "^6.18.0"
},
"devDependencies": {
"@tauri-apps/cli": "^1.5.0",
"@types/react": "^18.2.31",
"@types/react-dom": "^18.2.14",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"@vitejs/plugin-react-swc": "^3.3.2",
Expand All @@ -42,6 +46,6 @@
"prettier": "^3.0.3",
"tailwindcss": "^3.3.3",
"typescript": "^5.0.2",
"vite": "^4.4.5"
"vite": "^5.0.0"
}
}
Loading

0 comments on commit 809fabf

Please sign in to comment.