Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move landing page from manta-signer-install #89

Merged
merged 17 commits into from
Jun 13, 2022
Merged

feat: move landing page from manta-signer-install #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
819706e
feat: move landing page from `manta-signer-install`
bhgomes May 24, 2022
5dd6470
fix: remove create react app template code [#none]
bhgomes May 24, 2022
0118a39
fix: correct typos
bhgomes May 24, 2022
cab0958
fix: remove old react icons
bhgomes Jun 2, 2022
d3cd935
feat: add landing page to version sync check
bhgomes Jun 2, 2022
342efef
fix: remove old icons from manifest
bhgomes Jun 2, 2022
105db15
Merge branch 'main' into feat/move-landing-page
bhgomes Jun 6, 2022
a7f1d57
fix: use correct svg header for dolphin logo
bhgomes Jun 10, 2022
2f5e197
fix: remove tauri cli to fix windows issue
bhgomes Jun 10, 2022
8a2aaa1
fix: bump to latest version of tauri and fix windows issue
bhgomes Jun 10, 2022
71d4e36
fix: use correct icons
bhgomes Jun 10, 2022
5ac1b77
Update Cargo.toml
Jun 10, 2022
6d53313
Update Cargo.toml
Jun 10, 2022
5f848d1
Update package.json
Jun 11, 2022
b4ace52
Fix lockfiles
kdense521 Jun 11, 2022
bc11753
Remove patch number
kdense521 Jun 11, 2022
cb1127f
fix app height style
Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ write a little note why.
* ui/public/about.html
* ui/src-tauri/Cargo.toml
* ui/src-tauri/tauri.conf.json
* www/src/App.tsx
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Append version suffix
run: node ./scripts/suffix.js ${{ steps.suffixed.outputs.SUFFIXED }}
- name: Build & Sign
run: cd ui;yarn && yarn add @tauri-apps/cli && yarn tauri build -v
run: cd ui;yarn && yarn tauri build -v
env:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
Expand Down
4 changes: 2 additions & 2 deletions scripts/check_ref.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ echo $BRANCH $TARGET $VERSION $SUFFIX

if [[ "$BRANCH" == "master" ]] && [[ "$TARGET" == "win64" ]]
then
echo "::set-output name=SUFFIXED::$VERSION.$SUFFIX"
echo "::set-output name=SUFFIXED::$VERSION"
elif [[ "$BRANCH" == "master" ]]
then
echo "::set-output name=SUFFIXED::$VERSION-$SUFFIX"
elif [[ "$TARGET" == "win64" ]]
then
echo "::set-output name=SUFFIXED::$VERSION.$((100 + $SUFFIX))"
echo "::set-output name=SUFFIXED::$VERSION"
else
echo "::set-output name=SUFFIXED::$VERSION-$((100 + $SUFFIX))"
fi
2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@tauri-apps/api": "^1.0.0-rc.1",
"@tauri-apps/cli": "^1.0.0-rc.10",
"@tauri-apps/cli": "1.0.0-rc.10",
"@tauri-apps/tauricon": "^1.0.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
Loading