Ooguni7

.devcontainer/compose.yaml

@@ -1,4 +1,4 @@
-name: "matsue_onsen_map"
+name: "matsue_gourmet_map"
 
 services:
   rails-app:
@@ -7,9 +7,8 @@ services:
       dockerfile: .devcontainer/Dockerfile
 
     volumes:
-    - ../..:/workspaces:cached
-
-    # Overrides default command so things don't shut down after the process ends.
+      - ../..:/workspaces:cached
+      # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
     # Uncomment the next line to use a non-root user for all processes.
@@ -18,8 +17,8 @@ services:
     # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
     depends_on:
-    - selenium
-    - postgres
+      - selenium
+      - postgres
 
   selenium:
     image: selenium/standalone-chromium
@@ -29,12 +28,12 @@ services:
     image: postgres:16.1
     restart: unless-stopped
     networks:
-    - default
+      - default
     volumes:
-    - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql/data
     environment:
-        POSTGRES_USER: postgres
-        POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
 
 volumes:
   postgres-data:

.devcontainer/devcontainer.json

@@ -1,36 +1,32 @@
 // For format details, see https://containers.dev/implementors/json_reference/.
 // For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/ruby
 {
-  "name": "matsue_onsen_map",
+  "name": "matsue_gourmet_map",
   "dockerComposeFile": "compose.yaml",
   "service": "rails-app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
-
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/rails/devcontainer/features/activestorage": {},
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
     "ghcr.io/rails/devcontainer/features/postgres-client": {}
   },
-
   "containerEnv": {
     "CAPYBARA_SERVER_PORT": "45678",
     "SELENIUM_HOST": "selenium",
     "KAMAL_REGISTRY_PASSWORD": "$KAMAL_REGISTRY_PASSWORD",
     "DB_HOST": "postgres"
   },
-
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  "forwardPorts": [3000, 5432],
-
+  "forwardPorts": [
+    3000,
+    5432
+  ],
   // Configure tool-specific properties.
   // "customizations": {},
-
   // Uncomment to connect as root instead. More info: https://containers.dev/implementors/json_reference/#remoteUser.
   // "remoteUser": "root",
-
-
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": "bin/setup --skip-server"
-}
+}

Gemfile

@@ -1,5 +1,11 @@
 source "https://rubygems.org"
 
+# 地図gem
+gem "geocoder"
+
+# dotenv
+gem "dotenv-rails", groups: [ :development, :test ]
+
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "~> 8.0.2"
 # The modern asset pipeline for Rails [https://github.com/rails/propshaft]

Gemfile.lock

@@ -103,11 +103,15 @@ GEM
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
     crass (1.0.6)
+    csv (3.3.5)
     date (3.4.1)
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     dotenv (3.1.8)
+    dotenv-rails (3.1.8)
+      dotenv (= 3.1.8)
+      railties (>= 6.1)
     drb (2.2.3)
     ed25519 (1.4.0)
     erb (5.0.2)
@@ -123,6 +127,9 @@ GEM
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
+    geocoder (1.8.5)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     htmlbeautifier (1.4.3)
@@ -386,6 +393,8 @@ DEPENDENCIES
   brakeman
   capybara
   debug
+  dotenv-rails
+  geocoder
   htmlbeautifier
   image_processing (~> 1.2)
   importmap-rails

README.md

@@ -1,13 +1,13 @@
-# 松江温泉マップ 🗺️♨️
+# 松江グルメマップ 🗺️♨️
 
 ## プロジェクト概要
 
-このアプリケーションは、島根県松江市の温泉を登録・閲覧できるWebアプリケーションです。
+このアプリケーションは、島根県松江市のグルメを登録・閲覧できるWebアプリケーションです。
 
 ### 主な機能
-- 🗺️ **温泉マップ表示**: 登録された温泉を地図上で確認できます
-- ♨️ **温泉登録**: 新しい温泉スポットを登録できます
-- ⭐ **レビュー機能**: 温泉にレビューを投稿できます
+- 🗺️ **グルメマップ表示**: 登録されたグルメを地図上で確認できます
+- ♨️ **グルメ登録**: 新しいグルメスポットを登録できます
+- ⭐ **レビュー機能**: グルメにレビューを投稿できます
 - 📱 **レスポンシブデザイン**: 複数の画面幅に対応しています
 
 ## 技術スタック
@@ -97,7 +97,7 @@ matsue-onsen-map/
 
 ## 開発の流れ
 
-1. **機能の追加**: 新しい温泉登録機能を追加する場合
+1. **機能の追加**: 新しいグルメ登録機能を追加する場合
 2. **モデルの作成**: `rails generate model` でデータベーステーブルを作成
 3. **コントローラーの作成**: `rails generate controller` で画面処理を作成
 4. **ビューの作成**: HTMLテンプレートを作成

app/controllers/admin/admin_controller.rb

@@ -0,0 +1,15 @@
+# app/controllers/admin/admin_controller.rb
+class Admin::AdminController < ApplicationController
+  before_action :require_admin_password
+
+
+
+
+
+  private
+
+  def require_admin_password
+    return if session[:admin_authenticated]
+    redirect_to admin_login_path
+  end
+end

app/controllers/admin/base_controller.rb

@@ -0,0 +1,2 @@
+class Admin::BaseController < ApplicationController
+end

app/controllers/admin/onsens_controller.rb

@@ -1,12 +1,14 @@
-class Admin::OnsensController < ApplicationController
+class Admin::OnsensController < Admin::AdminController
   before_action :set_onsen, only: %i[ show edit update destroy ]
 
-  # GET /onsens or /onsens.json
+  # GET /onsens
   def index
