이승윤 / OpenSource-MyCookBook

Go to a project
Toggle navigation Toggle navigation pinning
이승윤
de34a2e1 2 parents 6349bb24 79cc4358

Merge branch 'style/home' into 'develop' 

Style/home



See merge request !13
Inline Side-by-side
Showing 5 changed files with 68 additions and 48 deletions
<% include ../includes/header.ejs %>
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="login-panel panel panel-default">
<div class="panel-heading">
<div class="w-25 border border-info border-3" style="position: absolute; left: 37%; top: 17%;">
<div>
<div>
<div style="padding-top: 5%; padding-left: 5%;">
<h3 class="panel-title">회원가입</h3>
</div>
<div class="panel-body">
<form role="form" action="" id="join_form" method="post">
<fieldset>
<div class="form-group">
<div class="w-100" style="padding-left: 5%; padding-right: 5%;">
<input class="form-control" placeholder="ID" name="username" type="text" autofocus="" required="">
</div>
<div class="form-group">
<div class="w-100" style="padding-left: 5%; padding-right: 5%;padding-top: 3%">
<input class="form-control" placeholder="Password" name="password" type="password" value="" required="">
</div>
<div class="form-group">
<div class="w-100" style="padding-left: 5%; padding-right: 5%;padding-top: 3%">
<input class="form-control" placeholder="Password 확인" name="password2" type="password" value="" required="">
</div>
<div class="form-group">
<div class="w-100" style="padding-left: 5%; padding-right: 5%;padding-top: 3%">
<input class="form-control" placeholder="이름" name="displayname" type="text" value="" required="">
</div>
<!-- Change this to a button or input when using this as a form -->
<div class="d-grid gap-2 col-11 mx-auto p-2">
<input type="submit" class="btn btn-lg btn-success btn-block" value="가입하기">
<div style="margin-top: 10px">
<a href="/auth/facebook" class="btn btn-lg btn-primary btn-block">
<i class="fa fa-facebook" aria-hidden="true"></i> 페이스북 회원가입
</a>
......
<% include ../includes/header.ejs %>
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="w-25 border border-info border-3" style="position: absolute; left: 37%; top: 17%;">
<div>
<%if(typeof flashMessage !=='undefined') {%>
<div class="alert alert-danger" role="alert"><%=flashMessage%></div>
<%}%>
<div class="login-panel panel panel-default">
<div class="panel-heading">
<div>
<div style="padding-top: 5%; padding-left: 5%;">
<h3 class="panel-title">로그인</h3>
</div>
<div class="panel-body">
<form role="form" action="" id="login_form" method="post">
<fieldset>
<div class="form-group">
<div class="w-100" style="padding-left: 5%; padding-right: 5%;">
<label for="login" class="form-label">ID</label>
<input class="form-control" placeholder="ID" name="username" type="text" autofocus="" required="">
</div>
<div class="form-group">
<div class="w-100 p-3">
<label for="password" class="form-label">Password</label>
<input class="form-control" placeholder="Password" name="password" type="password" value="" required="">
</div>
<!-- Change this to a button or input when using this as a form -->
<div class="d-grid gap-2 col-11 mx-auto p-2">
<input type="submit" class="btn btn-lg btn-success btn-block" value="로그인">
<div style="margin-top: 10px">
<a href="/auth/facebook" class="btn btn-lg btn-primary btn-block">
<i class="fa fa-facebook" aria-hidden="true"></i> 페이스북 로그인
</a>
......
<% include ../includes/header.ejs %>
<table class="table table-bordered table-hover">
<tr>
<tr class="table-info">
<th width="80px" style="text-align: center;">카테고리명</th>
<th width="50px" style="text-align: center;">개설 날짜</th>
<th width="350px" style="text-align: center;">내용</th>
<th width="30px" style="text-align: center;">사용자명</th>
<th width="550px" style="text-align: center;">내용</th>
<th width="50px" style="text-align: center;">사용자명</th>
<th width="30px" style="text-align: center;">삭제</th>
</tr>
<%categories.forEach(function(product){%>
......@@ -17,7 +17,7 @@
<%=product.getDate.month%> -
<%=product.getDate.day%>
</td>
<td style="text-align: center;">
<td>
<%=product.description%>
</td>
<td style="text-align: center;">
......@@ -30,6 +30,6 @@
<% }); %>
</table>
<a href="categories/write" class="btn btn-default">작성하기</a>
<a href="categories/write" class="btn btn-primary">작성하기</a>
<% include ../includes/footer.ejs %>
\ No newline at end of file
......
<% include ./includes/header.ejs %>
<div style="background-color:lavenderblush">
<div style="background-color:lavenderblush;">
<% var count = 0; %>
<center>
<% for (var i in video) { %>
<div style ="color:gray; font-weight:bold; font-size:2.0em;">
<div style ="color:gray; font-weight:bold; font-size:2.0em; margin-left: 30px; padding-top: 30px">
<div style="width: 100%;
max-width: 7rem;
height: 0.25rem;
background-color: #2c3e50;
border-radius: 1rem;
border-color: #2c3e50 !important;"></div>
<%=video[i].category.title%>
<div style="width: 100%;
max-width: 7rem;
height: 0.25rem;
background-color: #2c3e50;
border-radius: 1rem;
border-color: #2c3e50 !important;"></div>
</div>
<% for (var j in video[i].videos) { %>
<div id="<%=count%>" vid="<%=video[i].videos[j].video_id%>">
<div class="card" style="width: 55rem; margin-bottom: 15px; margin-top: 15px;">
<div class="card-top" id="<%=count%>" vid="<%=video[i].videos[j].video_id%>" style="margin: 30px;">
</div>
<%count++;};};%>
<div class="card-body">
<h5 class="card-title"><%=video[i].videos[j].title%></h5>
<p class="card-text">해당 영상에 대한 메모를 여기에 출력.
</p>
</div>
</div>
<%count++;}; %>
<%};%>
</center>
</div>
......@@ -47,8 +67,8 @@
function onYouTubeIframeAPIReady() {
for (var i = 0; i < videoIds.length; i++) {
player = new YT.Player(players[i], {
height: '360',
width: '640',
height: '450',
width: '800',
videoId: videoIds[i],
});
}
......
......@@ -9,38 +9,36 @@
src="https://code.jquery.com/jquery-3.2.1.min.js"
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<!--bootstrap js 추가 -->
<script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js"
integrity="sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4"
crossorigin="anonymous"></script>
</head>
<body>
<div class="container" style="margin-top: 15px;">
<div class="container-fluid" style="margin-top: 15px;">
<nav class="navbar navbar-light" style="background-color: #e3f2fd;">
<div>
<div class="navbar-header">
<!-- 오른쪽 메뉴바 -->
<button type="button" class="collapsed navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-9" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="/" class="navbar-brand">MyCookBook</a>
<div class="navbar-brand" style="float: left;">
<a href="/" class="nav-link">MyCookBook</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li >
<a href="/">Home</a>
<div class="navbar">
<ul class="nav">
<li class="nav-item">
<a class="nav-link" href="/">Home</a>
</li>
<li><a href="/categori/products">Categori</a></li>
<li class="nav-item"><a class="nav-link" href="/categori/products">Categori</a></li>
<% if(isLogin){%>
<li><a href="/accounts/logout" onclick="return confirm('로그아웃 하시겠습니까?')">LOGOUT</a></li>
<li class="nav-item"><a class="nav-link" href="/accounts/logout" onclick="return confirm('로그아웃 하시겠습니까?')">LOGOUT</a></li>
<%}else{%>
<li><a href="/accounts/join">SignUp</a></li>
<li><a href="/accounts/login">LOGIN</a></li>
<li class="nav-item"><a class="nav-link" href="/accounts/join">SignUp</a></li>
<li class="nav-item"><a class="nav-link" href="/accounts/login">LOGIN</a></li>
<%}%>
</ul>
</div>
</div>
<hr style=" border: 2px solid #4dabf7" />
</nav>
<hr style=" border: 2px solid #4263eb" />
......