Merge branch 'main' of https://github.com/CSID-DGU/2024-2-OSSProj-Oso…

…ri-FE-01 into feature/#6
CSID-DGU · Dec 10, 2024 · 1c1c7fd · 1c1c7fd
2 parents 8ac6069 + 7dab9b0
commit 1c1c7fd
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 6 deletions.
diff --git a/src/views/akopolio/Edit/akopolioEdit.vue b/src/views/akopolio/Edit/akopolioEdit.vue
@@ -2,6 +2,9 @@
   <div class="container">
     <!-- 헤더 -->
     <MainHeader />
+    <div class="back-button" @click="goBack">
+      <img src="@/assets/images/back.svg" alt="Back" class="arrow-left-icon" />
+    </div>
 
     <!-- 활동명과 활동일 -->
     <div class="activity-info">
@@ -354,4 +357,10 @@ input[type="file"] {
   height: auto;         
 }
 
+.arrow-left-icon {
+  cursor: pointer;
+  margin-bottom: 20px;
+}
+
+
 </style>
diff --git a/src/views/akopolio/Edit/edit.js b/src/views/akopolio/Edit/edit.js
@@ -68,6 +68,10 @@ export default {
     });
     const isDropdownOpen = ref(false);
 
+    const goBack = () => {
+      window.history.back();  // 뒤로 가기
+    };
+
     const toggleDropdown = () => {
       isDropdownOpen.value = !isDropdownOpen.value;
     };
@@ -349,6 +353,7 @@ export default {
       star,
       pmi,
       isDropdownOpen,
+      goBack,
       toggleDropdown,
       toggleTag,
       autoResize,

diff --git a/src/views/akopolio/create/akopolioCreate.vue b/src/views/akopolio/create/akopolioCreate.vue
@@ -2,7 +2,9 @@
   <div class="container">
     <!-- Header -->
     <MainHeader />
-
+    <div class="back-button" @click="goBack">
+      <img src="@/assets/images/back.svg" alt="Back" class="arrow-left-icon" />
+    </div>
     <!-- Activity Name and Date -->
     <div class="activity-info">
       <div class="activity-name-container">
@@ -391,4 +393,9 @@ input[type="file"] {
   height: auto;         
 }
 
+.arrow-left-icon {
+  cursor: pointer;
+  margin-bottom: 20px;
+}
+
 </style>
diff --git a/src/views/akopolio/create/create.js b/src/views/akopolio/create/create.js
@@ -50,6 +50,7 @@ export default {
     }
   },
   methods: {
+
     async fetchUserData() {
       try {
         const response = await fetch(
@@ -81,6 +82,10 @@ export default {
       }
     },
 
+    goBack() {
+      window.history.back();  // 이전 페이지로 돌아가기
+    },
+
     toggleDropdown() {
       this.isDropdownOpen = !this.isDropdownOpen;
     },

diff --git a/src/views/akopolio/detail/akopolioDetail.vue b/src/views/akopolio/detail/akopolioDetail.vue
@@ -3,6 +3,9 @@
     <MainHeader />
     <div class="detail-header">
       <div class="header-content">
+        <div class="back-button" @click="goBack">
+          <img src="@/assets/images/back.svg" alt="Back" class="arrow-left-icon" />
+        </div>
         <div class="action-buttons">
           <div class="edit-button" @click="editPortfolio">수정하기</div>
           <div class="delete-button" @click="handleDeletePortfolio">
@@ -280,4 +283,8 @@ p {
   vertical-align: middle; 
 }
 
+.arrow-left-icon {
+  cursor: pointer;
+}
+
 </style>
diff --git a/src/views/akopolio/detail/detail.js b/src/views/akopolio/detail/detail.js
@@ -48,7 +48,9 @@ export default {
     const router = useRouter(); // router 사용
     const portfolioId = route.params.id; // route에서 portfolioId 가져오기
 
-
+    const goBack = () => {
+      window.history.back();  // 뒤로 가기
+    };
     console.log("Portfolio ID:", portfolioId);
 
         // 포트폴리오 데이터 가져오기
@@ -140,6 +142,7 @@ export default {
       portfolio,
       images,
       nickname,
+      goBack,
       editPortfolio,
       handleDeletePortfolio,
     };

diff --git a/src/views/akopolio/main/akopolioMain.vue b/src/views/akopolio/main/akopolioMain.vue
@@ -175,6 +175,7 @@ input {
   font-weight: 300;
   justify-content: space-between;
   font-family: sans-serif;
+  max-width: 355px;
 }
 
 .tag-container div {

diff --git a/src/views/akopolio/main/main.js b/src/views/akopolio/main/main.js
@@ -19,10 +19,10 @@ export default {
       itemsPerPage: 7,
       selectedTags: [],
       tags: [
-        '전공', '교양', '교내동아리', '교외동아리', '학회', '봉사활동',
-        '인턴', '아르바이트', '대외활동', '서포터즈', '기자단', '기타',
-        '강연/행사', '스터디', '부트캠프', '프로젝트', '연구',
-        '학생회',
+        '교내동아리', '전공', '교양', '교외동아리', '학회', '봉사활동',
+        '인턴', '서포터즈', '기자단', '부트캠프', '아르바이트', '학생회', 
+        '대외활동', '스터디', '강연/행사', '기타', '연구', '프로젝트'
+
       ],
       isDropdownOpen: false,
       portfolioList: [], // 초기 포트폴리오는 빈 배열로 설정