Skip to content

๐Ÿ› fix : ์ผ๋ถ€ ์ฝ”๋“œ ์ˆ˜์ • #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hannabananah wants to merge 3 commits into
base: main
Choose a base branch
from
Open

๐Ÿ› fix : ์ผ๋ถ€ ์ฝ”๋“œ ์ˆ˜์ • #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad8e79d
๐Ÿ› fix : ๋‹จ์ผํƒœ๊ทธ๋กœ ์ˆ˜์ •
hannabananah Jun 5, 2024
ce6da85
๐Ÿ› fix : ๋‹จ์ผํƒœ๊ทธ๋กœ ์ˆ˜์ •
hannabananah Jun 5, 2024
5ccc5cf
Squashed commit of the following:
hannabananah Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions front/src/components/BoardArticleDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class="px-2 rounded-[8px]"
@click="router.push({ name: 'board' })"
>
<undo></undo>
<Undo />
</button>
<button
class="hover:drop-shadow transform-gpu hover:scale-110"
Expand Down Expand Up @@ -97,7 +97,7 @@ import Edit from 'vue-material-design-icons/SquareEditOutline.vue';
import Delete from 'vue-material-design-icons/TrashCanOutline.vue';
import Chat from 'vue-material-design-icons/ChatOutline.vue';
import Send from 'vue-material-design-icons/Send.vue';
import undo from 'vue-material-design-icons/undo.vue';
import Undo from 'vue-material-design-icons/Undo.vue';

const boardStore = useBoardStore();
const userStore = useUserStore();
Expand Down
54 changes: 27 additions & 27 deletions front/src/components/ProductAnnuityList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@
class="flex items-center justify-center w-full"
>
<span>์ž‘๋…„ ์ˆ˜์ต๋ฅ </span>
<upDown
<Swap
class="inline-block"
v-show="'btrm_prft_rate_1' !== sortedBy"
></upDown>
<up
/>
<Up
class="inline-block"
v-show="sortedBy === 'btrm_prft_rate_1' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'btrm_prft_rate_1' && !isSorted"
></down>
/>
</button>
</th>
<th class="border border-slate-300 w-[5%]">
Expand All @@ -70,18 +70,18 @@
class="flex items-center justify-center w-full"
>
<span>2๋…„์ „ ์ˆ˜์ต๋ฅ </span>
<upDown
<Swap
class="inline-block"
v-show="'btrm_prft_rate_2' !== sortedBy"
></upDown>
<up
/>
<Up
class="inline-block"
v-show="sortedBy === 'btrm_prft_rate_2' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'btrm_prft_rate_2' && !isSorted"
></down>
/>
</button>
</th>
<th class="border border-slate-300 w-[5%]">
Expand All @@ -90,18 +90,18 @@
class="flex items-center justify-center w-full"
>
<span>3๋…„์ „ ์ˆ˜์ต๋ฅ </span>
<upDown
<Swap
class="inline-block"
v-show="'btrm_prft_rate_3' !== sortedBy"
></upDown>
<up
/>
<Up
class="inline-block"
v-show="sortedBy === 'btrm_prft_rate_3' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'btrm_prft_rate_3' && !isSorted"
></down>
/>
</button>
</th>
<th class="border border-slate-300 w-[5%]">
Expand All @@ -110,18 +110,18 @@
class="flex items-center justify-center w-full"
>
<span>์ธ๊ธฐ์ˆœ</span>
<upDown
<Swap
class="inline-block"
v-show="'annuity_like_users.length' !== sortedBy"
></upDown>
<up
/>
<Up
class="inline-block"
v-show="sortedBy === 'annuity_like_users.length' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'annuity_like_users.length' && !isSorted"
></down>
/>
</button>
</th>
</tr>
Expand Down Expand Up @@ -175,9 +175,9 @@
import { ref, onMounted, computed } from 'vue';
import { useProductStore } from '@/stores/products';
import { useRouter } from 'vue-router';
import upDown from 'vue-material-design-icons/menuSwapOutline.vue';
import up from 'vue-material-design-icons/menuUp.vue';
import down from 'vue-material-design-icons/menuDown.vue';
import Swap from 'vue-material-design-icons/MenuSwapOutline.vue';
import Up from 'vue-material-design-icons/MenuUp.vue';
import Down from 'vue-material-design-icons/MenuDown.vue';

