+
+
+
-
-
+
+
+
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss
index 9f4a665..5497e46 100644
--- a/src/app/modules/public/discover/discover.component.scss
+++ b/src/app/modules/public/discover/discover.component.scss
@@ -1,22 +1,36 @@
-
-.discover__content{
- width: 100%;
-}
-
-.discover__filters{
- display: none;
- transition: 2s;
-}
-.discover__filters-show{
+.discover__layout {
+ display: grid;
+ width: 100%;
+ grid-template-areas:
+ "navbar navbar navbar"
+ "content content filters"
+ "footer footer filters";
+ grid-template-columns: 1fr 1fr max-content;
+ grid-template-rows: max-content 1fr max-content;
+ app-navbar {
+ grid-area: navbar;
position: sticky;
+ z-index: 99;
top: 0;
+ }
+ .discover__content {
+ grid-area: content;
+ }
+ .discover__filters {
+ display: none;
+ grid-area: filters;
+ }
+ .discover__filters-show {
+ position: sticky;
+ top: 3.8rem !important;
height: 100vh;
display: flex;
- height: 100%;
- max-width: 20rem;
- min-width: 20rem;
+ grid-area: filters;
transition: 2s;
right: 0;
- background-color:white;
- z-index: 70;
-}
\ No newline at end of file
+ background-color: white;
+ }
+ app-footer {
+ grid-area: footer;
+ }
+}
diff --git a/src/app/modules/public/discover/discover.component.ts b/src/app/modules/public/discover/discover.component.ts
index 020f8a2..ab2819d 100644
--- a/src/app/modules/public/discover/discover.component.ts
+++ b/src/app/modules/public/discover/discover.component.ts
@@ -1,8 +1,10 @@
import { Component, OnInit } from '@angular/core';
+import { Title } from '@angular/platform-browser';
import { faBorderAll } from '@fortawesome/free-solid-svg-icons';
import { Site } from 'src/app/core/interfaces/site/site';
import { SiteService } from 'src/app/core/services/site/site.service';
import { SITES } from '../../../core/mocks/data';
+import { ActivatedRoute } from '@angular/router'
@Component({
templateUrl: './discover.component.html',
@@ -14,9 +16,10 @@
sites: Site[] = SITES;
search: string = '';
- constructor(private site_service: SiteService) { }
+ constructor(private site_service: SiteService, private title: Title, private activeRoute: ActivatedRoute) { }
ngOnInit(): void {
+ this.setTitle("Discover | Camara de comercio|");
/* this.site_service.getSites().subscribe(
(sites) => {
console.log(sites)
@@ -26,6 +29,22 @@
console.log(error)
}
) */
+ this.getQueryParams();
+ }
+
+ public setTitle(newTitle: string) {
+ this.title.setTitle(newTitle);
+ }
+
+ public getQueryParams(){
+ this.activeRoute.queryParams.subscribe(
+ (data) => {
+ console.log("This is data search ",data);
+ if(data.search){
+ this.search = data.search;
+ }
+ }
+ )
}
handlePatternSearch($event: any) {
@@ -33,4 +52,4 @@
this.search = $event;
}
-}
\ No newline at end of file
+}
diff --git a/angular.json b/angular.json
index aec4866..68646ef 100644
--- a/angular.json
+++ b/angular.json
@@ -91,9 +91,9 @@
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
- "./node_modules/ngx-owl-carousel-o/lib/styles/prebuilt-themes/owl.carousel.min.css",
- "./node_modules/ngx-owl-carousel-o/lib/styles/prebuilt-themes/owl.theme.default.min.css",
- "src/styles.scss"
+ "src/styles.scss",
+ "./node_modules/bootstrap/dist/css/bootstrap.min.css",
+ "./node_modules/bootstrap/scss/bootstrap.scss"
],
"scripts": [
"./node_modules/jquery/dist/jquery.js",
diff --git a/package-lock.json b/package-lock.json
index 80c2ea7..33dc69b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,9 @@
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-regular-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
+ "@popperjs/core": "^2.10.2",
"@types/jquery": "^3.5.6",
+ "bootstrap": "^5.0.0-beta3",
"jquery": "^3.6.0",
"ngx-owl-carousel-o": "^6.0.0",
"rxjs": "~6.6.0",
@@ -2488,6 +2490,15 @@
"read-package-json-fast": "^2.0.1"
}
},
+ "node_modules/@popperjs/core": {
+ "version": "2.10.2",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
+ "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/popperjs"
+ }
+ },
"node_modules/@schematics/angular": {
"version": "12.2.7",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.7.tgz",
@@ -3552,6 +3563,18 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"dev": true
},
+ "node_modules/bootstrap": {
+ "version": "5.0.0-beta3",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta3.tgz",
+ "integrity": "sha512-0urccjfIOzhrb9qJysN8XW/DRw6rg3zH7qLeKIp4Zyl8+Ens4JWB0NC0cB5AhnSFPd2tftRggjwCMxablo6Tpg==",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/bootstrap"
+ },
+ "peerDependencies": {
+ "@popperjs/core": "^2.9.1"
+ }
+ },
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -17735,6 +17758,11 @@
"read-package-json-fast": "^2.0.1"
}
},
+ "@popperjs/core": {
+ "version": "2.10.2",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
+ "integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ=="
+ },
"@schematics/angular": {
"version": "12.2.7",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.7.tgz",
@@ -18627,6 +18655,12 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"dev": true
},
+ "bootstrap": {
+ "version": "5.0.0-beta3",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta3.tgz",
+ "integrity": "sha512-0urccjfIOzhrb9qJysN8XW/DRw6rg3zH7qLeKIp4Zyl8+Ens4JWB0NC0cB5AhnSFPd2tftRggjwCMxablo6Tpg==",
+ "requires": {}
+ },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
diff --git a/package.json b/package.json
index 091fac5..4d1988f 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,9 @@
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-regular-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
+ "@popperjs/core": "^2.10.2",
"@types/jquery": "^3.5.6",
+ "bootstrap": "^5.0.0-beta3",
"jquery": "^3.6.0",
"ngx-owl-carousel-o": "^6.0.0",
"rxjs": "~6.6.0",
diff --git a/src/app/modules/public/discover/components/filters/filters.component.scss b/src/app/modules/public/discover/components/filters/filters.component.scss
index 3a9ccff..a617a6f 100644
--- a/src/app/modules/public/discover/components/filters/filters.component.scss
+++ b/src/app/modules/public/discover/components/filters/filters.component.scss
@@ -1,5 +1,6 @@
.filters{
position: sticky;
top: 3.8rem;
+ height: 100vh;
padding: 1rem 2rem;
-}
\ No newline at end of file
+}
diff --git a/src/app/modules/public/discover/components/map/map.component.ts b/src/app/modules/public/discover/components/map/map.component.ts
index e04db4d..13346fc 100644
--- a/src/app/modules/public/discover/components/map/map.component.ts
+++ b/src/app/modules/public/discover/components/map/map.component.ts
@@ -31,7 +31,7 @@
latitude: 1234,
length: 123
}
- };
+ };
options: google.maps.MapOptions = {
zoomControl: true,
scrollwheel: false,
@@ -88,6 +88,15 @@
}
createMarkers() {
+ const svgMarker = {
+ path: "M10.453 14.016l6.563-6.609-1.406-1.406-5.156 5.203-2.063-2.109-1.406 1.406zM12 2.016q2.906 0 4.945 2.039t2.039 4.945q0 1.453-0.727 3.328t-1.758 3.516-2.039 3.070-1.711 2.273l-0.75 0.797q-0.281-0.328-0.75-0.867t-1.688-2.156-2.133-3.141-1.664-3.445-0.75-3.375q0-2.906 2.039-4.945t4.945-2.039z",
+ fillColor: "blue",
+ fillOpacity: 0.6,
+ strokeWeight: 0,
+ rotation: 0,
+ scale: 2,
+ anchor: new google.maps.Point(15, 30),
+ };
this.sites.forEach((site: Site) => {
this.markers.push({
position: {
@@ -102,6 +111,7 @@
info: {
...site
},
+ icon: svgMarker
/* icon: {
url: "https://upload.wikimedia.org/wikipedia/commons/thumb/6/69/How_to_use_icon.svg/2214px-How_to_use_icon.svg.png"
} */
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 10988c6..fd81823 100644
--- a/src/app/modules/public/discover/components/sites/sites.component.html
+++ b/src/app/modules/public/discover/components/sites/sites.component.html
@@ -15,13 +15,11 @@