Skip to content

Commit

Permalink
1.3.4 release (#204)
Browse files Browse the repository at this point in the history
* Add new logo

* Add discord link to app and web

* Increase version in package.json

* Bump version for download

* Tweaks to config files

Co-authored-by: Johannes Merkt <[email protected]>
  • Loading branch information
petrvecera and JohannesMerkt authored Apr 9, 2022
1 parent 899abeb commit b25bc68
Show file tree
Hide file tree
Showing 37 changed files with 118 additions and 38 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ jobs:
run: |
export NODE_OPTIONS=--max_old_space_size=4096
CI=false yarn web build
# When we release the electron app - it's build slower than the web release, we should probably have something better than this
# probably we can merge it together into one deploy job/release.
- name: Sleep for 240 seconds
run: sleep 240s
shell: bash
- name: Deploy to Firebase
env:
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN_CI_PROD}}
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@coh2stats/app",
"productName": "Coh2 Game Stats",
"version": "1.3.2",
"version": "1.3.4",
"description": "Displays stats of players in the current Coh2 game",
"main": ".webpack/main",
"private": true,
Expand Down
1 change: 1 addition & 0 deletions packages/app/src/main/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const config = {
mixpanelProjectToken: "40dec2eae51580f28e7ee646014b95cc",
twitchExtensionUpdateURL:
"https://us-east4-coh2-ladders-prod.cloudfunctions.net/updateTwitchExtData",
extensionURL: "https://dashboard.twitch.tv/extensions/6x9q2nzzv9wewklo7gt7hz2vypdgg7",
};

export default config;
9 changes: 2 additions & 7 deletions packages/app/src/renderer/windows/about/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,10 @@ const App = (): JSX.Element => {
or{" "}
<Link
onClick={() =>
window.electron.ipcRenderer.openInBrowser(
"https://github.com/cohstats/coh2stats",
)
window.electron.ipcRenderer.openInBrowser("https://discord.gg/jRrnwqMfkr")
}
>
get involved!
join our discord and get involved!
</Link>
</Text>
</p>
Expand All @@ -125,6 +123,3 @@ const App = (): JSX.Element => {
};

export default App;

// <Text type="secondary"> (up to date)</Text> // for after version
//<Link onClick={() => window.electron.ipcRenderer.openInBrowser(settings.appUpdateDownloadLink)}> </Link>
25 changes: 7 additions & 18 deletions packages/app/src/renderer/windows/settings/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Helper } from "@coh2stats/shared/src/components/helper";
import { Collapse, Divider, Result, Spin, Steps, Tooltip, Typography } from "antd";
import { ExclamationCircleOutlined, LoadingOutlined } from "@ant-design/icons";
import WindowTitlebar from "../../titlebar/window-titlebar";
import config from "../../../main/config";

const { Text } = Typography;

Expand Down Expand Up @@ -95,6 +96,10 @@ const App = (): JSX.Element => {
window.electron.ipcRenderer.scanForLogFile();
};

const openExtensionWebPage = () => {
window.electron.ipcRenderer.openInBrowser(config.extensionURL);
};

