diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+ diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+ diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+ diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+ diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro deleted file mode 100644 index e69de29..0000000 --- a/src/assets/images/svg/arro +++ /dev/null diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro deleted file mode 100644 index e69de29..0000000 --- a/src/assets/images/svg/arro +++ /dev/null diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg index 9e57567..6702a8a 100644 --- a/src/assets/images/svg/arrow-left.svg +++ b/src/assets/images/svg/arrow-left.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro deleted file mode 100644 index e69de29..0000000 --- a/src/assets/images/svg/arro +++ /dev/null diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg index 9e57567..6702a8a 100644 --- a/src/assets/images/svg/arrow-left.svg +++ b/src/assets/images/svg/arrow-left.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/src/assets/images/svg/clock.svg b/src/assets/images/svg/clock.svg new file mode 100644 index 0000000..d8ba474 --- /dev/null +++ b/src/assets/images/svg/clock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro deleted file mode 100644 index e69de29..0000000 --- a/src/assets/images/svg/arro +++ /dev/null diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg index 9e57567..6702a8a 100644 --- a/src/assets/images/svg/arrow-left.svg +++ b/src/assets/images/svg/arrow-left.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/src/assets/images/svg/clock.svg b/src/assets/images/svg/clock.svg new file mode 100644 index 0000000..d8ba474 --- /dev/null +++ b/src/assets/images/svg/clock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/svg/star.svg b/src/assets/images/svg/star.svg new file mode 100644 index 0000000..1d0d4c9 --- /dev/null +++ b/src/assets/images/svg/star.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro deleted file mode 100644 index e69de29..0000000 --- a/src/assets/images/svg/arro +++ /dev/null diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg index 9e57567..6702a8a 100644 --- a/src/assets/images/svg/arrow-left.svg +++ b/src/assets/images/svg/arrow-left.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/src/assets/images/svg/clock.svg b/src/assets/images/svg/clock.svg new file mode 100644 index 0000000..d8ba474 --- /dev/null +++ b/src/assets/images/svg/clock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/svg/star.svg b/src/assets/images/svg/star.svg new file mode 100644 index 0000000..1d0d4c9 --- /dev/null +++ b/src/assets/images/svg/star.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/images/svg/user.svg b/src/assets/images/svg/user.svg new file mode 100644 index 0000000..698837b --- /dev/null +++ b/src/assets/images/svg/user.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.html b/src/app/modules/public/discover/components/list-sites/list-sites.component.html index 896de32..15c0366 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.html +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.html @@ -1,3 +1,36 @@ -

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro deleted file mode 100644 index e69de29..0000000 --- a/src/assets/images/svg/arro +++ /dev/null diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg index 9e57567..6702a8a 100644 --- a/src/assets/images/svg/arrow-left.svg +++ b/src/assets/images/svg/arrow-left.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/src/assets/images/svg/clock.svg b/src/assets/images/svg/clock.svg new file mode 100644 index 0000000..d8ba474 --- /dev/null +++ b/src/assets/images/svg/clock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/svg/star.svg b/src/assets/images/svg/star.svg new file mode 100644 index 0000000..1d0d4c9 --- /dev/null +++ b/src/assets/images/svg/star.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/images/svg/user.svg b/src/assets/images/svg/user.svg new file mode 100644 index 0000000..698837b --- /dev/null +++ b/src/assets/images/svg/user.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/index.html b/src/index.html index bc1480a..2df82f3 100644 --- a/src/index.html +++ b/src/index.html @@ -8,9 +8,9 @@

- list-sites works! -

+
    +
  • +
    +
    +
    +
    +
    +

    Restaurante ǵpuls

    +
    + +
    +
    +
    +
    + + Abierto + Cierra a las 21:00 +
    + +
    +

    + El restaurante gouls ofrece platos tradicionales con toques de + modernidad, aprovechando los productos de la zona (excelentes carnes, + salazones). combinandolos con nuevos sabores y texturas. +

    +
    + + 380-121-303 + + Panaderia-@gmail.com +
    +
    +
    • +
