arreglo de conflictos

vistas y rutas de proceso de pago
2020-10-23 11:10:25 -05:00 · 2020-10-08 16:42:14 -05:00
8 changed files with 216 additions and 168 deletions
@@ -10968,36 +10968,6 @@
      }
    },
    "vue-loader-v16": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-      "version": "npm:vue-loader@16.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.7.tgz",
-      "integrity": "sha512-xQ8/GZmRPdQ3EinnE0IXwdVoDzh7Dowo0MowoyBuScEBXrRabw6At5/IdtD3waKklKW5PGokPsm8KRN6rvQ1cw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/mini-css-extract-plugin": "^0.9.1",
-        "chalk": "^3.0.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^1.2.3",
-        "merge-source-map": "^1.1.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-=======
->>>>>>> origin
-=======
->>>>>>> origin
      "version": "npm:vue-loader@16.0.0-beta.8",
      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz",
      "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==",
@@ -11016,38 +10986,13 @@
          "dev": true,
          "optional": true,
          "requires": {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> origin
->>>>>>> origin
-=======
->>>>>>> origin
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
-<<<<<<< HEAD
-<<<<<<< HEAD
          "version": "4.1.0",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-=======
-<<<<<<< HEAD
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-=======
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
->>>>>>> origin
->>>>>>> origin
-=======
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
->>>>>>> origin
          "dev": true,
          "optional": true,
          "requires": {
@@ -11079,20 +11024,6 @@
          "dev": true,
          "optional": true
        },
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-=======
->>>>>>> origin
-=======
->>>>>>> origin
        "loader-utils": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
@@ -11104,13 +11035,6 @@
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> origin
->>>>>>> origin
-=======
->>>>>>> origin
        },
        "supports-color": {
          "version": "7.2.0",
@@ -1,4 +1,8 @@
 <template>
+ <div>
+ <div>
+     <h1>Direcciones</h1>
+ </div>
  <div>

 <form class="mt-4" role="form" data-toggle="validator" >
@@ -182,7 +186,7 @@
  </div>
 </form>
 </div>
-
+</div>
 </template>

 <script>
@@ -229,6 +233,3 @@ export default {
 }
 </script>

-<style>
-
-</style>
@@ -1,82 +0,0 @@
-<template>
-<div class="container my-5">
-  <h4><b>Resultados para "{{productResult[0].searchText}}"</b></h4>
-  <p>Hay {{productResult[0].numberFound}} productos</p>
-  <div class="my-4 d-flex justify-content-sm-start justify-content-center flex-wrap">
-    <div class="card g-card-sty mr-4 mb-3" style="width: 12rem;">
-        <img v-bind:src="productResult[0].img" class="card-img-top" style="height:250px" alt="...">
-        <div class="card-body text-center" maxlength="5">
-            <p class="card-text">{{productResult[0].description}}</p>
-            <span><b>${{productResult[0].price}}</b></span>
-        </div>
-    </div>
-
-    <div class="card g-card-sty mr-4 mb-3" style="width: 12rem;">
-        <img v-bind:src="productResult[1].img" class="card-img-top" style="height:250px" alt="...">
-        <div class="card-body text-center">
-            <p class="card-text">{{productResult[1].description}}</p>
-            <span><b>${{productResult[1].price}}</b></span>
-        </div>
-    </div>
-
-    <div class="card g-card-sty mr-4 mb-3" style="width: 12rem;">
-        <img v-bind:src="productResult[2].img" class="card-img-top" style="height:250px" alt="...">
-        <div class="card-body text-center">
-            <p class="card-text">{{productResult[2].description}}</p>
-            <span><b>${{productResult[2].price}}</b></span>
-        </div>
-    </div>
-
-  </div>
-  <p>Mostrando {{productResult[0].numberFound}} de {{productResult[0].totalBookCategory}} artículo(s)</p>
-</div>
-</template>
-
-<script>
-export default {
-    data(){
-        return {
-            productResult: [
-                {
-                searchText: "Lorem ipsum",
-                numberFound: 3,
-                description: "Some quick example text to build on the card title and...",
-                price: 180,
-                totalBookCategory: 28,
-                img: 'https://images.cdn3.buscalibre.com/fit-in/360x360/7d/92/7d92cb1e49ff2d7756f192114e5c8901.jpg'
-                },
-                  {
-                searchText: "Lorem ipsum",
-                numberFound: 3,
-                description: "2 Some quick example text to build on the card title and...",
-                price: 190,
-                totalBookCategory: 28,
-                img: 'https://m.media-amazon.com/images/I/51HdyT9COEL.jpg'
-                },
-                  {
-                searchText: "Lorem ipsum",
-                numberFound: 3,
-                description: "3 Some quick example text to build on the card title and...",
-                price: 200,
-                totalBookCategory: 28,
-                img: 'https://upload.wikimedia.org/wikipedia/commons/8/8e/Lenin_book_1902.jpg'
-                }
-            ]
-        }
-    }
-}
-</script>
-
-<style scoped>
-.g-card-sty {
-    -webkit-box-shadow: 3px 3px 6px 0.2px rgba(0,0,0,0.2);
-    -moz-box-shadow: 3px 3px 6px 0.2px rgba(0,0,0,0.2);
-    box-shadow: 3px 3px 6px 0.2px rgba(0,0,0,0.2);
-}
-  p {
-      text-overflow: ellipsis;
-      width: 100%;
-      white-space: nowrap;
-      overflow: hidden; 
-    } 
-</style>
@@ -3,6 +3,10 @@ import VueRouter from 'vue-router'

 import Home from './view/Home.vue'
 import PersonalData from './view/PersonalData.vue'
+import Cart from './view/Cart.vue'
+import Pago from './view/Pago.vue'
+import Envio from './view/Envio.vue'
+import Direccion from './view/Direccion'

 const routes = [
    {
@@ -19,6 +23,26 @@ const routes = [
        path: '/datosPersonales',
        component: PersonalData,
        name: 'personalData'
+    },
+    {
+        path: '/cart',
+        component: Cart,
+        name: 'cart'
+    },
+    {
+        path: '/pago',
+        component: Pago,
+        name: 'pago'
+    },
+    {
+        path: '/envio',
+        component: Envio,
+        name: 'envio'
+    },
+    {
+        path: '/direcciones',
+        component: Direccion,
+        name: 'direcciones'
    }
 ]

@@ -0,0 +1,61 @@
+<template>
+  <div>
+<Header></Header>
+  
+<div class="my-5">  
+  
+<div class="row">
+
+<section class="col-10 col-sm-7 col-md-7 col-lg-7 col-xl-7 offset-1">
+  <ShoppingNav currentStep=2></ShoppingNav>
+
+  <Directions></Directions>
+
+
+</section>
+
+<aside id="CompraStatus" class="col-10 col-sm-2 col-md-2 col-lg-2 col-xl-2 offset-1 ">
+  <!-- <h3 class="text-center">status</h3> -->
+   <ShoppingStatus></ShoppingStatus> 
+</aside>
+
+
+</div>
+
+</div>
+
+<Footer></Footer>
+  </div>
+</template>
+
+<script>
+import Header from '../components/Header'
+import Footer from '../components/Footer'
+import ShoppingNav from '../components/ShoppingNav'
+import ShoppingStatus from '../components/ShoppingStatus'
+import Directions from '../components/Directions'
+
+export default {
+components: {
+        Header,
+        Footer,
+        ShoppingNav,
+        ShoppingStatus,
+        Directions
+    }
+}
+</script>
+
+<style scoped>
+#CompraStatus{
+ padding: 0;
+}
+
+@media screen and (max-width:760px )  {
+ #CompraStatus{
+   margin-top: 2rem;
+  
+ }
+}
+
+</style>
@@ -0,0 +1,60 @@
+<template>
+  <div>
+<Header></Header>
+  
+<div class="my-5">  
+  
+<div class="row">
+
+<section class="col-10 col-sm-7 col-md-7 col-lg-7 col-xl-7 offset-1">
+  <ShoppingNav currentStep=2></ShoppingNav>
+
+  <ShippingSection></ShippingSection>
+
+</section>
+
+<aside id="CompraStatus" class="col-10 col-sm-2 col-md-2 col-lg-2 col-xl-2 offset-1 ">
+  <!-- <h3 class="text-center">status</h3> -->
+   <ShoppingStatus></ShoppingStatus> 
+</aside>
+
+
+</div>
+
+</div>
+
+<Footer></Footer>
+  </div>
+</template>
+
+<script>
+import Header from '../components/Header'
+import Footer from '../components/Footer'
+import ShoppingNav from '../components/ShoppingNav'
+import ShoppingStatus from '../components/ShoppingStatus'
+import ShippingSection from '../components/ShippingSection'
+
+export default {
+components: {
+        Header,
+        Footer,
+        ShoppingNav,
+        ShoppingStatus,
+        ShippingSection
+    }
+}
+</script>
+
+<style scoped>
+#CompraStatus{
+ padding: 0;
+}
+
+@media screen and (max-width:760px )  {
+ #CompraStatus{
+   margin-top: 2rem;
+  
+ }
+}
+
+</style>
@@ -1,9 +1,9 @@
 <template>
 <div>
 <Header></Header>
