윤혜원 / YTMT

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

메인페이지front 수정완료!

Inline Side-by-side
Showing 32 changed files with 57 additions and 166 deletions
......@@ -2,13 +2,34 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ffe1a490-8fdb-4611-8537-4d1c03c40b8d" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/stylesheets/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/stylesheets/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/index.js" afterDir="false" />
<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$/ytmtDB.zip" beforeDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -135,13 +156,13 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="ejs" value="453" />
<entry key="ejs" value="712" />
<entry key="js" value="1398" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="EJS" value="453" />
<entry key="EJS" value="712" />
<entry key="JavaScript" value="1398" />
</counts>
</usages-collector>
......@@ -179,10 +200,13 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/views/index.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="46" column="84" lean-forward="true" selection-start-line="46" selection-start-column="84" selection-end-line="46" selection-end-column="84" />
<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" />
<folding>
<element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<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>
......@@ -506,7 +530,7 @@
<workItem from="1543588884449" duration="7362000" />
<workItem from="1543625351688" duration="5520000" />
<workItem from="1543732778568" duration="2000" />
<workItem from="1543986114264" duration="3571000" />
<workItem from="1543986114264" duration="4823000" />
</task>
<task id="LOCAL-00001" summary="초기 commit by intellij">
<created>1512174269218</created>
......@@ -526,7 +550,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="235732000" />
<option name="totallyTimeSpent" value="236984000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -803,10 +827,13 @@
</entry>
<entry file="file://$PROJECT_DIR$/views/index.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="46" column="84" lean-forward="true" selection-start-line="46" selection-start-column="84" selection-end-line="46" selection-end-column="84" />
<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" />
<folding>
<element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<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>
......
......@@ -15,7 +15,6 @@
<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">
<script src="http://developers.kakao.com/sdk/js/kakao.min.js">
function daum_click()
......@@ -36,14 +35,12 @@
<!-- 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">Touché</a> </div>
<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="#about" class="page-scroll">About</a></li>
<li><a href="#menu" class="page-scroll">Menu</a></li>
<li><a href="#portfolio" class="page-scroll">Gallery</a></li>
<li><a href="#portfolio" class="page-scroll">Webtoons</a></li>
<li><a href="/auth/login/kakao" class="page-scroll">Login</a></li>
</ul>
</div>
......@@ -57,7 +54,8 @@
<div class="container">
<div class="row">
<div class="intro-text">
<h1>YTMT</h1>
<h1 style="font-family:Gugi">니툰내툰</h1>
<p>NAVER / DAUM / WEBTOONS</p>
<a href="#about" class="btn btn-custom btn-lg page-scroll">All the Webtoons</a> </div>
</div>
......@@ -71,15 +69,16 @@
<div class="container">
<div class="row">
<div class="col-xs-12 col-md-6 ">
<div class="about-img"><img src="img/about.jpg" class="img-responsive" alt=""></div>
<div class="about-img"><img src="images/about.jpg" class="img-responsive" alt=""></div>
</div>
<div class="col-xs-12 col-md-6">
<div class="about-text">
<h2>Our Restaurant</h2>
<h2>Our Term-Project</h2>
<hr>
<!--수정해주세욤!-->
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed dapibus leo nec ornare diam. Sed commodo nibh ante facilisis bibendum dolor feugiat at. Duis sed dapibus leo nec ornare diam commodo nibh.</p>
<h3>Awarded Chefs</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis sed dapibus leo nec ornare diam. Sed commodo nibh ante facilisis bibendum dolor feugiat at. Duis sed dapibus leo nec ornare.</p>
<h3>Programmers</h3>
<p>2016104132 안형준, 2016104140 윤혜원</p>
</div>
</div>
</div>
......@@ -91,150 +90,15 @@
<div class="overlay">
<h2>Gallery</h2>
<hr>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit duis sed.</p>
<p>니툰내툰에서 제공하는 웹툰 리스트입니다</p>
</div>
</div>
<div class="container">
<div class="row">
<div class="categories">
<ul class="cat">
<li>
<ol class="type">
<li><a href="#" data-filter="*" class="active">All</a></li>
<li><a href="#" data-filter=".breakfast">Breakfast</a></li>
<li><a href="#" data-filter=".lunch">Lunch</a></li>
<li><a href="#" data-filter=".dinner">Dinner</a></li>
</ol>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
<div class="row">
<div class="portfolio-items">
<div class="col-sm-6 col-md-4 col-lg-4 breakfast">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/01-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/01-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 dinner">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/02-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/02-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 breakfast">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/03-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/03-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 breakfast">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/04-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/04-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 dinner">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/05-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/05-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 lunch">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/06-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/06-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 lunch">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/07-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/07-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 breakfast">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/08-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/08-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 dinner">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/09-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/09-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 lunch">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/10-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/10-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 lunch">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/11-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/11-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
<div class="col-sm-6 col-md-4 col-lg-4 breakfast">
<div class="portfolio-item">
<div class="hover-bg"> <a href="img/portfolio/12-large.jpg" title="Dish Name" data-lightbox-gallery="gallery1">
<div class="hover-text">
<h4>Dish Name</h4>
</div>
<img src="img/portfolio/12-small.jpg" class="img-responsive" alt="Project Title"> </a> </div>
</div>
</div>
</div>
</div>
</div>
</div>
<h1><%= title %></h1>
<p>웹툰 리스트</p>
<br>
<br>
<br>
<br>
<font size = 60>
<font size = 30>
다음 웹툰
</font>
......@@ -281,11 +145,11 @@
%>
</tr>
</table>
</br>
<!--</br>-->
</div>
<br>
<!--<br>-->
<font size = 60>
<font size = 30>
네이버 웹툰
</font>
<a onclick="Naver_webtoons.style.display=(Naver_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
......