+    session[:admin] = nil
+
     @onsens = Onsen.all
   end
 
-  # GET /onsens/1 or /onsens/1.json
+  # GET /onsens/1
   def show
   end
 
@@ -19,7 +21,7 @@ def new
   def edit
   end
 
-  # POST /onsens or /onsens.json
+  # POST /onsens
   def create
     @onsen = Onsen.new(onsen_params)
 
@@ -34,10 +36,17 @@ def create
     end
   end
 
-  # PATCH/PUT /onsens/1 or /onsens/1.json
+  # PATCH/PUT /onsens/1
   def update
     respond_to do |format|
-      if @onsen.update(onsen_params)
+      if @onsen.update(onsen_params.except(:remove_image_ids))
+        if onsen_params[:remove_image_ids].present?
+          onsen_params[:remove_image_ids].each do |image_id|
+            image = @onsen.images.find_by(id: image_id)
+            image.purge if image
+          end
+        end
+
         format.html { redirect_to admin_onsen_path(@onsen), notice: "Onsen was successfully updated." }
         format.json { render :show, status: :ok, location: @onsen }
       else
@@ -47,7 +56,8 @@ def update
     end
   end
 
-  # DELETE /onsens/1 or /onsens/1.json
+
+  # DELETE /onsens/1
   def destroy
     @onsen.destroy!
 
@@ -58,13 +68,14 @@ def destroy
   end
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_onsen
-      @onsen = Onsen.find(params.expect(:id))
-    end
 
-    # Only allow a list of trusted parameters through.
-    def onsen_params
-      params.expect(onsen: [ :name, :geo_lat, :geo_lng, :description, :tags, images: [] ])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_onsen
+    @onsen = Onsen.find(params[:id])
+  end
+
+  # Only allow a list of trusted parameters through.
+  def onsen_params
+    params.require(:onsen).permit(:name, :geo_lat, :geo_lng, :description, :tags, :url, :sales_s, :sales_f, :holiday, :address, :price, images: [], remove_image_ids: [])
+  end
 end

app/controllers/admin/sessions_controller.rb

@@ -0,0 +1,27 @@
+# app/controllers/admin/sessions_controller.rb
+class Admin::SessionsController < ApplicationController
+  def new
+    # パスワード入力フォーム
+  end
+
+  def create
+    if params[:password] == ENV["ADMIN_PASSWORD"]
+      session[:admin_authenticated] = true
+      redirect_to admin_root_path, notice: "ログイン成功"
+    else
+      flash[:alert] = "パスワードが違います"
+      render :new
+    end
+  end
+
+  def destroy
+    session.delete(:admin_authenticated)
+    redirect_to root_path, notice: "ログアウトしました"
+  end
+
+
+  # セッションリセット
+  def reset_admin_session
+    session[:admin_authenticated] = nil
+  end
+end

app/controllers/application_controller.rb

@@ -2,4 +2,10 @@ class ApplicationController < ActionController::Base
   # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
   # Disable browser restrictions in development environment
   allow_browser versions: :modern unless Rails.env.development?
+
+  private
+
+  def reset_admin_session
+    session.delete(:admin_authenticated)
+  end
 end

app/controllers/onsens_controller.rb

@@ -2,13 +2,26 @@ class OnsensController < ApplicationController
   before_action :set_onsen, only: %i[ show ]
   # GET /onsens or /onsens.json
   def index
-    # Strong Parametersで安全なパラメータのみ許可
-    @search_params = params.permit(:q, :tags)
+    # Strong Parametersで安全なパラメータのみ許可（boundsを追加）
+    @search_params = params.permit(:q, :tags, :bounds)
 
     # モデルの検索メソッドを呼び出し、新しい順でソート
     @onsens = Onsen.search(@search_params).order(created_at: :desc)
+
+    # 地図の表示範囲で絞り込み
+    if @search_params[:bounds].present?
+      bounds = @search_params[:bounds].split(",")
+      @onsens = @onsens.within_bounds(bounds)
+    end
+
+    # セッションリセット
+    reset_admin_session
   end
 
+
+
+
+
   # GET /onsens/1 or /onsens/1.json
   def show
     @reviews = @onsen.reviews.order(created_at: :desc)
@@ -18,4 +31,8 @@ def show
     def set_onsen
       @onsen = Onsen.find(params[:id])
     end
+
+    def onsen_params
+      params.require(:onsen).permit(:name, :sales_s, :sales_f, :holiday, :other_columns)
+    end
 end

app/helpers/admin/admin_helper.rb

@@ -0,0 +1,2 @@
+module Admin::AdminHelper
+end

app/helpers/admin/base_helper.rb

@@ -0,0 +1,2 @@
+module Admin::BaseHelper
+end

app/helpers/admin/sessions_helper.rb

@@ -0,0 +1,2 @@
+module Admin::SessionsHelper
+end

app/helpers/application_helper.rb

@@ -20,7 +20,7 @@ def public_navigation_links(current_path)
   # @return [Array<Hash>] 管理サイト用ナビゲーションリンク
   def admin_navigation_links(current_path)
     create_navigation_link_set([
-      { path: "/admin/onsens", label: t("views.navigation.onsen_management"), aria_label: "温泉管理", current_check: -> { current_path.start_with?("/admin/onsens") } },
+      { path: "/admin/onsens", label: t("views.navigation.onsen_management"), aria_label: "管理画面", current_check: -> { current_path.start_with?("/admin/onsens") } },
       { path: "/", label: t("views.navigation.public_site"), aria_label: "公開サイト", current_check: -> { false } }
     ])
   end