const handleTwitchExtensionModeChange = (checked: boolean) => {
dispatch(actions.setTwitchExtension(checked));
savedMessage();
Expand Down Expand Up @@ -264,15 +269,7 @@ const App = (): JSX.Element => {
<>
Use our twitch extension to display interactive stats for your viewers on
stream. Get the extension{" "}
<Typography.Link
onClick={() =>
window.electron.ipcRenderer.openInBrowser(
"https://github.com/cohstats/coh2stats/blob/master/packages/app/README.md",
)
}
>
here
</Typography.Link>
<Typography.Link onClick={openExtensionWebPage}>here</Typography.Link>
</>
}
style={{ paddingLeft: "5px" }}
Expand Down Expand Up @@ -362,15 +359,7 @@ const App = (): JSX.Element => {
<Form.Item wrapperCol={{ span: 24 }}>
<Text>
Now go on twitch install the{" "}
<Typography.Link
onClick={() =>
window.electron.ipcRenderer.openInBrowser(
"https://dashboard.twitch.tv/extensions/6x9q2nzzv9wewklo7gt7hz2vypdgg7-0.0.1",
)
}
>
extension
</Typography.Link>{" "}
<Typography.Link onClick={openExtensionWebPage}>extension</Typography.Link>{" "}
and in the extension settings set UUID field to be the same as the following
UUID:
</Text>
Expand Down
2 changes: 2 additions & 0 deletions packages/web/public/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig><msapplication><tile><square70x70logo src="logo/ms-icon-70x70.png"/><square150x150logo src="logo/ms-icon-150x150.png"/><square310x310logo src="logo/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
6 changes: 3 additions & 3 deletions packages/web/public/electron-app-version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.3.2",
"link": "https://github.com/cohstats/coh2stats/releases/tag/v1.3.2",
"downloadLink": "https://github.com/cohstats/coh2stats/releases/download/v1.3.2/Coh2.Game.Stats-1.3.2.Setup.exe"
"version": "1.3.4",
"link": "https://github.com/cohstats/coh2stats/releases/tag/v1.3.4",
"downloadLink": "https://github.com/cohstats/coh2stats/releases/download/v1.3.4/Coh2.Game.Stats-1.3.4.Setup.exe"
}
46 changes: 43 additions & 3 deletions packages/web/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,55 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/logoTrans.png" />
<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/logo/apple-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/logo/apple-icon-60x60.png" />
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/logo/apple-icon-72x72.png" />
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/logo/apple-icon-76x76.png" />
<link
rel="apple-touch-icon"
sizes="114x114"
href="%PUBLIC_URL%/logo/apple-icon-114x114.png"
/>
<link
rel="apple-touch-icon"
sizes="120x120"
href="%PUBLIC_URL%/logo/apple-icon-120x120.png"
/>
<link
rel="apple-touch-icon"
sizes="144x144"
href="%PUBLIC_URL%/logo/apple-icon-144x144.png"
/>
<link
rel="apple-touch-icon"
sizes="152x152"
href="%PUBLIC_URL%/logo/apple-icon-152x152.png"
/>
<link
rel="apple-touch-icon"
sizes="180x180"
href="%PUBLIC_URL%/logo/apple-icon-180x180.png"
/>
<link
rel="icon"
type="image/png"
sizes="192x192"
href="%PUBLIC_URL%/logo/android-icon-192x192.png"
/>
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/logo/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/logo/favicon-96x96.png" />
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/logo/favicon-16x16.png" />
<link rel="icon" type="image/ico" sizes="16x16" href="%PUBLIC_URL%/logo/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="msapplication-TileColor" content="#001529" />
<meta name="msapplication-TileImage" content="%PUBLIC_URL%/logo/ms-icon-144x144.png" />
<meta name="msapplication-config" content="%PUBLIC_URL%/browserconfig.xml" />
<meta name="theme-color" content="#001529" />
<meta
name="description"
content="Company of Heroes 2 Match Statistics, Player Cards, Recent Matches, Leaderboards and Charts about most used
Win rates, Commanders, Intel Bulletins and maps based on the real-time data from the recent games."
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link type="application/opensearchdescription+xml" rel="search" href="/opensearch.xml" />
<!--
manifest.json provides metadata used when your web app is installed on a
Expand Down
Binary file added packages/web/public/logo/android-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/android-icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/android-icon-36x36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/android-icon-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/android-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/android-icon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/apple-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/apple-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/apple-icon-57x57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/apple-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/apple-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/apple-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/favicon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/favicon.ico
Binary file not shown.
Binary file added packages/web/public/logo/ms-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/ms-icon-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/ms-icon-310x310.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/web/public/logo/ms-icon-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed packages/web/public/logoCoh.png
Binary file not shown.
Binary file removed packages/web/public/logoTrans.png
Binary file not shown.
39 changes: 35 additions & 4 deletions packages/web/public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,44 @@
"name": "Company of Heroes 2 Statistics and Logs",
"icons": [
{
"src": "logoTrans.png",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/png"
"src": "logo/android-icon-36x36.png",
"sizes": "36x36",
"type": "image/png",
"density": "0.75"
},
{
"src": "logo/android-icon-48x48.png",
"sizes": "48x48",
"type": "image/png",
"density": "1.0"
},
{
"src": "logo/android-icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"density": "1.5"
},
{
"src": "logo/android-icon-96x96.png",
"sizes": "96x96",
"type": "image/png",
"density": "2.0"
},
{
"src": "logo/android-icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"density": "3.0"
},
{
"src": "logo/android-icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"density": "4.0"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"theme_color": "#001529",
"background_color": "#ffffff"
}
10 changes: 10 additions & 0 deletions packages/web/public/resources/discord-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion packages/web/src/components/main-footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ export const MainFooter: React.FC = () => {
<br />
See <Link to={"/about"}>about page</Link> for more info.
<br />
© 2021 COH2stats.com
© 2022 COH2stats.com
<br />
<a href={"https://github.com/cohstats/coh2stats"} target="_blank" rel="noopener noreferrer">
<img width={30} height={30} src={"/resources/github-dark.png"} alt={"GitHub Logo"} />
</a>{" "}
<a href={"https://discord.gg/jRrnwqMfkr"} target="_blank" rel="noopener noreferrer">
<img width={30} height={30} src={"/resources/discord-icon.svg"} alt={"Discord Logo"} />
</a>
<br />
<br />
Expand Down
6 changes: 5 additions & 1 deletion packages/web/src/pages/about/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ const About: React.FC = () => {
.
<br />
<br />
For any discussion, ideas or anything else. Head over to the coh2.org{" "}
For any discussion, ideas or anything else. Visit our{" "}
<Link href="https://discord.gg/jRrnwqMfkr" target="_blank">
discord channel
</Link>{" "}
or head over to the coh2.org{" "}
<Link
href="https://www.coh2.org/topic/108057/coh2stats-com-match-and-player-statistics-2-0"
target="_blank"
Expand Down

0 comments on commit b25bc68

Please sign in to comment.