Table Added

손장민
Commit d9214f3f18a17193e595058480f1238aa4cfff9e d9214f3f 1 parent 93df4da6
Showing 3 changed files with 119 additions and 92 deletions
intro.html
pages/main.html
views/main2.ejs
--- a/intro.html
View file @d9214f3
+++ b/intro.html
View file @d9214f3
@@ -2,14 +2,14 @@
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <!-- 부가적인 테마 -->
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
+<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
 <!-- 합쳐지고 최소화된 최신 자바스크립트 -->
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
 <html>
   <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width", initial-scale="1">
+    <meta name="viewport" content="width=device-width" , initial-scale="1">
     <title>Coin Community</title>
     <linke rel="stylesheet" href="css/bootstrap.css">
   </head>
@@ -17,17 +17,19 @@
     <style type="text/css">
       .jumbotron{
         text-shadow: black 0.1em 0.1em 0.1em;
-        color: black;
+        color: white;
-        background-image: url('images/background.jpg');
+        background-image:url(https://network.ducatus.net/wp-content/uploads/2017/02/Bitcoin-Background.jpg);
-        background-size: cover;
+        background-size:cover;
       }
       </style>
-    <div class="container">
+    <!-- <div class="container"> -->
+    <h1 class="text-center">　</h1>
+    <h1 class="text-center">　</h1>
       <div class="jumbotron">
         <h1 class="text-center">Coin Community를 소개합니다.</h1>
         <p class="text-center">Coin Community는 Coin의 동향을 보고 서로 의견을 나누는 사이트입니다.</p>
         <p class="text-center"><a class="btn btn-primary btn-lg" href="/main" role="button">사이트로 접속하기</a></p>
       </div>
-    </div>
+    <!-- </div> -->
   </body>
 </html>
--- a/pages/main.html
View file @d9214f3
+++ b/pages/main.html
View file @d9214f3
@@ -43,14 +43,14 @@
   background-image: url("background.jpg");
   background-color: #cccccc;
   </style>
-  <style type = "text/css">
+  <style type="text/css">
-        .jumbotron{
+    .jumbotron{
-          background-image: url('images/background.jpg');
+      text-shadow: black 0.1em 0.1em 0.1em;
-          background-size: cover;
+      color: white;
-          text-shadow: black 0.1em 0.1em 0.1em;
+      background-image:url(https://network.ducatus.net/wp-content/uploads/2017/02/Bitcoin-Background.jpg);
-          color: whites;
+      background-size:cover;
-        }
+    }
-        </style>
+    </style>
   <!-- Fixed navbar -->
   <nav class="navbar navbar-default">
     <div class="container-fluid">
@@ -103,7 +103,7 @@
                   <script src="https://mining-profit.com/js/mp-btc-chart.js"></script>
                   <script type="text/javascript">
-                  MiningProfitBTCChart.setChartWidth(1070);
+                  MiningProfitBTCChart.setChartWidth(875);
                   MiningProfitBTCChart.setChartHeight(500);
                   MiningProfitBTCChart.isDisplayControlRanges(true);
                   MiningProfitBTCChart.isDisplayControlInterval(false);
@@ -125,7 +125,6 @@
         </div>
         <!-- /.panel -->
     </div>
-
   </div>
   <!-- /container -->
--- a/views/main2.ejs
View file @d9214f3
+++ b/views/main2.ejs
View file @d9214f3
@@ -39,98 +39,124 @@
     <![endif]-->
 </head>
 <style>
-<body>
+  <body>background-image: url("background.jpg");
-  background-image: url("background.jpg");
   background-color: #cccccc;
-  </style>
+</style>
-  <style type = "text/css">
+<style type="text/css">
-        .jumbotron{
+  .jumbotron {
-          background-image: url('images/background.jpg');
+    background-image: url('images/background.jpg');
-          background-size: cover;
+    background-size: cover;
-          text-shadow: black 0.1em 0.1em 0.1em;
+    text-shadow: black 0.1em 0.1em 0.1em;
-          color: whites;
+    color: whites;
-        }
+  }
-        </style>
+</style>
-  <!-- Fixed navbar -->
+<!-- Fixed navbar -->
-  <nav class="navbar navbar-default">
+<nav class="navbar navbar-default">
-    <div class="container-fluid">
+  <div class="container-fluid">
-      <!-- Brand and toggle get grouped for better mobile display -->
+    <!-- Brand and toggle get grouped for better mobile display -->
-      <div class="navbar-header">
+    <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+      <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" href="#">Coin Community</a>
+      <a class="navbar-brand" href="#">Coin Community</a>
-      </div>
+    </div>
-      <!-- Collect the nav links, forms, and other content for toggling -->
+    <!-- Collect the nav links, forms, and other content for toggling -->
-      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-        <ul class="nav navbar-nav">
+      <ul class="nav navbar-nav">
-          <!--<li class="active"><a href="#">View Chart <span class="sr-only">(current)</span></a></li>
+        <!--<li class="active"><a href="#">View Chart <span class="sr-only">(current)</span></a></li>
           <li><a href="#">Freeboard</a></li>-->
-        </ul>
+      </ul>
-        <ul class="nav navbar-nav navbar-right">
+      <ul class="nav navbar-nav navbar-right">
-          <li><a href="/logout">Logout</a></li>
+        <li><a href="/logout">Logout</a></li>
-            <li><a href="/info">About me</a></li>
+        <li><a href="/info">About me</a></li>
-        </ul>
+      </ul>
-      </div>
-      <!-- /.navbar-collapse -->
     </div>
-    <!-- /.container-fluid -->
+    <!-- /.navbar-collapse -->
-  </nav>
+  </div>
-
+  <!-- /.container-fluid -->
-  <div class="container">
+</nav>
-    <h1><%=name%>님 환영합니다</h1>
+
-
+<div class="container">
-
+  <h1><%=name%>님 환영합니다</h1>
-
+
-    <div class="col-lg-12">
+
-        <div class="panel panel-default">
+
-            <div class="panel-heading">
+  <div class="col-lg-12">
-                Line Chart Example
+    <div class="panel panel-default">
-
+      <div class="panel-heading">
-                  <script src="https://mining-profit.com/js/mp-btc-chart.js"></script>
+        Line Chart Example
-                  <script type="text/javascript">
+
-                  MiningProfitBTCChart.setChartWidth(1070);
+        <script src="https://mining-profit.com/js/mp-btc-chart.js"></script>
-                  MiningProfitBTCChart.setChartHeight(500);
+        <script type="text/javascript">
-                  MiningProfitBTCChart.isDisplayControlRanges(true);
+          MiningProfitBTCChart.setChartWidth(875);
-                  MiningProfitBTCChart.isDisplayControlInterval(false);
+          MiningProfitBTCChart.setChartHeight(500);
-                  MiningProfitBTCChart.setInitialRange('20h');
+          MiningProfitBTCChart.isDisplayControlRanges(true);
-                  MiningProfitBTCChart.setChartRanges(['6h', '10h', '20h', '2d', '1w', '2w', '1m']);
+          MiningProfitBTCChart.isDisplayControlInterval(false);
-                  MiningProfitBTCChart.setChartExchanges([{mpvaluation: '#428bca'}, {bitstamp: '#B4CD3E'}, {coinbase: '#D54E88'}, {btce: '#F0522B'}]);
+          MiningProfitBTCChart.setInitialRange('20h');
-                  MiningProfitBTCChart.setInitialExchange('coinbase');
+          MiningProfitBTCChart.setChartRanges(['6h', '10h', '20h', '2d', '1w', '2w', '1m']);
-                  MiningProfitBTCChart.setMajorColor('rgb(35, 119, 58)');
+          MiningProfitBTCChart.setChartExchanges([{
-                  MiningProfitBTCChart.draw();
+            mpvaluation: '#428bca'
-                  </script>
+          }, {
-            </div>
+            bitstamp: '#B4CD3E'
-            <!-- /.panel-heading -->
+          }, {
-            <div class="panel-body">
+            coinbase: '#D54E88'
-                <div class="flot-chart">
+          }, {
-                    <div class="flot-chart-content" id="flot-line-chart"></div>
+            btce: '#F0522B'
-                </div>
+          }]);
-            </div>
+          MiningProfitBTCChart.setInitialExchange('coinbase');
-            <!-- /.panel-body -->
+          MiningProfitBTCChart.setMajorColor('rgb(35, 119, 58)');
+          MiningProfitBTCChart.draw();
+        </script>
+      </div>
+      <!-- /.panel-heading -->
+      <div class="panel-body">
+        <div class="flot-chart">
+          <div class="flot-chart-content" id="flot-line-chart"></div>
         </div>
-        <!-- /.panel -->
+      </div>
+      <!-- /.panel-body -->
     </div>
-
+    <!-- /.panel -->
   </div>
-  <!-- /container -->
-  <!-- Bootstrap core JavaScript
+  <table class="table">
+    <thread>
+      <tr>
+        <th>제목</th>
+        <th>내용</th>
+        <th>작성자</th>
+        <th>날짜</th>
+      </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>아인스</td>
+          <td>오르나요</td>
+          <td>마나요</td>
+          <td>1234</td>
+        </tr>
+      </tbody>
+  </table>
+
+</div>
+<!-- /container -->
+
+<!-- Bootstrap core JavaScript
     ================================================== -->
-  <!-- Placed at the end of the document so the pages load faster -->
+<!-- Placed at the end of the document so the pages load faster -->
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-  <script src="../../dist/js/bootstrap.min.js"></script>
+<script src="../../dist/js/bootstrap.min.js"></script>
-  <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-  <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
-  <script scr="https://code.jquery.com/jquery-3.1.1.min.js"></script>
+<script scr="https://code.jquery.com/jquery-3.1.1.min.js"></script>
-  <script src="js/bootstrap.js"></script>
+<script src="js/bootstrap.js"></script>
 </body>
 </html>