#48 - heroku deployment (#70)

* test

* #48 - deployment

* #48 - fixes

* #48 - prod assets

* #48 - readme for heroku deployment

* #48 - fix

* #48 - ecs fix

* #48 - fix

* #48 - fix

* #48 - cr fix

* #48 - remove predis dependency

.gitignore

@@ -15,5 +15,6 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+google-credentials.json
 .idea/
 .composer

Procfile

@@ -0,0 +1,3 @@
+web: vendor/bin/heroku-php-nginx -C environment/prod/nginx.conf public/
+release: php artisan migrate --force && php artisan cache:clear && php artisan config:cache
+worker: php artisan queue:work

app/Eloquent/Observers/UserObserver.php

@@ -4,19 +4,19 @@ declare(strict_types=1);
 
 namespace Toby\Eloquent\Observers;
 
-use Toby\Eloquent\Helpers\YearPeriodRetriever;
 use Toby\Eloquent\Models\User;
+use Toby\Eloquent\Models\YearPeriod;
 
 class UserObserver
 {
-    public function __construct(
-        protected YearPeriodRetriever $yearPeriodRetriever,
-    ) {}
-
     public function created(User $user): void
     {
-        $user->vacationLimits()->create([
+        $yearPeriods = YearPeriod::all();
-            "year_period_id" => $this->yearPeriodRetriever->current()->id,
+
-        ]);
+        foreach ($yearPeriods as $yearPeriod) {
+            $user->vacationLimits()->create([
+                "year_period_id" => $yearPeriod->id,
+            ]);
+        }
     }
 }

app/Infrastructure/Http/Controllers/DashboardController.php

@@ -50,7 +50,7 @@ class DashboardController extends Controller
 
         $holidays = Holiday::query()
             ->whereDate("date", ">=", $now)
-            ->latest()
+            ->orderBy("date")
             ->limit(3)
             ->get();
 

app/Infrastructure/Http/Middleware/TrustProxies.php

