Skip to content
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

feat: 네비게이션 수정 및 링크 연결 #53

Merged
merged 1 commit into from
Aug 4, 2024
Merged

feat: 네비게이션 수정 및 링크 연결 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion AIReport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,23 @@
<title>AIReport</title>
<link rel="stylesheet" href="/css/bootstrap.css" />
<link rel="stylesheet" href="/css/AIReport.css" />
<link rel="stylesheet" href="css/navigation.css" />
<link rel="stylesheet" href="/css/color.css" />
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="element">
<div class="main-frame">
<div class="text-frame1">
Expand Down Expand Up @@ -56,7 +70,11 @@
</div>
</div>
</body>

<script>
document.getElementById("logo").addEventListener("click", function() {
window.location.href = "./home.html";
});
</script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script type="text/javascript" src="/js/bootstrap.js"></script>
<script src="js/AIReport.js"></script>
Expand Down
70 changes: 70 additions & 0 deletions css/navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
.navigation {
z-index: 1000;
position: fixed;
display: flex;
justify-content: center;
align-items: center;
width: 100vw;
min-width: 1024px;
height: 72px;
top: 0;
left: 0;
background-color: var(--main-green-2);
}
.nav-frame{
display: inline-flex;
align-items: center;
gap: 8px;
position: absolute;
left: 100px;
}
.logo-img{
cursor: pointer;
}
.logo-text {
width: fit-content;
margin-top: -1px;
font-family: "Pretendard-ExtraLight", Helvetica;
font-weight: 200;
color: var(--white);
font-size: 24px;
letter-spacing: -2.4px;
line-height: normal;
}
.navbar-list {
display: inline-flex;
align-items: center;
gap: 128px;
}
.navbar-items {
cursor: pointer;
width: fit-content;
margin-top: -1px;
font-family: "Pretendard-Regular", Helvetica;
font-weight: 400;
color: var(--white);
font-size: 20px;
letter-spacing: 0;
line-height: normal;
white-space: nowrap;
}

.nav-div{
display: flex;
align-items: center;
gap: 260px;
}

a{
text-decoration: none;
}

a:hover{
color: var(--n-800);
text-decoration: none;
}

a:active{
color: var(--n-800);
text-decoration: none;
}
14 changes: 14 additions & 0 deletions darkRecord.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,22 @@
<link rel="stylesheet" href="/css/bootstrap.css" />
<link rel="stylesheet" href="/css/darkRecord.css" />
<link rel="stylesheet" href="css/color.css" />
<link rel="stylesheet" href="css/navigation.css" />
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="element">
<div class="frame-wrapper">
<div class="frame">
Expand Down
20 changes: 19 additions & 1 deletion darkRecordDetail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,23 @@
<link rel="stylesheet" href="/css/bootstrap.css" />
<link rel="stylesheet" href="/css/darkRecord.css" />
<link rel="stylesheet" href="/css/darkRecordDetail.css" />
<link rel="stylesheet" href="css/navigation.css" />
<link rel="stylesheet" href="css/color.css" />
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="element">
<div class="frame-wrapper">
<div class="frame">
Expand Down Expand Up @@ -96,7 +110,11 @@
</div>
</div>
</body>

