Compare commits
	
		
			2 Commits
		
	
	
		
			#172-deplo
			...
			309c68d3fd
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 309c68d3fd | |||
| 4516df29d9 | 
| @@ -67,3 +67,9 @@ SLACK_ENABLED=true | ||||
| SLACK_CLIENT_TOKEN= | ||||
| SLACK_SIGNING_SECRET= | ||||
| SLACK_DEFAULT_CHANNEL="#general" | ||||
|  | ||||
| HEROKU_RELEASE_VERSION=v01 | ||||
| HEROKU_SLUG_DESCRIPTION="Dev 643f546" | ||||
| HEROKU_RELEASE_CREATED_AT=2022-07-04T18:05:46Z | ||||
| HEROKU_SLUG_COMMIT=643f546142b8a2db342f0ae46f01e61dce03e97c | ||||
| GITHUB_REPO_URL=https://github.com/blumilksoftware/toby/ | ||||
|   | ||||
| @@ -6,6 +6,7 @@ namespace Toby\Infrastructure\Http\Middleware; | ||||
|  | ||||
| use Closure; | ||||
| use Illuminate\Http\Request; | ||||
| use Illuminate\Support\Carbon; | ||||
| use Inertia\Middleware; | ||||
| use Toby\Domain\VacationRequestStatesRetriever; | ||||
| use Toby\Eloquent\Helpers\YearPeriodRetriever; | ||||
| @@ -25,6 +26,7 @@ class HandleInertiaRequests extends Middleware | ||||
|             "flash" => $this->getFlashData($request), | ||||
|             "years" => $this->getYearsData($request), | ||||
|             "vacationRequestsCount" => $this->getVacationRequestsCount($request), | ||||
|             "deployInformation" => $this->getDeployInformation(), | ||||
|         ]); | ||||
|     } | ||||
|  | ||||
| @@ -71,4 +73,17 @@ class HandleInertiaRequests extends Middleware | ||||
|             ->count() | ||||
|         : null; | ||||
|     } | ||||
|  | ||||
|     protected function getDeployInformation(): array | ||||
|     { | ||||
|         $releaseDate = config("heroku.release_created_at"); | ||||
|  | ||||
|         return [ | ||||
|             "release_version" => config("heroku.release_version"), | ||||
|             "slug_description" => config("heroku.slug_description"), | ||||
|             "release_created_at" => $releaseDate ? Carbon::parse($releaseDate)->format('Y-m-d H:i:s') : null, | ||||
|             "slug_commit" => config("heroku.slug_commit"), | ||||
|             "github_url" => preg_replace("/\/$/i", "", config("heroku.github_url", "")), | ||||
|         ]; | ||||
|     } | ||||
| } | ||||
|   | ||||
							
								
								
									
										11
									
								
								config/heroku.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								config/heroku.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | ||||
| <?php | ||||
|  | ||||
| declare(strict_types=1); | ||||
|  | ||||
| return [ | ||||
|     "release_version" => env("HEROKU_RELEASE_VERSION"), | ||||
|     "slug_description" => env("HEROKU_SLUG_DESCRIPTION"), | ||||
|     "release_created_at" => env("HEROKU_RELEASE_CREATED_AT"), | ||||
|     "slug_commit" => env("HEROKU_SLUG_COMMIT"), | ||||
|     "github_url" => env("GITHUB_REPO_URL") | ||||
| ]; | ||||
| @@ -9,6 +9,30 @@ | ||||
|       <div class="lg:px-4"> | ||||
|         <slot /> | ||||
|       </div> | ||||
|       <div class="p-4 text-xs text-gray-500 flex align-baseline gap-x-1"> | ||||
|         <p> | ||||
|           <strong>Wydanie:</strong> <a | ||||
|             v-if="deployInformation.github_url" | ||||
|             :href="`${deployInformation.github_url}/commit/${deployInformation.slug_commit}`" | ||||
|             target="_blank" | ||||
|             rel="noopener nofollow noreferrer" | ||||
|             :title="`Commit: ${deployInformation.slug_commit}`" | ||||
|           > | ||||
|             {{ deployInformation.slug_description }} ({{ deployInformation.release_version }}) | ||||
|           </a><span | ||||
|             v-else | ||||
|             :title="`Commit: ${deployInformation.slug_commit}`" | ||||
|           > | ||||
|             {{ deployInformation.slug_description }} | ||||
|           </span> | ||||
|         </p> | ||||
|         <p | ||||
|           v-if="deployInformation.release_created_at" | ||||
|           class="border-l-2 border-gray-300 pl-1" | ||||
|         > | ||||
|           <strong>Data wydania:</strong> {{ deployInformation.release_created_at }} | ||||
|         </p> | ||||
|       </div> | ||||
|     </main> | ||||
|   </div> | ||||
| </template> | ||||
| @@ -23,6 +47,7 @@ const props = defineProps({ | ||||
|   auth: Object, | ||||
|   years: Object, | ||||
|   vacationRequestsCount: Number, | ||||
|   deployInformation: Object, | ||||
| }) | ||||
|  | ||||
| const toast = useToast() | ||||
|   | ||||
| @@ -1,5 +1,32 @@ | ||||
| <template> | ||||
|   <div class="flex flex-col justify-center py-12 min-h-screen bg-blumilk-25 sm:px-6 lg:px-8"> | ||||
|   <div class="relative flex flex-col justify-center py-12 min-h-screen bg-blumilk-25 sm:px-6 lg:px-8"> | ||||
|     <slot /> | ||||
|     <div class="absolute left-0 bottom-0 min-w-full p-4 text-xs text-gray-500 flex flex-col gap-x-1"> | ||||
|       <p> | ||||
|         <strong>Wydanie:</strong> <a | ||||
|           v-if="deployInformation.github_url" | ||||
|           :href="`${deployInformation.github_url}/commit/${deployInformation.slug_commit}`" | ||||
|           target="_blank" | ||||
|           rel="noopener nofollow noreferrer" | ||||
|           :title="`Commit: ${deployInformation.slug_commit}`" | ||||
|         > | ||||
|           {{ deployInformation.slug_description }} ({{ deployInformation.release_version }}) | ||||
|         </a> | ||||
|         <span | ||||
|           v-else | ||||
|           :title="`Commit: ${deployInformation.slug_commit}`" | ||||
|         > | ||||
|           {{ deployInformation.slug_description }} | ||||
|         </span> | ||||
|       </p> | ||||
|       <p v-if="deployInformation.release_created_at"> | ||||
|         <strong>Data wydania:</strong> {{ deployInformation.release_created_at }} | ||||
|       </p> | ||||
|     </div> | ||||
|   </div> | ||||
| </template> | ||||
| <script setup> | ||||
| defineProps({ | ||||
|   deployInformation: Object, | ||||
| }) | ||||
| </script> | ||||
		Reference in New Issue
	
	Block a user