Merge remote-tracking branch 'origin/master'

# Conflicts: # bootstrap.min.css # public/bootstrap.min.css # public/index.html
lunijay2 · Aug 27, 2019 · 4d4bb47 · 4d4bb47
2 parents b8c0542 + f5c1ffb
commit 4d4bb47
Show file tree

Hide file tree

Showing 37 changed files with 13,137 additions and 0 deletions.
diff --git a/App.vue b/App.vue
@@ -0,0 +1,43 @@
+<template>
+  <form>
+    <header>
+      <Navbar></Navbar>
+    </header>
+
+    <section>
+      <div id="app">
+        <router-view />
+      </div>
+    </section>
+  </form>
+</template>
+
+<script>
+import Navbar from "./components/Navbar";
+
+export default {
+  name: "app",
+  components: {
+    Navbar
+  },
+  created() {
+    this.$store.commit("GET_TOKENS");
+  }
+};
+</script>
+
+<style>
+#app {
+  font-family: "Avenir", Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-align: center;
+  color: #2c3e50;
+  top: 97px;
+  position: relative;
+  background-color: #f5f5dc;
+  height: -webkit-fill-available;
+  width: 100%;
+  margin: 0 auto;
+}
+</style>
diff --git a/Home.vue b/Home.vue
@@ -0,0 +1,145 @@
+<template>
+<div>
+  <body>
+    <div id="wapper">
+      <!--헤더시작-->
+      <header>
+        <video
+          id="app2"
+          preload="auto"
+          autoplay="true"
+          loop="loop"
+          muted="muted"
+          volume="0"
+          height=""
+          width=""
+          position= "fixed"
+          z-index="-100"
+          src="../assets/red.mp4"
+        ></video>
+      </header>
+      <!--네비게이션-->
+      <nav>
+        <p>nav</p>
+        <ul>
+          <li>
+            <a href>link</a>
+          </li>
+          <li>
+            <a href>link</a>
+          </li>
+          <li>
+            <a href>link</a>
+          </li>
+        </ul>
+      </nav>
+      <!--콘텐츠부분-->
+      <section>
+        <p>section</p>
+        <article>
+          <p>article</p>
+        </article>
+      </section>
+      <!--사이드바-->
+      <aside>
+        <p>aside</p>
+      </aside>
+      <!--풋터-->
+      <footer>
+			<address>
+				코코넛페이 주소 : 서울특별시 서초구 강남대로<br />
+				전화번호 : (02) 123-4567   사업자등록번호 123-4567-890   대표자 : 홍길동<br />
+				copyright(c) 2019 coconut pay. all rights reserved 
+			</address>
+</footer>
+    </div>
+  </body>
+</div>
+</template>
+
+<script>
+export default {
+  name: "testvue"
+};
+</script>
+
+<style scoped>
+
+#app2 {
+  font-family: "Avenir", Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  position: relative;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  max-width: 100%;
+  max-height: 50%;
+}
+body {
+  text-align: center;
+  color: #fff;
+  width: 100%;
+}
+div#wapper {
+  width: 100%;
+  text-align: left;
+  margin: 0 auto;
+  height: -webkit-fill-available;
+}
+header,
+footer,
+nav,
+aside,
+section {
+  border: 1px solid #999;
+  margin: 5px;
+  padding: 10px;
+}
+header {
+  height: 10%;
+  background-color: red;
+}
+nav,
+section,
+aside {
+  float: left;
+  height: 1000px;
+}
+nav {
+  background-color: goldenrod;
+  width: 10%;
+}
+section {
+  background-color: green;
+  width: 70%;
+  height: 1000px;
+}
+aside {
+  background-color: goldenrod;
+  width: 10%;
+}
+footer {
+  text-align: center;
+  color:white;
+  height: auto;
+  background-color: gray;
+  position: relative;
+  clear: both;
+}
+article {
+  width: 90%;
+  margin: 20px;
+  background-color: #999;
+}
+
+#text {
+  position: fixed;
+  z-index: -99;        
+  font-size:3rem;
+        text-transform:uppercase;
+        margin-top:0;
+        letter-spacing:.3rem
+}
+</style>
diff --git a/Navbar.vue b/Navbar.vue
@@ -0,0 +1,71 @@
+<template>
+  <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
+    <!--홈 이미지-->
+    <router-link to="/" class="navbar-brand">
+      <img src="./coconut.png" style="width:200px">
+    </router-link>
+
+    <button
+      class="navbar-toggler"
+      type="button"
+      data-toggle="collapse"
+      data-target="#navbarsExampleDefault"
+      aria-controls="navbarsExampleDefault"
+      aria-expanded="false"
+      aria-label="Toggle navigation"
+    >
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarsExampleDefault">
+      <ul class="navbar-nav ml-auto">
+        <li class="nav-item" v-if="this.$store.state.pToken">
+          <router-link to="/MyPage" class="nav-link">MyPage</router-link>
+        </li>
+        <li class="nav-item">
+          <router-link to="/AllProduct" class="nav-link">Product</router-link>
+        </li>
+        <li class="nav-item">
+          <router-link to="/AllStore" class="nav-link">Store</router-link>
+        </li>
+        <li class="nav-item">
+          <router-link to="/Pay" class="nav-link">Pay</router-link>
+        </li>
+        <li class="nav-item" v-if="!this.$store.state.pToken">
+          <router-link to="/ChoiceMemberType" class="nav-link">SignUp</router-link>
+        </li>
+        <li class="nav-item" v-if="!this.$store.state.pToken">
+          <router-link to="/Login" class="nav-link">Login</router-link>
+        </li>
+        <li class="nav-item">
+          <router-link to="/Test" class="nav-link">Test</router-link>
+        </li>
+        <li class="nav-item">
+          <router-link to="/ImageUpload" class="nav-link">Image</router-link>
+        </li>
+        <li class="nav-item" v-if="this.$store.state.pToken">
+          <a class="nav-link" href="#" @click.prevent="onLogoutClick">Logout</a>
+        </li>
+      </ul>
+    </div>
+  </nav>
+</template>
+
+<script>
+export default {
+  name: "Navbar",
+  methods: {
+    onLogoutClick: function() {
+      this.$store.dispatch("LOGOUT");
+      this.$router.replace({ path: "/Login" });
+    }
+  }
+};
+</script>
+
+<style scoped>
+router-link{
+  text-decoration: none; 
+  color: #333333;
+
+}
+</style>