Merge pull request #40 from wednesday-solutions/dev

Dev

Author: poojesh-ws

.env

@@ -1 +1 @@
-SPACEX_URL=https://api.spacex.land/graphql/
+SPACEX_URL=https://spacex-production.up.railway.app/graphql/

.env.development

@@ -1 +1 @@
-SPACEX_URL=https://api.spacex.land/graphql/
+SPACEX_URL=https://spacex-production.up.railway.app/graphql/

.env.local

@@ -1 +1 @@
-SPACEX_URL=https://api.spacex.land/graphql/
+SPACEX_URL=https://spacex-production.up.railway.app/graphql/

.github/workflows/cd-alpha-release.yml

@@ -33,6 +33,7 @@ jobs:
           cd "$GITHUB_WORKSPACE"
           git config user.email "[email protected]"
           git config user.name "$GITHUB_ACTOR"
+          git pull
           npm version prerelease --preid=alpha
           git push
 

.github/workflows/cd-beta-release.yml

@@ -33,6 +33,7 @@ jobs:
           cd "$GITHUB_WORKSPACE"
           git config user.email "[email protected]"
           git config user.name "$GITHUB_ACTOR"
+          git pull
           npm version prerelease --preid=beta
           git push
 

.github/workflows/cd-latest-release.yml

@@ -32,49 +32,12 @@ jobs:
       - name: Build
         run: yarn build
 
-      - name: Get Commit Message
-        run: |
-          declare -A category=( [fix]="" [chore]="" [revert]="" [build]="" [docs]="" [feat]="" [perf]="" [refactor]="" [style]="" [temp]="" [test]="" [ci]="" [others]="") 
-          declare -A categoryTitle=( [fix]="<h5>Bug Fixes</h5>" [build]="<h5>Build</h5>" [docs]="<h5>Documentation</h5>" [feat]="<h5>New Features</h5>" [chore]="<h5>Changes to build process or aux tools</h5>" [ci]="<h5>Changes to CI config</h5>" [temp]="<h5>Temporary commit</h5>" [perf]="<h5>Performance Enhancement</h5>" [revert]="<h5>Revert Commits</h5>" [refactor]="<h5>Refactored</h5>" [style]="<h5>Changed Style</h5>" [test]="<h5>Added Tests</h5>" [others]="<h5>Others</h5>") 
-          msg="#${{ steps.getMergedPR.outputs.number}} ${{ steps.getMergedPR.outputs.title}}"
-          for i in $(git log --format=%h $(git merge-base HEAD^1 HEAD^2)..HEAD^2)
-          do
-            IFS=":" read -r type cmmsg <<< $(git log --format=%B -n 1 $i)
-            type="${type}" | xargs
-            text_msg="&nbsp;&nbsp;&nbsp;&nbsp;&#8226; $i - ${cmmsg}<br/>"
-            flag=1
-            for i in "${!category[@]}"
-            do
-                if [ "${type}" == "$i" ]
-                then
-                    category[$i]+="${text_msg}"
-                    flag=0
-                    break
-                fi
-            done 
-                if [ $flag -eq 1 ]
-                then
-                    category[others]+="${text_msg}"
-                fi
-            done
-            for i in "${!category[@]}" 
-            do
-                if [ ! -z "${category[$i]}" ] && [ "others" != "$i" ]
-                    then
-                    msg+="${categoryTitle[$i]}${category[$i]}"
-                fi
-            done
-            if [ ! -z "${category[others]}" ]
-            then
-                msg+="${categoryTitle[others]}${category[others]}"
-            fi
-            echo "COMMIT_MESSAGE=${msg}" >> $GITHUB_ENV
-
       - name: Bump version and push tag
         run: |
           cd "$GITHUB_WORKSPACE"
           git config user.email "[email protected]"
           git config user.name "$GITHUB_ACTOR"
+          git pull
           npm version patch
           git push
 

.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

README.md

@@ -9,7 +9,7 @@
   </p>
 
   <p>
-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.
   </p>
 
 ---
@@ -33,7 +33,7 @@ An enterprise react template application showcasing - Testing strategies, Global
 
 </div>
 
-![React GraphQL TS Template CD](https://github.com/wednesday-solutions/react-graphql-ts-template/workflows/React%20GraphQL%20TypeScript%20Template%20CD/badge.svg)
+![ELECTRON REACT TS Template CD](https://github.com/wednesday-solutions/react-graphql-ts-template/workflows/React%20GraphQL%20TypeScript%20Template%20CD/badge.svg)
 
 <div>
 <img src='./badges/badge-statements.svg' height="20"/>
@@ -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)

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;
     }
   }
 `;

app/containers/HomeContainer/tests/__snapshots__/index.test.tsx.snap

@@ -48,7 +48,7 @@ exports[`<HomeContainer /> tests should render and match the snapshot 1`] = `
           class="HomeContainer__ButtonBox-sc-1ly6omb-3 gSuRgZ"
         >
           <button
-            class="ant-btn"
+            class="ant-btn ant-btn-default"
             data-testid="clear-sort"
             disabled=""
             type="button"