Combine glick-api and glick-app repos

jlbelanger · jlbelanger · commit d5d7df0172e4 · 2025-03-15T11:20:15.000-04:00
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -10,4 +10,6 @@ jobs:
         node-version: '22'
     - uses: actions/checkout@v3
     - run: yarn install
+      working-directory: app
     - run: yarn run lint
+      working-directory: app
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -11,5 +11,8 @@ jobs:
         php-version: '8.4'
     - uses: actions/checkout@v3
     - run: composer install
+      working-directory: api
     - run: ./vendor/bin/phpcs
+      working-directory: api
     - run: ./vendor/bin/phpunit --coverage-text
+      working-directory: api
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+TODO.md
+.gitcommit
diff --git a/COPYING b/COPYING
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Glick API
+# Glick
 
 [View the site](https://glick.jennybelanger.com/).
 
@@ -8,20 +8,21 @@
 
 - [Composer](https://getcomposer.org/)
 - [Git](https://git-scm.com/)
+- [Yarn](https://classic.yarnpkg.com/en/docs/install)
 - Database
 - Web server with PHP
 
 ### Setup
 
 ``` bash
-# Clone the API repo
-git clone https://github.com/jlbelanger/glick-api.git
-cd glick-api
+# Clone the repo
+git clone https://github.com/jlbelanger/glick.git
 
-# Configure the environment settings
+# Configure the PHP environment settings
+cd glick/api
 cp .env.example .env
 
-# Install dependencies
+# Install PHP dependencies
 composer install
 
 # Generate key
@@ -36,45 +37,75 @@ chown -R www-data:www-data storage
 
 # Create account with username "test" and password "password" (or reset existing account password to "password")
 php artisan auth:reset-admin
+
+# Configure the JS environment settings
+cd ../app
+cp .env.example .env
+cp .env.example .env.production
+cp cypress.env.example.json cypress.env.json
+
+# Install JS dependencies
+yarn install
+```
+
+### Run
+
+``` bash
+cd app && yarn start
 ```
 
-Then, setup the [Glick app](https://github.com/jlbelanger/glick-app).
+Your browser should automatically open http://localhost:3000/
 
 ### Lint
 
 ``` bash
-./vendor/bin/phpcs
+./api/vendor/bin/phpcs
+```
+
+``` bash
+cd app && yarn lint
 ```
 
 ### Test
 
 ``` bash
-./vendor/bin/phpunit
+./api/vendor/bin/phpunit
+```
+
+``` bash
+cd app && yarn test:cypress
 ```
 
 ## Deployment
 
 Essentially, to set up the repo on the server:
 
 ``` bash
-git clone https://github.com/jlbelanger/glick-api.git
-cd glick-api
+git clone https://github.com/jlbelanger/glick.git
+cd glick/api
 cp .env.example .env
 # Then configure the values in .env.
 composer install
 php artisan key:generate
 php artisan migrate
 chown -R www-data:www-data storage
+cd ../app
+cp .env.example .env
+# Then configure the values in .env.
+yarn build
 ```
 
 For subsequent deploys, push changes to the main branch, then run the following on the server:
 
 ``` bash
-cd glick-api
+cd glick
 git fetch origin
 git pull
+cd api
 composer install
 php artisan config:clear
+cd ../app
+yarn build
 ```
 
 ### Deploy script
diff --git a/api/composer.json b/api/composer.json
@@ -1,5 +1,5 @@
 {
-	"name": "jlbelanger/glick-api",
+	"name": "jlbelanger/glick",
 	"description": "Track occurrences of time-based events.",
 	"version": "1.0.0",
 	"type": "project",
diff --git a/app/README.md b/app/README.md
diff --git a/app/deploy.sh b/app/deploy.sh
diff --git a/app/package.json b/app/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@jlbelanger/glick-app",
+	"name": "@jlbelanger/glick",
 	"version": "1.0.0",
 	"description": "Track occurrences of time-based events.",
 	"license": "GPL-3.0-only",
@@ -10,7 +10,7 @@
 	},
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/jlbelanger/glick-app.git"
+		"url": "https://github.com/jlbelanger/glick.git"
 	},
 	"scripts": {
 		"start": "npx update-browserslist-db@latest && react-scripts start",
diff --git a/app/yarn.lock b/app/yarn.lock
@@ -3637,9 +3637,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001688:
-  version "1.0.30001700"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz"
-  integrity sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==
+  version "1.0.30001704"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz"
+  integrity sha512-+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew==
 
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
diff --git a/deploy.sh b/deploy.sh
@@ -5,14 +5,18 @@ APP_NAME=$(basename "${PWD}")
 
 source "${HOME}/Websites/infrastructure/deploy/config.sh"
 source "${HOME}/Websites/infrastructure/deploy/composer.sh"
+source "${HOME}/Websites/infrastructure/deploy/etc.sh"
 source "${HOME}/Websites/infrastructure/deploy/git.sh"
 source "${HOME}/Websites/infrastructure/deploy/laravel.sh"
+source "${HOME}/Websites/infrastructure/deploy/static.sh"
 
 check_git_branch
+build_static "app"
 check_git_changes
-set_laravel_permissions
+set_laravel_permissions "/api"
 deploy_git
-deploy_composer
-deploy_laravel
-clear_laravel_cache
+deploy_composer "/api"
+deploy_laravel "/api"
+clear_laravel_cache "/api"
+deploy_static "/app"
 printf "\e[0;32mDone.\n\e[0m"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.DS_Store`
	`2`	`+TODO.md`
	`3`	`+.gitcommit`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "jlbelanger/glick-api",`
	`2`	`+ "name": "jlbelanger/glick",`
`3`	`3`	`"description": "Track occurrences of time-based events.",`
`4`	`4`	`"version": "1.0.0",`
`5`	`5`	`"type": "project",`