diff --git a/app.vue b/app.vue index bab94c0..cf55696 100644 --- a/app.vue +++ b/app.vue @@ -77,11 +77,11 @@ body { .main { /*max-width: 600px;*/ margin: 0 auto; - padding-top: 5rem; + padding-top: 4rem; } .bingo-card-frame { max-width: 500px; - margin: 1rem auto; + margin: 0 auto; padding-top: 2rem; padding-left: 1rem; padding-right: 1rem; diff --git a/components/AppControlArea.vue b/components/AppControlArea.vue new file mode 100644 index 0000000..99d5aa7 --- /dev/null +++ b/components/AppControlArea.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/components/AppHeader.vue b/components/AppHeader.vue index 7e5b5f6..236542e 100644 --- a/components/AppHeader.vue +++ b/components/AppHeader.vue @@ -55,9 +55,6 @@ const currentUser = useCurrentUser(); text-transform: uppercase; letter-spacing: 2px; } -header { - z-index: 10; -} .router-link-active { border-bottom: 2px solid var(--c5); -webkit-background-clip: text; diff --git a/components/BingoCardCarousel.vue b/components/BingoCardCarousel.vue index fa17a22..fe60cb1 100644 --- a/components/BingoCardCarousel.vue +++ b/components/BingoCardCarousel.vue @@ -1,14 +1,15 @@ @@ -123,9 +124,14 @@ const props = defineProps({ const emits = defineEmits([ "openBingoCardDetailModal", "changeBingoViewSetting", + "closeVideoModal", //親の BingoCardCarouselでのステータス管理のため + "openVideoModal", //親の BingoCardCarouselでのステータス管理のため ]); -const openBingoCardDetailModal = async (bingoCellId: string) => { - await emits("openBingoCardDetailModal", bingoCellId); +const closeVideoModal = () => { + emits("closeVideoModal"); //親の BingoCardCarouselでのステータス管理のため +}; +const openBingoCardDetailModal = (bingoCellId: string) => { + emits("openBingoCardDetailModal", bingoCellId); }; // computed プロパティを作成 const createdAt = computed(() => { @@ -181,6 +187,7 @@ const movieModalIsOpen = ref(false); const openMovieModal = (clearMovieUrl: String) => { if (!clearMovieUrl) return false; movieModalIsOpen.value = true; + emits("openVideoModal"); }; // ビンゴカード詳細モーダルを閉じる const closeMovieModal = async () => { diff --git a/components/MovieModal.vue b/components/MovieModal.vue index 34dd288..07dfc1e 100644 --- a/components/MovieModal.vue +++ b/components/MovieModal.vue @@ -11,7 +11,7 @@ :url="props.clearMovieUrl" > -
+

- - + + diff --git a/pages/mypage.vue b/pages/mypage.vue index 647598c..8398758 100644 --- a/pages/mypage.vue +++ b/pages/mypage.vue @@ -6,52 +6,12 @@ :displayName="currentUser.displayName" :userInfo="userInfo" :walletAccount="walletAccount" - :ownNfts="ownNfts" :bingoToken="bingoToken" /> - -
- -
-
-

- ウォレット -

- -
- -
-
- -
-

- その他の操作 -

- -
- - - - -
-
+ + + +