<script>
document.getElementById("logo").addEventListener("click", function() {
window.location.href = "./home.html";
});
</script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script type="text/javascript" src="/js/bootstrap.js"></script>
<script src="/js/darkRecordDetail.js"></script>
Expand Down
19 changes: 19 additions & 0 deletions darkRecordWriting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,22 @@
<link rel="stylesheet" href="/css/darkRecord.css" />
<link rel="stylesheet" href="/css/darkRecordDetail.css" />
<link rel="stylesheet" href="css/color.css" />
<link rel="stylesheet" href="css/navigation.css" />
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="element">
<div class="frame-wrapper">
<div class="frame">
Expand Down Expand Up @@ -94,6 +108,11 @@
</div>
</div>
</div>
<script>
document.getElementById("logo").addEventListener("click", function() {
window.location.href = "./home.html";
});
</script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
<script src="js/darkRecordWriting.js"></script>
Expand Down
31 changes: 19 additions & 12 deletions drinkRecord.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,27 @@
<link rel="stylesheet" href="css/bootstrap.css" />
<link rel="stylesheet" href="css/drinkRecord.css" />
<link rel="stylesheet" href="css/color.css" />
<link rel="stylesheet" href="css/navigation.css" />
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="screen">
<div class="div">
<p class="text-wrapper">
상천이삼촌님,<br />오늘의 음주를 기록해주세요😎
</p>
<div class="navigation">
<div class="frame">
<img class="img" src="img/logo.svg" />
<div class="text-wrapper-2">술 없는 나</div>
</div>
<div class="navbar">
<div class="text-wrapper-3">홈</div>
<div class="text-wrapper-3">음주 분석</div>
<div class="text-wrapper-3">음주 기록</div>
<div class="text-wrapper-3">설정</div>
</div>
</div>
<div class="frame-2">
<div class="frame-3">
<div class="frame-wrapper">
Expand Down Expand Up @@ -279,6 +281,11 @@
</div>
</div>
</div>
<script>
document.getElementById("logo").addEventListener("click", function() {
window.location.href = "./home.html";
});
</script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
Expand Down
31 changes: 19 additions & 12 deletions home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,24 @@
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="css/home.css" />
<link rel="stylesheet" href="css/color.css" />
<link rel="stylesheet" href="css/navigation.css" />
<script src="js/home.js"></script>
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="screen">
<div class="navigation">
<div class="frame">
<img class="img" src="img/logo.svg" />
<div class="text-wrapper-2">술 없는 나</div>
</div>
<div class="navbar">
<div class="text-wrapper-3">홈</div>
<div class="text-wrapper-3">음주 분석</div>
<div class="text-wrapper-3">음주 기록</div>
<div class="text-wrapper-3">설정</div>
</div>
</div>
<div class="container">
<div class="text-wrapper">
<p class="text-wrapper">
Expand Down Expand Up @@ -241,6 +243,11 @@
</div>
</div>
</body>
<script>
document.getElementById("logo").addEventListener("click", function() {
window.location.href = "./home.html";
});
</script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"></script>
Expand Down
10 changes: 6 additions & 4 deletions img/logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 14 additions & 12 deletions monthlyDashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,26 @@
<link rel="stylesheet" href="css/bootstrap.css" />
<link rel="stylesheet" href="css/weeklyDashboard.css" />
<link rel="stylesheet" href="css/color.css" />
<link rel="stylesheet" href="css/navigation.css" />
<script src="js/weeklyDashboard.js"></script>
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="div-wrapper">
<div class="div">
<div class="text-wrapper">상천이삼촌님의<br />음주 습관 분석</div>
<div class="navigation">
<div class="frame">
<img class="logo" src="img/logo.svg" />
<div class="text-wrapper-2">술 없는 나</div>
</div>
<div class="navbar">
<div class="text-wrapper-3">홈</div>
<div class="text-wrapper-3">음주 분석</div>
<div class="text-wrapper-3">음주 기록</div>
<div class="text-wrapper-3">설정</div>
</div>
</div>
<div class="frame-2">
<div class="frame-3">
<div class="group">
Expand Down
20 changes: 19 additions & 1 deletion setting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,23 @@
<title>Setting</title>
<link rel="stylesheet" href="/css/bootstrap.css" />
<link rel="stylesheet" href="/css/setting.css" />
<link rel="stylesheet" href="/css/navigation.css" />
<link rel="stylesheet" href="/css/color.css" />
</head>
<body>
<nav class="navigation">
<div class="nav-div">
<div class="nav-frame">
<img id="logo" class="logo-img" src="img/logo.svg" />
</div>
<div class="navbar-list">
<a href="./home.html" class="navbar-items">홈</a>
<a href="./weeklyDashboard.html" class="navbar-items">음주 분석</a>
<a href="./drinkRecord.html" class="navbar-items">음주 기록</a>
<a href="./setting.html" class="navbar-items">설정</a>
</div>
</div>
</nav>
<div class="element">
<div class="main-frame">
<div class="frame1"><p>개인 정보 관리</p></div>
Expand Down Expand Up @@ -129,7 +143,11 @@
</div>
</div>
</body>

<script>
document.getElementById("logo").addEventListener("click", function() {
window.location.href = "./home.html";
});
</script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script type="text/javascript" src="/js/bootstrap.js"></script>
<script src="/js/setting.js"></script>
Expand Down
Loading