- ![]()
@@ -9,7 +10,8 @@
![]()
+ ![]()
{{ notice.fromUserNickname }}
-{{ notice?.createdDate.split("T")[0] }}
diff --git a/nagne-web-vuejs/src/components/Header/TheHeader.vue b/nagne-web-vuejs/src/components/Header/TheHeader.vue index fa96394..7648a56 100644 --- a/nagne-web-vuejs/src/components/Header/TheHeader.vue +++ b/nagne-web-vuejs/src/components/Header/TheHeader.vue @@ -7,12 +7,27 @@
-
+
-
+
+
New alerts
- ![]()
-
-
-
- 로그인 -
- 내 프로필 -
- 저장한 게시물 -
- 내정보 수정 -
- 고객센터 -
- 로그아웃 +
- + 로그인 + +
- + 내 프로필 + +
- + 저장한 게시물 + +
- + 내정보 수정 + +
- + 고객센터 + +
- + 로그아웃 +
+
-
-
+
+
-
{{ - userInfo.nickname }}
-님을 기다리는 소식
-로그인 후 확인하세요!
- ++ {{ userInfo.nickname }} +
++ 님을 기다리는 소식 +
++ 로그인 후 확인하세요! +
+-
-
-
+
+
-
diff --git a/nagne-web-vuejs/src/components/MainPage/Article/ArticleDetailModal.vue b/nagne-web-vuejs/src/components/MainPage/Article/ArticleDetailModal.vue
index bc55def..1d0ee9b 100644
--- a/nagne-web-vuejs/src/components/MainPage/Article/ArticleDetailModal.vue
+++ b/nagne-web-vuejs/src/components/MainPage/Article/ArticleDetailModal.vue
@@ -3,21 +3,30 @@
+
+
+
+
- 
+ 
![]()
+
- ![]()
+
+ ![]()
+
+
+
- 
+ ![]()
+ {{ newArticle.userNickname }}
-{{ newArticle?.createdDate?.split('T')[0] }}
@@ -36,7 +45,8 @@ {{ newArticle.content }} -
@@ -105,11 +115,13 @@ import { onMounted, ref } from "vue";
import CommentList from "./CommentList.vue";
import { useAuthStore } from "@/store/auth";
import { useWriteStore } from "@/store/write";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
const router = useRouter();
+const route = useRoute();
const store = useAuthStore();
const writeStore = useWriteStore();
import { storeToRefs } from "pinia";
+import ArticleWriteSwiper from "@/components/Write/Article/ArticleWriteSwiper.vue";
const { getComment } = storeToRefs(writeStore);
const { genComments, resetComments } = writeStore
@@ -141,20 +153,22 @@ const modalRightWrapper = ref(null);
const noMoreData = ref(false);
const lastIndex = ref(1000000000);
const commentList = ref(null);
+const imgUrls = ref([]);
+const isManyImg = ref(false);
+
+const idByParams = route.params.id;
onMounted(async () => {
isLoading.value = true;
- setTimeout(() => {
- isLoading.value = false;
- }, 500);
-
- newArticle.value = props.article;
- isLiked.value = props.article.isLiked;
- commentCount.value = props.article.commentCount;
- isBookmarked.value = props.article.isBookmarked;
- likeCount.value = props.article.likeCount;
- commentContent.value = props.article.commentContent;
+ if (props) {
+ newArticle.value = props.article;
+ isLiked.value = props.article.isLiked;
+ commentCount.value = props.article.commentCount;
+ isBookmarked.value = props.article.isBookmarked;
+ likeCount.value = props.article.likeCount;
+ commentContent.value = props.article.commentContent;
+ }
//게시글 작성자가 현재 로그인한 유저와 일치하는지 확인
if (newArticle.value.userId === Number(sessionStorage.getItem('loginUserId'))) {
@@ -165,7 +179,7 @@ onMounted(async () => {
});
const fetchArticleDetail = async () => {
- await axios.get(`http://localhost:8080/api/articles/${props.article.id}`, {
+ await axios.get(`http://localhost:8080/api/articles/${newArticle.value.id}`, {
headers: {
Authorization: `Bearer ${sessionStorage.getItem('token')}`,
}
@@ -176,13 +190,25 @@ const fetchArticleDetail = async () => {
isBookmarked.value = newArticle.value.isBookmarked;
likeCount.value = newArticle.value.likeCount;
commentContent.value = newArticle.value.commentContent;
+ isLoading.value = false;
+ imgUrls.value = newArticle.value.imageUrls;
+ if (imgUrls.value.length > 1) {
+ isManyImg.value = true;
+ } else {
+ isManyImg.value = false;
+ }
})
}
const moveTo = (action) => {
switch (action) {
case 'modify':
- router.push({ name: 'articleModify', params: { id: newArticle.value.id } });
+ if (!idByParams) {
+ router.push({ name: 'articleModify', params: { id: newArticle.value.id } });
+ } else {
+ router.push({ name: 'articleModify', params: { id: idByParams } });
+ }
+
break;
case 'delete':
@@ -221,7 +247,7 @@ const clickSocialBtn = async (btnName) => {
alert('로그인 후 진행하세요!');
return;
}
- console.log(newArticle.value.id)
+
try {
switch (btnName) {
case 'like':
@@ -313,14 +339,6 @@ const postComment = async () => {
})
}
-
-const handleScroll = () => {
- const { scrollTop, scrollHeight, clientHeight } = modalRightWrapper.value;
- if (scrollTop + clientHeight >= scrollHeight - 5) {
- commentList.value.fetchComments();
- }
-};
-
@@ -379,6 +397,8 @@ const handleScroll = () => {
.modal-wrapper {
height: 90%;
+ overflow-y: scroll;
+ scrollbar-width: none
}
.modal-box {
@@ -404,6 +424,7 @@ const handleScroll = () => {
.modal-left-img {
width: 100%;
height: 100%;
+ border-radius: 20px;
}
.modal-right {
@@ -429,11 +450,11 @@ const handleScroll = () => {
.modal-right-wrapper {
overflow-y: auto;
/* 내용이 넘칠 경우 세로 스크롤 활성화 */
- /* scrollbar-width: none; */
+ scrollbar-width: none;
- /* ::-webkit-scrollbar {
+ ::-webkit-scrollbar {
display: none;
- } */
+ }
}
}
@@ -610,7 +631,7 @@ const handleScroll = () => {
@media screen and (max-width: 1300px) {
.modal-wrapper {
height: 80%;
- overflow-y: scroll;
+ /* overflow-y: scroll; */
display: flex;
justify-content: center;
align-items: flex-start;
@@ -619,11 +640,11 @@ const handleScroll = () => {
background-color: #fff;
/* 배경색 설정 */
- ::-webkit-scrollbar {
+ /* ::-webkit-scrollbar {
display: none;
- }
+ } */
- scrollbar-width: none;
+ /* scrollbar-width: none; */
border-radius: 8px 8px 8px 8px;
}
diff --git a/nagne-web-vuejs/src/components/MainPage/Article/CommentList.vue b/nagne-web-vuejs/src/components/MainPage/Article/CommentList.vue
index e4a0329..6fd7050 100644
--- a/nagne-web-vuejs/src/components/MainPage/Article/CommentList.vue
+++ b/nagne-web-vuejs/src/components/MainPage/Article/CommentList.vue
@@ -1,6 +1,7 @@
-
+
아직 댓글이 없어요!
@@ -13,25 +14,34 @@ import { ref, watch, onMounted } from "vue"; import CommentListItem from "./CommentListItem.vue"; import { useWriteStore } from "@/store/write"; import { storeToRefs } from "pinia"; +import InfiniteLoading from "v3-infinite-loading"; +import "v3-infinite-loading/lib/style.css"; const writeStore = useWriteStore(); const { getComment } = storeToRefs(writeStore); const props = defineProps({ - articleid: Number, - gencomments: Number, + articleId: { + type: Number, + required: true, + } }); const isLoading = ref(false); -const lastIndex = ref(1000000000); +const lastIndex = ref(null); // 초기값을 null로 설정합니다. const comments = ref([]); const noMoreData = ref(false); +const showInfinity = ref(true); -const fetchComments = async () => { - if (isLoading.value || noMoreData.value) return; +const loadData = async ($state) => { + if (isLoading.value || noMoreData.value) { + $state.complete(); + showInfinity.value = false; + return; + } isLoading.value = true; - let url = `http://localhost:8080/api/comments?articleId=${props.articleid}&size=10`; + let url = `http://localhost:8080/api/comments?articleId=${props.articleId}&size=10`; if (lastIndex.value !== null) { url += `&lastIndex=${lastIndex.value}`; } @@ -42,49 +52,52 @@ const fetchComments = async () => { }, }).then(({ data }) => { const commentsData = data.response.comments; - if (commentsData.length < 10) { - noMoreData.value = true; - } + $state.loaded(); comments.value.push(...commentsData); - if (commentsData.length > 0) { - lastIndex.value = commentsData[commentsData.length - 1].id; - } + lastIndex.value = commentsData[commentsData.length - 1].id; + + }).catch(() => { + $state.error(); }).finally(() => { isLoading.value = false; }); }; onMounted(async () => { - if (props.articleid) { - await fetchComments(); + if (props.articleId) { + await fetchComments(props.articleId); } }); -watch(() => props.articleid, async (newId) => { - if (newId) { - comments.value = []; - lastIndex.value = 1000000000; - noMoreData.value = false; - await fetchComments(); - } -}); +const fetchComments = async (id) => { + if (isLoading.value || noMoreData.value) return; -watch(() => props.gencomments, async (newVal) => { - if (newVal) { - await fetchComments(); + isLoading.value = true; + let url = `http://localhost:8080/api/comments?articleId=${id}&size=10`; + if (lastIndex.value !== null) { + url += `&lastIndex=${lastIndex.value}`; } -}); -watch(getComment, async (newVal) => { - if (newVal) { - comments.value = []; - lastIndex.value = 1000000000; - noMoreData.value = false; - await fetchComments(); - } -}); + await axios.get(url, { + headers: { + Authorization: `Bearer ${sessionStorage.getItem('token')}`, + }, + }).then(({ data }) => { + if (data.response.comments.length != 0) { + const commentsData = data.response.comments; + if (commentsData.length < 10) { + noMoreData.value = true; + } + comments.value.push(...commentsData); + + lastIndex.value = (commentsData[commentsData.length - 1]).id; + } + }).finally(() => { + isLoading.value = false; + }); +}; \ No newline at end of file diff --git a/nagne-web-vuejs/src/components/Map/Find/Day2Section.vue b/nagne-web-vuejs/src/components/Map/Find/Day2Section.vue new file mode 100644 index 0000000..20ff825 --- /dev/null +++ b/nagne-web-vuejs/src/components/Map/Find/Day2Section.vue @@ -0,0 +1,43 @@ + +
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nagne-web-vuejs/src/components/Map/Find/Day3Section.vue b/nagne-web-vuejs/src/components/Map/Find/Day3Section.vue
new file mode 100644
index 0000000..bcce166
--- /dev/null
+++ b/nagne-web-vuejs/src/components/Map/Find/Day3Section.vue
@@ -0,0 +1,43 @@
+
+
+
+ Day 2
+
+
+
+
+
+ {{ element }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nagne-web-vuejs/src/components/Map/Find/Day4Section.vue b/nagne-web-vuejs/src/components/Map/Find/Day4Section.vue
new file mode 100644
index 0000000..872b0ae
--- /dev/null
+++ b/nagne-web-vuejs/src/components/Map/Find/Day4Section.vue
@@ -0,0 +1,43 @@
+
+
+
+ Day 3
+
+
+
+
+
+ {{ element }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nagne-web-vuejs/src/components/Map/Find/TourList.vue b/nagne-web-vuejs/src/components/Map/Find/TourList.vue
index c44dd1e..fe949ba 100644
--- a/nagne-web-vuejs/src/components/Map/Find/TourList.vue
+++ b/nagne-web-vuejs/src/components/Map/Find/TourList.vue
@@ -3,8 +3,13 @@
+
+ Day 4
+
+
+
+
+
+ {{ element }}
+
+
-
-
+
+
-
- ![]()
+ ![]()
- ![]()
+
+ ![]()
+
diff --git a/nagne-web-vuejs/src/components/Map/Find/TourListItem.vue b/nagne-web-vuejs/src/components/Map/Find/TourListItem.vue
index ab2155b..b074f6c 100644
--- a/nagne-web-vuejs/src/components/Map/Find/TourListItem.vue
+++ b/nagne-web-vuejs/src/components/Map/Find/TourListItem.vue
@@ -1,63 +1,158 @@
-
+
+
+
+ + 선택된 여행지 {{ myAttractions.length }}개 +
+ +
+
+
+
+
+
+ ![]()
+
+
+ {{ truncateText(myAttraction.title) }}
+
-
diff --git a/nagne-web-vuejs/src/components/Write/Article/ArticleContent.vue b/nagne-web-vuejs/src/components/Write/Article/ArticleContent.vue
index e53665c..744e6ba 100644
--- a/nagne-web-vuejs/src/components/Write/Article/ArticleContent.vue
+++ b/nagne-web-vuejs/src/components/Write/Article/ArticleContent.vue
@@ -38,11 +38,9 @@ const props = defineProps({
});
watch(props, () => {
- console.log(props.modifyArticle)
- console.log(props.modifyArticle.content)
if (props.modifyArticle && props.modifyArticle.content) {
content.value = props.modifyArticle.content;
- console.log(props.modifyArticle);
+
}
});
@@ -55,6 +53,11 @@ const move = async (path) => {
writeStore.step--;
break;
case 'next':
+ if (props.modifyArticle && props.modifyArticle.content) {
+ await uploadFile();
+ return;
+ }
+
if (!content.value) {
alert('내용을 입력하세요.');
return;
@@ -73,10 +76,31 @@ const move = async (path) => {
const uploadFile = async () => {
const formData = new FormData();
+
+ if (props.modifyArticle && props.modifyArticle.content) { //게시글 수정의 경우
+ const body = { 'content': content.value };
+
+ try {
+ await axios.patch(`http://localhost:8080/api/articles/${props.modifyArticle.id}`, body, {
+ headers: {
+ Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+ 'Content-Type': 'application/json',
+ },
+ });
+ alert("게시글이 수정되었습니다!");
+ router.push({ name: 'articleDetail', params: { 'id': props.modifyArticle.id } })
+ } catch (error) {
+ alert('게시글 수정 실패!');
+ }
+
+ return;
+ }
+
+
formData.append('encrypt', "multipart/form-data");
for (let i = 0; i < selectedImg.value.length; i++) {
- formData.append('images', selectedImg.value[i]);
+ formData.append('images', selectedImg.value[i], selectedImg.value[i].name);
}
const json = JSON.stringify({ content: content.value });
diff --git a/nagne-web-vuejs/src/components/Write/Article/ArticleImgSelect.vue b/nagne-web-vuejs/src/components/Write/Article/ArticleImgSelect.vue
index ab32835..0249201 100644
--- a/nagne-web-vuejs/src/components/Write/Article/ArticleImgSelect.vue
+++ b/nagne-web-vuejs/src/components/Write/Article/ArticleImgSelect.vue
@@ -10,8 +10,8 @@
- ![]()
- ![]()
+ {{ following.nickname }}
- 
+
+
![]()
+ ![]()
diff --git a/nagne-web-vuejs/src/components/User/UserArticleItem.vue b/nagne-web-vuejs/src/components/User/UserArticleItem.vue
index 19c732f..7231d42 100644
--- a/nagne-web-vuejs/src/components/User/UserArticleItem.vue
+++ b/nagne-web-vuejs/src/components/User/UserArticleItem.vue
@@ -1,27 +1,42 @@
- {{ follower.nickname }}
-
+
diff --git a/nagne-web-vuejs/src/components/User/UserFollowing.vue b/nagne-web-vuejs/src/components/User/UserFollowing.vue
index ae0fefa..6796b82 100644
--- a/nagne-web-vuejs/src/components/User/UserFollowing.vue
+++ b/nagne-web-vuejs/src/components/User/UserFollowing.vue
@@ -6,7 +6,7 @@
+ ![]()
+ ![]()
+
+
+
\ No newline at end of file
+
diff --git a/nagne-web-vuejs/src/components/Search/SearchAll.vue b/nagne-web-vuejs/src/components/Search/SearchAll.vue
new file mode 100644
index 0000000..8f82243
--- /dev/null
+++ b/nagne-web-vuejs/src/components/Search/SearchAll.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
- {{ attraction.title }}
+{{ attractionByData.name }}
-
+ {{ attraction.title }}
- -{{ attraction.addr }}
-{{ attraction.zipCode }}
+
+ ![]()
+
+
+
{{ attraction.addr }}
+{{ attraction.zipCode }}
+
+
+
+
+
+
+
diff --git a/nagne-web-vuejs/src/pages/map/MapSavedPage.vue b/nagne-web-vuejs/src/components/Search/SearchArticle.vue
similarity index 84%
rename from nagne-web-vuejs/src/pages/map/MapSavedPage.vue
rename to nagne-web-vuejs/src/components/Search/SearchArticle.vue
index 43603ba..ea0819a 100644
--- a/nagne-web-vuejs/src/pages/map/MapSavedPage.vue
+++ b/nagne-web-vuejs/src/components/Search/SearchArticle.vue
@@ -1,6 +1,6 @@
+
+
+
+ 프로필
+ +
+
+
+ 
+
+
+ 검색 결과가 없습니다.
+
+
+
+
+ 게시물
+ +
+
+
+
+
+
+ 검색 결과가 없습니다.
+
+
+
+
+ 여행지
+ +
+
+
+
+
+
+ 검색 결과가 없습니다.
+
-
+ 게시물
diff --git a/nagne-web-vuejs/src/components/Search/SearchAttraction.vue b/nagne-web-vuejs/src/components/Search/SearchAttraction.vue
new file mode 100644
index 0000000..c5a12d0
--- /dev/null
+++ b/nagne-web-vuejs/src/components/Search/SearchAttraction.vue
@@ -0,0 +1,13 @@
+
+
+ 키워드
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nagne-web-vuejs/src/pages/map/FindByTagPage.vue b/nagne-web-vuejs/src/components/Search/SearchUser.vue
similarity index 86%
rename from nagne-web-vuejs/src/pages/map/FindByTagPage.vue
rename to nagne-web-vuejs/src/components/Search/SearchUser.vue
index 43603ba..2a18114 100644
--- a/nagne-web-vuejs/src/pages/map/FindByTagPage.vue
+++ b/nagne-web-vuejs/src/components/Search/SearchUser.vue
@@ -1,6 +1,6 @@
-
+ 유저
diff --git a/nagne-web-vuejs/src/components/Search/SearchUserItem.vue b/nagne-web-vuejs/src/components/Search/SearchUserItem.vue
new file mode 100644
index 0000000..a9e5264
--- /dev/null
+++ b/nagne-web-vuejs/src/components/Search/SearchUserItem.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
diff --git a/nagne-web-vuejs/src/components/User/FollowListItem.vue b/nagne-web-vuejs/src/components/User/FollowListItem.vue
index d56ad59..dea55a3 100644
--- a/nagne-web-vuejs/src/components/User/FollowListItem.vue
+++ b/nagne-web-vuejs/src/components/User/FollowListItem.vue
@@ -2,12 +2,13 @@
+
+
+
+ ![]()
+
+
+
+
+
+
+ ![]()
+
+ {{ user.nickname }}
+
-
+ 
+
{{ followItem.nickname }}
-
- {{ userArticle.content }}
-
-
-
-
-
-
-
\ No newline at end of file
+
+ ![]()
+
+
+
+
+
+
\ No newline at end of file
diff --git a/nagne-web-vuejs/src/components/User/UserFollowers.vue b/nagne-web-vuejs/src/components/User/UserFollowers.vue
index 38dc8e7..5e72750 100644
--- a/nagne-web-vuejs/src/components/User/UserFollowers.vue
+++ b/nagne-web-vuejs/src/components/User/UserFollowers.vue
@@ -6,7 +6,7 @@
+
+
Selected
-
-
- ![]()
-
-
-
-
-
-
-
-
\ No newline at end of file
+}
+
diff --git a/nagne-web-vuejs/src/etc/attraction_type.js b/nagne-web-vuejs/src/etc/attraction_type.js
new file mode 100644
index 0000000..2c3501c
--- /dev/null
+++ b/nagne-web-vuejs/src/etc/attraction_type.js
@@ -0,0 +1,12 @@
+const attraction_type = [
+ { attractionTypeId: 12, name: "관광지", logo: "nature"},
+ { attractionTypeId: 14, name: "문화시설", logo: "culture"},
+ { attractionTypeId: 15, name: "축제/공연/행사", logo: "festival"},
+ { attractionTypeId: 25, name: "여행코스", logo: "trip"},
+ { attractionTypeId: 28, name: "레포츠", logo: "activity"},
+ { attractionTypeId: 32, name: "숙박", logo: "sleep"},
+ { attractionTypeId: 38, name: "쇼핑", logo: "shopping"},
+ { attractionTypeId: 39, name: "음식", logo: "food"},
+];
+
+export {attraction_type};
\ No newline at end of file
diff --git a/nagne-web-vuejs/src/etc/weather_icons.js b/nagne-web-vuejs/src/etc/weather_icons.js
new file mode 100644
index 0000000..702910c
--- /dev/null
+++ b/nagne-web-vuejs/src/etc/weather_icons.js
@@ -0,0 +1,22 @@
+const weather_icons = {
+'01d' : '/assets/weather_icon/sunny.svg',
+'01n' : '/assets/weather_icon/sunny.svg',
+'02d' : '/assets/weather_icon/cloudy-sunny.svg',
+'02n' : '/assets/weather_icon/cloudy-sunny.svg',
+'03d' : '/assets/weather_icon/cloudy.svg',
+'03n' : '/assets/weather_icon/cloudy.svg',
+'04d' : '/assets/weather_icon/sunny.svg',
+'04n' : '/assets/weather_icon/sunny.svg',
+'09d' : '/assets/weather_icon/rainy.svg',
+'09n' : '/assets/weather_icon/rainy.svg',
+'10d' : '/assets/weather_icon/rainy.svg',
+'10n' : '/assets/weather_icon/rainy.svg',
+'11d' : '/assets/weather_icon/thunder.svg',
+'11n' : '/assets/weather_icon/thunder.svg',
+'13d' : '/assets/weather_icon/snowy.svg',
+'13n' : '/assets/weather_icon/snowy.svg',
+'50d' : '/assets/weather_icon/cloudy.svg',
+'50n' : '/assets/weather_icon/cloudy.svg',
+}
+
+export {weather_icons}
\ No newline at end of file
diff --git a/nagne-web-vuejs/src/main.js b/nagne-web-vuejs/src/main.js
index 705712e..91351ca 100644
--- a/nagne-web-vuejs/src/main.js
+++ b/nagne-web-vuejs/src/main.js
@@ -3,7 +3,9 @@ import { createPinia } from "pinia";
import "./style.css";
import App from "./App.vue";
import router from "./router";
-import { useKakao } from 'vue3-kakao-maps/@utils';
+import { useKakao } from "vue3-kakao-maps/@utils";
+import InfiniteLoading from "v3-infinite-loading";
+import "v3-infinite-loading/lib/style.css";
useKakao(import.meta.env.VITE_KAKAO_MAP_KEY);
// fontawesome import
import { library } from "@fortawesome/fontawesome-svg-core";
@@ -14,5 +16,9 @@ const pinia = createPinia();
library.add(fas);
-
-createApp(App).use(pinia).use(router).component("font-awesome-icon", FontAwesomeIcon).mount("#app");
\ No newline at end of file
+createApp(App)
+ .component("infinite-loading", InfiniteLoading)
+ .use(pinia)
+ .use(router)
+ .component("font-awesome-icon", FontAwesomeIcon)
+ .mount("#app");
diff --git a/nagne-web-vuejs/src/openai/gptAPI.js b/nagne-web-vuejs/src/openai/gptAPI.js
new file mode 100644
index 0000000..951b8a6
--- /dev/null
+++ b/nagne-web-vuejs/src/openai/gptAPI.js
@@ -0,0 +1,28 @@
+import OpenAI from "openai";
+
+// chatGPT description
+const getGPTResponse = async () => {
+ try {
+ const openai = new OpenAI({
+ apiKey: `${import.meta.env.VITE_OPENAI_API_KEY}`,
+ dangerouslyAllowBrowser: true,
+ });
+
+ const prompt = `${entity.value.roadAddr}라는 주소와 연결된 데이터에 ${JSON.stringify(
+ entity.value
+ )}란 정보가 있는데 이 정보를 중심으로 주소를 100자 정도로 설명해줘.`;
+
+ const response = await openai.chat.completions.create({
+ messages: [
+ {
+ role: "user",
+ content: prompt,
+ },
+ ],
+ model: "gpt-3.5-turbo",
+ });
+ console.log("chatGPT 결과: ", response.choices[0].message.content);
+ } catch (error) {
+ console.log("chatGPT: 🚨 에러가 발생했습니다.");
+ }
+};
diff --git a/nagne-web-vuejs/src/pages/ArticleDetail/ArticleDetailPage.vue b/nagne-web-vuejs/src/pages/ArticleDetail/ArticleDetailPage.vue
index 89bf479..4198ade 100644
--- a/nagne-web-vuejs/src/pages/ArticleDetail/ArticleDetailPage.vue
+++ b/nagne-web-vuejs/src/pages/ArticleDetail/ArticleDetailPage.vue
@@ -2,21 +2,29 @@
-
@@ -37,7 +37,7 @@ import { storeToRefs } from 'pinia';
import imageCompression from "browser-image-compression";
const store = useWriteStore();
-// const { selectedImg, tempUrl } = storeToRefs(store);
+const { selectedImg, tempUrl } = storeToRefs(store);
const router = useRouter();
const inputFileRef = ref(null);
@@ -61,28 +61,15 @@ onMounted(() => {
const fileChangeHandler = async (event) => {
if (event.target.files && event.target.files.length > 0) {
+ console.log(event.target.files[0].name)
for (let file of event.target.files) {
- const compressedFile = await compressImage(file);
- store.selectedImg.push(compressedFile);
- const url = URL.createObjectURL(compressedFile);
+ store.selectedImg.push(file);
+ const url = URL.createObjectURL(file);
store.tempUrl.push(url);
}
}
};
-const compressImage = async (file) => {
- const options = {
- maxSizeMB: 1,
- maxWidthOrHeight: 1920,
- useWebWorker: true
- };
- try {
- return await imageCompression(file, options);
- } catch (error) {
- console.error(error);
- return file;
- }
-};
const inputImg = () => {
inputFileRef.value.click();
diff --git a/nagne-web-vuejs/src/components/Write/Article/ArticleWriteSwiper.vue b/nagne-web-vuejs/src/components/Write/Article/ArticleWriteSwiper.vue
index c3f0631..a44f121 100644
--- a/nagne-web-vuejs/src/components/Write/Article/ArticleWriteSwiper.vue
+++ b/nagne-web-vuejs/src/components/Write/Article/ArticleWriteSwiper.vue
@@ -1,93 +1,93 @@
- {{ truncatedName(img) }}
+
+
{{ truncatedName(img.name) }}
-
+
+
- ![]()
+
+ ![]()
+
+
+
-
+
![]()
@@ -18,12 +21,7 @@
@@ -34,7 +32,7 @@ import axios from 'axios';
import { faTableCells, faExpand } from "@fortawesome/free-solid-svg-icons";
import { useAuthStore } from '@/store/auth';
import { ref, onMounted } from 'vue';
-import {useRouter } from "vue-router"
+import { useRouter } from "vue-router"
const router = useRouter();
import GridView from '@/components/BookMark/GridView.vue';
const authStore = useAuthStore();
@@ -54,22 +52,22 @@ onMounted(async () => {
const fetchUserInfo = async () => {
await axios.get(`http://localhost:8080/api/users/${sessionStorage.getItem('loginUserId')}`, {
- headers: {Authorization: `Bearer ${sessionStorage.getItem('token')}`,},
- }).then(({data})=>{
- userInfo.value = data.response.userInfo;
- })
+ headers: { Authorization: `Bearer ${sessionStorage.getItem('token')}`, },
+ }).then(({ data }) => {
+ userInfo.value = data.response.userInfo;
+ })
}
const fetchBookMarkList = async () => {
await axios.get(`http://localhost:8080/api/articles/bookmark?size=9`, {
- headers: {Authorization: `Bearer ${sessionStorage.getItem('token')}`,},
- }).then(({data})=>{
- bookMarkList.value = data.response.articles;
- })
+ headers: { Authorization: `Bearer ${sessionStorage.getItem('token')}`, },
+ }).then(({ data }) => {
+ bookMarkList.value = data.response.articles;
+ })
}
const move = () => {
- router.push({name : 'user', params : {'id' : userInfo.value.id}})
+ router.push({ name: 'user', params: { 'id': userInfo.value.id } })
}
@@ -106,10 +104,15 @@ p {
display: flex;
justify-content: center;
align-items: center;
- background-color: antiquewhite;
+ overflow: hidden;
border-radius: 100px
}
+.user-profile-img {
+ width: 200px;
+ height: 200px;
+}
+
.info-box {
display: flex;
flex-direction: column;
diff --git a/nagne-web-vuejs/src/pages/EditProfile/EditProfile.vue b/nagne-web-vuejs/src/pages/EditProfile/EditProfile.vue
index ed1255f..b5a4471 100644
--- a/nagne-web-vuejs/src/pages/EditProfile/EditProfile.vue
+++ b/nagne-web-vuejs/src/pages/EditProfile/EditProfile.vue
@@ -4,13 +4,15 @@
-
+ ![]()
+ {{ article?.userNickname }}
-{{ article?.createdDate?.split('T')[0] }}
@@ -104,6 +112,7 @@ import { onMounted, ref } from "vue"; import CommentList from "@/components/MainPage/Article/CommentList.vue"; import { useAuthStore } from "@/store/auth"; import { useRouter, useRoute } from "vue-router"; +import ArticleWriteSwiper from "@/components/Write/Article/ArticleWriteSwiper.vue"; const router = useRouter(); const route = useRoute(); const store = useAuthStore(); @@ -124,11 +133,12 @@ const dotMenuStyle = ref({}); const commentInput = ref(null); const commentContent = ref(""); const fetchComments = ref(false); +const imgUrls = ref([]); +const isManyImg = ref(false); onMounted(async () => { isLoading.value = true; await fetchArticleData(); - isLoading.value = false; if (article.value.userId === Number(sessionStorage.getItem('loginUserId'))) { isUsersArticle.value = true; } @@ -145,6 +155,13 @@ const fetchArticleData = async () => { article.value = data.response.articleInfo; isLiked.value = article.value.isLiked; isBookmarked.value = article.value.isBookmarked; + isLoading.value = false; + imgUrls.value = article.value.imageUrls; + if (imgUrls.value.length > 1) { + isManyImg.value = true; + } else { + isManyImg.value = false; + } } catch (error) { console.error(error); } @@ -154,7 +171,7 @@ const fetchArticleData = async () => { const moveTo = (action) => { switch (action) { case 'modify': - router.push({ name: 'articleModify', params: { id: props.articleIdByParams } }); + router.push({ name: 'articleModify', params: { id: articleIdByParams } }); break; case 'delete': @@ -162,6 +179,8 @@ const moveTo = (action) => { deleteArticle(); } break; + case 'user': + router.push({ name: 'user', params: { id: article.value.userId } }); case 'declare': // 신고하기 diff --git a/nagne-web-vuejs/src/pages/BookMark/BookMarkPage.vue b/nagne-web-vuejs/src/pages/BookMark/BookMarkPage.vue index 57014ce..db8b750 100644 --- a/nagne-web-vuejs/src/pages/BookMark/BookMarkPage.vue +++ b/nagne-web-vuejs/src/pages/BookMark/BookMarkPage.vue @@ -2,13 +2,16 @@
-
+ ![]()
+
- ![]()
+ ![]()
{{ userInfo.nickname}}
-{{ userInfo.nickname }}
+
-
-
회원 정보 수정
- 
-
+
+
@@ -35,7 +37,8 @@
-
+
-
+
+
-
{{profileImg.name && (profileImg.name.length > 12 ? profileImg.name.substring(0, 12) + '..' : profileImg.name)}}
+{{ profileImg.name && (profileImg.name.length + > 12 ? profileImg.name.substring(0, 12) + '..' : profileImg.name) }}
@@ -105,12 +108,12 @@
+
+
diff --git a/nagne-web-vuejs/src/pages/User/UserInfoPage.vue b/nagne-web-vuejs/src/pages/User/UserInfoPage.vue
index 6027c26..7b70f1d 100644
--- a/nagne-web-vuejs/src/pages/User/UserInfoPage.vue
+++ b/nagne-web-vuejs/src/pages/User/UserInfoPage.vue
@@ -2,16 +2,17 @@
![]()
+ ![]()
-
+
@@ -78,6 +79,10 @@ const changeTab = (tab) => {
tabState.value = tab;
}
+const moveEdit = () => {
+ router.push({ name: 'edit' })
+}
+
const openFollowModal = (type) => {
switch (type) {
case 'followers':
@@ -231,7 +236,8 @@ p {
justify-content: center;
align-items: center;
background-color: antiquewhite;
- border-radius: 100px
+ border-radius: 100px;
+ overflow: hidden;
}
.info-box {
diff --git a/nagne-web-vuejs/src/pages/map/FindByMapPage.vue b/nagne-web-vuejs/src/pages/map/FindByMapPage.vue
index 940b1af..23e8347 100644
--- a/nagne-web-vuejs/src/pages/map/FindByMapPage.vue
+++ b/nagne-web-vuejs/src/pages/map/FindByMapPage.vue
@@ -4,19 +4,25 @@
:height="'89vh'" @onLoadKakaoMap="onLoadKakaoMap">
+ :image="{ imageSrc: '/assets/logo/logo_img.png', imageWidth: 50, imageHeight: 40, imageOption: {} }">
+
+
+
-
-
+ ![]()
+ {{ userInfo.nickname }}
-
-
- ![]()
+
+ ![]()
-
-
@@ -30,17 +31,19 @@ import { useAuthStore } from "@/store/auth";
import { storeToRefs } from 'pinia'
const writeStore = useWriteStore();
const authStore = useAuthStore();
+const { selectedImg, tempUrl } = storeToRefs(writeStore);
const route = useRoute();
const router = useRouter();
-const renderBaseImg = ref(true);
-//S3 업로드 전까진 기본 이미지 사용.
-
const idByParams = route.params.id;
-
const modifyArticle = ref({});
+const isManyImg = ref(false);
+
onMounted(async () => {
+ console.log()
+ writeStore.selectedImg = [];
+ writeStore.tempUrl = [];
await getArticleToModify();
})
@@ -51,10 +54,16 @@ const getArticleToModify = async () => {
}
}).then(({ data }) => {
modifyArticle.value = data.response.articleInfo; //이거 지우고 article 객체 선언 후 게시글 객체 불러오기
+ writeStore.tempUrl = modifyArticle.value.imageUrls
+ if (writeStore.tempUrl.length > 1) {
+ isManyImg.value = true;
+ } else {
+ isManyImg.value = false;
+ }
})
}
-const baseImg = ref("/src/assets/logo/logo.png");
+const baseImg = ref("/assets/logo/logo.png");
const move = (path) => {
switch (path) {
case 'back':
diff --git a/nagne-web-vuejs/src/pages/write/ArticleWrite/ArticleWritePage.vue b/nagne-web-vuejs/src/pages/write/ArticleWrite/ArticleWritePage.vue
index 96c6472..e85b6dd 100644
--- a/nagne-web-vuejs/src/pages/write/ArticleWrite/ArticleWritePage.vue
+++ b/nagne-web-vuejs/src/pages/write/ArticleWrite/ArticleWritePage.vue
@@ -3,10 +3,11 @@
-
- ![]()
+
+ ![]()
-
+
@@ -31,9 +32,8 @@ const store = useWriteStore();
const { selectedImg, tempUrl } = storeToRefs(store);
const router = useRouter();
-const renderBaseImg = ref(true);
-
-const baseImg = ref("/src/assets/logo/logo.png");
+const isManyImg = ref(false);
+const renderBaseImg = ref(false);
const move = (path) => {
switch (path) {
@@ -48,11 +48,11 @@ const move = (path) => {
};
onMounted(() => {
- watch(store.tempUrl, (newTempUrl) => {
- if (newTempUrl && newTempUrl.length >= 1) {
- renderBaseImg.value = false;
+ watch(tempUrl, (newTempUrl) => {
+ if (newTempUrl && newTempUrl.length > 1) {
+ isManyImg.value = true;
} else {
- renderBaseImg.value = true;
+ isManyImg.value = false;
}
}, { deep: true });
});
diff --git a/nagne-web-vuejs/src/pages/write/PlanWrite/PlanWritePage.vue b/nagne-web-vuejs/src/pages/write/PlanWrite/PlanWritePage.vue
index 43603ba..04dd3ac 100644
--- a/nagne-web-vuejs/src/pages/write/PlanWrite/PlanWritePage.vue
+++ b/nagne-web-vuejs/src/pages/write/PlanWrite/PlanWritePage.vue
@@ -1,6 +1,20 @@
-
-
+
+
diff --git a/nagne-web-vuejs/src/pages/write/WritePage.vue b/nagne-web-vuejs/src/pages/write/WritePage.vue
index dc993cd..c49a1bc 100644
--- a/nagne-web-vuejs/src/pages/write/WritePage.vue
+++ b/nagne-web-vuejs/src/pages/write/WritePage.vue
@@ -60,7 +60,7 @@ const movePage = (path) => {
align-items: center;
flex-direction: column;
gap: 50px;
- background-image: url('@/assets/page/0E4A6201.jpg');
+ background-image: url('/assets/page/0E4A6201.jpg');
background-repeat: no-repeat;
background-size: cover;
background-position: bottom, center;
diff --git a/nagne-web-vuejs/src/router/index.js b/nagne-web-vuejs/src/router/index.js
index b31d50d..00e4213 100644
--- a/nagne-web-vuejs/src/router/index.js
+++ b/nagne-web-vuejs/src/router/index.js
@@ -8,16 +8,15 @@ import PlanWritePage from "@/pages/write/PlanWrite/PlanWritePage.vue";
import ArticleWritePage from "@/pages/write/ArticleWrite/ArticleWritePage.vue";
import ArticleModifyPage from "@/pages/write/ArticleWrite/ArticleModifyPage.vue";
import MapMainPage from "@/pages/map/MapMainPage.vue";
-import FindByMapPage from "@/pages/map/FindByMapPage.vue";
-import FindByTagPage from "@/pages/map/FindByTagPage.vue";
-import MapSavedPage from "@/pages/map/MapSavedPage.vue";
-import MyTripPlanPage from "@/pages/map/MyTripPlanPage.vue";
+import FindByMapPage from "@/pages/map/FindByMapPage.vue";
+import MyTripPlanPage from "@/pages/map/MyTripPlanPage.vue";
import UserInfoPage from "@/pages/User/UserInfoPage.vue";
import UserFollowing from "@/components/User/UserFollowing.vue";
import UserFollowers from "@/components/User/UserFollowers.vue";
import BookMarkPage from "@/pages/BookMark/BookMarkPage.vue";
import ArticleDetailPage from "@/pages/ArticleDetail/ArticleDetailPage.vue";
import EditProfile from "@/pages/EditProfile/EditProfile.vue";
+import SearchResultPage from "@/pages/Search/SearchResultPage.vue";
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
@@ -66,41 +65,31 @@ const router = createRouter({
],
},
{
- path: 'detail/:id',
- name: 'articleDetail',
- component: ArticleDetailPage
- }
+ path: "detail/:id",
+ name: "articleDetail",
+ component: ArticleDetailPage,
+ },
],
},
{
- path : "/map",
- name : 'mapMain',
+ path: "/map",
+ name: "mapMain",
component: MapMainPage,
},
{
- path : "/map",
- children : [
- {
- path : "find",
- name: 'mapFind',
- component: FindByMapPage
- },
- {
- path : 'tag',
- name: 'mapTag',
- component: FindByTagPage
- },
+ path: "/map",
+ children: [
{
- path : 'save',
- name: 'mapSave',
- component: MapSavedPage
+ path: "find",
+ name: "mapFind",
+ component: FindByMapPage,
},
{
- path : 'plan',
- name: 'mapPlan',
- component: MyTripPlanPage
+ path: "plan",
+ name: "mapPlan",
+ component: MyTripPlanPage,
},
- ]
+ ],
},
{
path: "/plans/write",
@@ -114,14 +103,19 @@ const router = createRouter({
},
{
path: "/bookmark",
- name: 'bookmark',
+ name: "bookmark",
component: BookMarkPage,
},
{
path: "/editProfile",
- name: 'edit',
+ name: "edit",
component: EditProfile,
- }
+ },
+ {
+ path: "/search",
+ name: "search",
+ component: SearchResultPage,
+ },
],
});
diff --git a/nagne-web-vuejs/src/store/attraction.js b/nagne-web-vuejs/src/store/attraction.js
new file mode 100644
index 0000000..78d026c
--- /dev/null
+++ b/nagne-web-vuejs/src/store/attraction.js
@@ -0,0 +1,21 @@
+// src/store/attraction.js
+import { defineStore } from "pinia";
+import { ref, watch } from "vue";
+
+export const useAttractionStore = defineStore("attraction", () => {
+ const myAttractions = ref([]);
+ const attractionSearchKeyword = ref("");
+ const attractionToPlan = ref([]);
+
+ const deleteMyAttractions = (attractionId) => {
+ myAttractions.value = myAttractions.value.filter(
+ (attraction) => attraction.id !== attractionId
+ );
+ };
+
+ const changeKeyword = (newValue) => {
+ attractionSearchKeyword.value = newValue;
+ };
+
+ return { myAttractions, deleteMyAttractions, changeKeyword };
+});
diff --git a/nagne-web-vuejs/update-assets-path.js b/nagne-web-vuejs/update-assets-path.js
new file mode 100644
index 0000000..44ce37a
--- /dev/null
+++ b/nagne-web-vuejs/update-assets-path.js
@@ -0,0 +1,22 @@
+const fs = require('fs');
+const path = require('path');
+
+const srcDir = path.join(__dirname, 'src');
+const assetPattern = /(['"`])(@\/assets\/|\/src\/assets\/)([^'"`]+)/g;
+
+function updatePaths(dir) {
+ const files = fs.readdirSync(dir);
+ for (const file of files) {
+ const fullPath = path.join(dir, file);
+ if (fs.statSync(fullPath).isDirectory()) {
+ updatePaths(fullPath);
+ } else if (path.extname(fullPath) === '.vue') {
+ let content = fs.readFileSync(fullPath, 'utf-8');
+ content = content.replace(assetPattern, '$1/assets/$3');
+ fs.writeFileSync(fullPath, content, 'utf-8');
+ console.log(`Updated paths in ${fullPath}`);
+ }
+ }
+}
+
+updatePaths(srcDir);
나그네와 함께 여행을 떠나봐요!
+
+
+
+
+
+ 주변 둘러보기
+
+
+
+
+ 내 여행 계획
+