Update storage location rendering and Docker configuration

chaostreff-flensburg · Mar 22, 2024 · 9d5ea5d · 9d5ea5d
1 parent fd5a920
commit 9d5ea5d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/app/Livewire/StorageLocations.php b/app/Livewire/StorageLocations.php
@@ -21,7 +21,6 @@ public function render()
 
         if ($this->term) {
             $this->storageLocations = StorageLocation::where('name', 'like', '%'.$this->term.'%')
-                ->with('tags')
                 ->get();
         } else {
             $this->storageLocations = StorageLocation::all();

diff --git a/docker-compose.live.yml b/docker-compose.live.yml
@@ -9,16 +9,15 @@ volumes:
 
 services:
   ausleihe:
-    # image: ghcr.io/chaostreff-flensburg/simple-borrow:latest
-    image: simple-borrow:latest
+    image: ghcr.io/chaostreff-flensburg/simple-borrow:latest
     restart: always
     volumes:
       - storage:/var/www/html/storage
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.ausleihe.rule=Host(`ausleihe.chaostreff-flensburg.de`)"
       - "traefik.http.routers.ausleihe.entrypoints=https,http"
-      - "traefik.http.services.ausleihe.loadbalancer.server.port=80"
+      - "traefik.http.services.ausleihe.loadbalancer.server.port=9000"
       - "traefik.http.routers.ausleihe.tls.certresolver=mytlschallenge"
       - "traefik.docker.network=web"
     networks:
@@ -32,8 +31,7 @@ services:
     command: ["bash", "/var/www/html/docker/startup.sh"]
 
   schedule:
-    # image: ghcr.io/chaostreff-flensburg/simple-borrow:latest
-    image: simple-borrow:latest
+    image: ghcr.io/chaostreff-flensburg/simple-borrow:latest
     restart: always
     volumes:
       - storage:/var/www/html/storage
@@ -47,8 +45,7 @@ services:
     command: ["bash", "/var/www/html/docker/schedule.sh"]
 
   queue:
-    # image: ghcr.io/chaostreff-flensburg/simple-borrow:latest
-    image: simple-borrow:latest
+    image: ghcr.io/chaostreff-flensburg/simple-borrow:latest
     restart: always
     depends_on:
       - ausleihe

diff --git a/resources/views/livewire/storage-locations.blade.php b/resources/views/livewire/storage-locations.blade.php
@@ -8,7 +8,7 @@
                 <h2 class="card-title"><a href="/items/{{ $storageLocation->id }}">{{ $storageLocation->name }}</a></h2>
                 <p>{{ $storageLocation->description }}</p>
                 <div class="card-actions justify-between items-end">
-                    <a href="/items/{{ $storageLocation->id }}" class="btn btn-primary">Details</a>
+                    <a href="{{ route('storageLocation.show', ['storageLocation' => $storageLocation]) }}" class="btn btn-primary">Details</a>
                 </div>
             </div>
         </div>