@@ -48,7 +48,7 @@ An enterprise react template application showcasing - Testing strategies, Global
- Install dependencies using `yarn install`
-- Start the dev server using `yarn start`
+- Start the electron dev server using `yarn run electron:start`
- Go through the other scripts in `package.json`
diff --git a/package.json b/package.json
index 2068121..b2fcbed 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "react-graphql-ts-template",
+ "name": "electron-react-ts-template",
"version": "1.0.8",
"description": "A React Typescript GraphQL application",
"repository": {
From 7a3cf91388ce6538b4af6aa438d9f397ffc327fd Mon Sep 17 00:00:00 2001
From: Poojesh Shetty
Date: Mon, 13 Mar 2023 10:43:23 +0530
Subject: [PATCH 12/18] feat: update read me
---
README.md | 10 ++++++++++
package.json | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 16072f9..7030ffa 100644
--- a/README.md
+++ b/README.md
@@ -50,8 +50,18 @@ An enterprise electron template application showcasing - Testing strategies, Glo
- Start the electron dev server using `yarn run electron:start`
+- Package the app for production using `yarn run electron:package`
+
- Go through the other scripts in `package.json`
+## Electron Configuration
+
+- Electron configuration using [main.js](https://www.electronjs.org/docs/latest/tutorial/examples)
+
+ Take a look at the following files
+
+ - [main/main.js](main/main.js)
+
## TypeScript Configuration
- Typescript Configuration using [tsconfig.json](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html)
diff --git a/package.json b/package.json
index b2fcbed..d7628da 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,8 @@
"generate": "react-generate",
"electron:dev": "export ENVIRONMENT_NAME=local && concurrently -c green.bold,blue.bold,white.bold -n WEBPACK,TYPESCRIPT,ELECTRON \"cross-env NODE_ENV=development node server\" \"yarn tsc:watch\" \"wait-on http://localhost:3000 && cross-env NODE_ENV=development electron .\"",
"electron:prod": "yarn run build && concurrently -c gree.bold,blue.bold -n WEBPACK,ELECTRON \"yarn run start:prod\" \"wait-on http://localhost:3000 && cross-env NODE_ENV=development electron .\"",
- "electron:build": "yarn run build && electron-builder"
+ "electron:build": "yarn run build && electron-builder",
+ "electron:package": "yarn run electron-builder -- --publish always --win --mac --linux"
},
"browserslist": [
"last 2 versions",
From c7e2714d2aedfea211e5635f9928e98cd3bce71a Mon Sep 17 00:00:00 2001
From: Poojesh Shetty
Date: Mon, 13 Mar 2023 10:46:14 +0530
Subject: [PATCH 13/18] docs: add cd workflow app
---
README.md | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 7030ffa..77aeeff 100644
--- a/README.md
+++ b/README.md
@@ -278,10 +278,12 @@ Where `type` is one of the following:
## Auto release
-- Each push into `qa` branch will produce a beta release
+- Each push into `dev` branch will produce a alpha release
+- Each push into `staging` branch will produce a beta release
- Each push into `master` branch will produce a prod release
Take a look at the following files
-- [.github/workflows/beta-release.yml](.github/workflows/beta-release.yml)
-- [.github/workflows/prod-release.yml](.github/workflows/prod-release.yml)
+- [.github/workflows/cd-alpha-release.yml](.github/workflows/cd-alpha-release.yml)
+- [.github/workflows/cd-beta-release.yml](.github/workflows/cd-beta-release.yml)
+- [.github/workflows/cd-latest-release.yml](.github/workflows/cd-latest-release.yml)
From 012677d89d7d2a83d7a2e2b60fffc6f97440ef79 Mon Sep 17 00:00:00 2001
From: Poojesh Shetty
Date: Mon, 13 Mar 2023 10:51:17 +0530
Subject: [PATCH 14/18] docs: update readme doc
---
README.md | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 77aeeff..7012acb 100644
--- a/README.md
+++ b/README.md
@@ -199,6 +199,20 @@ An enterprise electron template application showcasing - Testing strategies, Glo
- [.github/workflows/ci.yml](.github/workflows/ci.yml)
- [.github/workflows/cd.yml](.github/workflows/cd.yml)
+## Auto release
+
+- Each push into `dev` branch will produce a alpha release
+- Each push into `staging` branch will produce a beta release
+- Each push into `master` branch will produce a prod release
+
+- These releases will also have the respective packaged electron app in it assets.
+
+ Take a look at the following files
+
+ - [.github/workflows/cd-alpha-release.yml](.github/workflows/cd-alpha-release.yml)
+ - [.github/workflows/cd-beta-release.yml](.github/workflows/cd-beta-release.yml)
+ - [.github/workflows/cd-latest-release.yml](.github/workflows/cd-latest-release.yml)
+
## Testing using @testing-library/react
- Testing is done using the @testing-library/react.
@@ -275,15 +289,3 @@ Where `type` is one of the following:
Where `flags` is an optional comma-separated list of one or more of the following (must be surrounded in square brackets):
- `breaking`: alters `type` to be a breaking change
And `category` can be anything of your choice. If you use a type not found in the list (but it still follows the same format of the message), it'll be grouped under `other`.
-
-## Auto release
-
-- Each push into `dev` branch will produce a alpha release
-- Each push into `staging` branch will produce a beta release
-- Each push into `master` branch will produce a prod release
-
- Take a look at the following files
-
-- [.github/workflows/cd-alpha-release.yml](.github/workflows/cd-alpha-release.yml)
-- [.github/workflows/cd-beta-release.yml](.github/workflows/cd-beta-release.yml)
-- [.github/workflows/cd-latest-release.yml](.github/workflows/cd-latest-release.yml)
From c617a55c325e58d1c21a2b2525c7b867c2c17445 Mon Sep 17 00:00:00 2001
From: Poojesh Shetty
Date: Mon, 13 Mar 2023 10:52:50 +0530
Subject: [PATCH 15/18] docs: update readme doc
---
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 7012acb..0d562e4 100644
--- a/README.md
+++ b/README.md
@@ -205,13 +205,13 @@ An enterprise electron template application showcasing - Testing strategies, Glo
- Each push into `staging` branch will produce a beta release
- Each push into `master` branch will produce a prod release
-- These releases will also have the respective packaged electron app in it assets.
+These releases will also have the respective packaged electron app in it assets.
- Take a look at the following files
+Take a look at the following files
- - [.github/workflows/cd-alpha-release.yml](.github/workflows/cd-alpha-release.yml)
- - [.github/workflows/cd-beta-release.yml](.github/workflows/cd-beta-release.yml)
- - [.github/workflows/cd-latest-release.yml](.github/workflows/cd-latest-release.yml)
+- [.github/workflows/cd-alpha-release.yml](.github/workflows/cd-alpha-release.yml)
+- [.github/workflows/cd-beta-release.yml](.github/workflows/cd-beta-release.yml)
+- [.github/workflows/cd-latest-release.yml](.github/workflows/cd-latest-release.yml)
## Testing using @testing-library/react
From 4639d9cf47fd5a159aa7a3f3476da4e5862110f4 Mon Sep 17 00:00:00 2001
From: poojesh-ws
Date: Mon, 13 Mar 2023 05:42:05 +0000
Subject: [PATCH 16/18] 1.0.9-alpha.4
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index e6628e3..acffeba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-graphql-ts-template",
- "version": "1.0.9-alpha.3",
+ "version": "1.0.9-alpha.4",
"description": "A React Typescript GraphQL application",
"repository": {
"type": "git",
From 89536a590c10d42697a7ae40c3774fd9c5f6305e Mon Sep 17 00:00:00 2001
From: Poojesh Shetty
Date: Mon, 13 Mar 2023 11:42:19 +0530
Subject: [PATCH 17/18] feat: fix antd theme
---
app/components/Siderbar/index.tsx | 8 +++++---
package.json | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/components/Siderbar/index.tsx b/app/components/Siderbar/index.tsx
index 95cb880..4dd1ee0 100644
--- a/app/components/Siderbar/index.tsx
+++ b/app/components/Siderbar/index.tsx
@@ -17,13 +17,15 @@ const SidebarWrapper = styled.div`
const SidebarDrawer = styled(Drawer)`
&& {
.ant-drawer-body {
- padding: ${(props) => props.theme.headerHeight} 0 0 0;
background-color: ${colors.primary};
- width: ${(props) => props.theme.sidebarWidth};
text-align: center;
}
+ .ant-drawer-header {
+ border-bottom: 1px solid ${colors.primary};
+ background-color: ${colors.primary};
+ }
.ant-drawer-close {
- top: 1rem;
+ padding-top: 1rem;
}
}
`;
diff --git a/package.json b/package.json
index 2068121..e0b6349 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"build-storybook": "export ENVIRONMENT_NAME=production && build-storybook",
"initialize": "git checkout --orphan temp-branch && git add -A && git commit -m 'Initial commit' && git branch -D master && git branch -m master",
"generate": "react-generate",
- "electron:dev": "export ENVIRONMENT_NAME=local && concurrently -c green.bold,blue.bold,white.bold -n WEBPACK,TYPESCRIPT,ELECTRON \"cross-env NODE_ENV=development node server\" \"yarn tsc:watch\" \"wait-on http://localhost:3000 && cross-env NODE_ENV=development electron .\"",
+ "electron:dev": "export ENVIRONMENT_NAME=local && concurrently -k -c green.bold,blue.bold,white.bold -n WEBPACK,TYPESCRIPT,ELECTRON \"cross-env NODE_ENV=development node server\" \"yarn tsc:watch\" \"wait-on http://localhost:3000 && cross-env NODE_ENV=development electron .\"",
"electron:prod": "yarn run build && concurrently -c gree.bold,blue.bold -n WEBPACK,ELECTRON \"yarn run start:prod\" \"wait-on http://localhost:3000 && cross-env NODE_ENV=development electron .\"",
"electron:build": "yarn run build && electron-builder"
},
From c644b5617f959af8da0a0453c57a58bc8011c4f2 Mon Sep 17 00:00:00 2001
From: poojesh-ws
Date: Mon, 13 Mar 2023 06:29:35 +0000
Subject: [PATCH 18/18] 1.0.9-alpha.5
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9e8f0ea..282ac95 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-graphql-ts-template",
- "version": "1.0.9-alpha.4",
+ "version": "1.0.9-alpha.5",
"description": "A React Typescript GraphQL application",
"repository": {
"type": "git",