UI/UX 개선: 모바일 네비게이션, 로그인 모달, 지도 기능, 캐치테이블 연동

- 모바일 하단 네비게이션(홈/식당목록/내주변/찜/내정보) 추가
- 로그인 버튼을 모달 방식으로 변경 (소셜 로그인 확장 가능)
- 내위치 기반 정렬 및 영역 필터, 지도 내위치 버튼 추가
- 채널 필터 시 해당 채널만 마커/범례 표시
- 캐치테이블 검색/연동 (단건/벌크), NONE 저장 패턴
- 벌크 트랜스크립트 SSE (Playwright 브라우저 재사용)
- 테이블링/캐치테이블 버튼 UI 차별화
- Google Maps 링크 모바일 호환, 초기화 버튼, 검색 라벨 개선

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
joungmin
2026-03-11 00:49:16 +09:00
parent 58c0f972e2
commit cdee37e341
23 changed files with 1465 additions and 325 deletions

View File

@@ -1,16 +1,29 @@
package com.tasteby.config; package com.tasteby.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
import javax.sql.DataSource;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
@Configuration @Configuration
public class DataSourceConfig { public class DataSourceConfig {
private static final Logger log = LoggerFactory.getLogger(DataSourceConfig.class);
@Value("${app.oracle.wallet-path:}") @Value("${app.oracle.wallet-path:}")
private String walletPath; private String walletPath;
private final DataSource dataSource;
public DataSourceConfig(DataSource dataSource) {
this.dataSource = dataSource;
}
@PostConstruct @PostConstruct
public void configureWallet() { public void configureWallet() {
if (walletPath != null && !walletPath.isBlank()) { if (walletPath != null && !walletPath.isBlank()) {
@@ -18,4 +31,23 @@ public class DataSourceConfig {
System.setProperty("oracle.net.wallet_location", walletPath); System.setProperty("oracle.net.wallet_location", walletPath);
} }
} }
@EventListener(ApplicationReadyEvent.class)
public void runMigrations() {
migrate("ALTER TABLE restaurants ADD (tabling_url VARCHAR2(500))");
migrate("ALTER TABLE restaurants ADD (catchtable_url VARCHAR2(500))");
}
private void migrate(String sql) {
try (var conn = dataSource.getConnection(); var stmt = conn.createStatement()) {
stmt.execute(sql);
log.info("[MIGRATE] {}", sql);
} catch (Exception e) {
if (e.getMessage() != null && e.getMessage().contains("ORA-01430")) {
log.debug("[MIGRATE] already done: {}", sql);
} else {
log.warn("[MIGRATE] failed: {} - {}", sql, e.getMessage());
}
}
}
} }

View File

@@ -6,6 +6,7 @@ import com.tasteby.domain.Channel;
import com.tasteby.security.AuthUtil; import com.tasteby.security.AuthUtil;
import com.tasteby.service.CacheService; import com.tasteby.service.CacheService;
import com.tasteby.service.ChannelService; import com.tasteby.service.ChannelService;
import com.tasteby.service.YouTubeService;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ResponseStatusException;
@@ -18,11 +19,14 @@ import java.util.Map;
public class ChannelController { public class ChannelController {
private final ChannelService channelService; private final ChannelService channelService;
private final YouTubeService youtubeService;
private final CacheService cache; private final CacheService cache;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
public ChannelController(ChannelService channelService, CacheService cache, ObjectMapper objectMapper) { public ChannelController(ChannelService channelService, YouTubeService youtubeService,
CacheService cache, ObjectMapper objectMapper) {
this.channelService = channelService; this.channelService = channelService;
this.youtubeService = youtubeService;
this.cache = cache; this.cache = cache;
this.objectMapper = objectMapper; this.objectMapper = objectMapper;
} }
@@ -60,6 +64,18 @@ public class ChannelController {
} }
} }
@PostMapping("/{channelId}/scan")
public Map<String, Object> scan(@PathVariable String channelId,
@RequestParam(defaultValue = "false") boolean full) {
AuthUtil.requireAdmin();
var result = youtubeService.scanChannel(channelId, full);
if (result == null) {
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Channel not found");
}
cache.flush();
return result;
}
@DeleteMapping("/{channelId}") @DeleteMapping("/{channelId}")
public Map<String, Object> delete(@PathVariable String channelId) { public Map<String, Object> delete(@PathVariable String channelId) {
AuthUtil.requireAdmin(); AuthUtil.requireAdmin();

View File

@@ -2,24 +2,38 @@ package com.tasteby.controller;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.microsoft.playwright.*;
import com.tasteby.domain.Restaurant; import com.tasteby.domain.Restaurant;
import com.tasteby.security.AuthUtil; import com.tasteby.security.AuthUtil;
import com.tasteby.service.CacheService; import com.tasteby.service.CacheService;
import com.tasteby.service.RestaurantService; import com.tasteby.service.RestaurantService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadLocalRandom;
@RestController @RestController
@RequestMapping("/api/restaurants") @RequestMapping("/api/restaurants")
public class RestaurantController { public class RestaurantController {
private static final Logger log = LoggerFactory.getLogger(RestaurantController.class);
private final RestaurantService restaurantService; private final RestaurantService restaurantService;
private final CacheService cache; private final CacheService cache;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor();
public RestaurantController(RestaurantService restaurantService, CacheService cache, ObjectMapper objectMapper) { public RestaurantController(RestaurantService restaurantService, CacheService cache, ObjectMapper objectMapper) {
this.restaurantService = restaurantService; this.restaurantService = restaurantService;
@@ -83,6 +97,232 @@ public class RestaurantController {
return Map.of("ok", true); return Map.of("ok", true);
} }
/** 단건 테이블링 URL 검색 */
@GetMapping("/{id}/tabling-search")
public List<Map<String, Object>> tablingSearch(@PathVariable String id) {
AuthUtil.requireAdmin();
var r = restaurantService.findById(id);
if (r == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND);
try (Playwright pw = Playwright.create()) {
try (Browser browser = launchBrowser(pw)) {
BrowserContext ctx = newContext(browser);
Page page = newPage(ctx);
return searchTabling(page, r.getName());
}
} catch (Exception e) {
log.error("[TABLING] Search failed for '{}': {}", r.getName(), e.getMessage());
throw new ResponseStatusException(HttpStatus.BAD_GATEWAY, "Search failed: " + e.getMessage());
}
}
/** 테이블링 미연결 식당 목록 */
@GetMapping("/tabling-pending")
public Map<String, Object> tablingPending() {
AuthUtil.requireAdmin();
var list = restaurantService.findWithoutTabling();
var summary = list.stream()
.map(r -> Map.of("id", (Object) r.getId(), "name", (Object) r.getName()))
.toList();
return Map.of("count", list.size(), "restaurants", summary);
}
/** 벌크 테이블링 검색 (SSE) */
@PostMapping("/bulk-tabling")
public SseEmitter bulkTabling() {
AuthUtil.requireAdmin();
SseEmitter emitter = new SseEmitter(600_000L);
executor.execute(() -> {
try {
var restaurants = restaurantService.findWithoutTabling();
int total = restaurants.size();
emit(emitter, Map.of("type", "start", "total", total));
if (total == 0) {
emit(emitter, Map.of("type", "complete", "total", 0, "linked", 0, "notFound", 0));
emitter.complete();
return;
}
int linked = 0;
int notFound = 0;
try (Playwright pw = Playwright.create()) {
try (Browser browser = launchBrowser(pw)) {
BrowserContext ctx = newContext(browser);
Page page = newPage(ctx);
for (int i = 0; i < total; i++) {
var r = restaurants.get(i);
emit(emitter, Map.of("type", "processing", "current", i + 1,
"total", total, "name", r.getName()));
try {
var results = searchTabling(page, r.getName());
if (!results.isEmpty()) {
String url = String.valueOf(results.get(0).get("url"));
String title = String.valueOf(results.get(0).get("title"));
restaurantService.update(r.getId(), Map.of("tabling_url", url));
linked++;
emit(emitter, Map.of("type", "done", "current", i + 1,
"name", r.getName(), "url", url, "title", title));
} else {
restaurantService.update(r.getId(), Map.of("tabling_url", "NONE"));
notFound++;
emit(emitter, Map.of("type", "notfound", "current", i + 1,
"name", r.getName()));
}
} catch (Exception e) {
notFound++;
emit(emitter, Map.of("type", "error", "current", i + 1,
"name", r.getName(), "message", e.getMessage()));
}
// Google 봇 판정 방지 랜덤 딜레이 (5~15초)
int delay = ThreadLocalRandom.current().nextInt(5000, 15001);
log.info("[TABLING] Waiting {}ms before next search...", delay);
page.waitForTimeout(delay);
}
}
}
cache.flush();
emit(emitter, Map.of("type", "complete", "total", total, "linked", linked, "notFound", notFound));
emitter.complete();
} catch (Exception e) {
log.error("[TABLING] Bulk search error", e);
emitter.completeWithError(e);
}
});
return emitter;
}
/** 테이블링 URL 저장 */
@PutMapping("/{id}/tabling-url")
public Map<String, Object> setTablingUrl(@PathVariable String id, @RequestBody Map<String, String> body) {
AuthUtil.requireAdmin();
var r = restaurantService.findById(id);
if (r == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND);
String url = body.get("tabling_url");
restaurantService.update(id, Map.of("tabling_url", url != null ? url : ""));
cache.flush();
return Map.of("ok", true);
}
/** 단건 캐치테이블 URL 검색 */
@GetMapping("/{id}/catchtable-search")
public List<Map<String, Object>> catchtableSearch(@PathVariable String id) {
AuthUtil.requireAdmin();
var r = restaurantService.findById(id);
if (r == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND);
try (Playwright pw = Playwright.create()) {
try (Browser browser = launchBrowser(pw)) {
BrowserContext ctx = newContext(browser);
Page page = newPage(ctx);
return searchCatchtable(page, r.getName());
}
} catch (Exception e) {
log.error("[CATCHTABLE] Search failed for '{}': {}", r.getName(), e.getMessage());
throw new ResponseStatusException(HttpStatus.BAD_GATEWAY, "Search failed: " + e.getMessage());
}
}
/** 캐치테이블 미연결 식당 목록 */
@GetMapping("/catchtable-pending")
public Map<String, Object> catchtablePending() {
AuthUtil.requireAdmin();
var list = restaurantService.findWithoutCatchtable();
var summary = list.stream()
.map(r -> Map.of("id", (Object) r.getId(), "name", (Object) r.getName()))
.toList();
return Map.of("count", list.size(), "restaurants", summary);
}
/** 벌크 캐치테이블 검색 (SSE) */
@PostMapping("/bulk-catchtable")
public SseEmitter bulkCatchtable() {
AuthUtil.requireAdmin();
SseEmitter emitter = new SseEmitter(600_000L);
executor.execute(() -> {
try {
var restaurants = restaurantService.findWithoutCatchtable();
int total = restaurants.size();
emit(emitter, Map.of("type", "start", "total", total));
if (total == 0) {
emit(emitter, Map.of("type", "complete", "total", 0, "linked", 0, "notFound", 0));
emitter.complete();
return;
}
int linked = 0;
int notFound = 0;
try (Playwright pw = Playwright.create()) {
try (Browser browser = launchBrowser(pw)) {
BrowserContext ctx = newContext(browser);
Page page = newPage(ctx);
for (int i = 0; i < total; i++) {
var r = restaurants.get(i);
emit(emitter, Map.of("type", "processing", "current", i + 1,
"total", total, "name", r.getName()));
try {
var results = searchCatchtable(page, r.getName());
if (!results.isEmpty()) {
String url = String.valueOf(results.get(0).get("url"));
String title = String.valueOf(results.get(0).get("title"));
restaurantService.update(r.getId(), Map.of("catchtable_url", url));
linked++;
emit(emitter, Map.of("type", "done", "current", i + 1,
"name", r.getName(), "url", url, "title", title));
} else {
restaurantService.update(r.getId(), Map.of("catchtable_url", "NONE"));
notFound++;
emit(emitter, Map.of("type", "notfound", "current", i + 1,
"name", r.getName()));
}
} catch (Exception e) {
notFound++;
emit(emitter, Map.of("type", "error", "current", i + 1,
"name", r.getName(), "message", e.getMessage()));
}
int delay = ThreadLocalRandom.current().nextInt(5000, 15001);
log.info("[CATCHTABLE] Waiting {}ms before next search...", delay);
page.waitForTimeout(delay);
}
}
}
cache.flush();
emit(emitter, Map.of("type", "complete", "total", total, "linked", linked, "notFound", notFound));
emitter.complete();
} catch (Exception e) {
log.error("[CATCHTABLE] Bulk search error", e);
emitter.completeWithError(e);
}
});
return emitter;
}
/** 캐치테이블 URL 저장 */
@PutMapping("/{id}/catchtable-url")
public Map<String, Object> setCatchtableUrl(@PathVariable String id, @RequestBody Map<String, String> body) {
AuthUtil.requireAdmin();
var r = restaurantService.findById(id);
if (r == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND);
String url = body.get("catchtable_url");
restaurantService.update(id, Map.of("catchtable_url", url != null ? url : ""));
cache.flush();
return Map.of("ok", true);
}
@GetMapping("/{id}/videos") @GetMapping("/{id}/videos")
public List<Map<String, Object>> videos(@PathVariable String id) { public List<Map<String, Object>> videos(@PathVariable String id) {
String key = cache.makeKey("restaurant_videos", id); String key = cache.makeKey("restaurant_videos", id);
@@ -98,4 +338,127 @@ public class RestaurantController {
cache.set(key, result); cache.set(key, result);
return result; return result;
} }
// ─── Playwright helpers ──────────────────────────────────────────────
private Browser launchBrowser(Playwright pw) {
return pw.chromium().launch(new BrowserType.LaunchOptions()
.setHeadless(false)
.setArgs(List.of("--disable-blink-features=AutomationControlled")));
}
private BrowserContext newContext(Browser browser) {
return browser.newContext(new Browser.NewContextOptions()
.setLocale("ko-KR").setViewportSize(1280, 900));
}
private Page newPage(BrowserContext ctx) {
Page page = ctx.newPage();
page.addInitScript("Object.defineProperty(navigator, 'webdriver', {get: () => false})");
return page;
}
@SuppressWarnings("unchecked")
private List<Map<String, Object>> searchTabling(Page page, String restaurantName) {
String query = "site:tabling.co.kr " + restaurantName;
log.info("[TABLING] Searching: {}", query);
String searchUrl = "https://www.google.com/search?q=" +
URLEncoder.encode(query, StandardCharsets.UTF_8);
page.navigate(searchUrl);
page.waitForTimeout(3000);
Object linksObj = page.evaluate("""
() => {
const results = [];
const links = document.querySelectorAll('a[href]');
for (const a of links) {
const href = a.href;
if (href.includes('tabling.co.kr/restaurant/') || href.includes('tabling.co.kr/place/')) {
const title = a.closest('[data-header-feature]')?.querySelector('h3')?.textContent
|| a.querySelector('h3')?.textContent
|| a.textContent?.trim()?.substring(0, 80)
|| '';
results.push({ title, url: href });
}
}
const seen = new Set();
return results.filter(r => {
if (seen.has(r.url)) return false;
seen.add(r.url);
return true;
}).slice(0, 5);
}
""");
List<Map<String, Object>> results = new ArrayList<>();
if (linksObj instanceof List<?> list) {
for (var item : list) {
if (item instanceof Map<?, ?> map) {
results.add(Map.of(
"title", String.valueOf(map.get("title")),
"url", String.valueOf(map.get("url"))
));
}
}
}
log.info("[TABLING] Found {} results for '{}'", results.size(), restaurantName);
return results;
}
@SuppressWarnings("unchecked")
private List<Map<String, Object>> searchCatchtable(Page page, String restaurantName) {
String query = "site:app.catchtable.co.kr " + restaurantName;
log.info("[CATCHTABLE] Searching: {}", query);
String searchUrl = "https://www.google.com/search?q=" +
URLEncoder.encode(query, StandardCharsets.UTF_8);
page.navigate(searchUrl);
page.waitForTimeout(3000);
Object linksObj = page.evaluate("""
() => {
const results = [];
const links = document.querySelectorAll('a[href]');
for (const a of links) {
const href = a.href;
if (href.includes('catchtable.co.kr/') && (href.includes('/dining/') || href.includes('/shop/'))) {
const title = a.closest('[data-header-feature]')?.querySelector('h3')?.textContent
|| a.querySelector('h3')?.textContent
|| a.textContent?.trim()?.substring(0, 80)
|| '';
results.push({ title, url: href });
}
}
const seen = new Set();
return results.filter(r => {
if (seen.has(r.url)) return false;
seen.add(r.url);
return true;
}).slice(0, 5);
}
""");
List<Map<String, Object>> results = new ArrayList<>();
if (linksObj instanceof List<?> list) {
for (var item : list) {
if (item instanceof Map<?, ?> map) {
results.add(Map.of(
"title", String.valueOf(map.get("title")),
"url", String.valueOf(map.get("url"))
));
}
}
}
log.info("[CATCHTABLE] Found {} results for '{}'", results.size(), restaurantName);
return results;
}
private void emit(SseEmitter emitter, Map<String, Object> data) {
try {
emitter.send(SseEmitter.event().data(objectMapper.writeValueAsString(data)));
} catch (Exception e) {
log.debug("SSE emit error: {}", e.getMessage());
}
}
} }

View File

@@ -103,6 +103,24 @@ public class VideoController {
return Map.of("ok", true, "length", result.text().length(), "source", result.source()); return Map.of("ok", true, "length", result.text().length(), "source", result.source());
} }
/** 클라이언트(브라우저)에서 가져온 트랜스크립트를 저장 */
@PostMapping("/{id}/upload-transcript")
public Map<String, Object> uploadTranscript(@PathVariable String id,
@RequestBody Map<String, String> body) {
AuthUtil.requireAdmin();
var video = videoService.findDetail(id);
if (video == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Video not found");
String text = body.get("text");
if (text == null || text.isBlank()) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "text is required");
}
videoService.updateTranscript(id, text);
String source = body.getOrDefault("source", "browser");
return Map.of("ok", true, "length", text.length(), "source", source);
}
@GetMapping("/extract/prompt") @GetMapping("/extract/prompt")
public Map<String, Object> getExtractPrompt() { public Map<String, Object> getExtractPrompt() {
return Map.of("prompt", extractorService.getPrompt()); return Map.of("prompt", extractorService.getPrompt());

View File

@@ -13,6 +13,7 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ThreadLocalRandom;
/** /**
* SSE streaming endpoints for bulk operations. * SSE streaming endpoints for bulk operations.
@@ -26,6 +27,7 @@ public class VideoSseController {
private final VideoService videoService; private final VideoService videoService;
private final RestaurantService restaurantService; private final RestaurantService restaurantService;
private final PipelineService pipelineService; private final PipelineService pipelineService;
private final YouTubeService youTubeService;
private final OciGenAiService genAi; private final OciGenAiService genAi;
private final CacheService cache; private final CacheService cache;
private final ObjectMapper mapper; private final ObjectMapper mapper;
@@ -34,12 +36,14 @@ public class VideoSseController {
public VideoSseController(VideoService videoService, public VideoSseController(VideoService videoService,
RestaurantService restaurantService, RestaurantService restaurantService,
PipelineService pipelineService, PipelineService pipelineService,
YouTubeService youTubeService,
OciGenAiService genAi, OciGenAiService genAi,
CacheService cache, CacheService cache,
ObjectMapper mapper) { ObjectMapper mapper) {
this.videoService = videoService; this.videoService = videoService;
this.restaurantService = restaurantService; this.restaurantService = restaurantService;
this.pipelineService = pipelineService; this.pipelineService = pipelineService;
this.youTubeService = youTubeService;
this.genAi = genAi; this.genAi = genAi;
this.cache = cache; this.cache = cache;
this.mapper = mapper; this.mapper = mapper;
@@ -48,13 +52,70 @@ public class VideoSseController {
@PostMapping("/bulk-transcript") @PostMapping("/bulk-transcript")
public SseEmitter bulkTranscript() { public SseEmitter bulkTranscript() {
AuthUtil.requireAdmin(); AuthUtil.requireAdmin();
SseEmitter emitter = new SseEmitter(600_000L); // 10 min timeout SseEmitter emitter = new SseEmitter(1_800_000L); // 30 min timeout
executor.execute(() -> { executor.execute(() -> {
try { try {
// TODO: Implement when transcript extraction is available in Java var videos = videoService.findVideosWithoutTranscript();
emit(emitter, Map.of("type", "start", "total", 0)); int total = videos.size();
emit(emitter, Map.of("type", "complete", "total", 0, "success", 0)); emit(emitter, Map.of("type", "start", "total", total));
if (total == 0) {
emit(emitter, Map.of("type", "complete", "total", 0, "success", 0, "failed", 0));
emitter.complete();
return;
}
int success = 0;
int failed = 0;
try (var session = youTubeService.createBrowserSession()) {
for (int i = 0; i < total; i++) {
var v = videos.get(i);
String videoId = (String) v.get("video_id");
String title = (String) v.get("title");
String id = (String) v.get("id");
emit(emitter, Map.of("type", "processing", "index", i, "title", title));
try {
// Playwright browser first (reuse page)
var result = youTubeService.getTranscriptWithPage(session.page(), videoId);
// Fallback: thoroldvix API
if (result == null) {
log.warn("[BULK-TRANSCRIPT] Browser failed for {}, trying API", videoId);
result = youTubeService.getTranscript(videoId, "auto");
}
if (result != null) {
videoService.updateTranscript(id, result.text());
success++;
emit(emitter, Map.of("type", "done", "index", i,
"title", title, "source", result.source(),
"length", result.text().length()));
} else {
failed++;
emit(emitter, Map.of("type", "error", "index", i,
"title", title, "message", "자막을 찾을 수 없음"));
}
} catch (Exception e) {
failed++;
log.error("[BULK-TRANSCRIPT] Error for {}: {}", videoId, e.getMessage());
emit(emitter, Map.of("type", "error", "index", i,
"title", title, "message", e.getMessage()));
}
// 봇 판정 방지 랜덤 딜레이 (5~15초)
if (i < total - 1) {
int delay = ThreadLocalRandom.current().nextInt(5000, 15001);
log.info("[BULK-TRANSCRIPT] Waiting {}ms before next...", delay);
session.page().waitForTimeout(delay);
}
}
}
emit(emitter, Map.of("type", "complete", "total", total, "success", success, "failed", failed));
emitter.complete(); emitter.complete();
} catch (Exception e) { } catch (Exception e) {
log.error("Bulk transcript error", e); log.error("Bulk transcript error", e);

View File

@@ -24,6 +24,8 @@ public class Restaurant {
private String phone; private String phone;
private String website; private String website;
private String googlePlaceId; private String googlePlaceId;
private String tablingUrl;
private String catchtableUrl;
private String businessStatus; private String businessStatus;
private Double rating; private Double rating;
private Integer ratingCount; private Integer ratingCount;

View File

@@ -55,6 +55,10 @@ public interface RestaurantMapper {
void updateFoodsMentioned(@Param("id") String id, @Param("foods") String foods); void updateFoodsMentioned(@Param("id") String id, @Param("foods") String foods);
List<Restaurant> findWithoutTabling();
List<Restaurant> findWithoutCatchtable();
List<Map<String, Object>> findForRemapCuisine(); List<Map<String, Object>> findForRemapCuisine();
List<Map<String, Object>> findForRemapFoods(); List<Map<String, Object>> findForRemapFoods();

View File

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -45,6 +46,8 @@ public class OciGenAiService {
private final ObjectMapper mapper; private final ObjectMapper mapper;
private ConfigFileAuthenticationDetailsProvider authProvider; private ConfigFileAuthenticationDetailsProvider authProvider;
private GenerativeAiInferenceClient chatClient;
private GenerativeAiInferenceClient embedClient;
public OciGenAiService(ObjectMapper mapper) { public OciGenAiService(ObjectMapper mapper) {
this.mapper = mapper; this.mapper = mapper;
@@ -55,45 +58,50 @@ public class OciGenAiService {
try { try {
ConfigFileReader.ConfigFile configFile = ConfigFileReader.parseDefault(); ConfigFileReader.ConfigFile configFile = ConfigFileReader.parseDefault();
authProvider = new ConfigFileAuthenticationDetailsProvider(configFile); authProvider = new ConfigFileAuthenticationDetailsProvider(configFile);
log.info("OCI GenAI auth configured"); chatClient = GenerativeAiInferenceClient.builder()
.endpoint(chatEndpoint).build(authProvider);
embedClient = GenerativeAiInferenceClient.builder()
.endpoint(embedEndpoint).build(authProvider);
log.info("OCI GenAI auth configured (clients initialized)");
} catch (Exception e) { } catch (Exception e) {
log.warn("OCI config not found, GenAI features disabled: {}", e.getMessage()); log.warn("OCI config not found, GenAI features disabled: {}", e.getMessage());
} }
} }
@PreDestroy
public void destroy() {
if (chatClient != null) chatClient.close();
if (embedClient != null) embedClient.close();
}
/** /**
* Call OCI GenAI LLM (Chat). * Call OCI GenAI LLM (Chat).
*/ */
public String chat(String prompt, int maxTokens) { public String chat(String prompt, int maxTokens) {
if (authProvider == null) throw new IllegalStateException("OCI GenAI not configured"); if (chatClient == null) throw new IllegalStateException("OCI GenAI not configured");
try (var client = GenerativeAiInferenceClient.builder() var textContent = TextContent.builder().text(prompt).build();
.endpoint(chatEndpoint) var userMessage = UserMessage.builder().content(List.of(textContent)).build();
.build(authProvider)) {
var textContent = TextContent.builder().text(prompt).build(); var chatRequest = GenericChatRequest.builder()
var userMessage = UserMessage.builder().content(List.of(textContent)).build(); .messages(List.of(userMessage))
.maxTokens(maxTokens)
.temperature(0.0)
.build();
var chatRequest = GenericChatRequest.builder() var chatDetails = ChatDetails.builder()
.messages(List.of(userMessage)) .compartmentId(compartmentId)
.maxTokens(maxTokens) .servingMode(OnDemandServingMode.builder().modelId(chatModelId).build())
.temperature(0.0) .chatRequest(chatRequest)
.build(); .build();
var chatDetails = ChatDetails.builder() ChatResponse response = chatClient.chat(
.compartmentId(compartmentId) ChatRequest.builder().chatDetails(chatDetails).build());
.servingMode(OnDemandServingMode.builder().modelId(chatModelId).build())
.chatRequest(chatRequest)
.build();
ChatResponse response = client.chat( var chatResult = (GenericChatResponse) response.getChatResult().getChatResponse();
ChatRequest.builder().chatDetails(chatDetails).build()); var choice = chatResult.getChoices().get(0);
var content = ((TextContent) choice.getMessage().getContent().get(0)).getText();
var chatResult = (GenericChatResponse) response.getChatResult().getChatResponse(); return content.trim();
var choice = chatResult.getChoices().get(0);
var content = ((TextContent) choice.getMessage().getContent().get(0)).getText();
return content.trim();
}
} }
/** /**
@@ -111,25 +119,22 @@ public class OciGenAiService {
} }
private List<List<Double>> embedBatch(List<String> texts) { private List<List<Double>> embedBatch(List<String> texts) {
try (var client = GenerativeAiInferenceClient.builder() if (embedClient == null) throw new IllegalStateException("OCI GenAI not configured");
.endpoint(embedEndpoint)
.build(authProvider)) {
var embedDetails = EmbedTextDetails.builder() var embedDetails = EmbedTextDetails.builder()
.inputs(texts) .inputs(texts)
.servingMode(OnDemandServingMode.builder().modelId(embedModelId).build()) .servingMode(OnDemandServingMode.builder().modelId(embedModelId).build())
.compartmentId(compartmentId) .compartmentId(compartmentId)
.inputType(EmbedTextDetails.InputType.SearchDocument) .inputType(EmbedTextDetails.InputType.SearchDocument)
.build(); .build();
EmbedTextResponse response = client.embedText( EmbedTextResponse response = embedClient.embedText(
EmbedTextRequest.builder().embedTextDetails(embedDetails).build()); EmbedTextRequest.builder().embedTextDetails(embedDetails).build());
return response.getEmbedTextResult().getEmbeddings() return response.getEmbedTextResult().getEmbeddings()
.stream() .stream()
.map(emb -> emb.stream().map(Number::doubleValue).toList()) .map(emb -> emb.stream().map(Number::doubleValue).toList())
.toList(); .toList();
}
} }
/** /**

View File

@@ -26,6 +26,14 @@ public class RestaurantService {
return restaurants; return restaurants;
} }
public List<Restaurant> findWithoutTabling() {
return mapper.findWithoutTabling();
}
public List<Restaurant> findWithoutCatchtable() {
return mapper.findWithoutCatchtable();
}
public Restaurant findById(String id) { public Restaurant findById(String id) {
Restaurant restaurant = mapper.findById(id); Restaurant restaurant = mapper.findById(id);
if (restaurant == null) return null; if (restaurant == null) return null;

View File

@@ -208,13 +208,13 @@ public class YouTubeService {
public TranscriptResult getTranscript(String videoId, String mode) { public TranscriptResult getTranscript(String videoId, String mode) {
if (mode == null) mode = "auto"; if (mode == null) mode = "auto";
// 1) Fast path: youtube-transcript-api // 1) Playwright headed browser (봇 판정 회피)
TranscriptResult apiResult = getTranscriptApi(videoId, mode); TranscriptResult browserResult = getTranscriptBrowser(videoId);
if (apiResult != null) return apiResult; if (browserResult != null) return browserResult;
// 2) Fallback: Playwright browser // 2) Fallback: youtube-transcript-api
log.warn("API failed for {}, trying Playwright browser", videoId); log.warn("Browser failed for {}, trying API", videoId);
return getTranscriptBrowser(videoId); return getTranscriptApi(videoId, mode);
} }
private TranscriptResult getTranscriptApi(String videoId, String mode) { private TranscriptResult getTranscriptApi(String videoId, String mode) {
@@ -262,151 +262,173 @@ public class YouTubeService {
} }
} }
// ─── Playwright browser fallback ─────────────────────────────────────────── // ─── Playwright browser ───────────────────────────────────────────────────
/**
* Fetch transcript using an existing Playwright Page (for bulk reuse).
*/
@SuppressWarnings("unchecked")
public TranscriptResult getTranscriptWithPage(Page page, String videoId) {
return fetchTranscriptFromPage(page, videoId);
}
/**
* Create a Playwright browser + context + page for transcript fetching.
* Caller must close the returned resources (Playwright, Browser).
*/
public record BrowserSession(Playwright playwright, Browser browser, Page page) implements AutoCloseable {
@Override
public void close() {
try { browser.close(); } catch (Exception ignored) {}
try { playwright.close(); } catch (Exception ignored) {}
}
}
public BrowserSession createBrowserSession() {
Playwright pw = Playwright.create();
Browser browser = pw.chromium().launch(new BrowserType.LaunchOptions()
.setHeadless(false)
.setArgs(List.of("--disable-blink-features=AutomationControlled")));
BrowserContext ctx = browser.newContext(new Browser.NewContextOptions()
.setLocale("ko-KR")
.setViewportSize(1280, 900));
loadCookies(ctx);
Page page = ctx.newPage();
page.addInitScript("Object.defineProperty(navigator, 'webdriver', {get: () => false})");
return new BrowserSession(pw, browser, page);
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private TranscriptResult getTranscriptBrowser(String videoId) { private TranscriptResult getTranscriptBrowser(String videoId) {
try (Playwright pw = Playwright.create()) { try (BrowserSession session = createBrowserSession()) {
BrowserType.LaunchOptions launchOpts = new BrowserType.LaunchOptions() return fetchTranscriptFromPage(session.page(), videoId);
.setHeadless(false) } catch (Exception e) {
.setArgs(List.of("--disable-blink-features=AutomationControlled")); log.error("[TRANSCRIPT] Playwright failed for {}: {}", videoId, e.getMessage());
return null;
}
}
try (Browser browser = pw.chromium().launch(launchOpts)) { @SuppressWarnings("unchecked")
Browser.NewContextOptions ctxOpts = new Browser.NewContextOptions() private TranscriptResult fetchTranscriptFromPage(Page page, String videoId) {
.setLocale("ko-KR") try {
.setViewportSize(1280, 900); log.info("[TRANSCRIPT] Opening YouTube page for {}", videoId);
page.navigate("https://www.youtube.com/watch?v=" + videoId,
new Page.NavigateOptions().setWaitUntil(WaitUntilState.DOMCONTENTLOADED).setTimeout(30000));
page.waitForTimeout(5000);
BrowserContext ctx = browser.newContext(ctxOpts); skipAds(page);
// Load YouTube cookies if available page.waitForTimeout(2000);
loadCookies(ctx); log.info("[TRANSCRIPT] Page loaded, looking for transcript button");
Page page = ctx.newPage(); // Click "더보기" (expand description)
page.evaluate("""
// Hide webdriver flag to reduce bot detection () => {
page.addInitScript("Object.defineProperty(navigator, 'webdriver', {get: () => false})"); const moreBtn = document.querySelector('tp-yt-paper-button#expand');
if (moreBtn) moreBtn.click();
log.info("[TRANSCRIPT] Opening YouTube page for {}", videoId);
page.navigate("https://www.youtube.com/watch?v=" + videoId,
new Page.NavigateOptions().setWaitUntil(WaitUntilState.DOMCONTENTLOADED).setTimeout(30000));
page.waitForTimeout(5000);
// Skip ads if present
skipAds(page);
page.waitForTimeout(2000);
log.info("[TRANSCRIPT] Page loaded, looking for transcript button");
// Click "더보기" (expand description)
page.evaluate("""
() => {
const moreBtn = document.querySelector('tp-yt-paper-button#expand');
if (moreBtn) moreBtn.click();
}
""");
page.waitForTimeout(2000);
// Click transcript button
Object clicked = page.evaluate("""
() => {
// Method 1: aria-label
for (const label of ['스크립트 표시', 'Show transcript']) {
const btns = document.querySelectorAll(`button[aria-label="${label}"]`);
for (const b of btns) { b.click(); return 'aria-label: ' + label; }
}
// Method 2: text content
const allBtns = document.querySelectorAll('button');
for (const b of allBtns) {
const text = b.textContent.trim();
if (text === '스크립트 표시' || text === 'Show transcript') {
b.click();
return 'text: ' + text;
}
}
// Method 3: engagement panel buttons
const engBtns = document.querySelectorAll('ytd-button-renderer button, ytd-button-renderer a');
for (const b of engBtns) {
const text = b.textContent.trim().toLowerCase();
if (text.includes('transcript') || text.includes('스크립트')) {
b.click();
return 'engagement: ' + text;
}
}
return false;
}
""");
log.info("[TRANSCRIPT] Clicked transcript button: {}", clicked);
if (Boolean.FALSE.equals(clicked)) {
Object btnLabels = page.evaluate("""
() => {
const btns = document.querySelectorAll('button[aria-label]');
return Array.from(btns).map(b => b.getAttribute('aria-label')).slice(0, 30);
}
""");
log.warn("[TRANSCRIPT] Transcript button not found. Available buttons: {}", btnLabels);
return null;
} }
""");
page.waitForTimeout(2000);
// Wait for transcript segments to appear (max ~40s) // Click transcript button
Object clicked = page.evaluate("""
() => {
// Method 1: aria-label
for (const label of ['스크립트 표시', 'Show transcript']) {
const btns = document.querySelectorAll(`button[aria-label="${label}"]`);
for (const b of btns) { b.click(); return 'aria-label: ' + label; }
}
// Method 2: text content
const allBtns = document.querySelectorAll('button');
for (const b of allBtns) {
const text = b.textContent.trim();
if (text === '스크립트 표시' || text === 'Show transcript') {
b.click();
return 'text: ' + text;
}
}
// Method 3: engagement panel buttons
const engBtns = document.querySelectorAll('ytd-button-renderer button, ytd-button-renderer a');
for (const b of engBtns) {
const text = b.textContent.trim().toLowerCase();
if (text.includes('transcript') || text.includes('스크립트')) {
b.click();
return 'engagement: ' + text;
}
}
return false;
}
""");
log.info("[TRANSCRIPT] Clicked transcript button: {}", clicked);
if (Boolean.FALSE.equals(clicked)) {
Object btnLabels = page.evaluate("""
() => {
const btns = document.querySelectorAll('button[aria-label]');
return Array.from(btns).map(b => b.getAttribute('aria-label')).slice(0, 30);
}
""");
log.warn("[TRANSCRIPT] Transcript button not found. Available buttons: {}", btnLabels);
return null;
}
// Wait for transcript segments to appear (max ~40s)
page.waitForTimeout(3000);
for (int attempt = 0; attempt < 12; attempt++) {
page.waitForTimeout(3000); page.waitForTimeout(3000);
for (int attempt = 0; attempt < 12; attempt++) { Object count = page.evaluate(
page.waitForTimeout(3000); "() => document.querySelectorAll('ytd-transcript-segment-renderer').length");
Object count = page.evaluate( int segCount = count instanceof Number n ? n.intValue() : 0;
"() => document.querySelectorAll('ytd-transcript-segment-renderer').length"); log.info("[TRANSCRIPT] Wait {}s: {} segments", (attempt + 1) * 3 + 3, segCount);
int segCount = count instanceof Number n ? n.intValue() : 0; if (segCount > 0) break;
log.info("[TRANSCRIPT] Wait {}s: {} segments", (attempt + 1) * 3 + 3, segCount); }
if (segCount > 0) break;
}
// Select Korean if available selectKorean(page);
selectKorean(page);
// Scroll transcript panel and collect segments
Object segmentsObj = page.evaluate("""
async () => {
const container = document.querySelector(
'ytd-transcript-segment-list-renderer #segments-container, ' +
'ytd-transcript-renderer #body'
);
if (!container) {
const segs = document.querySelectorAll('ytd-transcript-segment-renderer');
return Array.from(segs).map(s => {
const txt = s.querySelector('.segment-text, yt-formatted-string.segment-text');
return txt ? txt.textContent.trim() : '';
}).filter(t => t);
}
let prevCount = 0;
for (let i = 0; i < 50; i++) {
container.scrollTop = container.scrollHeight;
await new Promise(r => setTimeout(r, 300));
const segs = document.querySelectorAll('ytd-transcript-segment-renderer');
if (segs.length === prevCount && i > 3) break;
prevCount = segs.length;
}
// Scroll transcript panel and collect segments
Object segmentsObj = page.evaluate("""
async () => {
const container = document.querySelector(
'ytd-transcript-segment-list-renderer #segments-container, ' +
'ytd-transcript-renderer #body'
);
if (!container) {
const segs = document.querySelectorAll('ytd-transcript-segment-renderer'); const segs = document.querySelectorAll('ytd-transcript-segment-renderer');
return Array.from(segs).map(s => { return Array.from(segs).map(s => {
const txt = s.querySelector('.segment-text, yt-formatted-string.segment-text'); const txt = s.querySelector('.segment-text, yt-formatted-string.segment-text');
return txt ? txt.textContent.trim() : ''; return txt ? txt.textContent.trim() : '';
}).filter(t => t); }).filter(t => t);
} }
""");
if (segmentsObj instanceof List<?> segments && !segments.isEmpty()) { let prevCount = 0;
String text = segments.stream() for (let i = 0; i < 50; i++) {
.map(Object::toString) container.scrollTop = container.scrollHeight;
.collect(Collectors.joining(" ")); await new Promise(r => setTimeout(r, 300));
log.info("[TRANSCRIPT] Browser success: {} chars from {} segments", text.length(), segments.size()); const segs = document.querySelectorAll('ytd-transcript-segment-renderer');
return new TranscriptResult(text, "browser"); if (segs.length === prevCount && i > 3) break;
prevCount = segs.length;
}
const segs = document.querySelectorAll('ytd-transcript-segment-renderer');
return Array.from(segs).map(s => {
const txt = s.querySelector('.segment-text, yt-formatted-string.segment-text');
return txt ? txt.textContent.trim() : '';
}).filter(t => t);
} }
""");
log.warn("[TRANSCRIPT] No segments found via browser for {}", videoId); if (segmentsObj instanceof List<?> segments && !segments.isEmpty()) {
return null; String text = segments.stream()
.map(Object::toString)
.collect(Collectors.joining(" "));
log.info("[TRANSCRIPT] Browser success: {} chars from {} segments", text.length(), segments.size());
return new TranscriptResult(text, "browser");
} }
log.warn("[TRANSCRIPT] No segments found via browser for {}", videoId);
return null;
} catch (Exception e) { } catch (Exception e) {
log.error("[TRANSCRIPT] Playwright failed for {}: {}", videoId, e.getMessage()); log.error("[TRANSCRIPT] Page fetch failed for {}: {}", videoId, e.getMessage());
return null; return null;
} }
} }

View File

@@ -39,7 +39,7 @@ app:
expiration-days: 7 expiration-days: 7
cors: cors:
allowed-origins: http://localhost:3000,http://localhost:3001,https://www.tasteby.net,https://tasteby.net allowed-origins: http://localhost:3000,http://localhost:3001,https://www.tasteby.net,https://tasteby.net,https://dev.tasteby.net
oracle: oracle:
wallet-path: ${ORACLE_WALLET:} wallet-path: ${ORACLE_WALLET:}

View File

@@ -16,6 +16,8 @@
<result property="phone" column="phone"/> <result property="phone" column="phone"/>
<result property="website" column="website"/> <result property="website" column="website"/>
<result property="googlePlaceId" column="google_place_id"/> <result property="googlePlaceId" column="google_place_id"/>
<result property="tablingUrl" column="tabling_url"/>
<result property="catchtableUrl" column="catchtable_url"/>
<result property="businessStatus" column="business_status"/> <result property="businessStatus" column="business_status"/>
<result property="rating" column="rating"/> <result property="rating" column="rating"/>
<result property="ratingCount" column="rating_count"/> <result property="ratingCount" column="rating_count"/>
@@ -26,7 +28,7 @@
<select id="findAll" resultMap="restaurantMap"> <select id="findAll" resultMap="restaurantMap">
SELECT DISTINCT r.id, r.name, r.address, r.region, r.latitude, r.longitude, SELECT DISTINCT r.id, r.name, r.address, r.region, r.latitude, r.longitude,
r.cuisine_type, r.price_range, r.google_place_id, r.cuisine_type, r.price_range, r.google_place_id, r.tabling_url, r.catchtable_url,
r.business_status, r.rating, r.rating_count, r.updated_at r.business_status, r.rating, r.rating_count, r.updated_at
FROM restaurants r FROM restaurants r
<if test="channel != null and channel != ''"> <if test="channel != null and channel != ''">
@@ -54,7 +56,7 @@
<select id="findById" resultMap="restaurantMap"> <select id="findById" resultMap="restaurantMap">
SELECT r.id, r.name, r.address, r.region, r.latitude, r.longitude, SELECT r.id, r.name, r.address, r.region, r.latitude, r.longitude,
r.cuisine_type, r.price_range, r.phone, r.website, r.google_place_id, r.cuisine_type, r.price_range, r.phone, r.website, r.google_place_id,
r.business_status, r.rating, r.rating_count r.tabling_url, r.catchtable_url, r.business_status, r.rating, r.rating_count
FROM restaurants r FROM restaurants r
WHERE r.id = #{id} WHERE r.id = #{id}
</select> </select>
@@ -129,6 +131,12 @@
<if test="fields.containsKey('website')"> <if test="fields.containsKey('website')">
website = #{fields.website}, website = #{fields.website},
</if> </if>
<if test="fields.containsKey('tabling_url')">
tabling_url = #{fields.tabling_url},
</if>
<if test="fields.containsKey('catchtable_url')">
catchtable_url = #{fields.catchtable_url},
</if>
<if test="fields.containsKey('latitude')"> <if test="fields.containsKey('latitude')">
latitude = #{fields.latitude}, latitude = #{fields.latitude},
</if> </if>
@@ -201,6 +209,24 @@
</foreach> </foreach>
</select> </select>
<select id="findWithoutTabling" resultMap="restaurantMap">
SELECT r.id, r.name, r.address, r.region
FROM restaurants r
WHERE r.tabling_url IS NULL
AND r.latitude IS NOT NULL
AND EXISTS (SELECT 1 FROM video_restaurants vr WHERE vr.restaurant_id = r.id)
ORDER BY r.name
</select>
<select id="findWithoutCatchtable" resultMap="restaurantMap">
SELECT r.id, r.name, r.address, r.region
FROM restaurants r
WHERE r.catchtable_url IS NULL
AND r.latitude IS NOT NULL
AND EXISTS (SELECT 1 FROM video_restaurants vr WHERE vr.restaurant_id = r.id)
ORDER BY r.name
</select>
<!-- ===== Remap operations ===== --> <!-- ===== Remap operations ===== -->
<update id="updateCuisineType"> <update id="updateCuisineType">

View File

@@ -186,7 +186,8 @@
<insert id="insertVideo"> <insert id="insertVideo">
INSERT INTO videos (id, channel_id, video_id, title, url, published_at) INSERT INTO videos (id, channel_id, video_id, title, url, published_at)
VALUES (#{id}, #{channelId}, #{videoId}, #{title}, #{url}, #{publishedAt}) VALUES (#{id}, #{channelId}, #{videoId}, #{title}, #{url},
TO_TIMESTAMP(#{publishedAt}, 'YYYY-MM-DD"T"HH24:MI:SS"Z"'))
</insert> </insert>
<select id="getExistingVideoIds" resultType="string"> <select id="getExistingVideoIds" resultType="string">
@@ -194,7 +195,7 @@
</select> </select>
<select id="getLatestVideoDate" resultType="string"> <select id="getLatestVideoDate" resultType="string">
SELECT TO_CHAR(MAX(published_at), 'YYYY-MM-DD"T"HH24:MI:SS"Z"') SELECT TO_CHAR(MAX(published_at), 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS latest_date
FROM videos WHERE channel_id = #{channelId} FROM videos WHERE channel_id = #{channelId}
</select> </select>

View File

@@ -5,5 +5,6 @@
<setting name="mapUnderscoreToCamelCase" value="true"/> <setting name="mapUnderscoreToCamelCase" value="true"/>
<setting name="callSettersOnNulls" value="true"/> <setting name="callSettersOnNulls" value="true"/>
<setting name="returnInstanceForEmptyRow" value="true"/> <setting name="returnInstanceForEmptyRow" value="true"/>
<setting name="jdbcTypeForNull" value="VARCHAR"/>
</settings> </settings>
</configuration> </configuration>

View File

@@ -1495,6 +1495,12 @@ function RestaurantsPanel({ isAdmin }: { isAdmin: boolean }) {
const [editForm, setEditForm] = useState<Record<string, string>>({}); const [editForm, setEditForm] = useState<Record<string, string>>({});
const [saving, setSaving] = useState(false); const [saving, setSaving] = useState(false);
const [videos, setVideos] = useState<VideoLink[]>([]); const [videos, setVideos] = useState<VideoLink[]>([]);
const [tablingSearching, setTablingSearching] = useState(false);
const [bulkTabling, setBulkTabling] = useState(false);
const [bulkTablingProgress, setBulkTablingProgress] = useState({ current: 0, total: 0, name: "", linked: 0, notFound: 0 });
const [catchtableSearching, setCatchtableSearching] = useState(false);
const [bulkCatchtable, setBulkCatchtable] = useState(false);
const [bulkCatchtableProgress, setBulkCatchtableProgress] = useState({ current: 0, total: 0, name: "", linked: 0, notFound: 0 });
type RestSortKey = "name" | "region" | "cuisine_type" | "price_range" | "rating" | "business_status"; type RestSortKey = "name" | "region" | "cuisine_type" | "price_range" | "rating" | "business_status";
const [sortKey, setSortKey] = useState<RestSortKey>("name"); const [sortKey, setSortKey] = useState<RestSortKey>("name");
const [sortAsc, setSortAsc] = useState(true); const [sortAsc, setSortAsc] = useState(true);
@@ -1617,10 +1623,126 @@ function RestaurantsPanel({ isAdmin }: { isAdmin: boolean }) {
</button> </button>
)} )}
</div> </div>
{isAdmin && (<>
<button
onClick={async () => {
const pending = await fetch(`/api/restaurants/tabling-pending`, {
headers: { Authorization: `Bearer ${localStorage.getItem("tasteby_token")}` },
}).then(r => r.json());
if (pending.count === 0) { alert("테이블링 미연결 식당이 없습니다"); return; }
if (!confirm(`테이블링 미연결 식당 ${pending.count}개를 벌크 검색합니다.\n식당당 5~15초 소요됩니다. 진행할까요?`)) return;
setBulkTabling(true);
setBulkTablingProgress({ current: 0, total: pending.count, name: "", linked: 0, notFound: 0 });
try {
const res = await fetch("/api/restaurants/bulk-tabling", {
method: "POST",
headers: { Authorization: `Bearer ${localStorage.getItem("tasteby_token")}` },
});
const reader = res.body!.getReader();
const decoder = new TextDecoder();
let buf = "";
while (true) {
const { done, value } = await reader.read();
if (done) break;
buf += decoder.decode(value, { stream: true });
const lines = buf.split("\n");
buf = lines.pop() || "";
for (const line of lines) {
const m = line.match(/^data:(.+)$/);
if (!m) continue;
const evt = JSON.parse(m[1]);
if (evt.type === "processing" || evt.type === "done" || evt.type === "notfound" || evt.type === "error") {
setBulkTablingProgress(p => ({
...p, current: evt.current, total: evt.total || p.total, name: evt.name,
linked: evt.type === "done" ? p.linked + 1 : p.linked,
notFound: (evt.type === "notfound" || evt.type === "error") ? p.notFound + 1 : p.notFound,
}));
} else if (evt.type === "complete") {
alert(`완료! 연결: ${evt.linked}개, 미발견: ${evt.notFound}`);
}
}
}
} catch (e) { alert("벌크 테이블링 실패: " + (e instanceof Error ? e.message : String(e))); }
finally { setBulkTabling(false); load(); }
}}
disabled={bulkTabling}
className="px-3 py-1.5 text-xs bg-orange-500 text-white rounded hover:bg-orange-600 disabled:opacity-50"
>
{bulkTabling ? `테이블링 검색 중 (${bulkTablingProgress.current}/${bulkTablingProgress.total})` : "벌크 테이블링 연결"}
</button>
<button
onClick={async () => {
const pending = await fetch(`/api/restaurants/catchtable-pending`, {
headers: { Authorization: `Bearer ${localStorage.getItem("tasteby_token")}` },
}).then(r => r.json());
if (pending.count === 0) { alert("캐치테이블 미연결 식당이 없습니다"); return; }
if (!confirm(`캐치테이블 미연결 식당 ${pending.count}개를 벌크 검색합니다.\n식당당 5~15초 소요됩니다. 진행할까요?`)) return;
setBulkCatchtable(true);
setBulkCatchtableProgress({ current: 0, total: pending.count, name: "", linked: 0, notFound: 0 });
try {
const res = await fetch("/api/restaurants/bulk-catchtable", {
method: "POST",
headers: { Authorization: `Bearer ${localStorage.getItem("tasteby_token")}` },
});
const reader = res.body!.getReader();
const decoder = new TextDecoder();
let buf = "";
while (true) {
const { done, value } = await reader.read();
if (done) break;
buf += decoder.decode(value, { stream: true });
const lines = buf.split("\n");
buf = lines.pop() || "";
for (const line of lines) {
const m = line.match(/^data:(.+)$/);
if (!m) continue;
const evt = JSON.parse(m[1]);
if (evt.type === "processing" || evt.type === "done" || evt.type === "notfound" || evt.type === "error") {
setBulkCatchtableProgress(p => ({
...p, current: evt.current, total: evt.total || p.total, name: evt.name,
linked: evt.type === "done" ? p.linked + 1 : p.linked,
notFound: (evt.type === "notfound" || evt.type === "error") ? p.notFound + 1 : p.notFound,
}));
} else if (evt.type === "complete") {
alert(`완료! 연결: ${evt.linked}개, 미발견: ${evt.notFound}`);
}
}
}
} catch (e) { alert("벌크 캐치테이블 실패: " + (e instanceof Error ? e.message : String(e))); }
finally { setBulkCatchtable(false); load(); }
}}
disabled={bulkCatchtable}
className="px-3 py-1.5 text-xs bg-violet-500 text-white rounded hover:bg-violet-600 disabled:opacity-50"
>
{bulkCatchtable ? `캐치테이블 검색 중 (${bulkCatchtableProgress.current}/${bulkCatchtableProgress.total})` : "벌크 캐치테이블 연결"}
</button>
</>)}
<span className="text-sm text-gray-400 ml-auto"> <span className="text-sm text-gray-400 ml-auto">
{nameSearch ? `${sorted.length} / ` : ""} {restaurants.length} {nameSearch ? `${sorted.length} / ` : ""} {restaurants.length}
</span> </span>
</div> </div>
{bulkTabling && bulkTablingProgress.name && (
<div className="bg-orange-50 rounded p-3 mb-4 text-sm">
<div className="flex justify-between mb-1">
<span>{bulkTablingProgress.current}/{bulkTablingProgress.total} - {bulkTablingProgress.name}</span>
<span className="text-xs text-gray-500">: {bulkTablingProgress.linked} / : {bulkTablingProgress.notFound}</span>
</div>
<div className="w-full bg-orange-200 rounded-full h-1.5">
<div className="bg-orange-500 h-1.5 rounded-full transition-all" style={{ width: `${(bulkTablingProgress.current / bulkTablingProgress.total) * 100}%` }} />
</div>
</div>
)}
{bulkCatchtable && bulkCatchtableProgress.name && (
<div className="bg-violet-50 rounded p-3 mb-4 text-sm">
<div className="flex justify-between mb-1">
<span>{bulkCatchtableProgress.current}/{bulkCatchtableProgress.total} - {bulkCatchtableProgress.name}</span>
<span className="text-xs text-gray-500">: {bulkCatchtableProgress.linked} / : {bulkCatchtableProgress.notFound}</span>
</div>
<div className="w-full bg-violet-200 rounded-full h-1.5">
<div className="bg-violet-500 h-1.5 rounded-full transition-all" style={{ width: `${(bulkCatchtableProgress.current / bulkCatchtableProgress.total) * 100}%` }} />
</div>
</div>
)}
<div className="bg-white rounded-lg shadow overflow-auto"> <div className="bg-white rounded-lg shadow overflow-auto">
<table className="w-full text-sm"> <table className="w-full text-sm">
@@ -1730,6 +1852,109 @@ function RestaurantsPanel({ isAdmin }: { isAdmin: boolean }) {
</a> </a>
</p> </p>
)} )}
{/* 테이블링 연결 */}
{isAdmin && (
<div className="mt-4 border-t pt-3">
<div className="flex items-center gap-2 mb-2">
<h4 className="text-xs font-semibold text-gray-500"></h4>
{selected.tabling_url === "NONE" ? (
<span className="text-xs text-gray-400">-</span>
) : selected.tabling_url ? (
<a href={selected.tabling_url} target="_blank" rel="noopener noreferrer"
className="text-blue-600 hover:underline text-xs">{selected.tabling_url}</a>
) : (
<span className="text-xs text-gray-400"></span>
)}
<button
onClick={async () => {
setTablingSearching(true);
try {
const results = await api.searchTabling(selected.id);
if (results.length === 0) {
alert("테이블링에서 검색 결과가 없습니다");
} else {
const best = results[0];
if (confirm(`"${best.title}"\n${best.url}\n\n이 테이블링 페이지를 연결할까요?`)) {
await api.setTablingUrl(selected.id, best.url);
setSelected({ ...selected, tabling_url: best.url });
load();
}
}
} catch (e) { alert("검색 실패: " + (e instanceof Error ? e.message : String(e))); }
finally { setTablingSearching(false); }
}}
disabled={tablingSearching}
className="px-2 py-0.5 text-[11px] bg-orange-500 text-white rounded hover:bg-orange-600 disabled:opacity-50"
>
{tablingSearching ? "검색 중..." : "테이블링 검색"}
</button>
{selected.tabling_url && (
<button
onClick={async () => {
await api.setTablingUrl(selected.id, "");
setSelected({ ...selected, tabling_url: null });
load();
}}
className="px-2 py-0.5 text-[11px] text-red-500 border border-red-200 rounded hover:bg-red-50"
>
</button>
)}
</div>
</div>
)}
{/* 캐치테이블 연결 */}
{isAdmin && (
<div className="mt-4 border-t pt-3">
<div className="flex items-center gap-2 mb-2">
<h4 className="text-xs font-semibold text-gray-500"></h4>
{selected.catchtable_url === "NONE" ? (
<span className="text-xs text-gray-400">-</span>
) : selected.catchtable_url ? (
<a href={selected.catchtable_url} target="_blank" rel="noopener noreferrer"
className="text-blue-600 hover:underline text-xs">{selected.catchtable_url}</a>
) : (
<span className="text-xs text-gray-400"></span>
)}
<button
onClick={async () => {
setCatchtableSearching(true);
try {
const results = await api.searchCatchtable(selected.id);
if (results.length === 0) {
alert("캐치테이블에서 검색 결과가 없습니다");
} else {
const best = results[0];
if (confirm(`"${best.title}"\n${best.url}\n\n이 캐치테이블 페이지를 연결할까요?`)) {
await api.setCatchtableUrl(selected.id, best.url);
setSelected({ ...selected, catchtable_url: best.url });
load();
}
}
} catch (e) { alert("검색 실패: " + (e instanceof Error ? e.message : String(e))); }
finally { setCatchtableSearching(false); }
}}
disabled={catchtableSearching}
className="px-2 py-0.5 text-[11px] bg-violet-500 text-white rounded hover:bg-violet-600 disabled:opacity-50"
>
{catchtableSearching ? "검색 중..." : "캐치테이블 검색"}
</button>
{selected.catchtable_url && (
<button
onClick={async () => {
await api.setCatchtableUrl(selected.id, "");
setSelected({ ...selected, catchtable_url: null });
load();
}}
className="px-2 py-0.5 text-[11px] text-red-500 border border-red-200 rounded hover:bg-red-50"
>
</button>
)}
</div>
</div>
)}
{videos.length > 0 && ( {videos.length > 0 && (
<div className="mt-4 border-t pt-3"> <div className="mt-4 border-t pt-3">
<h4 className="text-xs font-semibold text-gray-500 mb-2"> ({videos.length})</h4> <h4 className="text-xs font-semibold text-gray-500 mb-2"> ({videos.length})</h4>

View File

@@ -42,3 +42,8 @@ html, body, #__next {
.gm-style .gm-style-iw-d { .gm-style .gm-style-iw-d {
overflow: auto !important; overflow: auto !important;
} }
/* Safe area for iOS bottom nav */
.safe-area-bottom {
padding-bottom: env(safe-area-inset-bottom, 0px);
}

View File

@@ -2,6 +2,7 @@
import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { GoogleLogin } from "@react-oauth/google"; import { GoogleLogin } from "@react-oauth/google";
import LoginMenu from "@/components/LoginMenu";
import { api } from "@/lib/api"; import { api } from "@/lib/api";
import type { Restaurant, Channel, Review } from "@/lib/api"; import type { Restaurant, Channel, Review } from "@/lib/api";
import { useAuth } from "@/lib/auth-context"; import { useAuth } from "@/lib/auth-context";
@@ -140,6 +141,7 @@ export default function Home() {
const [cuisineFilter, setCuisineFilter] = useState(""); const [cuisineFilter, setCuisineFilter] = useState("");
const [priceFilter, setPriceFilter] = useState(""); const [priceFilter, setPriceFilter] = useState("");
const [viewMode, setViewMode] = useState<"map" | "list">("list"); const [viewMode, setViewMode] = useState<"map" | "list">("list");
const [mobileTab, setMobileTab] = useState<"home" | "list" | "nearby" | "favorites" | "profile">("home");
const [showMobileFilters, setShowMobileFilters] = useState(false); const [showMobileFilters, setShowMobileFilters] = useState(false);
const [mapBounds, setMapBounds] = useState<MapBounds | null>(null); const [mapBounds, setMapBounds] = useState<MapBounds | null>(null);
const [boundsFilterOn, setBoundsFilterOn] = useState(false); const [boundsFilterOn, setBoundsFilterOn] = useState(false);
@@ -151,6 +153,7 @@ export default function Home() {
const [showMyReviews, setShowMyReviews] = useState(false); const [showMyReviews, setShowMyReviews] = useState(false);
const [myReviews, setMyReviews] = useState<(Review & { restaurant_id: string; restaurant_name: string | null })[]>([]); const [myReviews, setMyReviews] = useState<(Review & { restaurant_id: string; restaurant_name: string | null })[]>([]);
const [visits, setVisits] = useState<{ today: number; total: number } | null>(null); const [visits, setVisits] = useState<{ today: number; total: number } | null>(null);
const [userLoc, setUserLoc] = useState<{ lat: number; lng: number }>({ lat: 37.498, lng: 127.0276 });
const geoApplied = useRef(false); const geoApplied = useRef(false);
const regionTree = useMemo(() => buildRegionTree(restaurants), [restaurants]); const regionTree = useMemo(() => buildRegionTree(restaurants), [restaurants]);
@@ -169,6 +172,8 @@ export default function Home() {
}, [regionTree, countryFilter, cityFilter]); }, [regionTree, countryFilter, cityFilter]);
const filteredRestaurants = useMemo(() => { const filteredRestaurants = useMemo(() => {
const dist = (r: Restaurant) =>
(r.latitude - userLoc.lat) ** 2 + (r.longitude - userLoc.lng) ** 2;
return restaurants.filter((r) => { return restaurants.filter((r) => {
if (channelFilter && !(r.channels || []).includes(channelFilter)) return false; if (channelFilter && !(r.channels || []).includes(channelFilter)) return false;
if (cuisineFilter && !matchCuisineFilter(r.cuisine_type, cuisineFilter)) return false; if (cuisineFilter && !matchCuisineFilter(r.cuisine_type, cuisineFilter)) return false;
@@ -184,12 +189,23 @@ export default function Home() {
if (r.longitude < mapBounds.west || r.longitude > mapBounds.east) return false; if (r.longitude < mapBounds.west || r.longitude > mapBounds.east) return false;
} }
return true; return true;
}).sort((a, b) => {
const da = dist(a), db = dist(b);
if (da !== db) return da - db;
return (b.rating || 0) - (a.rating || 0);
}); });
}, [restaurants, channelFilter, cuisineFilter, priceFilter, countryFilter, cityFilter, districtFilter, boundsFilterOn, mapBounds]); }, [restaurants, channelFilter, cuisineFilter, priceFilter, countryFilter, cityFilter, districtFilter, boundsFilterOn, mapBounds, userLoc]);
// Set desktop default to map mode on mount // Set desktop default to map mode on mount + get user location
useEffect(() => { useEffect(() => {
if (window.innerWidth >= 768) setViewMode("map"); if (window.innerWidth >= 768) setViewMode("map");
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(
(pos) => setUserLoc({ lat: pos.coords.latitude, lng: pos.coords.longitude }),
() => {},
{ timeout: 5000 },
);
}
}, []); }, []);
// Load channels + record visit on mount // Load channels + record visit on mount
@@ -220,12 +236,9 @@ export default function Home() {
if (match) { if (match) {
setCountryFilter(match.country); setCountryFilter(match.country);
setCityFilter(match.city); setCityFilter(match.city);
const matched = restaurants.filter((r) => {
const p = parseRegion(r.region);
return p && p.country === match.country && p.city === match.city;
});
setRegionFlyTo(computeFlyTo(matched));
} }
const mobile = window.innerWidth < 768;
setRegionFlyTo({ lat: pos.coords.latitude, lng: pos.coords.longitude, zoom: mobile ? 13 : 16 });
}, },
() => { /* user denied or error — do nothing */ }, () => { /* user denied or error — do nothing */ },
{ timeout: 5000 }, { timeout: 5000 },
@@ -262,6 +275,21 @@ export default function Home() {
setMapBounds(bounds); setMapBounds(bounds);
}, []); }, []);
const handleMyLocation = useCallback(() => {
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(
(pos) => {
setUserLoc({ lat: pos.coords.latitude, lng: pos.coords.longitude });
setRegionFlyTo({ lat: pos.coords.latitude, lng: pos.coords.longitude, zoom: 16 });
},
() => setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 16 }),
{ timeout: 5000 },
);
} else {
setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 16 });
}
}, []);
const handleCountryChange = useCallback((country: string) => { const handleCountryChange = useCallback((country: string) => {
setCountryFilter(country); setCountryFilter(country);
setCityFilter(""); setCityFilter("");
@@ -333,6 +361,75 @@ export default function Home() {
.finally(() => setLoading(false)); .finally(() => setLoading(false));
}, []); }, []);
const handleMobileTab = useCallback(async (tab: "home" | "list" | "nearby" | "favorites" | "profile") => {
// 홈 탭 재클릭 = 리셋
if (tab === "home" && mobileTab === "home") {
handleReset();
return;
}
setMobileTab(tab);
setShowDetail(false);
setShowMobileFilters(false);
setSelected(null);
if (tab === "nearby") {
setBoundsFilterOn(true);
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(
(pos) => setRegionFlyTo({ lat: pos.coords.latitude, lng: pos.coords.longitude, zoom: 13 }),
() => setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 13 }),
{ timeout: 5000 },
);
} else {
setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 13 });
}
// 내주변에서 돌아올 때를 위해 favorites/reviews 해제
if (showFavorites || showMyReviews) {
setShowFavorites(false);
setShowMyReviews(false);
setMyReviews([]);
api.getRestaurants({ limit: 500, channel: channelFilter || undefined }).then(setRestaurants);
}
return;
}
setBoundsFilterOn(false);
if (tab === "favorites") {
if (!user) return;
setShowMyReviews(false);
setMyReviews([]);
try {
const favs = await api.getMyFavorites();
setRestaurants(favs);
setShowFavorites(true);
} catch { /* ignore */ }
} else if (tab === "profile") {
if (!user) return;
setShowFavorites(false);
try {
const reviews = await api.getMyReviews();
setMyReviews(reviews);
setShowMyReviews(true);
} catch { /* ignore */ }
// 프로필에서는 식당 목록을 원래대로 복원
if (showFavorites) {
api.getRestaurants({ limit: 500, channel: channelFilter || undefined }).then(setRestaurants);
}
} else {
// 홈 / 식당 목록 - 항상 전체 식당 목록으로 복원
const needReload = showFavorites || showMyReviews;
setShowFavorites(false);
setShowMyReviews(false);
setMyReviews([]);
if (needReload) {
const data = await api.getRestaurants({ limit: 500, channel: channelFilter || undefined });
setRestaurants(data);
}
}
}, [user, showFavorites, showMyReviews, channelFilter, mobileTab, handleReset]);
const handleToggleFavorites = async () => { const handleToggleFavorites = async () => {
if (showFavorites) { if (showFavorites) {
setShowFavorites(false); setShowFavorites(false);
@@ -436,6 +533,13 @@ export default function Home() {
<div className="w-96 shrink-0"> <div className="w-96 shrink-0">
<SearchBar onSearch={handleSearch} isLoading={loading} /> <SearchBar onSearch={handleSearch} isLoading={loading} />
</div> </div>
<button
onClick={handleReset}
className="p-1.5 text-gray-400 dark:text-gray-500 hover:text-orange-500 dark:hover:text-orange-400 transition-colors"
title="초기화"
>
<svg viewBox="0 0 24 24" className="w-5 h-5 fill-current"><path d="M17.65 6.35A7.958 7.958 0 0012 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08A5.99 5.99 0 0112 18c-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>
</button>
<select <select
value={channelFilter} value={channelFilter}
onChange={(e) => { onChange={(e) => {
@@ -445,7 +549,7 @@ export default function Home() {
}} }}
className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800"
> >
<option value="">📺 </option> <option value="">📺 </option>
{channels.map((ch) => ( {channels.map((ch) => (
<option key={ch.id} value={ch.channel_name}> <option key={ch.id} value={ch.channel_name}>
📺 {ch.channel_name} 📺 {ch.channel_name}
@@ -457,7 +561,7 @@ export default function Home() {
onChange={(e) => setCuisineFilter(e.target.value)} onChange={(e) => setCuisineFilter(e.target.value)}
className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800"
> >
<option value="">🍽 </option> <option value="">🍽 </option>
{CUISINE_TAXONOMY.map((g) => ( {CUISINE_TAXONOMY.map((g) => (
<optgroup key={g.category} label={`── ${g.category} ──`}> <optgroup key={g.category} label={`── ${g.category} ──`}>
<option value={g.category}>🍽 {g.category} </option> <option value={g.category}>🍽 {g.category} </option>
@@ -474,7 +578,7 @@ export default function Home() {
onChange={(e) => setPriceFilter(e.target.value)} onChange={(e) => setPriceFilter(e.target.value)}
className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800"
> >
<option value="">💰 </option> <option value="">💰 </option>
{PRICE_GROUPS.map((g) => ( {PRICE_GROUPS.map((g) => (
<option key={g.label} value={g.label}>{g.label}</option> <option key={g.label} value={g.label}>{g.label}</option>
))} ))}
@@ -487,7 +591,7 @@ export default function Home() {
onChange={(e) => handleCountryChange(e.target.value)} onChange={(e) => handleCountryChange(e.target.value)}
className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-3 py-1.5 text-sm text-gray-600 dark:text-gray-300 dark:bg-gray-800"
> >
<option value="">🌍 </option> <option value="">🌍 </option>
{countries.map((c) => ( {countries.map((c) => (
<option key={c} value={c}>🌍 {c}</option> <option key={c} value={c}>🌍 {c}</option>
))} ))}
@@ -518,15 +622,29 @@ export default function Home() {
)} )}
<div className="w-px h-5 bg-gray-200 dark:bg-gray-700" /> <div className="w-px h-5 bg-gray-200 dark:bg-gray-700" />
<button <button
onClick={() => setBoundsFilterOn(!boundsFilterOn)} onClick={() => {
const next = !boundsFilterOn;
setBoundsFilterOn(next);
if (next) {
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(
(pos) => setRegionFlyTo({ lat: pos.coords.latitude, lng: pos.coords.longitude, zoom: 15 }),
() => setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 15 }),
{ timeout: 5000 },
);
} else {
setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 15 });
}
}
}}
className={`px-3 py-1.5 text-sm border rounded-lg transition-colors ${ className={`px-3 py-1.5 text-sm border rounded-lg transition-colors ${
boundsFilterOn boundsFilterOn
? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400" ? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400"
: "hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-600 dark:text-gray-400" : "hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-600 dark:text-gray-400"
}`} }`}
title="지도 영역 내 식당만 표시" title="내 위치 주변 식당만 표시"
> >
{boundsFilterOn ? "📍 영역 필터" : "📍 영역"} {boundsFilterOn ? "📍 내위치 ON" : "📍 내위치"}
</button> </button>
<button <button
onClick={() => setViewMode(viewMode === "map" ? "list" : "map")} onClick={() => setViewMode(viewMode === "map" ? "list" : "map")}
@@ -591,74 +709,32 @@ export default function Home() {
</button> </button>
</div> </div>
) : ( ) : (
<GoogleLogin <LoginMenu onGoogleSuccess={(credential) => login(credential).catch(console.error)} />
onSuccess={(credentialResponse) => {
if (credentialResponse.credential) {
login(credentialResponse.credential).catch(console.error);
}
}}
onError={() => console.error("Google login failed")}
size="small"
/>
)} )}
</div> </div>
</div> </div>
{/* ── Header row 2 (mobile only): search + toolbar ── */} {/* ── Header row 2 (mobile only): search + toolbar ── */}
<div className="md:hidden px-4 pb-3 space-y-2"> <div className={`md:hidden px-4 pb-3 space-y-2 ${mobileTab === "favorites" || mobileTab === "profile" ? "hidden" : ""}`}>
{/* Row 1: Search */} {/* Row 1: Search */}
<SearchBar onSearch={handleSearch} isLoading={loading} /> <SearchBar onSearch={handleSearch} isLoading={loading} />
{/* Row 2: Toolbar */} {/* Row 2: Toolbar */}
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<button
onClick={() => setViewMode(viewMode === "map" ? "list" : "map")}
className={`px-3 py-1.5 text-xs border rounded-lg transition-colors ${
viewMode === "map"
? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400"
: "text-gray-600"
}`}
>
{viewMode === "map" ? "🗺 지도" : "☰ 리스트"}
</button>
<button <button
onClick={() => setShowMobileFilters(!showMobileFilters)} onClick={() => setShowMobileFilters(!showMobileFilters)}
className={`px-3 py-1.5 text-xs border rounded-lg transition-colors relative ${ className={`px-3 py-1.5 text-xs border rounded-lg transition-colors relative ${
showMobileFilters || channelFilter || cuisineFilter || priceFilter || countryFilter || boundsFilterOn showMobileFilters || channelFilter || cuisineFilter || priceFilter || countryFilter
? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400" ? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400"
: "text-gray-600" : "text-gray-600"
}`} }`}
> >
{showMobileFilters ? "✕ 닫기" : "🔽 필터"} {showMobileFilters ? "✕ 닫기" : "🔽 필터"}
{!showMobileFilters && (channelFilter || cuisineFilter || priceFilter || countryFilter || boundsFilterOn) && ( {!showMobileFilters && (channelFilter || cuisineFilter || priceFilter || countryFilter) && (
<span className="absolute -top-1.5 -right-1.5 w-4 h-4 bg-orange-500 text-white rounded-full text-[9px] flex items-center justify-center"> <span className="absolute -top-1.5 -right-1.5 w-4 h-4 bg-orange-500 text-white rounded-full text-[9px] flex items-center justify-center">
{[channelFilter, cuisineFilter, priceFilter, countryFilter, boundsFilterOn].filter(Boolean).length} {[channelFilter, cuisineFilter, priceFilter, countryFilter].filter(Boolean).length}
</span> </span>
)} )}
</button> </button>
{user && (
<>
<button
onClick={handleToggleFavorites}
className={`px-3 py-1.5 text-xs rounded-full border transition-colors ${
showFavorites
? "bg-rose-50 dark:bg-rose-900/30 border-rose-300 dark:border-rose-700 text-rose-600 dark:text-rose-400"
: "border-gray-300 dark:border-gray-700 text-gray-600 dark:text-gray-400"
}`}
>
{showFavorites ? "♥ 찜" : "♡ 찜"}
</button>
<button
onClick={handleToggleMyReviews}
className={`px-3 py-1.5 text-xs rounded-full border transition-colors ${
showMyReviews
? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400"
: "border-gray-300 dark:border-gray-700 text-gray-600 dark:text-gray-400"
}`}
>
{showMyReviews ? "✎ 리뷰" : "✎ 리뷰"}
</button>
</>
)}
<span className="text-xs text-gray-400 ml-auto"> <span className="text-xs text-gray-400 ml-auto">
{filteredRestaurants.length} {filteredRestaurants.length}
</span> </span>
@@ -678,7 +754,7 @@ export default function Home() {
}} }}
className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800"
> >
<option value="">📺 </option> <option value="">📺 </option>
{channels.map((ch) => ( {channels.map((ch) => (
<option key={ch.id} value={ch.channel_name}> <option key={ch.id} value={ch.channel_name}>
📺 {ch.channel_name} 📺 {ch.channel_name}
@@ -690,7 +766,7 @@ export default function Home() {
onChange={(e) => setCuisineFilter(e.target.value)} onChange={(e) => setCuisineFilter(e.target.value)}
className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800"
> >
<option value="">🍽 </option> <option value="">🍽 </option>
{CUISINE_TAXONOMY.map((g) => ( {CUISINE_TAXONOMY.map((g) => (
<optgroup key={g.category} label={`── ${g.category} ──`}> <optgroup key={g.category} label={`── ${g.category} ──`}>
<option value={g.category}>🍽 {g.category} </option> <option value={g.category}>🍽 {g.category} </option>
@@ -707,7 +783,7 @@ export default function Home() {
onChange={(e) => setPriceFilter(e.target.value)} onChange={(e) => setPriceFilter(e.target.value)}
className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800"
> >
<option value="">💰 </option> <option value="">💰 </option>
{PRICE_GROUPS.map((g) => ( {PRICE_GROUPS.map((g) => (
<option key={g.label} value={g.label}>💰 {g.label}</option> <option key={g.label} value={g.label}>💰 {g.label}</option>
))} ))}
@@ -720,7 +796,7 @@ export default function Home() {
onChange={(e) => handleCountryChange(e.target.value)} onChange={(e) => handleCountryChange(e.target.value)}
className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800" className="border dark:border-gray-700 rounded-lg px-2.5 py-1.5 text-xs text-gray-600 dark:text-gray-300 bg-white dark:bg-gray-800"
> >
<option value="">🌍 </option> <option value="">🌍 </option>
{countries.map((c) => ( {countries.map((c) => (
<option key={c} value={c}>🌍 {c}</option> <option key={c} value={c}>🌍 {c}</option>
))} ))}
@@ -753,14 +829,28 @@ export default function Home() {
{/* Toggle buttons */} {/* Toggle buttons */}
<div className="flex items-center gap-2 flex-wrap"> <div className="flex items-center gap-2 flex-wrap">
<button <button
onClick={() => setBoundsFilterOn(!boundsFilterOn)} onClick={() => {
const next = !boundsFilterOn;
setBoundsFilterOn(next);
if (next) {
if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(
(pos) => setRegionFlyTo({ lat: pos.coords.latitude, lng: pos.coords.longitude, zoom: 15 }),
() => setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 15 }),
{ timeout: 5000 },
);
} else {
setRegionFlyTo({ lat: 37.498, lng: 127.0276, zoom: 15 });
}
}
}}
className={`px-2.5 py-1.5 text-xs border rounded-lg transition-colors ${ className={`px-2.5 py-1.5 text-xs border rounded-lg transition-colors ${
boundsFilterOn boundsFilterOn
? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400" ? "bg-orange-50 dark:bg-orange-900/30 border-orange-300 dark:border-orange-700 text-orange-600 dark:text-orange-400"
: "text-gray-600 dark:text-gray-400 bg-white dark:bg-gray-800" : "text-gray-600 dark:text-gray-400 bg-white dark:bg-gray-800"
}`} }`}
> >
{boundsFilterOn ? "📍 영역 ON" : "📍 영역"} {boundsFilterOn ? "📍 내위치 ON" : "📍 내위치"}
</button> </button>
</div> </div>
</div> </div>
@@ -784,6 +874,8 @@ export default function Home() {
onSelectRestaurant={handleSelectRestaurant} onSelectRestaurant={handleSelectRestaurant}
onBoundsChanged={handleBoundsChanged} onBoundsChanged={handleBoundsChanged}
flyTo={regionFlyTo} flyTo={regionFlyTo}
onMyLocation={handleMyLocation}
activeChannel={channelFilter || undefined}
/> />
{visits && ( {visits && (
<div className="absolute bottom-1 right-2 bg-white/60 backdrop-blur-sm text-gray-700 text-[10px] px-2.5 py-1 rounded-lg shadow-sm"> <div className="absolute bottom-1 right-2 bg-white/60 backdrop-blur-sm text-gray-700 text-[10px] px-2.5 py-1 rounded-lg shadow-sm">
@@ -804,6 +896,8 @@ export default function Home() {
onSelectRestaurant={handleSelectRestaurant} onSelectRestaurant={handleSelectRestaurant}
onBoundsChanged={handleBoundsChanged} onBoundsChanged={handleBoundsChanged}
flyTo={regionFlyTo} flyTo={regionFlyTo}
onMyLocation={handleMyLocation}
activeChannel={channelFilter || undefined}
/> />
{visits && ( {visits && (
<div className="absolute bottom-1 right-2 bg-white/60 backdrop-blur-sm text-gray-700 text-[10px] px-2.5 py-1 rounded-lg shadow-sm"> <div className="absolute bottom-1 right-2 bg-white/60 backdrop-blur-sm text-gray-700 text-[10px] px-2.5 py-1 rounded-lg shadow-sm">
@@ -816,68 +910,115 @@ export default function Home() {
</div> </div>
{/* Mobile layout */} {/* Mobile layout */}
<div className="md:hidden flex-1 flex flex-col overflow-hidden"> <div className="md:hidden flex-1 flex flex-col overflow-hidden pb-14">
{viewMode === "map" ? ( {/* Tab content — takes all remaining space above fixed nav */}
<> {mobileTab === "nearby" ? (
<div className="flex-1 relative"> /* 내주변: 지도 + 리스트 분할, 영역필터 ON */
<div className="flex-1 flex flex-col overflow-hidden">
<div className="h-[45%] relative shrink-0">
<MapView <MapView
restaurants={filteredRestaurants} restaurants={filteredRestaurants}
selected={selected} selected={selected}
onSelectRestaurant={handleSelectRestaurant} onSelectRestaurant={handleSelectRestaurant}
onBoundsChanged={handleBoundsChanged} onBoundsChanged={handleBoundsChanged}
flyTo={regionFlyTo} flyTo={regionFlyTo}
onMyLocation={handleMyLocation}
activeChannel={channelFilter || undefined}
/> />
<div className="absolute top-2 left-2 bg-white/90 dark:bg-gray-900/90 backdrop-blur-sm rounded-lg px-3 py-1.5 shadow-sm z-10">
<span className="text-xs font-medium text-orange-600 dark:text-orange-400">
{filteredRestaurants.length}
</span>
</div>
{visits && ( {visits && (
<div className="absolute bottom-1 right-2 bg-white/60 backdrop-blur-sm text-gray-700 text-[10px] px-2.5 py-1 rounded-lg shadow-sm z-10"> <div className="absolute bottom-1 right-2 bg-white/60 backdrop-blur-sm text-gray-700 text-[10px] px-2.5 py-1 rounded-lg shadow-sm z-10">
{visits.today} · {visits.total.toLocaleString()} {visits.today} · {visits.total.toLocaleString()}
</div> </div>
)} )}
</div> </div>
</> <div className="flex-1 overflow-y-auto">
) : ( {mobileListContent}
<> </div>
{/* List area — if selected, show single row; otherwise full list */} </div>
{selected ? ( ) : mobileTab === "profile" ? (
<div /* 내정보 */
className="shrink-0 bg-white dark:bg-gray-950 border-b dark:border-gray-800 px-3 py-2 flex items-center gap-2 cursor-pointer" <div className="flex-1 overflow-y-auto bg-white dark:bg-gray-950">
onClick={() => { setSelected(null); setShowDetail(false); }} {!user ? (
> <div className="flex flex-col items-center justify-center h-full gap-4 px-6">
<span className="text-base">{getCuisineIcon(selected.cuisine_type)}</span> <p className="text-gray-500 dark:text-gray-400 text-sm"> </p>
<span className="font-semibold text-sm truncate flex-1">{selected.name}</span> <GoogleLogin
{selected.rating && ( onSuccess={(res) => {
<span className="text-xs text-gray-500"><span className="text-yellow-500"></span> {selected.rating}</span> if (res.credential) login(res.credential).catch(console.error);
)} }}
{selected.cuisine_type && ( onError={() => console.error("Google login failed")}
<span className="text-xs text-gray-400">{selected.cuisine_type}</span> size="large"
)} text="signin_with"
<button />
onClick={(e) => { e.stopPropagation(); setSelected(null); setShowDetail(false); }}
className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 text-lg leading-none ml-1"
>
</button>
</div> </div>
) : ( ) : (
<div className="max-h-[360px] bg-white dark:bg-gray-950 overflow-y-auto border-b dark:border-gray-800"> <div className="p-4 space-y-4">
{mobileListContent} {/* 프로필 헤더 */}
<div className="flex items-center gap-3 pb-4 border-b dark:border-gray-800">
{user.avatar_url ? (
<img src={user.avatar_url} alt="" className="w-12 h-12 rounded-full border border-gray-200" />
) : (
<div className="w-12 h-12 rounded-full bg-orange-100 text-orange-700 flex items-center justify-center text-lg font-semibold border border-orange-200">
{(user.nickname || user.email || "?").charAt(0).toUpperCase()}
</div>
)}
<div className="flex-1">
<p className="font-semibold text-sm dark:text-gray-100">{user.nickname || user.email}</p>
{user.nickname && user.email && (
<p className="text-xs text-gray-400">{user.email}</p>
)}
</div>
<button
onClick={logout}
className="px-3 py-1.5 text-xs text-gray-500 border border-gray-300 dark:border-gray-700 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800"
>
</button>
</div>
{/* 내 리뷰 */}
<div>
<h3 className="font-semibold text-sm mb-2 dark:text-gray-200"> </h3>
{myReviews.length === 0 ? (
<p className="text-sm text-gray-400"> </p>
) : (
<MyReviewsList
reviews={myReviews}
onClose={() => {}}
onSelectRestaurant={async (restaurantId) => {
try {
const r = await api.getRestaurant(restaurantId);
handleSelectRestaurant(r);
} catch { /* ignore */ }
}}
/>
)}
</div>
</div> </div>
)} )}
{/* Map fills remaining space below the list */} </div>
<div className="flex-1 relative"> ) : (
<MapView /* 홈 / 식당 목록 / 찜: 리스트 표시 */
restaurants={filteredRestaurants} <div className="flex-1 overflow-y-auto bg-white dark:bg-gray-950">
selected={selected} {mobileTab === "favorites" && !user ? (
onSelectRestaurant={handleSelectRestaurant} <div className="flex flex-col items-center justify-center h-full gap-4 px-6">
onBoundsChanged={handleBoundsChanged} <p className="text-gray-500 dark:text-gray-400 text-sm"> </p>
flyTo={regionFlyTo} <GoogleLogin
/> onSuccess={(res) => {
{visits && ( if (res.credential) login(res.credential).catch(console.error);
<div className="absolute bottom-1 right-2 bg-white/60 backdrop-blur-sm text-gray-700 text-[10px] px-2.5 py-1 rounded-lg shadow-sm z-10"> }}
{visits.today} · {visits.total.toLocaleString()} onError={() => console.error("Google login failed")}
</div> size="large"
)} text="signin_with"
</div> />
</> </div>
) : (
mobileListContent
)}
</div>
)} )}
{/* Mobile Bottom Sheet for restaurant detail */} {/* Mobile Bottom Sheet for restaurant detail */}
@@ -888,8 +1029,44 @@ export default function Home() {
</BottomSheet> </BottomSheet>
</div> </div>
{/* Footer */} {/* ── Mobile Bottom Nav (fixed) ── */}
<footer className="shrink-0 border-t dark:border-gray-800 bg-white/60 dark:bg-gray-900/60 backdrop-blur-sm py-2.5 flex items-center justify-center gap-2 text-[11px] text-gray-400 dark:text-gray-500 group"> <nav className="md:hidden fixed bottom-0 left-0 right-0 z-40 border-t dark:border-gray-800 bg-white dark:bg-gray-950 safe-area-bottom">
<div className="flex items-stretch h-14">
{([
{ key: "home", label: "홈", icon: (
<svg viewBox="0 0 24 24" className="w-5 h-5 fill-current"><path d="M12 3l9 8h-3v9h-5v-6h-2v6H6v-9H3z"/></svg>
)},
{ key: "list", label: "식당 목록", icon: (
<svg viewBox="0 0 24 24" className="w-5 h-5 fill-current"><path d="M3 4h18v2H3zm0 7h18v2H3zm0 7h18v2H3z"/></svg>
)},
{ key: "nearby", label: "내주변", icon: (
<svg viewBox="0 0 24 24" className="w-5 h-5 fill-current"><path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"/></svg>
)},
{ key: "favorites", label: "찜", icon: (
<svg viewBox="0 0 24 24" className="w-5 h-5 fill-current"><path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"/></svg>
)},
{ key: "profile", label: "내정보", icon: (
<svg viewBox="0 0 24 24" className="w-5 h-5 fill-current"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/></svg>
)},
] as { key: "home" | "list" | "nearby" | "favorites" | "profile"; label: string; icon: React.ReactNode }[]).map((tab) => (
<button
key={tab.key}
onClick={() => handleMobileTab(tab.key)}
className={`flex-1 flex flex-col items-center justify-center gap-0.5 py-2 transition-colors ${
mobileTab === tab.key
? "text-orange-600 dark:text-orange-400"
: "text-gray-400 dark:text-gray-500"
}`}
>
{tab.icon}
<span className="text-[10px] font-medium">{tab.label}</span>
</button>
))}
</div>
</nav>
{/* Desktop Footer */}
<footer className="hidden md:flex shrink-0 border-t dark:border-gray-800 bg-white/60 dark:bg-gray-900/60 backdrop-blur-sm py-2.5 items-center justify-center gap-2 text-[11px] text-gray-400 dark:text-gray-500 group">
<div className="relative"> <div className="relative">
<img <img
src="/icon.jpg" src="/icon.jpg"

View File

@@ -0,0 +1,60 @@
"use client";
import { useState } from "react";
import { createPortal } from "react-dom";
import { GoogleLogin } from "@react-oauth/google";
interface LoginMenuProps {
onGoogleSuccess: (credential: string) => void;
}
export default function LoginMenu({ onGoogleSuccess }: LoginMenuProps) {
const [open, setOpen] = useState(false);
return (
<>
<button
onClick={() => setOpen(true)}
className="px-3 py-1.5 text-sm font-medium text-gray-600 dark:text-gray-300 hover:text-orange-600 dark:hover:text-orange-400 border border-gray-300 dark:border-gray-600 hover:border-orange-400 dark:hover:border-orange-500 rounded-lg transition-colors"
>
</button>
{open && createPortal(
<div
className="fixed inset-0 flex items-center justify-center bg-black/40 backdrop-blur-sm"
style={{ zIndex: 99999 }}
onClick={(e) => { if (e.target === e.currentTarget) setOpen(false); }}
>
<div className="bg-white dark:bg-gray-900 rounded-2xl shadow-2xl p-6 mx-4 w-full max-w-xs space-y-4">
<div className="flex items-center justify-between">
<h3 className="text-base font-semibold dark:text-gray-100"></h3>
<button
onClick={() => setOpen(false)}
className="text-gray-400 hover:text-gray-600 dark:hover:text-gray-200 text-lg leading-none"
>
</button>
</div>
<p className="text-xs text-gray-400 dark:text-gray-500"> </p>
<div className="flex flex-col items-center gap-3">
<GoogleLogin
onSuccess={(res) => {
if (res.credential) {
onGoogleSuccess(res.credential);
setOpen(false);
}
}}
onError={() => console.error("Google login failed")}
size="large"
width="260"
text="signin_with"
/>
</div>
</div>
</div>,
document.body,
)}
</>
);
}

View File

@@ -57,33 +57,14 @@ interface MapViewProps {
onSelectRestaurant?: (r: Restaurant) => void; onSelectRestaurant?: (r: Restaurant) => void;
onBoundsChanged?: (bounds: MapBounds) => void; onBoundsChanged?: (bounds: MapBounds) => void;
flyTo?: FlyTo | null; flyTo?: FlyTo | null;
onMyLocation?: () => void;
activeChannel?: string;
} }
function MapContent({ restaurants, selected, onSelectRestaurant, onBoundsChanged, flyTo }: MapViewProps) { function MapContent({ restaurants, selected, onSelectRestaurant, flyTo, activeChannel }: Omit<MapViewProps, "onMyLocation" | "onBoundsChanged">) {
const map = useMap(); const map = useMap();
const [infoTarget, setInfoTarget] = useState<Restaurant | null>(null); const [infoTarget, setInfoTarget] = useState<Restaurant | null>(null);
const channelColors = useMemo(() => getChannelColorMap(restaurants), [restaurants]); const channelColors = useMemo(() => getChannelColorMap(restaurants), [restaurants]);
const boundsTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
// Report bounds on idle (debounced)
useEffect(() => {
if (!map) return;
const listener = map.addListener("idle", () => {
if (boundsTimerRef.current) clearTimeout(boundsTimerRef.current);
boundsTimerRef.current = setTimeout(() => {
const b = map.getBounds();
if (b && onBoundsChanged) {
const ne = b.getNorthEast();
const sw = b.getSouthWest();
onBoundsChanged({ north: ne.lat(), south: sw.lat(), east: ne.lng(), west: sw.lng() });
}
}, 300);
});
return () => {
google.maps.event.removeListener(listener);
if (boundsTimerRef.current) clearTimeout(boundsTimerRef.current);
};
}, [map, onBoundsChanged]);
const handleMarkerClick = useCallback( const handleMarkerClick = useCallback(
(r: Restaurant) => { (r: Restaurant) => {
@@ -113,7 +94,8 @@ function MapContent({ restaurants, selected, onSelectRestaurant, onBoundsChanged
{restaurants.map((r) => { {restaurants.map((r) => {
const isSelected = selected?.id === r.id; const isSelected = selected?.id === r.id;
const isClosed = r.business_status === "CLOSED_PERMANENTLY"; const isClosed = r.business_status === "CLOSED_PERMANENTLY";
const chColor = r.channels?.[0] ? channelColors[r.channels[0]] : CHANNEL_COLORS[0]; const chKey = activeChannel && r.channels?.includes(activeChannel) ? activeChannel : r.channels?.[0];
const chColor = chKey ? channelColors[chKey] : CHANNEL_COLORS[0];
const c = chColor || CHANNEL_COLORS[0]; const c = chColor || CHANNEL_COLORS[0];
return ( return (
<AdvancedMarker <AdvancedMarker
@@ -208,29 +190,56 @@ function MapContent({ restaurants, selected, onSelectRestaurant, onBoundsChanged
); );
} }
export default function MapView({ restaurants, selected, onSelectRestaurant, onBoundsChanged, flyTo }: MapViewProps) { export default function MapView({ restaurants, selected, onSelectRestaurant, onBoundsChanged, flyTo, onMyLocation, activeChannel }: MapViewProps) {
const channelColors = useMemo(() => getChannelColorMap(restaurants), [restaurants]); const channelColors = useMemo(() => getChannelColorMap(restaurants), [restaurants]);
const channelNames = useMemo(() => Object.keys(channelColors), [channelColors]); const channelNames = useMemo(() => {
const names = Object.keys(channelColors);
if (activeChannel) return names.filter((n) => n === activeChannel);
return names;
}, [channelColors, activeChannel]);
const boundsTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const handleCameraChanged = useCallback((ev: { detail: { bounds: { north: number; south: number; east: number; west: number } } }) => {
if (!onBoundsChanged) return;
if (boundsTimerRef.current) clearTimeout(boundsTimerRef.current);
boundsTimerRef.current = setTimeout(() => {
const { north, south, east, west } = ev.detail.bounds;
onBoundsChanged({ north, south, east, west });
}, 150);
}, [onBoundsChanged]);
return ( return (
<APIProvider apiKey={API_KEY}> <APIProvider apiKey={API_KEY}>
<Map <Map
defaultCenter={SEOUL_CENTER} defaultCenter={SEOUL_CENTER}
defaultZoom={12} defaultZoom={13}
mapId="tasteby-map" mapId="tasteby-map"
className="h-full w-full" className="h-full w-full"
colorScheme="LIGHT" colorScheme="LIGHT"
mapTypeControl={false} mapTypeControl={false}
fullscreenControl={false}
onCameraChanged={handleCameraChanged}
> >
<MapContent <MapContent
restaurants={restaurants} restaurants={restaurants}
selected={selected} selected={selected}
onSelectRestaurant={onSelectRestaurant} onSelectRestaurant={onSelectRestaurant}
onBoundsChanged={onBoundsChanged}
flyTo={flyTo} flyTo={flyTo}
activeChannel={activeChannel}
/> />
</Map> </Map>
{channelNames.length > 1 && ( {onMyLocation && (
<button
onClick={onMyLocation}
className="absolute top-2 right-2 w-9 h-9 bg-white dark:bg-gray-900 rounded-lg shadow-md flex items-center justify-center text-gray-600 dark:text-gray-300 hover:text-orange-500 dark:hover:text-orange-400 transition-colors z-10"
title="내 위치"
>
<svg viewBox="0 0 24 24" className="w-5 h-5 fill-current">
<path d="M12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm8.94 3A8.994 8.994 0 0013 3.06V1h-2v2.06A8.994 8.994 0 003.06 11H1v2h2.06A8.994 8.994 0 0011 20.94V23h2v-2.06A8.994 8.994 0 0020.94 13H23v-2h-2.06zM12 19c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z"/>
</svg>
</button>
)}
{channelNames.length > 0 && (
<div className="absolute bottom-2 left-2 bg-white/90 dark:bg-gray-900/90 backdrop-blur-sm rounded-lg shadow px-2.5 py-1.5 flex flex-wrap gap-x-3 gap-y-1 text-[11px] z-10"> <div className="absolute bottom-2 left-2 bg-white/90 dark:bg-gray-900/90 backdrop-blur-sm rounded-lg shadow px-2.5 py-1.5 flex flex-wrap gap-x-3 gap-y-1 text-[11px] z-10">
{channelNames.map((ch) => ( {channelNames.map((ch) => (
<div key={ch} className="flex items-center gap-1"> <div key={ch} className="flex items-center gap-1">

View File

@@ -84,6 +84,7 @@ export default function RestaurantDetail({
{restaurant.rating && ( {restaurant.rating && (
<div className="flex items-center gap-2 text-sm"> <div className="flex items-center gap-2 text-sm">
<span className="text-blue-500 dark:text-blue-400 font-medium text-xs">Google</span>
<span className="text-yellow-500 dark:text-yellow-400">{"★".repeat(Math.round(restaurant.rating))}</span> <span className="text-yellow-500 dark:text-yellow-400">{"★".repeat(Math.round(restaurant.rating))}</span>
<span className="font-medium dark:text-gray-200">{restaurant.rating}</span> <span className="font-medium dark:text-gray-200">{restaurant.rating}</span>
{restaurant.rating_count && ( {restaurant.rating_count && (
@@ -124,7 +125,7 @@ export default function RestaurantDetail({
{restaurant.google_place_id && ( {restaurant.google_place_id && (
<p> <p>
<a <a
href={`https://www.google.com/maps/place/?q=place_id:${restaurant.google_place_id}`} href={`https://www.google.com/maps/search/?api=1&query=${encodeURIComponent(restaurant.name)}`}
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
className="text-orange-600 dark:text-orange-400 hover:underline text-xs" className="text-orange-600 dark:text-orange-400 hover:underline text-xs"
@@ -135,6 +136,30 @@ export default function RestaurantDetail({
)} )}
</div> </div>
{restaurant.tabling_url && restaurant.tabling_url !== "NONE" && (
<a
href={restaurant.tabling_url}
target="_blank"
rel="noopener noreferrer"
className="flex items-center justify-center gap-2 w-full px-4 py-2.5 bg-rose-500 hover:bg-rose-600 text-white rounded-lg text-sm font-semibold transition-colors"
>
<span>T</span>
<span> </span>
</a>
)}
{restaurant.catchtable_url && restaurant.catchtable_url !== "NONE" && (
<a
href={restaurant.catchtable_url}
target="_blank"
rel="noopener noreferrer"
className="flex items-center justify-center gap-2 w-full px-4 py-2.5 bg-violet-500 hover:bg-violet-600 text-white rounded-lg text-sm font-semibold transition-colors"
>
<span>C</span>
<span> </span>
</a>
)}
<div> <div>
<h3 className="font-semibold text-sm mb-2 dark:text-gray-200"> </h3> <h3 className="font-semibold text-sm mb-2 dark:text-gray-200"> </h3>
{loading ? ( {loading ? (
@@ -161,7 +186,8 @@ export default function RestaurantDetail({
<div key={v.video_id} className="border dark:border-gray-700 rounded-lg p-3"> <div key={v.video_id} className="border dark:border-gray-700 rounded-lg p-3">
<div className="flex items-center gap-2 mb-1"> <div className="flex items-center gap-2 mb-1">
{v.channel_name && ( {v.channel_name && (
<span className="inline-block px-1.5 py-0.5 bg-orange-50 dark:bg-orange-900/30 text-orange-600 dark:text-orange-400 rounded text-[10px] font-medium"> <span className="inline-flex items-center gap-1 px-1.5 py-0.5 bg-red-100 dark:bg-red-900/40 text-red-600 dark:text-red-400 rounded text-[10px] font-semibold">
<span className="text-[9px]"></span>
{v.channel_name} {v.channel_name}
</span> </span>
)} )}
@@ -175,8 +201,11 @@ export default function RestaurantDetail({
href={v.url} href={v.url}
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
className="block text-sm font-medium text-orange-600 dark:text-orange-400 hover:underline" className="inline-flex items-center gap-1.5 text-sm font-medium text-red-600 dark:text-red-400 hover:underline"
> >
<svg viewBox="0 0 24 24" className="w-4 h-4 flex-shrink-0 fill-current" aria-hidden="true">
<path d="M23.5 6.2c-.3-1-1-1.8-2-2.1C19.6 3.5 12 3.5 12 3.5s-7.6 0-9.5.6c-1 .3-1.7 1.1-2 2.1C0 8.1 0 12 0 12s0 3.9.5 5.8c.3 1 1 1.8 2 2.1 1.9.6 9.5.6 9.5.6s7.6 0 9.5-.6c1-.3 1.7-1.1 2-2.1.5-1.9.5-5.8.5-5.8s0-3.9-.5-5.8zM9.5 15.5V8.5l6.3 3.5-6.3 3.5z"/>
</svg>
{v.title} {v.title}
</a> </a>
{v.foods_mentioned.length > 0 && ( {v.foods_mentioned.length > 0 && (

View File

@@ -34,7 +34,7 @@ export default function SearchBar({ onSearch, isLoading }: SearchBarProps) {
> >
<option value="hybrid"></option> <option value="hybrid"></option>
<option value="keyword"></option> <option value="keyword"></option>
<option value="semantic"></option> <option value="semantic"></option>
</select> </select>
<button <button
type="submit" type="submit"

View File

@@ -42,6 +42,8 @@ export interface Restaurant {
cuisine_type: string | null; cuisine_type: string | null;
price_range: string | null; price_range: string | null;
google_place_id: string | null; google_place_id: string | null;
tabling_url: string | null;
catchtable_url: string | null;
business_status: string | null; business_status: string | null;
rating: number | null; rating: number | null;
rating_count: number | null; rating_count: number | null;
@@ -322,6 +324,32 @@ export const api = {
}); });
}, },
searchTabling(restaurantId: string) {
return fetchApi<{ title: string; url: string }[]>(
`/api/restaurants/${restaurantId}/tabling-search`
);
},
setTablingUrl(restaurantId: string, tablingUrl: string) {
return fetchApi<{ ok: boolean }>(
`/api/restaurants/${restaurantId}/tabling-url`,
{ method: "PUT", body: JSON.stringify({ tabling_url: tablingUrl }) }
);
},
searchCatchtable(restaurantId: string) {
return fetchApi<{ title: string; url: string }[]>(
`/api/restaurants/${restaurantId}/catchtable-search`
);
},
setCatchtableUrl(restaurantId: string, catchtableUrl: string) {
return fetchApi<{ ok: boolean }>(
`/api/restaurants/${restaurantId}/catchtable-url`,
{ method: "PUT", body: JSON.stringify({ catchtable_url: catchtableUrl }) }
);
},
deleteChannel(channelId: string) { deleteChannel(channelId: string) {
return fetchApi<{ ok: boolean }>(`/api/channels/${channelId}`, { return fetchApi<{ ok: boolean }>(`/api/channels/${channelId}`, {
method: "DELETE", method: "DELETE",
@@ -381,6 +409,13 @@ export const api = {
); );
}, },
uploadTranscript(videoDbId: string, text: string, source: string = "browser") {
return fetchApi<{ ok: boolean; length: number; source: string }>(
`/api/videos/${videoDbId}/upload-transcript`,
{ method: "POST", body: JSON.stringify({ text, source }) }
);
},
triggerProcessing(limit: number = 5) { triggerProcessing(limit: number = 5) {
return fetchApi<{ restaurants_extracted: number }>( return fetchApi<{ restaurants_extracted: number }>(
`/api/videos/process?limit=${limit}`, `/api/videos/process?limit=${limit}`,

View File

@@ -4,6 +4,47 @@ server {
return 301 https://www.tasteby.net$request_uri; return 301 https://www.tasteby.net$request_uri;
} }
server {
listen 80;
server_name dev.tasteby.net;
return 301 https://dev.tasteby.net$request_uri;
}
server {
listen 443 ssl http2;
server_name dev.tasteby.net;
ssl_certificate /etc/letsencrypt/live/dev.tasteby.net/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/dev.tasteby.net/privkey.pem;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers HIGH:!aNULL:!MD5;
# Frontend (Next.js)
location / {
proxy_pass http://127.0.0.1:3001;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
# Backend API
location /api/ {
proxy_pass http://127.0.0.1:8000;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 300;
proxy_connect_timeout 75;
proxy_send_timeout 300;
}
}
server { server {
listen 443 ssl http2; listen 443 ssl http2;
server_name tasteby.net; server_name tasteby.net;