Skip to content

Chore/fix misc issues #172

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

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

Chore/fix misc issues #172

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
81a7896
change:ヘッダのボタンをlinkに
mathsuky Apr 23, 2025
62dc717
fix: ボタンのサイズをデザインに合わせて変更
mathsuky Apr 23, 2025
33f7185
fix: debugの設定を残していた
mathsuky Apr 23, 2025
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
53 changes: 18 additions & 35 deletions src/components/Navigations/TopNavbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<script setup lang="ts">
import { ref } from 'vue'
import PrimaryButton from '@/components/Controls/PrimaryButton.vue'
import IconDropdownTriangle from '@/components/icons/IconDropdownTriangle.vue'
import MenuButton from '@/components/Navigations/MenuButton.vue'
import PrimaryButton from '@/components/Controls/PrimaryButton.vue'
import { ref } from 'vue'
import { useRouter } from 'vue-router'

const { isLoggedIn = false, username = '' } = defineProps<{
isLoggedIn: boolean
username: string
}>()

const router = useRouter()
const isMenuOpen = ref(false)

const modalHandler = (e: MouseEvent) => {
Expand All @@ -25,32 +27,29 @@ const setMenuState = (state: boolean) => {
if (state) document.addEventListener('mousedown', modalHandler)
else document.removeEventListener('mousedown', modalHandler)
}

const handleLogin = () => {
router.push('/login')
}
</script>

<template>
<header
class="sticky top-0 z-50 flex h-14 w-full items-center bg-background-tertiary px-8 font-primary text-text-primary"
>
<a class="flex items-center gap-3" href="/">
<router-link to="/" class="flex items-center gap-3">
<img src="" class="inline-block size-7.5" />
<span class="text-xl font-semibold">traO Judge</span>
</a>
</router-link>
<span class="fontstyle-ui-control-strong ml-auto flex items-center gap-5">
<button>問題一覧</button>
<button>提出一覧</button>
<PrimaryButton
v-if="!isLoggedIn"
padding="1rem"
@click="
() => {
console.log('TODO: login')
}
"
>
<router-link to="/problems">問題一覧</router-link>
<router-link to="/submissions">提出一覧</router-link
><!-- TODO: どこに飛ぶのか確認 -->
<PrimaryButton v-if="!isLoggedIn" padding="0.5rem" class="h-10 w-22" @click="handleLogin">
ログイン
</PrimaryButton>
<div id="top-navbar-menu" class="relative">
<button v-if="isLoggedIn" class="flex items-center gap-1" @click="toggleMenu">
<div v-else id="top-navbar-menu" class="relative">
<button class="flex items-center gap-1" @click="toggleMenu">
<span class="inline-block">{{ username }}</span>
<IconDropdownTriangle
class="inline-block h-1.625"
Expand All @@ -61,26 +60,10 @@ const setMenuState = (state: boolean) => {
v-if="isMenuOpen"
class="absolute right-0 top-7 flex w-50 flex-col gap-y-1 rounded-lg border border-border-secondary bg-background-primary p-2"
>
<MenuButton
icon="person"
@click="
() => {
console.log('TODO: プロフィール画面へ遷移')
}
"
>
<MenuButton icon="person" @click="() => router.push(`/users/${username}`)">
プロフィール
</MenuButton>
<MenuButton
icon="settings"
@click="
() => {
console.log('TODO: 設定画面へ遷移')
}
"
>
設定
</MenuButton>
<MenuButton icon="settings" @click="() => router.push('/settings')"> 設定 </MenuButton>
<MenuButton
icon="logout"
@click="
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default {
6.5: '1.625rem',
7.5: '1.875rem',
11.5: '2.875rem',
22: '5.5rem',
27: '6.75rem',
37: '9.25rem',
50: '12.5rem',
Expand Down