Skip to content

Commit

Permalink
Merge pull request #100 from juanky201271/dev_new_version_zingo_pc_1_0_1
Browse files Browse the repository at this point in the history
New Zingo PC version 1.0.1
  • Loading branch information
juanky201271 authored Aug 24, 2023
2 parents 9b75828 + d6b0cbe commit 84621c3
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion bin/printversion.ps1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
echo "VERSION=1.0.0" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "VERSION=1.0.1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
2 changes: 1 addition & 1 deletion bin/printversion.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
VERSION="1.0.0"
VERSION="1.0.1"
echo "VERSION=$VERSION" >> $GITHUB_ENV
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "zingo-pc",
"productName": "Zingo PC",
"version": "1.0.0",
"version": "1.0.1",
"private": true,
"description": "Zingo PC",
"license": "MIT",
Expand Down Expand Up @@ -117,7 +117,7 @@
"build-win-x64": "yarn neon-win-x64 && node scripts/build.js",
"build-win-arm64": "yarn neon-win-arm64 && node scripts/build.js",
"test": "yarn neon && node scripts/test.js",
"dist:linux": "yarn build && electron-builder -l --universal -c.extraMetadata.main=build/electron.js --publish never",
"dist:linux": "yarn build && electron-builder -l -c.extraMetadata.main=build/electron.js --publish never",
"dist:mac-arm64": "yarn build-mac-arm64 && electron-builder -m --arm64 -c.extraMetadata.main=build/electron.js --publish never",
"dist:mac-x64": "yarn build-mac-x64 && electron-builder -m --x64 -c.extraMetadata.main=build/electron.js --publish never",
"dist:win-arm64": "yarn build-win-arm64 && electron-builder -w --arm64 -c.extraMetadata.main=build/electron.js --publish never",
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function App() {
<p>Built using CRA electron-builder-typescript Template.</p>
{/*<p>{addon.zingolib_say_hello("Me")}</p>*/}
<img src={logo} className="App-logo" alt="logo" />
<p>Zingo PC v1.0.0</p>
<p>Zingo PC v1.0.1</p>
<p>
Edit <code>public/electron.js</code> or <code>src/App.js</code> and save to reload.
</p>
Expand Down
8 changes: 4 additions & 4 deletions src/components/loadingscreen/LoadingScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 0 && (
<div>
<div style={{ marginTop: "100px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.0</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.1</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div>{currentStatus}</div>
Expand Down Expand Up @@ -496,7 +496,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 1 && (
<div>
<div style={{ marginTop: "20px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.0</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.1</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down Expand Up @@ -557,7 +557,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 2 && (
<div>
<div style={{ marginTop: "20px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.0</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.1</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down Expand Up @@ -605,7 +605,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 3 && (
<div>
<div style={{ marginTop: "20px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.0</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.1</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class Sidebar extends PureComponent<SidebarProps & RouteComponentProps, SidebarS
openErrorModal(
"Zingo PC",
<div className={cstyles.verticalflex}>
<div className={cstyles.margintoplarge}>Zingo PC v1.0.0</div>
<div className={cstyles.margintoplarge}>Zingo PC v1.0.1</div>
<div className={cstyles.margintoplarge}>Built with Electron. Copyright (c) 2023, ZingoLabs.</div>
<div className={cstyles.margintoplarge}>
The MIT License (MIT) Copyright (c) 2023 ZingoLabs
Expand Down Expand Up @@ -539,7 +539,7 @@ class Sidebar extends PureComponent<SidebarProps & RouteComponentProps, SidebarS
/>

<div className={[cstyles.center, styles.sidebarlogobg].join(" ")}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.0</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.1</div>
<img src={Logo} width="70" alt="logo" style={{ borderRadius: 5 }} />
</div>

Expand Down

0 comments on commit 84621c3

Please sign in to comment.