-
-<SearchResultsPage></SearchResultsPage>
-
+<div class="container my-5">
+  <h1 class="text-center">Home</h1>
+</div>
 <Footer></Footer>
 </div>
 </template>
@@ -11,14 +11,13 @@
 <script>

 import Header from '../components/Header'
-import SearchResultsPage from '../components/SearchResultsPage'
 import Footer from '../components/Footer'
        
 export default {
 components: {
        Header,
-        SearchResultsPage,
-        Footer
+        Footer,
+
    }
 }
 </script>
@@ -0,0 +1,61 @@
+<template>
+  <div>
+<Header></Header>
+  
+<div class="my-5">  
+  
+<div class="row">
+
+<section class="col-10 col-sm-7 col-md-7 col-lg-7 col-xl-7 offset-1">
+  <ShoppingNav currentStep=2></ShoppingNav>
+
+  <Payment></Payment>
+
+
+</section>
+
+<aside id="CompraStatus" class="col-10 col-sm-2 col-md-2 col-lg-2 col-xl-2 offset-1 ">
+  <!-- <h3 class="text-center">status</h3> -->
+   <ShoppingStatus></ShoppingStatus> 
+</aside>
+
+
+</div>
+
+</div>
+
+<Footer></Footer>
+  </div>
+</template>
+
+<script>
+import Header from '../components/Header'
+import Footer from '../components/Footer'
+import ShoppingNav from '../components/ShoppingNav'
+import ShoppingStatus from '../components/ShoppingStatus'
+import Payment from '../components/Payment'
+
+export default {
+components: {
+        Header,
+        Footer,
+        ShoppingNav,
+        ShoppingStatus,
+        Payment
+    }
+}
+</script>
+
+<style scoped>
+#CompraStatus{
+ padding: 0;
+}
+
+@media screen and (max-width:760px )  {
+ #CompraStatus{
+   margin-top: 2rem;
+  
+ }
+}
+
+</style>
Author	SHA1	Message	Date
casnet1	1687e3e671	arreglo de conflictos	2020-10-23 11:10:25 -05:00
eithan	c72226aaa4	vistas y rutas de proceso de pago	2020-10-08 16:42:14 -05:00