From b872f377b2b88922eb4468396fd9397e0bebf9f6 Mon Sep 17 00:00:00 2001
From: hayano <hayano3255@gmail.com>
Date: Tue, 29 Oct 2024 00:56:12 +0000
Subject: [PATCH] Supervisor update 2

---
 Dockerfile.supervisor           |   9 +++++++++
 config/settings.py              |   6 ++++--
 docker-compose.yaml             |   2 ++
 rog/.serializers.py.swp         | Bin 0 -> 16384 bytes
 rog/.urls.py.swp                | Bin 0 -> 16384 bytes
 rog/.views.py.swp               | Bin 0 -> 16384 bytes
 rog/urls.py                     |   7 ++++++-
 rog/views.py                    |  20 +++++++++++++++++---
 supervisor/html/.index.html.swp | Bin 0 -> 16384 bytes
 supervisor/html/index.html      |  20 +++++++++++++++++---
 supervisor/nginx/default.conf   |   6 ++++++
 11 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 rog/.serializers.py.swp
 create mode 100644 rog/.urls.py.swp
 create mode 100644 rog/.views.py.swp
 create mode 100644 supervisor/html/.index.html.swp

diff --git a/Dockerfile.supervisor b/Dockerfile.supervisor
index a1c088b..6d18f76 100644
--- a/Dockerfile.supervisor
+++ b/Dockerfile.supervisor
@@ -13,6 +13,15 @@ RUN mkdir -p /usr/share/nginx/html \
 COPY supervisor/html/* /usr/share/nginx/html/
 COPY supervisor/nginx/default.conf /etc/nginx/conf.d/default.conf
 
+# メディアディレクトリを作成
+RUN mkdir -p /app/media && chmod 755 /app/media
+
+# 静的ファイルをコピー
+#COPY ./static /usr/share/nginx/html/static
+
+# 権限の設定
+RUN chown -R nginx:nginx /app/media
+
 # Set final permissions
 RUN chown -R nginx:nginx /usr/share/nginx/html \
     && chmod -R 755 /usr/share/nginx/html \
diff --git a/config/settings.py b/config/settings.py
index 44ad25b..6c6985a 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -179,10 +179,12 @@ USE_TZ = True
 STATIC_URL = '/static/'
 
 #STATIC_URL = '/static2/'
-STATIC_ROOT = BASE_DIR / "static"
+#STATIC_ROOT = BASE_DIR / "static"
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 MEDIA_URL = '/media/'
-MEDIA_ROOT = BASE_DIR / "media/"
+#MEDIA_ROOT = BASE_DIR / "media/"
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
 #STATICFILES_DIRS = (os.path.join(BASE_DIR, "static2"),os.path.join(BASE_DIR, "media"))
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3f59ebb..44e07a1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -53,6 +53,7 @@ services:
         - type: volume
           source: nginx_logs
           target: /var/log/nginx
+        - media_data:/app/media:ro
       ports:
         - "80:80"
       depends_on:
@@ -72,3 +73,4 @@ volumes:
   geoserver-data:
   static_volume:
   nginx_logs:
+  media_data:
diff --git a/rog/.serializers.py.swp b/rog/.serializers.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..cb59a7d2a317ef7346346fef68fa2e91d09bbbdc
GIT binary patch
literal 16384
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
Pn5tWbji#RZ<CA{_{6Uh9

literal 0
HcmV?d00001

diff --git a/rog/.urls.py.swp b/rog/.urls.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..6b690aae213d4cf557d5843d01ea693d347e242a
GIT binary patch
literal 16384
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
Oh$2V2qA0SUD*PL1@|AJ`

literal 0
HcmV?d00001

diff --git a/rog/.views.py.swp b/rog/.views.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..d010457559dd8ff51111f170086a58952fe612f2
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/rog/urls.py b/rog/urls.py
index 1cb6e8e..863d91d 100644
--- a/rog/urls.py
+++ b/rog/urls.py
@@ -11,10 +11,11 @@ from .views import TestActionViewSet
 
 from .views import OwnerEntriesView, OwnerTeamsView, OwnerMembersView
 
-from django.urls import path
 from . import views
 #from .views import NewEvent2AdminView
 
+from django.conf import settings
+from django.conf.urls.static import static
 
 router = DefaultRouter()
 router.register(r'newevent2', views.NewEvent2ViewSet)
@@ -124,3 +125,7 @@ urlpatterns += [
     # for Supervisor Web app
     path('test/', views.test_api, name='test_api'),
 ]
+
+if settings.DEBUG:
+    # 開発環境でのメディアファイル提供
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/rog/views.py b/rog/views.py
index d58c5b7..16a4e23 100644
--- a/rog/views.py
+++ b/rog/views.py
@@ -88,6 +88,7 @@ import xlsxwriter
 from io import BytesIO
 
 from django.urls import get_resolver
+import os
 
 logger = logging.getLogger(__name__)
 
@@ -2381,6 +2382,19 @@ def get_team_info(request, zekken_number):
 
         team = Team.objects.get(id=self.kwargs['team_id'])
 
+def get_image_url(image_path):
+    """画像URLを生成する補助関数"""
+    if not image_path:
+        return None
+    
+    # 開発環境用のパス生成
+    if settings.DEBUG:
+        return os.path.join(settings.MEDIA_URL, str(image_path))
+    
+    # 本番環境用のパス生成
+    return f"{settings.MEDIA_URL}{image_path}"
+
+
 @api_view(['GET'])
 def get_checkins(request, *args, **kwargs):
 #def get_checkins(request, zekken_number, event_code):
@@ -2437,14 +2451,14 @@ def get_checkins(request, *args, **kwargs):
                     'points': c.points or 0,
                     'buy_flag': c.buy_flag,
                     'photos': location.photos if location else None,
-                    'image_address': c.image_address,
-                    'receipt_address': c.image_receipt,
+                    'image_address': get_image_url(c.image_address),
+                    'receipt_address': get_image_url(c.image_receipt),
                     'location_name': location.location_name if location else None,
                     'checkin_point': location.checkin_point if location else None,
                     'buy_point': location.buy_point
                 })
 
-        logger.debug(f"data={data}")
+        #logger.debug(f"data={data}")
         return Response(data)
 
     except Exception as e:
diff --git a/supervisor/html/.index.html.swp b/supervisor/html/.index.html.swp
new file mode 100644
index 0000000000000000000000000000000000000000..56342d9b5ae84155f32f1b585d0bfaea8e892995
GIT binary patch
literal 16384
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
W&wOZ|K4Igb?AuUt=-}ZoG<_Gc$iL_S

literal 0
HcmV?d00001

diff --git a/supervisor/html/index.html b/supervisor/html/index.html
index 2d5b64f..7fed476 100755
--- a/supervisor/html/index.html
+++ b/supervisor/html/index.html
@@ -257,8 +257,8 @@
                     tr.innerHTML = `
                         <td class="px-6 py-4">${checkin.path_order}</td>
                         <td class="px-6 py-4">
-                            ${location.photos ? 
-                                `<img src="${checkin.photos}" class="h-20 w-20 object-cover rounded">` : ''}
+                            ${checkin.photos ? 
+                                `<img src="/media/compressed/${checkin.photos}" class="h-20 w-20 object-cover rounded" onclick="showLargeImage(this.src)">` : ''}
 			    <div class="text-sm">${checkin.photos}</div>
                         </td>
                         <td class="px-6 py-4">
@@ -424,7 +424,21 @@
                     calculateTotalPoints();
                 });
         }
-        
+
+        // 画像拡大表示用のモーダル関数
+        function showLargeImage(src) {
+            const modal = document.createElement('div');
+            modal.classList.add('fixed', 'inset-0', 'bg-black', 'bg-opacity-75', 'flex', 'items-center', 'justify-center', 'z-50');
+            
+            const img = document.createElement('img');
+            img.src = src;
+            img.classList.add('max-w-3xl', 'max-h-[90vh]', 'object-contain');
+            
+            modal.appendChild(img);
+            modal.onclick = () => modal.remove();
+            document.body.appendChild(modal);
+        }
+
         // 新規CP追加用のモーダル
         function showAddCPModal() {
             const modal = document.createElement('div');
diff --git a/supervisor/nginx/default.conf b/supervisor/nginx/default.conf
index cb99160..e59c853 100644
--- a/supervisor/nginx/default.conf
+++ b/supervisor/nginx/default.conf
@@ -46,6 +46,12 @@ server {
         index index.html;
     }
 
+    location = /media/ {
+        alias /app/media/;  # MEDIA_ROOT のパス
+        expires 30d;  # キャッシュの設定
+        add_header Cache-Control "public, no-transform";
+    }
+
     error_page 404 /404.html;
     error_page 500 502 503 504 /50x.html;
     location = /50x.html {