Merge branch 'master' of https://github.com/Power-tile/Power-tile.git…

…hub.io
Power-tile · Jun 28, 2021 · f8fdd57 · f8fdd57
2 parents e409caa + ea3f578
commit f8fdd57
Show file tree

Hide file tree

Showing 10 changed files with 562 additions and 112 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/index.html b/index.html
@@ -4,34 +4,49 @@
     <meta charset="utf-8">
     <title>Daniel He's Personal Webpage - Home</title>
 
-    <style>
-      .demo-carousel {
-        height: 350px;
-        width: 100%;
-        background-color: red;
-      }
-    </style>
-
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
+    <!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script> -->
 
     <!-- <link rel="stylesheet" type="text/css" href="http://unpkg.com/view-design/dist/styles/iview.css">
     <script type="text/javascript" src="http://vuejs.org/js/vue.min.js"></script>
     <script type="text/javascript" src="http://unpkg.com/view-design/dist/iview.min.js"></script> -->
+
+    <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css">
+    <script src="./node_modules/jquery/dist/jquery.slim.min.js"></script>
+    <script src="./node_modules/popper.js/dist/umd/popper.min.js"></script>
+    <script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script src="./node_modules/vue/dist/vue.js"></script>
+    <link rel="stylesheet" type="text/css" href="./node_modules/view-design/dist/styles/iview.css">
+    <script src="./node_modules/view-design/dist/iview.js"></script>
   </head>
   <body>
-    <div id="main" class="container">
-      <div>Currently the main page is still in developing. You can checkout some pages in this website:</div>
-      <a href="./webpages/defense/2020-xa" target='_blank'>My Learning of IT This Year</a> <br>
-      <a href="./webpages/ip_climate_mitigation_handbook.html" target='_blank'>IP Climate Mitigation Handbook</a> <br>
-      <a href="./webpages/defense/2020-sa.html" target='_blank'>IP Climate Mitigation Project Reflection</a> <br>
-      <a href="./webpages/scp_makerspace.html" target='_blank'>Makerspace website</a> <br>
-      <a href="./webpages/defense/2020-ha.html" target='_blank'>Sophon Project Reflection</a> <br>
-      <a href="./webpages/powershell_tutorial.html" target='_blank'>Powershell Tutorial</a> <br>
+    <div id="main" class="container-fluid p-0" style="font-family: Kreon">
+      <div class="position-fixed w-100" style="background-color: rgb(30, 30, 30); height: 60px;">
+        <div class="container h-100">
+          <div class="row h-100 d-flex align-items-center" style="color: rgb(0, 183, 255)">
+            <h4 class="col-sm text-center p-0"><a href="./index.html">Home</a></h4>
+            <h4 class="col-sm text-center p-0"><a href="./webpages/academia.html">Academia</a></h4>
+            <h4 class="col-sm text-center p-0"><a href="./webpages/courses.html">Courses</a></h4>
+            <h4 class="col-sm text-center p-0"><a href="./webpages/projects.html">Projects</a></h4>
+            <h4 class="col-sm text-center p-0"><a href="./webpages/trivia.html" class="disabled">Trivia</a></h4>
+            <div class="col-5"></div>
+          </div>
+        </div>
+      </div>
 
+      <div class="container">
+        <Carousel class="w-100" style="height: 500px" v-model="carouselValue" loop>
+          <Carousel-Item>
+            <div class="text-center w-100 h-100" style="background-color: rgb(0, 183, 255)">1</div>
+          </Carousel-Item>
+          <Carousel-Item>
+            <div class="text-center w-100 h-100" style="background-color: rgb(0, 183, 255)">2</div>
+          </Carousel-Item>
+        </Carousel>
+      </div>
     </div>
-    <!-- <script src="./js/script.js"></script> -->
+    <script src="./script.js"></script>
   </body>
 </html>
diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
diff --git a/package.json b/package.json
@@ -2,6 +2,8 @@
   "dependencies": {
     "bootstrap": "^4.5.0",
     "jquery": "^3.5.1",
-    "popper.js": "^1.16.1"
+    "popper.js": "^1.16.1",
+    "view-design": "^4.3.1",
+    "vue": "^2.6.11"
   }
 }
diff --git a/script.js b/script.js
@@ -0,0 +1,10 @@
+// import Vue from 'vue';
+// import iview from 'iview';
+// Vue.use(iview);
+
+let main = new Vue({
+    el: "#main",
+    data: {
+        carouselValue: 0,
+    }
+})