이진아 / YTMT

Go to a project
Toggle navigation Toggle navigation pinning
윤혜원
8d1ecb1e 1 parent 6e83121e

웹툰 담기 front 수정완료

Inline Side-by-side
Showing 4 changed files with 179 additions and 104 deletions
......@@ -2,34 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ffe1a490-8fdb-4611-8537-4d1c03c40b8d" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/public/images/portfolio/01-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/01-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/02-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/02-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/03-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/03-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/04-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/04-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/05-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/05-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/06-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/06-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/07-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/07-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/08-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/08-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/09-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/09-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/10-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/10-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/11-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/11-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/12-large.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/portfolio/12-small.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/team/01.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/team/02.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/images/team/03.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/views/index.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/index.ejs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/views/mytoons.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/mytoons.ejs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/views/setting.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/views/setting.ejs" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -141,7 +116,7 @@
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="2" />
<entry key="ejs" value="6" />
<entry key="ejs" value="8" />
<entry key="html" value="1" />
<entry key="js" value="9" />
</counts>
......@@ -149,20 +124,20 @@
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="2" />
<entry key="EJS" value="6" />
<entry key="EJS" value="8" />
<entry key="HTML" value="1" />
<entry key="JavaScript" value="9" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="ejs" value="712" />
<entry key="ejs" value="835" />
<entry key="js" value="1398" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="EJS" value="712" />
<entry key="EJS" value="835" />
<entry key="JavaScript" value="1398" />
</counts>
</usages-collector>
......@@ -173,8 +148,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/mytoons.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-152">
<caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
<state relative-caret-position="494">
<caret line="26" column="20" lean-forward="true" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
</state>
</provider>
</entry>
......@@ -182,8 +157,11 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1862">
<caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
<state relative-caret-position="475">
<caret line="70" column="8" lean-forward="true" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="8" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -191,17 +169,29 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="28" lean-forward="true" selection-start-line="16" selection-end-line="28" />
<state relative-caret-position="-988">
<caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/views/setting.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="469">
<caret line="135" lean-forward="true" selection-start-line="135" selection-end-line="135" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/index.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="101" column="6" selection-start-line="101" selection-start-column="6" selection-end-line="101" selection-end-column="6" />
<state relative-caret-position="380">
<caret line="104" column="34" lean-forward="true" selection-start-line="93" selection-start-column="2" selection-end-line="104" selection-end-column="34" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -287,7 +277,6 @@
<option value="$PROJECT_DIR$/models/user.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/01265fc0-37d6-481f-ac14-42262cda0ac3/console.sql" />
<option value="$PROJECT_DIR$/views/setting.ejs" />
<option value="$PROJECT_DIR$/views/toonviewer.html" />
<option value="$PROJECT_DIR$/views/toonviewer.ejs" />
<option value="$PROJECT_DIR$/node_modules/phantomjs/lib/phantom/examples/module.js" />
......@@ -301,6 +290,7 @@
<option value="$PROJECT_DIR$/routes/index.js" />
<option value="$PROJECT_DIR$/views/mytoons.ejs" />
<option value="$PROJECT_DIR$/views/index.ejs" />
<option value="$PROJECT_DIR$/views/setting.ejs" />
</list>
</option>
</component>
......@@ -530,7 +520,7 @@
<workItem from="1543588884449" duration="7362000" />
<workItem from="1543625351688" duration="5520000" />
<workItem from="1543732778568" duration="2000" />
<workItem from="1543986114264" duration="4823000" />
<workItem from="1543986114264" duration="6680000" />
</task>
<task id="LOCAL-00001" summary="초기 commit by intellij">
<created>1512174269218</created>
......@@ -550,7 +540,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="236984000" />
<option name="totallyTimeSpent" value="238841000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -742,20 +732,6 @@
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/YTMT-master-f6ba581c2d39966c105a13a31a3246237b655d48/app.js" />
<entry file="file://$PROJECT_DIR$/views/toonviewer.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/setting.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="31" column="15" lean-forward="true" selection-start-line="31" selection-start-column="15" selection-end-line="31" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/setting.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1007">
......@@ -804,36 +780,56 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/toonviewer.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/mytoons.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-152">
<caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
<state relative-caret-position="494">
<caret line="26" column="20" lean-forward="true" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/index.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="104" column="34" lean-forward="true" selection-start-line="93" selection-start-column="2" selection-end-line="104" selection-end-column="34" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/mytoons.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1862">
<caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
<state relative-caret-position="475">
<caret line="70" column="8" lean-forward="true" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="8" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="28" lean-forward="true" selection-start-line="16" selection-end-line="28" />
<state relative-caret-position="-988">
<caret line="65" column="34" lean-forward="true" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/index.ejs">
<entry file="file://$PROJECT_DIR$/views/setting.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="101" column="6" selection-start-line="101" selection-start-column="6" selection-end-line="101" selection-end-column="6" />
<state relative-caret-position="469">
<caret line="135" lean-forward="true" selection-start-line="135" selection-end-line="135" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#h1#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#header#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#ul#0;n#div#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......
......@@ -20,13 +20,19 @@
function daum_click()
{
if(Daum_webtoons.display == "none")
Daum_webtoons.display == "block"
Daum_webtoons.display == "block";
if(Daum_webtoons.display = "block")
Daum_webtoons.display == "none"
Daum_webtoons.display == "none";
}
function naver_click()
{
if(Naver_webtoons.display == "none")
Naver_webtoons.display == "block";
if(Naver_webtoons.display = "block")
Naver_webtoons.display == "none";
}
</script>
</head>
<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
<!-- Navigation
==========================================-->
......@@ -102,7 +108,6 @@
다음 웹툰
</font>
<a onclick="Daum_webtoons.style.display=(Daum_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
<img src ='/images/daumicon.png' width="83" height="90" onclick="daum_click" />
</a>
......
......@@ -3,31 +3,19 @@
<head>
<title>내툰</title>
<link rel='stylesheet' href='/stylesheets/style2.css' />
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Touché</title>
<meta name="description" content="">
<meta name="author" content="">
<!-- Favicons
================================================== -->
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
<link rel="apple-touch-icon" href="img/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">
<!-- Bootstrap -->
<link rel="stylesheet" type="text/css" href="css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="fonts/font-awesome/css/font-awesome.css">
<<!-- Bootstrap -->
<link rel="stylesheet" type="text/css" href="/stylesheets/bootstrap.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/font-awesome.css">
<!-- Stylesheet
================================================== -->
<link rel="stylesheet" type="text/css" href="css/style.css">
<link rel="stylesheet" type="text/css" href="css/nivo-lightbox/nivo-lightbox.css">
<link rel="stylesheet" type="text/css" href="css/nivo-lightbox/default.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/style.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/nivo-lightbox.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/default.css">
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,500,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Dancing+Script:400,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Gugi&amp;subset=korean" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
......@@ -58,11 +46,27 @@
</style>
</head>
<h1>내툰</h1>
<p>추가한 리스트</p>
<a href="/auth/logout/kakao">로그아웃</a>
<br>
<a href="/setting/"><img src = "/images/basket.png" height="50" witdh="50">웹툰 담기</a>
<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
<!-- Navigation
==========================================-->
<nav id="menu" class="navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
<a class="navbar-brand page-scroll" href="#page-top" style="font-family:Gugi">내툰</a> </div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li><a href="#mylist" class="page-scroll">MyList</a></li>
<li><a href="/setting/"><!--<img src = "/images/basket.png" height="50" witdh="50">-->웹툰 담기</a>
<li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
</nav>
<table>
<tr>
<th>썸네일</th>
......
......@@ -2,16 +2,85 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>설정</title>
<title>웹툰 담기</title>
<link rel='stylesheet' href='/stylesheets/style2.css' />
<<!-- Bootstrap -->
<link rel="stylesheet" type="text/css" href="/stylesheets/bootstrap.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/font-awesome.css">
<!-- Stylesheet
================================================== -->
<link rel="stylesheet" type="text/css" href="/stylesheets/style.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/nivo-lightbox.css">
<link rel="stylesheet" type="text/css" href="/stylesheets/nivo-lightbox/default.css">
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,500,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Dancing+Script:400,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Gugi&amp;subset=korean" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<style>
.registered{
background-color: #AAAAAA;
}
.toon_name,.toon_thumbnail{
width:10%;
}
td{
vertical-align: middle;
border-bottom: 1px solid #bcbcbc;
border-left: 1px solid #bcbcbc;
border-right: 1px solid #bcbcbc;
margin:0;
Text-align:center;
}
table{
border-collapse:collapse;
border: 2px solid #474747;
}
th{
border-bottom:2px solid #474747;
}
</style>
</head>
<h1>내툰</h1>
<p>추가하거나 제거할 웹툰을 선택해주세요.</p>
<a href="/mytoons">뒤로</a>
<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
<!-- Navigation
==========================================-->
<nav id="menu" class="navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
<a class="navbar-brand page-scroll" href="#page-top" style="font-family:Gugi">웹툰담기</a> </div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li><a href="/mytoons" class="page-scroll">MyList</a></li>
<li><a href="/auth/logout/kakao" class="page-scroll">Logout</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
</nav>
<div id="portfolio">
<div class="section-title text-center center">
<div class="overlay">
<h2>웹툰담기</h2>
<hr>
<p>추가하거나 제거할 웹툰을 선택해주세요</p>
</div>
</div>
<div class="container">
<div class="row">
<div class="categories">
<br>
<a onclick="daumtoons.style.display=(daumtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
......@@ -63,9 +132,7 @@
</table>
</form>
</div>
</br>
<br>
<br>
<a onclick="navertoons.style.display=(navertoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
<img src ='/images/navericon.png' width="83" height="90"/>
......@@ -116,7 +183,10 @@
</table>
</form>
</div>
<body>
</div>
</div>
</div>
</div>
</body>
</html>
......