Skip to content

Commit

Permalink
Merge branch 'jvogt/clickup-card' of github.com:RoboJackets/apiary in…
Browse files Browse the repository at this point in the history
…to jvogt/clickup-card
  • Loading branch information
jvogt23 committed Aug 31, 2024
2 parents 8482fd9 + 1c00fec commit daed5da
Show file tree
Hide file tree
Showing 9 changed files with 454 additions and 442 deletions.
4 changes: 2 additions & 2 deletions .nomad/conf/.env.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ REDIS_PORT="-1"
REDIS_HOST="{{- index .ServiceMeta "socket" | trimSpace -}}"
{{ end }}
REDIS_PASSWORD="{{- key "redis/password" | trimSpace -}}"
{{- range service "meilisearch-v1-9" }}
{{- range service "meilisearch-v1-10" }}
MEILISEARCH_HOST="http://127.0.0.1:{{- .Port -}}"
{{ end }}
MEILISEARCH_KEY="{{- key "meilisearch/admin-key-v1.9" | trimSpace -}}"
MEILISEARCH_KEY="{{- key "meilisearch/admin-key-v1.10" | trimSpace -}}"
SESSION_SECURE_COOKIE="true"
SESSION_COOKIE="__Host-apiary_session"
{{ range $key, $value := (key (printf "apiary/%s" (slice (env "NOMAD_JOB_NAME") 7)) | parseJSON) -}}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN set -eux && \
npm install --no-progress && \
npm run production --no-progress

FROM node:20.16.0 AS frontend
FROM node:20.17.0 AS frontend

COPY --link --from=frontend-source /app/ /app/

Expand Down
10 changes: 10 additions & 0 deletions app/Http/Controllers/MerchandiseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ public function index(): JsonResponse
);
}

public function show(Merchandise $merchandise): JsonResponse
{
return response()->json(
[
'status' => 'success',
'merchandise' => MerchandiseResource::make($merchandise),
]
);
}

public function getDistribution(Merchandise $merchandise, User $user): JsonResponse
{
if (! $merchandise->distributable) {
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
"htmlmin/htmlmin": "dev-master",
"http-interop/http-factory-guzzle": "1.2.0",
"kiritokatklian/nova-permission": "4.0.10",
"laravel/framework": "11.20.0",
"laravel/framework": "11.21.0",
"laravel/horizon": "5.27.1",
"laravel/nova": "4.35.0",
"laravel/passport": "12.3.0",
"laravel/scout": "10.11.1",
"laravel/slack-notification-channel": "3.3.0",
"laravel/slack-notification-channel": "3.3.1",
"laravel/socialite": "5.15.1",
"laravel/tinker": "2.9.0",
"madewithlove/laravel-nova-uuid-support": "dev-l11-compatibility",
"meilisearch/meilisearch-php": "1.9.1",
"meilisearch/meilisearch-php": "1.10.0",
"mrclay/jsmin-php": "2.4.3",
"mwgg/airports": "1.0",
"realrashid/sweet-alert": "7.2.0",
Expand All @@ -61,9 +61,9 @@
"spatie/laravel-permission": "6.9.0",
"spatie/laravel-responsecache": "7.6.0",
"spatie/laravel-webhook-client": "3.4.2",
"square/square": "37.1.1.20240717",
"square/square": "38.0.0.20240821",
"subfission/cas": "5.0.0",
"symfony/http-client": "7.1.3",
"symfony/http-client": "7.1.4",
"symfony/postmark-mailer": "7.1.1",
"xammie/mailbook": "1.8.1"
},
Expand All @@ -75,10 +75,10 @@
"mockery/mockery": "1.6.12",
"mxl/laravel-job": "1.6.0",
"nunomaduro/collision": "8.1.1",
"larastan/larastan": "2.9.7",
"larastan/larastan": "2.9.8",
"phan/phan": "5.4.3",
"phpstan/extension-installer": "1.4.1",
"phpstan/phpstan": "1.11.4",
"phpstan/extension-installer": "1.4.2",
"phpstan/phpstan": "1.12.0",
"phpstan/phpstan-deprecation-rules": "1.2.0",
"phpstan/phpstan-strict-rules": "1.6.0",
"phpunit/phpunit": "10.5.20",
Expand Down
Loading

0 comments on commit daed5da

Please sign in to comment.