Skip to content

Commit 658e50a

Browse files
committed
Merge branch 'dev' of https://github.com/pirogramming/TripTailor into feature/pje
2 parents 8a68d69 + 9ebdfb6 commit 658e50a

File tree

15 files changed

+405
-94
lines changed

15 files changed

+405
-94
lines changed

README.md

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
2025 Pirogramming : **Triptailor**
77
<br/><br/>
88

9+
링크 : https://triptailor.kro.kr/
10+
911
## 🚀 Triptailor
1012

1113
> “여행지를 어떻게 선택하시나요?”
@@ -45,31 +47,45 @@ AI와 데이터 기반으로 여행을 **쉽고 즐겁게 계획**할 수 있는
4547

4648
---
4749

48-
## 🛠️ Tech Stack
4950

50-
📌 **Stack**
51+
## 📌 Stack
5152
![HTML5](https://img.shields.io/badge/HTML5-E34F26?style=for-the-badge&logo=html5&logoColor=white)
5253
![CSS3](https://img.shields.io/badge/CSS3-1572B6?style=for-the-badge&logo=css3&logoColor=white)
5354
![JavaScript](https://img.shields.io/badge/JavaScript-F7DF1E?style=for-the-badge&logo=javascript&logoColor=black)
5455
![Python](https://img.shields.io/badge/Python-3776AB?style=for-the-badge&logo=python&logoColor=white)
5556

56-
📌 **Tools**
57+
58+
## 📌 Tools
5759
![Visual Studio Code](https://img.shields.io/badge/Visual%20Studio%20Code-007ACC?style=for-the-badge&logo=visualstudiocode&logoColor=white)
5860
![Figma](https://img.shields.io/badge/Figma-F24E1E?style=for-the-badge&logo=figma&logoColor=white)
5961
![Git](https://img.shields.io/badge/Git-F05032?style=for-the-badge&logo=git&logoColor=white)
6062

61-
📌 **Collaboration**
63+
64+
## 📌 Collaboration
6265
![GitHub](https://img.shields.io/badge/GitHub-181717?style=for-the-badge&logo=github&logoColor=white)
6366
![Notion](https://img.shields.io/badge/Notion-000000?style=for-the-badge&logo=notion&logoColor=white)
6467
![Discord](https://img.shields.io/badge/Discord-5865F2?style=for-the-badge&logo=discord&logoColor=white)
6568

66-
---
6769

68-
## ⚙️ Features
70+
## 📌 Server
71+
[![Docker](https://img.shields.io/badge/Docker-2496ED?logo=docker&logoColor=white&style=for-the-badge)](https://www.docker.com/)
72+
[![GitHub Actions](https://img.shields.io/badge/GitHub%20Actions-2088FF?logo=githubactions&logoColor=white&style=for-the-badge)](https://github.com/features/actions)
73+
[![Ubuntu](https://img.shields.io/badge/Ubuntu-E95420?logo=ubuntu&logoColor=white&style=for-the-badge)](https://ubuntu.com/)
74+
[![Gunicorn](https://img.shields.io/badge/Gunicorn-499848?logo=gunicorn&logoColor=white&style=for-the-badge)](https://gunicorn.org/)
75+
[![Nginx](https://img.shields.io/badge/NGINX-009639?logo=nginx&logoColor=white&style=for-the-badge)](https://nginx.org/)
76+
6977

78+
## ⚙️ Features
7079

80+
| 기능 | 설명 | 화면 예시 |
81+
|------|------|-----------|
82+
| **태그 분류** | 여행지/후기/추천 시스템에서 태그를 자동 분류하여 검색 및 추천 정확도 향상 | <img width="500" alt="태그 분류" src="https://github.com/user-attachments/assets/372b5842-5afb-4fcc-9368-956fa362bf22" /> |
83+
| **장소 추천** | 사용자 입력(취향·키워드)에 맞는 장소를 벡터 검색 + AI 기반으로 추천 | <img width="500" alt="장소 추천" src="https://github.com/user-attachments/assets/ff6d7778-0a5a-4c3f-86bb-e5205606fdbb" /> |
84+
| **댓글 생성 및 조회** | 각 장소에 대한 댓글을 작성·조회 가능 (텍스트 + 이미지 첨부 지원) | <img width="500" alt="댓글 생성 및 조회" src="https://github.com/user-attachments/assets/b257b1ff-072e-4407-ab96-dc21b8b64f7f" /> |
85+
| **루트 추가** | 여행 루트를 직접 생성하고 장소를 추가/편집 가능 | <img width="250" alt="루트 추가1" src="https://github.com/user-attachments/assets/7b7ab98a-e309-4f9c-a901-5c36c67f582c" /> <img width="300" alt="루트 추가2" src="https://github.com/user-attachments/assets/7764c9de-5c2e-4496-b6ca-db31174dc3b6" /> <img width="220" alt="루트 추가3" src="https://github.com/user-attachments/assets/8e2f0546-66cb-4948-99bc-d065dfb134a9" /> |
86+
| **마이페이지 조회** | 내가 작성한 후기, 좋아요 누른 장소, 생성한 루트 등 개인화 정보 관리 | <img width="250" alt="마이페이지1" src="https://github.com/user-attachments/assets/b63aefb6-ee51-499a-92b2-3b9c87feac98" /> <img width="350" alt="마이페이지2" src="https://github.com/user-attachments/assets/a3c6d0a9-b40a-4429-a648-0028be616be8" /> <img width="350" alt="마이페이지3" src="https://github.com/user-attachments/assets/491431ea-5ff1-4afb-a4b2-9b9a220d2abc" /> <img width="350" alt="마이페이지4" src="https://github.com/user-attachments/assets/616d590d-8c21-4e34-a7cd-ab0ebdca25a6" /> |
87+
| **장소 검색** | 키워드, 태그, 지역 등을 기반으로 원하는 장소를 빠르게 검색 | <img width="350" alt="장소 검색1" src="https://github.com/user-attachments/assets/70ac374a-7749-43ae-ad5f-4f5a9bd0a4f2" /> <img width="350" alt="장소 검색2" src="https://github.com/user-attachments/assets/277c5d0e-ea26-4797-8726-84603203cf09" /> |
7188

72-
---
7389

7490
## 📂 폴더 구조
7591

@@ -104,9 +120,7 @@ TripTailor/
104120
├─ manage.py
105121
├─ README.md
106122
├─ recommend.py
107-
├─ requirements.txt
108-
├─ triptailor_cosine_v2.index
109-
└─ triptailor_full_metadata.csv
123+
└─ requirements.txt
110124
111125
```
112126

apps/places/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
app_name = 'places'
55

66
urlpatterns = [
7-
path('', views.main, name='main'), # 메인 화면
7+
path('', views.place_search, name='main'), # 메인 화면
88
path('search/', views.search, name='search'),
9-
path('place-search/', views.place_search, name='place_search'), # 새로운 장소 검색 화면
9+
path('place-search/', views.main, name='place_search'), # 새로운 장소 검색 화면
1010
path('<int:pk>/', views.place_detail, name='place_detail'),
1111
path('<int:pk>/like/', views.toggle_place_like, name='place_like'),
1212
path('fragment/', views.place_list_fragment, name='place_list_fragment'),

apps/reviews/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Review(models.Model):
4242
created_at = models.DateTimeField(auto_now_add=True)
4343

4444
def __str__(self):
45-
return self.title
45+
return self.content[:30]
4646

4747
class Meta:
4848
ordering = ["-created_at"] # 리스트뷰 페이지네이션 경고 방지용

static/css/account/login.css

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ main > h1 {
4848
}
4949

5050
#id_login {
51-
width: 400px;
51+
width: 376px;
5252
height: 55px;
5353
border: 1px solid rgba(128, 128, 128, 0.50);
5454
border-radius: 15px;;
@@ -57,7 +57,7 @@ main > h1 {
5757
}
5858

5959
#id_password {
60-
width: 400px;
60+
width: 376px;
6161
height: 55px;
6262
border: 1px solid rgba(128, 128, 128, 0.50);
6363
border-radius: 15px;
@@ -67,7 +67,6 @@ main > h1 {
6767

6868
#id_login::placeholder, #id_password::placeholder {
6969
color: #80808080;
70-
padding-left: 10px;
7170
font-size: 1rem;
7271
}
7372

@@ -92,6 +91,11 @@ main > h1 {
9291
font-weight: 500;
9392
}
9493

94+
input[type="email"], input[type="password"] {
95+
font-size: 1rem;
96+
padding: 0 12px;
97+
}
98+
9599
#remember-container {
96100
width: 400px;
97101
display: flex;
@@ -202,3 +206,7 @@ main > h1 {
202206
align-items: center;
203207
}
204208

209+
.bar {
210+
color: #ccc; /* 원하는 색 */
211+
font-size: 15px;
212+
}

static/css/account/signup.css

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ main > h1 {
1919
padding: 19px;
2020
}
2121

22+
form {
23+
display: flex;
24+
flex-direction: column;
25+
justify-content: center;
26+
align-items: center;
27+
}
28+
29+
ul {
30+
width: 400px;
31+
padding-top: 1vw;
32+
}
33+
2234
#form-container {
2335
width: 500px;
2436
border-radius: 25px;
@@ -40,7 +52,7 @@ main > h1 {
4052
}
4153

4254
#id_username, #id_email, #id_password1, #id_password2 {
43-
width: 400px;
55+
width: 376px;
4456
height: 55px;
4557
border: 1px solid rgba(128, 128, 128, 0.50);
4658
border-radius: 15px;
@@ -50,10 +62,14 @@ main > h1 {
5062

5163
#id_username::placeholder, #id_email::placeholder, #id_password1::placeholder, #id_password2::placeholder {
5264
color: #80808080;
53-
padding-left:10px;
5465
font-size: 1rem;
5566
}
5667

68+
input[type="text"], input[type="email"], input[type="password"] {
69+
font-size: 1rem;
70+
padding: 0 12px;
71+
}
72+
5773
button {
5874
width: 400px;
5975
height: 60px;

static/css/cursor.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
html, body {
2+
cursor: url("cursor_24.png") 8 8, auto; /* 8 8 = 핫스팟 좌표(x,y) */
3+
}
4+
5+
a, button { cursor: pointer; } /* 클릭 가능 */
6+
input[type="text"], textarea { cursor: text; } /* 텍스트 선택 */
7+
[draggable="true"], .drag { cursor: grab; }
8+
.drag:active { cursor: grabbing; }
9+
.disabled, button:disabled { cursor: not-allowed; }
10+
.move { cursor: move; } /* 이동 */
11+
.zoom-in { cursor: zoom-in; } /* 확대 */
12+
.zoom-out { cursor: zoom-out; } /* 축소 */

static/css/cursor_16.png

667 Bytes
Loading

static/css/cursor_24.png

1.05 KB
Loading

static/css/main.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,9 @@ form[method="get"] > div button[type="submit"]:hover {
708708
cursor: pointer !important;
709709
box-shadow: none !important;
710710
gap: 8px;
711+
position: fixed;
712+
bottom: 20px;
713+
right: 20px;
711714
}
712715

713716
/* 실제 버튼 모양 */

0 commit comments

Comments
 (0)