Updates: (#24)

- Rename repo to `base-app-monorepo` to reflect what it is now
- Update scripts
- `client-seo`: move `pages` to inside `src` since next 9.3.4 supports it
- Rename folders in `common` to use dashes instead of camel case

Author: eddeee888

.env

@@ -1,7 +1,7 @@
 # GENERAL
-SERVER_NAME=https://bra.com.vm
-MAIN_SERVER_NAME=bra.com.vm
-GRAPHQL_ENDPOINT=https://bra.com.vm/graphql
+SERVER_NAME=https://bam.com.vm
+MAIN_SERVER_NAME=bam.com.vm
+GRAPHQL_ENDPOINT=https://bam.com.vm/graphql
 
 # AWS
 AWS_S3_IMAGES_GET_SIGNED_URL='' # Endpoint to sign URL to upload to S3
@@ -15,7 +15,7 @@ JWT_SECRET=SUPER_SECRET_JWT
 PRISMA_SERVICE_NAME=prisma
 PRISMA_SECRET=PrismaSecret
 PRISMA_PORT=4466
-PRISMA_ENDPOINT=http://prisma:4466/bra/dev
+PRISMA_ENDPOINT=http://prisma:4466/bam/dev
 
 # SERVER
 SERVER_SERVICE_NAME=server

.gitattributes

@@ -0,0 +1,3 @@
+client/src/routes/**/*.* linguist-generated
+client-seo/src/routes/**/*.* linguist-generated
+server/src/routes/**/*.* linguist-generated

README.md

@@ -1,4 +1,4 @@
-# Base React App
+# Base App Monorepo
 
 Note: This setup is for Mac, you will have to do the equivalent if you use Linux or Windows
 
@@ -29,13 +29,13 @@ More on how it works [here](./docs/INIT.md)
 We use Docker machine since it gives us better performance compared to Docker for Mac. We create the machine and DNS resolver using the following command:
 
 ```
-$ bra vm-up
+$ bam vm-up
 ```
 
 Then, we switch into the docker-machine environment by running:
 
 ```
-$ eval $(docker-machine env bra)
+$ eval $(docker-machine env bam)
 ```
 
 Running `docker` commands should now work. For example:
@@ -49,40 +49,34 @@ $ docker ps
 To keep things simple, we do not share common components/functions/settings via published npm packages. Instead, `/common` serves as the place where commons live. When changes happen in source folders, they would get copied into target folders. Settings can be found and extended [here](./common/watcher.js#L13-L20). To start, run the following:
 
 ```
-$ bra ws common:watch
+$ bam ws common:watch
 ```
 
 #### Turn on the containers the first time
 
 ```
-$ bra build
-$ bra up
+$ bam build
+$ bam up
 ```
 
 Once they have successfully built, go to the following URL from your favourite browser:
 
 ```
-https://bra.com.vm/
+https://bam.com.vm/
 ```
 
 #### Generate dummy data
 
 Here's the script to generate some dummy data to get started!
 
 ```
-$ bra init-data
-```
-
-#### Start containers without building
-
-```
-$ bra start
+$ bam init-data
 ```
 
 #### Turn off everything
 
 ```
-$ bra vm-down
+$ bam vm-down
 ```
 
 ### Routing
@@ -92,7 +86,7 @@ It is easy to make mistake when routing between multiple apps. Inner-app routing
 The config can be found [here](./route-manager/route-codegen.yml). After making changes, run the following to generate route modules:
 
 ```
-bra ws routegen
+bam ws routegen
 ```
 
 Read more about [route-codegen](https://github.com/eddeee888/route-codegen)

TODO.md

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # We are running this from /usr/local/bin
-CORE_CMD_NAME="bra"
+CORE_CMD_NAME="bam"
 
 
 function display_help(){

bin/core.sh

@@ -1,16 +1,11 @@
 #!/bin/bash
 
 function dm_create(){
-    local cmd_create="docker-machine create --driver=virtualbox --virtualbox-cpu-count=2 --virtualbox-memory 4096 --virtualbox-disk-size=100000 $1"
+    local cmd_create="docker-machine create --driver=virtualbox --virtualbox-cpu-count=4 --virtualbox-memory 8192 --virtualbox-disk-size=100000 $1"
     echo "*** Creating new docker machine called \"$1\"..."
     echo $cmd_create
     eval $cmd_create
 
-    local cmd_increase_watchers="docker-machine ssh $1 'echo fs.inotify.max_user_watches=1048576 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p'"
-    echo "*** Increasing IO Notify watch limit on docker machine"
-    echo $cmd_increase_watchers
-    eval $cmd_increase_watchers
-
     echo ""
     echo "Docker machine \"$1\" can now be used!"
     echo ""

bin/dm-create.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-CORE_CMD_NAME="bra"
+CORE_CMD_NAME="bam"
 USR_BIN="/usr/local/bin"
-COMMON_NAME="bra.com.vm"
+COMMON_NAME="bam.com.vm"
 TOP_LEVEL_DOMAIN="vm"
 DNS_PORT=53535
 DNS_CONTAINER_NAME="${TOP_LEVEL_DOMAIN}-dnsmasq" 

bin/utils/constants.sh

@@ -74,7 +74,18 @@ function create_resolver_file {
   echo "---"
 }
 
+function increase_watchers {
+  local cmd_increase_watchers="docker-machine ssh $CORE_CMD_NAME 'echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p'"
+  echo "*** Increasing IO Notify watch limit on docker machine"
+  echo ""
+  echo $cmd_increase_watchers
+  eval $cmd_increase_watchers
+  echo ""
+  echo "---"
+}
+
 start_docker_machine
 docker_machine_env
 set_up_dnsmasq
-create_resolver_file
+create_resolver_file
+increase_watchers

bin/vm-up.sh

@@ -1,4 +1,4 @@
-FROM node:12.8.0-alpine AS base
+FROM node:13.12.0-alpine3.11 AS base
 
 RUN apk update \ 
   && apk add bash \

client-seo/Dockerfile

@@ -5,16 +5,16 @@ module.exports = {
     config.module.rules.push({
       test: /\.(graphql|gql)$/,
       exclude: /node_modules/,
-      loader: 'graphql-tag/loader'
+      loader: "graphql-tag/loader",
     });
 
     return config;
   },
   webpackDevMiddleware: (config) => {
     config.watchOptions = {
       poll: 1000,
-      aggregateTimeout: 1000
+      aggregateTimeout: 1000,
     };
     return config;
-  }
+  },
 };