const router = useRouter();
const isSorted = ref(true);
Expand Down
70 changes: 29 additions & 41 deletions front/src/components/ProductDepositList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,15 @@
class="flex items-center justify-center w-full"
>
<span>6๊ฐœ์›”</span>
<upDown
class="inline-block"
v-show="sortedBy !== 'month_6'"
></upDown>
<up
<Swap class="inline-block" v-show="sortedBy !== 'month_6'" />
<Up
class="inline-block"
v-show="sortedBy === 'month_6' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'month_6' && !isSorted"
></down>
/>
</button>
</th>
<th class="border border-slate-300 w-[8%]">
Expand All @@ -62,18 +59,15 @@
class="flex items-center justify-center w-full"
>
<span>12๊ฐœ์›”</span>
<upDown
class="inline-block"
v-show="sortedBy !== 'month_12'"
></upDown>
<up
<Swap class="inline-block" v-show="sortedBy !== 'month_12'" />
<Up
class="inline-block"
v-show="sortedBy === 'month_12' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'month_12' && !isSorted"
></down>
/>
</button>
</th>
<th class="border border-slate-300 w-[8%]">
Expand All @@ -82,18 +76,15 @@
class="flex items-center justify-center w-full"
>
<span>24๊ฐœ์›”</span>
<upDown
class="inline-block"
v-show="'month_24' !== sortedBy"
></upDown>
<up
<Swap class="inline-block" v-show="'month_24' !== sortedBy" />
<Up
class="inline-block"
v-show="sortedBy === 'month_24' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'month_24' && !isSorted"
></down>
/>
</button>
</th>
<th class="border border-slate-300 w-[8%]">
Expand All @@ -102,18 +93,15 @@
class="flex items-center justify-center w-full"
>
<span>36๊ฐœ์›”</span>
<upDown
class="inline-block"
v-show="'month_36' !== sortedBy"
></upDown>
<up
<Swap class="inline-block" v-show="'month_36' !== sortedBy" />
<Up
class="inline-block"
v-show="sortedBy === 'month_36' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'month_36' && !isSorted"
></down>
/>
</button>
</th>
<th class="border border-slate-300 w-[8%]">
Expand All @@ -122,18 +110,18 @@
class="flex items-center justify-center w-full"
>
<span>์ธ๊ธฐ์ˆœ</span>
<upDown
<Swap
class="inline-block"
v-show="'deposit_like_users.length' !== sortedBy"
></upDown>
<up
/>
<Up
class="inline-block"
v-show="sortedBy === 'deposit_like_users.length' && isSorted"
></up>
<down
/>
<Down
class="inline-block"
v-show="sortedBy === 'deposit_like_users.length' && !isSorted"
></down>
/>
</button>
</th>
</tr>
Expand Down Expand Up @@ -178,9 +166,9 @@
import { ref, onMounted, computed } from 'vue';
import { useProductStore } from '@/stores/products';
import { useRouter } from 'vue-router';
import upDown from 'vue-material-design-icons/menuSwapOutline.vue';
import up from 'vue-material-design-icons/menuUp.vue';
import down from 'vue-material-design-icons/menuDown.vue';
import Swap from 'vue-material-design-icons/MenuSwapOutline.vue';
import Up from 'vue-material-design-icons/MenuUp.vue';
import Down from 'vue-material-design-icons/MenuDown.vue';

const store = useProductStore();
const router = useRouter();
Expand Down
27 changes: 7 additions & 20 deletions front/src/components/ProductDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@
class="border border-solid border-sky-600 px-2 rounded-[8px] bg-slate-50 hover:shadow-inner hover:bg-slate-100"
@click="$router.go(-1)"
>
<undo fillColor="#4682B4"></undo>
<Undo fillColor="#4682B4" />
</button>
<div>
<button v-show="isLiked" @click="doLike">
<heart
fillColor="#FF6666"
class="inline-block h-[20px] ml-auto"
></heart>
<Heart fillColor="#FF6666" class="inline-block h-[20px] ml-auto" />
</button>
<button v-show="!isLiked" @click="doLike">
<heartOutline
<HeartOutline
fillColor="#FF6666"
class="inline-block h-[20px] ml-auto"
></heartOutline></button
/></button
>{{ numberOfLikes }}
</div>
</div>
Expand Down Expand Up @@ -59,16 +56,6 @@
{{ product.dcls_month }}
</td>
</tr>
<!-- <tr>
<th
class="border-r border-slate-300 w-[30%] text-start pl-3"
>
์ƒํ’ˆ๋ช…
</th>
<td class=" border-slate-300 w-[70%] text-start pl-3">
{{ product.fin_prdt_nm }}
</td>
</tr> -->
<tr class="w-full">
<th class="border-r border-slate-300 w-[30%] text-start pl-3">
๊ธฐ๊ด€๋ช…
Expand Down Expand Up @@ -295,9 +282,9 @@ import { ref, onMounted, computed } from 'vue';
import axios from 'axios';
import { useRoute, useRouter } from 'vue-router';
import { useUserStore } from '@/stores/user';
import undo from 'vue-material-design-icons/undo.vue';
import heart from 'vue-material-design-icons/heart.vue';
import heartOutline from 'vue-material-design-icons/heartOutline.vue';
import Undo from 'vue-material-design-icons/Undo.vue';
import Heart from 'vue-material-design-icons/Heart.vue';
import HeartOutline from 'vue-material-design-icons/HeartOutline.vue';

const product = ref(null);
const userStore = useUserStore();
Expand Down
Loading