diff --git a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss index e69de29..6837eb3 100644 --- a/src/app/modules/public/discover/components/list-sites/list-sites.component.scss +++ b/src/app/modules/public/discover/components/list-sites/list-sites.component.scss @@ -0,0 +1,33 @@ + + +ul { + list-style-type: none; + padding-left: 0; +} + +li { + /* @media only screen and (min-width: 1500px) { + min-height: 250px; + width: 100%; + } */ + min-height: 250px; + width: 100%; + border: 1.5px solid #8c8c8c; + border-radius: 20px; +} + +.img-container { + +} + +.img-container div { + width: 25rem; + height: 12.5rem; + border-radius: 20px; + background-image: url(../../../../../../assets/images/restaurant_135621509.jpg); + background-size: cover; +} + +.info-container{ + width: 60%; +} diff --git a/src/app/modules/public/discover/components/sites/sites.component.html b/src/app/modules/public/discover/components/sites/sites.component.html index fd81823..4e7464a 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,25 +1,25 @@
-
- -

Todos los sitios

-
- +
+
-
- +
+
-
- +
+
diff --git a/src/app/modules/public/discover/components/sites/sites.component.scss b/src/app/modules/public/discover/components/sites/sites.component.scss index f993430..b111960 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -5,6 +5,14 @@ border-bottom: 4px solid #B72929; } -.sites_slide{ - height:14.375rem; +.sites__header-sites div{ + width:auto; +} + +.icon-grid { + font-size: 25px; +} + +.icon-menu{ + font-size: 26px; } \ No newline at end of file diff --git a/src/app/modules/public/discover/components/sites/sites.component.ts b/src/app/modules/public/discover/components/sites/sites.component.ts index fd365f7..d24891f 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -13,4 +13,12 @@ ngOnInit() { } + changeModeList(){ + this.is_slide_mode=true; + } + + changeModeSlide(){ + this.is_slide_mode=false; + } + } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html index 681a418..5847510 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.html @@ -1,42 +1,53 @@ - - -
- - - -

Hola mundo

- - + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ +
+ diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss index e42935e..481bea1 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.scss @@ -1,5 +1,9 @@ -.carousel{ - width: 30rem; +.carousel_size{ + /* width: 100vw; */ +} + +.carousel_size_show{ + width: 82.4vw; } diff --git a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts index cf29090..7316828 100644 --- a/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts +++ b/src/app/modules/public/discover/components/slide-sites/slide-sites.component.ts @@ -1,9 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { faChevronCircleUp } from '@fortawesome/free-solid-svg-icons'; import { OwlOptions } from 'ngx-owl-carousel-o'; -import 'swiper/scss'; -import 'swiper/scss/navigation'; -import 'swiper/scss/pagination'; @Component({ selector: 'app-slide-sites', templateUrl: './slide-sites.component.html', @@ -12,7 +9,7 @@ export class SlideSitesComponent implements OnInit { icon_chevron_up = faChevronCircleUp; @ViewChild('album-rotator-holder') albumRotator: any; - + customOptions: OwlOptions = { loop: true, mouseDrag: true, @@ -22,12 +19,11 @@ touchDrag: false, pullDrag: false, dots: false, - margin:10, + margin:1, navSpeed: 700, - navText : ['', - ''], + navText : ['',''], nav: true, - responsive: { + /* responsive: { 0: { items: 1, nav: true @@ -46,10 +42,10 @@ nav: true, loop: true } - } + } */ } constructor() {} - + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index bfef90b..d822584 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,10 +13,10 @@ import { MapComponent } from './components/map/map.component'; import { GoogleMapsModule } from '@angular/google-maps'; import { ModalSiteComponent } from './components/modal-site/modal-site.component' -import { SwiperModule } from 'swiper/angular'; /* carousel */ + import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ @@ -36,10 +36,9 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, - CarouselModule, - SwiperModule + CarouselModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class DiscoverModule { } \ No newline at end of file +export class DiscoverModule { } diff --git a/src/app/modules/public/home/home.component.html b/src/app/modules/public/home/home.component.html index 50b0c53..01b48cd 100644 --- a/src/app/modules/public/home/home.component.html +++ b/src/app/modules/public/home/home.component.html @@ -1,9 +1,11 @@
- Los mejores servicios a tu alcance + Los mejores servicios a tu alcance
- +

discover @@ -12,12 +14,11 @@

-
diff --git a/src/app/modules/public/home/home.component.scss b/src/app/modules/public/home/home.component.scss index 745fc61..a6fe1d8 100644 --- a/src/app/modules/public/home/home.component.scss +++ b/src/app/modules/public/home/home.component.scss @@ -1,7 +1,4 @@ -*{ - margin: 0; - width: 100%; -} + .home__background{ width: 100%; height: 85vh; diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html index a062389..06da8fc 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.html +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.html @@ -1,23 +1,65 @@ -
-
+
+
-
    -
  • +
      +
    • +
      • +
    +
      +
    • + +
      • +
    +
      +
    • +
+ diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss index 445209f..4edcc42 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.scss @@ -4,18 +4,18 @@ } .dropdown{ - button{ - background: none; - border: none; - color: var(--base-color-dark) !important; - } - .dropdown-menu{ - width: 12rem; - left: 5px !important; - li{ - &:hover{ - background: var(--base-color-gray-dark); - } - } - } + button{ + background: none; + border: none; + color: var(--base-color-dark) !important; + } + .dropdown-menu{ + width: 12rem; + left: 5px !important; + li{ + &:hover{ + background: var(--base-color-gray-dark); + } + } + } } diff --git a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts index 2c1f51e..ff408f3 100644 --- a/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts +++ b/src/app/shared/components/dropdown-categories/dropdown-categories.component.ts @@ -12,26 +12,70 @@ @Input() is_in_home: boolean = true; @Input() name!: string; @Input() icon!: FaIconComponent; - @Input() elements: any[] = [ + @Input() consumables: any[] = [ + { + name: "Comidas rapidas", + value: "ropa", + icon: "fast-food-outline" + }, + { + name: "Comidas gourmet", + value: "artesanias", + icon: "restaurant-outline" + }, + { + name: "Panaderias & cafeterias", + value: "plazas", + icon: "cafe-outline" + }, + { + name: "Heladerias", + value: "supermercado", + icon: "ice-cream-outline" + } + ] + @Input() stores: any[] = [ { name: "Ropa & zapatos", value: "ropa", - icon: faTags + icon: 'pricetags-outline' }, { name: "Artesanias", value: "artesanias", - icon: faStore + icon: "storefront-outline" }, { name: "Plazas", value: "plazas", - icon: faTicketAlt + icon: "ticket-outline" }, { name: "Supermercado", value: "supermercado", - icon: faShoppingCart + icon: "cart-outline" + } + ] + @Input() more: any[] = [ + { + name: "Bar", + value: "ropa", + icon: 'wine-outline' + }, + { + name: "Gym", + value: "artesanias", + icon: "barbell-outline" + }, + { + name: "Hoteles", + value: "plazas", + icon: "bed-outline" + }, + { + name: "Autolavado", + value: "supermercado", + icon: "car-outline" } ] icon_store: any = faStore; diff --git a/src/app/shared/components/footer/footer.component.scss b/src/app/shared/components/footer/footer.component.scss index ffd6965..62a5182 100644 --- a/src/app/shared/components/footer/footer.component.scss +++ b/src/app/shared/components/footer/footer.component.scss @@ -8,10 +8,17 @@ } } -p{ - margin-bottom: 0; +p { + margin-bottom: 0; } -span{ - margin-bottom:20px ; -} \ No newline at end of file +span { + margin-bottom: 20px; +} + +.image-container { + display: flex; + align-items: center; + justify-content: center; + padding-top: 26px; +} diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index 8fdcd41..331db4c 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,3 +1,8 @@ +* { + margin: 0; + width: 100%; +} + .navbar__discover { background: #ffffff; border-bottom: 4px solid var(--base-color-primary); diff --git a/src/app/shared/components/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts index 14ec655..f6258dc 100644 --- a/src/app/shared/components/navbar/navbar.component.ts +++ b/src/app/shared/components/navbar/navbar.component.ts @@ -4,7 +4,7 @@ @Component({ selector: 'app-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.component.scss'] + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { @@ -13,23 +13,26 @@ icon_settings = faSlidersH; filters_is_visible: boolean = false; search: string = ''; - - constructor() { } - ngOnInit(): void { - } + constructor() {} - showFilters(){ - const filters: any = document.querySelector(".discover__filters"); - if(!this.filters_is_visible){ - console.log("Run show filters") - filters.classList.add("discover__filters-show") + ngOnInit(): void {} + + showFilters() { + const filters: any = document.querySelector('.discover__filters'); + const carousel: any = document.querySelector('.carousel_size'); + if (!this.filters_is_visible) { + console.log('Run show filters'); + filters.classList.add('discover__filters-show'); this.filters_is_visible = true; - }else{ - console.log("Run hide filters") - filters.classList.remove("discover__filters-show") + carousel.classList.add('carousel_size_show'); + console.log('listo'); + } else { + console.log('Run hide filters'); + filters.classList.remove('discover__filters-show'); this.filters_is_visible = false; + carousel.classList.remove('carousel_size_show'); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2a5735e..bbc7675 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchComponent } from './components/search/search.component'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,6 +32,7 @@ FooterComponent, DropdownCategoriesComponent, SearchPipe, - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class SharedModule { } \ No newline at end of file +export class SharedModule { } diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg index 519f663..6581569 100644 --- a/src/assets/images/svg/arow-right.svg +++ b/src/assets/images/svg/arow-right.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro deleted file mode 100644 index e69de29..0000000 --- a/src/assets/images/svg/arro +++ /dev/null diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg index 9e57567..6702a8a 100644 --- a/src/assets/images/svg/arrow-left.svg +++ b/src/assets/images/svg/arrow-left.svg @@ -1,3 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/src/assets/images/svg/clock.svg b/src/assets/images/svg/clock.svg new file mode 100644 index 0000000..d8ba474 --- /dev/null +++ b/src/assets/images/svg/clock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/svg/star.svg b/src/assets/images/svg/star.svg new file mode 100644 index 0000000..1d0d4c9 --- /dev/null +++ b/src/assets/images/svg/star.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/images/svg/user.svg b/src/assets/images/svg/user.svg new file mode 100644 index 0000000..698837b --- /dev/null +++ b/src/assets/images/svg/user.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/index.html b/src/index.html index bc1480a..2df82f3 100644 --- a/src/index.html +++ b/src/index.html @@ -8,9 +8,9 @@