Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/suitable

This commit is contained in:
Daseul Kim 2025-05-15 18:33:59 +09:00
commit 2159bef4e0
2 changed files with 10 additions and 2 deletions

View File

@ -3,6 +3,7 @@
import { useRouter } from 'next/navigation'
import { usePopupController } from '@/store/popupController'
import { useSessionStore } from '@/store/session'
import Image from 'next/image'
export default function MemberInformationPopup() {
const popupController = usePopupController()
@ -22,7 +23,7 @@ export default function MemberInformationPopup() {
<div className="modal-header-inner">
<div className="modal-name-wrap">
<div className="modal-img">
<img src="/assets/images/layout/modal_header_icon.svg" alt="" />
<Image src="/assets/images/layout/modal_header_icon.svg" width={18} height={20} alt="" />
</div>
<div className="modal-name"></div>
</div>

View File

@ -5,9 +5,16 @@ import { usePathname } from 'next/navigation'
export default function FloatBtn() {
const pathname = usePathname()
const scrollToTop = () => {
window.scrollTo({
top: 0,
behavior: 'smooth',
})
}
if (pathname === '/login' || pathname === '/') {
return null
}
return <button className="top-btn"></button>
return <button className="top-btn" onClick={scrollToTop}></button>
}