Skip to content

Commit

Permalink
[#22] feat: zzazanstagram logo navBar에 추가 및 다른 페이지에도 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
@wbluke
wbluke committed Aug 14, 2019
1 parent 6fbb985 commit 797d89e
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 36 deletions.
Binary file added src/main/resources/static/images/logo/zzazanstagram.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions src/main/resources/templates/article-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@
<div class="header-container max-width-lg mx-auto">
<ul class="nav-left mrg-left-0 padding-15">
<li>
<img class="logo desktop-view" src="/images/logo/instgram_logo.png">
<div class="width-40px mobile-view overflow-hidden">
<img class="logo" src="/images/logo/instgram_logo.png">
</div>
<img class="logo desktop-view mrg-top-5" src="/images/logo/zzazanstagram.png">
</li>
</ul>
<ul class="nav-right padding-15">
Expand Down
5 changes: 1 addition & 4 deletions src/main/resources/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@
<div class="header-container max-width-lg mx-auto">
<ul class="nav-left mrg-left-0 padding-15">
<li>
<img class="logo desktop-view" src="images/logo/instgram_logo.png">
<div class="width-40px mobile-view overflow-hidden">
<img class="logo" src="images/logo/instgram_logo.png">
</div>
<img class="logo desktop-view mrg-top-5" src="/images/logo/zzazanstagram.png">
</li>
<li class="search-box mrg-left-20 desktop-view">
<a class="search-toggle no-pdd-right" href=";">
Expand Down
139 changes: 111 additions & 28 deletions src/main/resources/templates/signup.html
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,119 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no">
<title>woostagram</title>
<meta name="robots" content="index, follow">

<meta name="keyword" content="우아한테크코스, 프로그래밍, 개발자, 백엔드, 프론트엔드, Backend, Frontend, IOS, Android">
<meta name="description" id="metaDesc" content="woostagram">

<meta property="og:type" content="website">
<meta property="og:title" content="우아한테크코스">
<meta property="og:description" id="metaOgDesc" content="woostagram">
<meta property="og:image" content="/images/logo/logo-thumnail-bg.jpg">
<meta property="og:url" content="https://woowacourse.github.io/">

<meta name="twitter:card" content="website">
<meta name="twitter:title" content="우아한테크코스">
<meta name="twitter:description" id="metaTwitterDesc" content="woostagram">
<meta name="twitter:image" content="/images/logo/logo-thumnail-bg.jpg">
<meta name="twitter:domain" content="https://woowacourse.github.io/">

<link rel="shortcut icon" href="/images/logo/favicon.ico">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lykmapipo/[email protected]/css/themify-icons.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Amiri:400,400i|Source+Sans+Pro:400,400i,600,700'">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700,800&display=swap">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="/css/app.css">
<link rel="stylesheet" href="/css/index.css">
</head>
<body>
<form method="post" action="/members">
<div class="form-group">
<label class="text-normal text-dark">Username</label>
<input id="name" type="text" name="name" class="form-control" value="nick">
<!--<form method="post" action="/members">-->
<!-- <div class="form-group">-->
<!-- <label class="text-normal text-dark">Username</label>-->
<!-- <input id="name" type="text" name="name" class="form-control" value="nick">-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="text-normal text-dark">Email Address</label>-->
<!-- <input id="email" type="email" name="email" class="form-control" value="[email protected]">-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="text-normal text-dark">Password</label>-->
<!-- <input id="password " type="password" name="password" class="form-control" placeholder="Password"-->
<!-- value="Passw@rd!">-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="text-normal text-dark">nickName</label>-->
<!-- <input id="nickName" name="nickName" class="form-control" value="nick">-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="text-normal text-dark">profile</label>-->
<!-- <input id="profile" name="profile" class="form-control"-->
<!-- value="https://image.shutterstock.com/image-photo/bright-spring-view-cameo-island-600w-1048185397.jpg">-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <button type="submit" class="btn btn-info btn-block border-radius-6 font-size-16 text-white">가입하기</button>-->
<!-- </div>-->
<!--</form>-->


<div>
<header id="header" class="header navbar">
<div class="header-container max-width-lg mx-auto">
<ul class="nav-left mrg-left-0 padding-15">
<li>
<img class="logo desktop-view mrg-top-5" src="/images/logo/zzazanstagram.png">
</li>
</ul>
</div>
</header>

<div class="page-container mrg-top-120">
<div class="main-content">
<div class="container-fluid max-width-lg mx-auto">
<div class="row">
<div class="col-lg-9 mx-auto">
<img width="350px" src="https://www.instagram.com/static/images/homepage/[email protected]/9364675fb26a.png" alt="">

</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="text-normal text-dark">Email Address</label>
<input id="email" type="email" name="email" class="form-control" value="[email protected]">
</div>
<div class="form-group">
<label class="text-normal text-dark">Password</label>
<input id="password " type="password" name="password" class="form-control" placeholder="Password"
value="Passw@rd!">
</div>
<div class="form-group">
<label class="text-normal text-dark">nickName</label>
<input id="nickName" name="nickName" class="form-control" value="nick">
</div>
<div class="form-group">
<label class="text-normal text-dark">profile</label>
<input id="profile" name="profile" class="form-control"
value="https://image.shutterstock.com/image-photo/bright-spring-view-cameo-island-600w-1048185397.jpg">
</div>
<div class="form-group">
<button type="submit" class="btn btn-info btn-block border-radius-6 font-size-16 text-white">가입하기</button>
</div>
</form>
</div>

<script></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pace/1.0.2/pace.min.js"></script>
<script src="https://unpkg.com/popper.js/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.bundle.min.js" integrity="sha384-pjaaA8dDz/5BgdFUPX6M/9SUZv4d12SUPF0axWc+VRZkx5xU3daN+lYb49+Ax+Tl" crossorigin="anonymous"></script>
<script>
const articleForm = document.querySelector("#article-form");
const articleFormMethod = document.querySelector("#article-form-method");

function goBackToIndexPage(event) {
event.preventDefault();

if (confirm("작성하신 게시물을 취소하고 돌아가시겠습니까?") == true) {
articleForm.setAttribute("method", "get");
articleForm.setAttribute("action", "/");
articleFormMethod.remove();

articleForm.submit();
}
}

function submitArticle(event) {
event.preventDefault();


}
</script>
</body>
</html>

0 comments on commit 797d89e

Please sign in to comment.