diff --git a/.env b/.env
index 4266650..d38b112 100644
--- a/.env
+++ b/.env
@@ -1 +1 @@
-SPACEX_URL=https://api.spacex.land/graphql/
+SPACEX_URL=https://spacex-production.up.railway.app/graphql/
diff --git a/.env.development b/.env.development
index 4266650..d38b112 100644
--- a/.env.development
+++ b/.env.development
@@ -1 +1 @@
-SPACEX_URL=https://api.spacex.land/graphql/
+SPACEX_URL=https://spacex-production.up.railway.app/graphql/
diff --git a/.env.local b/.env.local
index 4266650..d38b112 100644
--- a/.env.local
+++ b/.env.local
@@ -1 +1 @@
-SPACEX_URL=https://api.spacex.land/graphql/
+SPACEX_URL=https://spacex-production.up.railway.app/graphql/
diff --git a/.github/workflows/cd-alpha-release.yml b/.github/workflows/cd-alpha-release.yml
index 0aafde9..289372f 100644
--- a/.github/workflows/cd-alpha-release.yml
+++ b/.github/workflows/cd-alpha-release.yml
@@ -33,6 +33,7 @@ jobs:
cd "$GITHUB_WORKSPACE"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
git config user.name "$GITHUB_ACTOR"
+ git pull
npm version prerelease --preid=alpha
git push
diff --git a/.github/workflows/cd-beta-release.yml b/.github/workflows/cd-beta-release.yml
index 0c62b2e..53b32f5 100644
--- a/.github/workflows/cd-beta-release.yml
+++ b/.github/workflows/cd-beta-release.yml
@@ -33,6 +33,7 @@ jobs:
cd "$GITHUB_WORKSPACE"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
git config user.name "$GITHUB_ACTOR"
+ git pull
npm version prerelease --preid=beta
git push
diff --git a/.github/workflows/cd-latest-release.yml b/.github/workflows/cd-latest-release.yml
index 94f6c91..41aa098 100644
--- a/.github/workflows/cd-latest-release.yml
+++ b/.github/workflows/cd-latest-release.yml
@@ -37,6 +37,7 @@ jobs:
cd "$GITHUB_WORKSPACE"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
git config user.name "$GITHUB_ACTOR"
+ git pull
npm version patch
git push
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 788d453..7f26d3d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- node-version: [12.x]
+ node-version: [14.x]
steps:
- uses: actions/checkout@v2
diff --git a/README.md b/README.md
index fd2f5de..0d562e4 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
-An enterprise react template application showcasing - Testing strategies, Global state management, middleware support, a network layer, component library integration, localization, PWA support, route configuration, lazy loading, and Continuous integration & deployment.
+An enterprise electron template application showcasing - Testing strategies, Global state management, middleware support, a network layer, component library integration, localization, PWA support, route configuration, lazy loading, and Continuous integration & deployment.
---
@@ -33,7 +33,7 @@ An enterprise react template application showcasing - Testing strategies, Global
-
+
@@ -48,10 +48,20 @@ 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`
+
+- 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)
@@ -189,6 +199,20 @@ An enterprise react template application showcasing - Testing strategies, Global
- [.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.
@@ -265,13 +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 `qa` 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)
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/app/containers/HomeContainer/tests/__snapshots__/index.test.tsx.snap b/app/containers/HomeContainer/tests/__snapshots__/index.test.tsx.snap
index 279b9a3..efb056c 100644
--- a/app/containers/HomeContainer/tests/__snapshots__/index.test.tsx.snap
+++ b/app/containers/HomeContainer/tests/__snapshots__/index.test.tsx.snap
@@ -48,7 +48,7 @@ exports[`
tests should render and match the snapshot 1`] = `
class="HomeContainer__ButtonBox-sc-1ly6omb-3 gSuRgZ"
>