@@ -9,12 +9,6 @@ use Symfony\Component\HttpFoundation\Request;
 
 class TrustProxies extends Middleware
 {
-    protected $proxies;
+    protected $proxies = "*";
-
+    protected $headers = Request::HEADER_X_FORWARDED_AWS_ELB;
-    protected $headers =
-        Request::HEADER_X_FORWARDED_FOR |
-        Request::HEADER_X_FORWARDED_HOST |
-        Request::HEADER_X_FORWARDED_PORT |
-        Request::HEADER_X_FORWARDED_PROTO |
-        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

composer.json

@@ -7,6 +7,7 @@
     "require": {
         "php": "^8.1",
         "ext-pdo": "*",
+        "ext-redis": "*",
         "azuyalabs/yasumi": "^2.4",
         "barryvdh/laravel-dompdf": "^1.0",
         "fruitcake/laravel-cors": "^2.0",
@@ -24,12 +25,12 @@
     },
     "require-dev": {
         "blumilksoftware/codestyle": "^0.10.0",
-        "spatie/laravel-ignition": "^1.0",
+        "fakerphp/faker": "^1.19",
-        "fakerphp/faker": "^1.9.1",
         "laravel/dusk": "^6.21",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^6.1",
-        "phpunit/phpunit": "^9.5.10"
+        "phpunit/phpunit": "^9.5.10",
+        "spatie/laravel-ignition": "^1.0"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "937eef6310bd4bb12f1d0ccb623946d1",
+    "content-hash": "45ec654a060d5985bc58fec1f42d8219",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -10983,7 +10983,8 @@
     "prefer-lowest": false,
     "platform": {
         "php": "^8.1",
-        "ext-pdo": "*"
+        "ext-pdo": "*",
+        "ext-redis": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.1.0"

config/google-calendar.php

@@ -6,14 +6,9 @@ return [
     "default_auth_profile" => env("GOOGLE_CALENDAR_AUTH_PROFILE", "service_account"),
     "auth_profiles" => [
         "service_account" => [
-            "credentials_json" => storage_path("app/google-calendar/service-account-credentials.json"),
+            "credentials_json" => base_path("google-credentials.json"),
-        ],
-        "oauth" => [
-            "credentials_json" => storage_path("app/google-calendar/oauth-credentials.json"),
-            "token_json" => storage_path("app/google-calendar/oauth-token.json"),
         ],
     ],
-
     "calendar_id" => env("GOOGLE_CALENDAR_ID"),
     "user_to_impersonate" => env("GOOGLE_CALENDAR_IMPERSONATE"),
 ];

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     container_name: toby-web
     working_dir: /application
     volumes:
-      - ./docker/dev/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ./environment/dev/nginx/nginx.conf:/etc/nginx/conf.d/default.conf
       - .:/application
     networks:
       - toby-dev
@@ -19,7 +19,7 @@ services:
 
   php:
     build:
-      context: docker/dev/php
+      context: environment/dev/php
       args:
         INSTALL_XDEBUG: ${DOCKER_INSTALL_XDEBUG:-false}
     container_name: toby-php
@@ -27,7 +27,7 @@ services:
     user: ${CURRENT_UID:-1000}
     volumes:
       - .:/application
-      - ./docker/dev/php/php.ini:/usr/local/etc/php/conf.d/php.ini
+      - ./environment/dev/php/php.ini:/usr/local/etc/php/conf.d/php.ini
     networks:
       - toby-dev
     extra_hosts:

environment/prod/nginx.conf

@@ -0,0 +1,10 @@
+if ($http_x_forwarded_proto != 'https') {
+    rewrite ^ https://$host$request_uri? permanent;
+}
+
+location / {
+    try_files $uri @rewriteapp;
+}
+location @rewriteapp {
+    rewrite ^(.*)$ /index.php$1 last;
+}

environment/prod/readme.md

@@ -0,0 +1,45 @@
+# Heroku deployment
+
+## Addons
+
+* Heroku Postgres
+* Heroku Redis
+    
+## Dynos
+
+* web (app)
+* worker (queue worker)
+
+## Buildpacks
+* heroku/php
+* heroku/nodejs
+* https://github.com/buyersight/heroku-google-application-credentials-buildpack.git
+
+## Config vars
+* APP_DEBUG=false
+* APP_ENV=production
+* APP_KEY=
+* APP_NAME="Toby HR application"
+* APP_URL=
+* ASSET_URL=
+* BROADCAST_DRIVER=log
+* CACHE_DRIVER=redis
+* DATABASE_URL=
+* DB_CONNECTION=pgsql
+* DB_DATABASE=
+* DB_HOST=
+* DB_PORT=
+* DB_USER=
+* FILESYSTEM_DISK=local
+* GOOGLE_CALENDAR_ID=
+* GOOGLE_CLIENT_ID=
+* GOOGLE_CLIENT_SECRET=
+* GOOGLE_CREDENTIALS=
+* GOOGLE_REDIRECT=
+* LOG_CHANNEL=errorlog
+* LOG_LEVEL=info
+* MAIL_MAILER=log
+* QUEUE_CONNECTION=redis
+* REDIS_URL=
+* SESSION_DRIVER=redis
+* SESSION_LIFETIME=120

package.json

@@ -9,7 +9,8 @@
         "prod": "npm run production",
         "production": "mix --production",
         "lint": "./node_modules/.bin/eslint resources/js --ext .js,.vue",
-        "lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix"
+        "lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix",
+        "postinstall": "npm run prod"
     },
     "dependencies": {
         "@headlessui/vue": "^1.5.0",

readme.md

@@ -53,14 +53,14 @@ Directory structure little differs from a standard Laravel tree. We decided to r
 
       dcr node npm run dev
 
-- place google credentials here: `/storage/app/google-calendar/service-account-credentials.json` ([how to obtain the credentials](https://github.com/spatie/laravel-google-calendar#how-to-obtain-the-credentials-to-communicate-with-google-calendar))
+- place google credentials here: `/google-credentials.json` ([how to obtain the credentials](https://github.com/spatie/laravel-google-calendar#how-to-obtain-the-credentials-to-communicate-with-google-calendar))
 
 ### Available containers (local)
 
 - **web** - nginx HTTP server
 - **php** - php and composer stuff
 - **node** - npm stuff
-- **mysql** - database for local development
+- **pgsql** - database for local development
 - **mailhog** - for emails preview
 
 ### Running tests

resources/js/Composables/statusInfo.js

@@ -125,7 +125,7 @@ const statuses = [
 
 export function useStatusInfo() {
   const getStatues = () => statuses
-  const findStatus = value => statuses.find(month => month.value === value)
+  const findStatus = value => statuses.find(status => status.value === value)
 
   return {
     getStatues,

resources/js/Pages/VacationRequest/Create.vue

@@ -372,7 +372,7 @@ export default {
   setup(props) {
     const form = useForm({
       user: props.can.createOnBehalfOfEmployee
-        ? props.users.data.find(user => user.id === props.auth.user.id)
+        ? props.users.data.find(user => user.id === props.auth.user.id) ?? props.users.data[0]
         : props.auth.user,
       from: null,
       to: null,