Skip to content

Commit

Permalink
Feat: Footer과 Header 레이아웃 폴더 이동 및 import문 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
study2895 committed Oct 23, 2024
1 parent f80946a commit 60e082a
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 119 deletions.
4 changes: 2 additions & 2 deletions src/components/layout/FeedLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</template>

<script>
import MainHeader from '@/views/mainpage/Header.vue'
import MainFooter from '@/views/mainpage/Footer.vue'
import MainHeader from '@/components/layout/Header.vue'
import MainFooter from '@/components/layout/Footer.vue'

export default {
name: 'FeedLayout'
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

<script>
export default {
name: 'MainHeader' // Header 컴포넌트를 다른 파일에서 사용하기 위해 export
name: 'HeaderComponent' // Header 컴포넌트를 다른 파일에서 사용하기 위해 export
}
</script>
4 changes: 2 additions & 2 deletions src/views/calendar/CalendarMainView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
import { ref } from 'vue'
import { format } from 'date-fns'
import 'v-calendar/dist/style.css'
import MainHeader from '@/views/mainpage/Header.vue'
import MainFooter from '@/views/mainpage/Footer.vue'
import MainHeader from '@/components/layout/Header.vue'
import MainFooter from '@/components/layout/Footer.vue'
// 현재 날짜를 기준으로 연도와 월을 가져옴
const currentDate = new Date()
Expand Down
2 changes: 1 addition & 1 deletion src/views/feed/AkoStampWriteView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<script setup>
import { ref } from 'vue'
import axios from 'axios'
import MainFooter from '@/views/mainpage/Footer.vue'
import MainFooter from '@/components/layout/Footer.vue'
const currentDate = ref(
new Date().toLocaleDateString('ko-KR', {
Expand Down
121 changes: 10 additions & 111 deletions src/views/login/mypage/MypageView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,121 +158,20 @@
</section>
</main>
<!-- 하단바 -->
<footer
class="bg-white shadow-sm py-3 px-4 fixed bottom-0 left-1/2 transform -translate-x-1/2 w-[395px] min-w-[340px] z-10"
>
<div class="flex items-center justify-between">
<h1 class="text-xl font-bold">{{ user.nickname }}님의 마이페이지</h1>
<button
@click="handleLogout"
class="text-[#F6B87A] hover:bg-[#F6B87A] hover:bg-opacity-10 px-2 py-1 rounded-full transition-colors duration-300 text-sm"
>
로그아웃
</button>
</div>
</footer>
<MainFooter />
</div>
</div>
</template>

<script src="./MypageScript.js"></script>

<style scoped>
/* .mypage-container {
max-width: 600px;
margin: 0 auto;
padding: 20px;
background-color: #f9f9f9;
border-radius: 10px;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
}
h1 {
text-align: center;
color: #333;
margin-bottom: 30px;
font-size: 24px;
}
.logout-button {
background-color: #ff4d4f;
color: white;
border: none;
padding: 10px 20px;
border-radius: 5px;
cursor: pointer;
display: block;
margin: 10px auto;
width: 150px;
text-align: center;
}
.logout-button:hover {
background-color: #ff7875;
}
.intro-section,
.profile-section {
background-color: white;
padding: 20px;
border-radius: 10px;
margin-bottom: 20px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);
}
h2 {
color: #666;
margin-bottom: 15px;
font-size: 20px;
}
.introduce-text {
font-style: italic;
color: #555;
margin-bottom: 10px;
}
.edit-button {
background-color: #40a9ff;
color: white;
border: none;
padding: 8px 15px;
border-radius: 5px;
cursor: pointer;
}
.edit-button:hover {
background-color: #69c0ff;
}
.form-group {
margin-bottom: 15px;
}
label {
display: block;
margin-bottom: 5px;
color: #555;
}
input {
width: 100%;
padding: 8px;
border: 1px solid #ddd;
border-radius: 5px;
}
<script src="./MypageScript.js">
import MainFooter from '@/components/layout/Footer.vue'
import './MypageScript.js';
.save-button {
background-color: #52c41a;
color: white;
border: none;
padding: 10px 20px;
border-radius: 5px;
cursor: pointer;
margin-top: 10px;
export default {
components: {
MainFooter
}
}
</script>

.save-button:hover {
background-color: #73d13d;
} */
</style>
<style scoped></style>
Empty file.
14 changes: 12 additions & 2 deletions src/views/mainpage/MainpageView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@

<script setup>
import { ref } from 'vue'
import MainHeader from '@/views/mainpage/Header.vue'
import MainFooter from '@/views/mainpage/Footer.vue'
import MainHeader from '@/components/layout/Header.vue'
import MainFooter from '@/components/layout/Footer.vue'
import minielephanticon from '@/assets/Icons/akoming/mainpage/minielephanticon.svg'
const stamps = ref([
Expand All @@ -118,3 +118,13 @@ const tasks = ref([
{ name: '아코폴리오', completed: false }
])
</script>

<style scoped>
@font-face {
font-family: 'UhBeeSe_hyun';
src: url('https://gcore.jsdelivr.net/gh/projectnoonnu/[email protected]/UhBeeSe_hyun.woff')
format('woff');
font-weight: normal;
font-style: normal;
}
</style>

0 comments on commit 60e082a

Please sign in to comment.