diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ No newline at end of file diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg new file mode 100644 index 0000000..519f663 --- /dev/null +++ b/src/assets/images/svg/arow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg new file mode 100644 index 0000000..519f663 --- /dev/null +++ b/src/assets/images/svg/arow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/assets/images/svg/arro diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg new file mode 100644 index 0000000..519f663 --- /dev/null +++ b/src/assets/images/svg/arow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/assets/images/svg/arro diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg new file mode 100644 index 0000000..9e57567 --- /dev/null +++ b/src/assets/images/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg new file mode 100644 index 0000000..519f663 --- /dev/null +++ b/src/assets/images/svg/arow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/assets/images/svg/arro diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg new file mode 100644 index 0000000..9e57567 --- /dev/null +++ b/src/assets/images/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/images/svg/medium-star.svg b/src/assets/images/svg/medium-star.svg new file mode 100644 index 0000000..91ed073 --- /dev/null +++ b/src/assets/images/svg/medium-star.svg @@ -0,0 +1,4 @@ + + + + diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg new file mode 100644 index 0000000..519f663 --- /dev/null +++ b/src/assets/images/svg/arow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/assets/images/svg/arro diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg new file mode 100644 index 0000000..9e57567 --- /dev/null +++ b/src/assets/images/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/images/svg/medium-star.svg b/src/assets/images/svg/medium-star.svg new file mode 100644 index 0000000..91ed073 --- /dev/null +++ b/src/assets/images/svg/medium-star.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/svg/restaurant.svg b/src/assets/images/svg/restaurant.svg new file mode 100644 index 0000000..a4e7f5a --- /dev/null +++ b/src/assets/images/svg/restaurant.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg new file mode 100644 index 0000000..519f663 --- /dev/null +++ b/src/assets/images/svg/arow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/assets/images/svg/arro diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg new file mode 100644 index 0000000..9e57567 --- /dev/null +++ b/src/assets/images/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/images/svg/medium-star.svg b/src/assets/images/svg/medium-star.svg new file mode 100644 index 0000000..91ed073 --- /dev/null +++ b/src/assets/images/svg/medium-star.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/svg/restaurant.svg b/src/assets/images/svg/restaurant.svg new file mode 100644 index 0000000..a4e7f5a --- /dev/null +++ b/src/assets/images/svg/restaurant.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/index.html b/src/index.html index 9203dd2..d6ceb80 100644 --- a/src/index.html +++ b/src/index.html @@ -9,9 +9,12 @@ + + + diff --git a/angular.json b/angular.json index e472bd3..aec4866 100644 --- a/angular.json +++ b/angular.json @@ -26,13 +26,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,14 +89,16 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], + "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" ], - "scripts": [] + "scripts": [ + "./node_modules/jquery/dist/jquery.js", + "./node_modules/owl.carousel/dist/owl.carousel.js" + ] } } } diff --git a/package-lock.json b/package-lock.json index f66c566..80c2ea7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, @@ -2503,18 +2504,6 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==", - "bin": { - "stencil": "bin/stencil" - }, - "engines": { - "node": ">=12.10.0", - "npm": ">=6.0.0" - } - }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -2587,11 +2576,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "node_modules/@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -2604,6 +2588,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -2628,6 +2620,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "node_modules/@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -5394,6 +5391,14 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, + "node_modules/dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "dependencies": { + "ssr-window": "^4.0.0" + } + }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -7424,14 +7429,6 @@ "node": ">=6" } }, - "node_modules/ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "dependencies": { - "@stencil/core": "^2.5.0" - } - }, "node_modules/ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7959,6 +7956,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9179,6 +9181,19 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "dependencies": { + "tslib": "^2.1.0" + }, + "peerDependencies": { + "@angular/common": " ^12.0.0-rc.0 || ^12.0.0", + "@angular/core": "^12.0.0-rc.0 || ^12.0.0", + "rxjs": "^6.0.1" + } + }, "node_modules/nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -13777,6 +13792,11 @@ "node": ">=0.10.0" } }, + "node_modules/ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "node_modules/ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -14120,6 +14140,29 @@ "node": ">=10.13.0" } }, + "node_modules/swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "hasInstallScript": true, + "dependencies": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + }, + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", @@ -17703,11 +17746,6 @@ "jsonc-parser": "3.0.0" } }, - "@stencil/core": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", - "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" - }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -17774,11 +17812,6 @@ "@types/node": "*" } }, - "@types/google.maps": { - "version": "3.45.6", - "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.45.6.tgz", - "integrity": "sha512-BzGzxs8UXFxeP8uN/0nRgGbsbpYQxSCKsv/7S8OitU7wwhfFcqQSm5aAcL1nbwueMiJ/VVmIZKPq69s0kX5W+Q==" - }, "@types/googlemaps": { "version": "3.43.3", "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", @@ -17790,6 +17823,14 @@ "integrity": "sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==", "dev": true }, + "@types/jquery": { + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz", + "integrity": "sha512-SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg==", + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", @@ -17814,6 +17855,11 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==" + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -19998,6 +20044,14 @@ "entities": "^2.0.0" } }, + "dom7": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-4.0.0.tgz", + "integrity": "sha512-xOJ0LAHFwktyj8Xljz4R2wzRI+Y9mR0plkMP0WlqtwqAkqn/vbdAyRifiW/w8mXe17LGktntcAwsQ5fKVDBNYg==", + "requires": { + "ssr-window": "^4.0.0" + } + }, "domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", @@ -21615,14 +21669,6 @@ "ipaddr.js": "^1.9.0" } }, - "ionicons": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz", - "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==", - "requires": { - "@stencil/core": "^2.5.0" - } - }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -22014,6 +22060,11 @@ } } }, + "jquery": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -22964,6 +23015,14 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "ngx-owl-carousel-o": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/ngx-owl-carousel-o/-/ngx-owl-carousel-o-6.0.0.tgz", + "integrity": "sha512-jD6YkQ5PLGA4quR210nfFTQYOLj8Q1FHKOSyw8ZRH2GD85ImnEuFLJ31OyfrZQjPsfV3yMsaWaj6qVFqfjJbzg==", + "requires": { + "tslib": "^2.1.0" + } + }, "nice-napi": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", @@ -26440,6 +26499,11 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-4.0.0.tgz", + "integrity": "sha512-qCg6wJNeGNTVcPK2KFNfwtHU1gA3UZDZdxogu+Ys5+Ue5PMOENxUb7sscpAWWo4mWOBkJRCwQ50IlyA7qZ0hxw==" + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -26692,6 +26756,15 @@ "stable": "^0.1.8" } }, + "swiper": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-7.0.8.tgz", + "integrity": "sha512-1IpWjHam98eTNiysi9MauvPHdLgrLesSYGd7JXvQEJkvW/NvI9gogMfRfbv+7jCK3+nIWuCpVnJmKCOBtJi4JA==", + "requires": { + "dom7": "^4.0.0", + "ssr-window": "^4.0.0" + } + }, "symbol-observable": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", diff --git a/package.json b/package.json index 32e1eac..091fac5 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,11 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@types/google.maps": "^3.45.6", - "@types/googlemaps": "^3.43.3", - "ionicons": "^5.5.3", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", + "swiper": "^7.0.8", "tslib": "^2.3.0", "zone.js": "~0.11.4" }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fd0971b..87c3910 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,8 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CoreModule } from './core/core.module'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; + @NgModule({ declarations: [ @@ -11,7 +13,8 @@ imports: [ BrowserModule, AppRoutingModule, - CoreModule + CoreModule, + BrowserAnimationsModule ], providers: [], bootstrap: [AppComponent] 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 aa7a20a..678375b 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.html +++ b/src/app/modules/public/discover/components/sites/sites.component.html @@ -1,8 +1,25 @@
-
- +
+
+ + +
+

Todos los sitios

+
+ +
+
+
+
-
- +
+
-
\ No newline at end of file + +
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 e69de29..f993430 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.scss +++ b/src/app/modules/public/discover/components/sites/sites.component.scss @@ -0,0 +1,10 @@ +.sites__header-sites{ + padding: .5rem 1rem; + background: rgb(233, 191, 4); + height:2.813rem; + border-bottom: 4px solid #B72929; +} + +.sites_slide{ + height:14.375rem; +} \ 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 519b690..fd365f7 100644 --- a/src/app/modules/public/discover/components/sites/sites.component.ts +++ b/src/app/modules/public/discover/components/sites/sites.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; - +import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-sites', templateUrl: './sites.component.html', @@ -8,9 +8,8 @@ export class SitesComponent implements OnInit { @Input() is_slide_mode: boolean = true; - + icon_border_all = faBorderAll; constructor() { } - ngOnInit() { } 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 7e8132b..b5ebe62 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,16 +1,31 @@ -
- -
-
- 4,5 - + + +
+
+ 5 + +
+
+ Panaderia Blink +
-
-

Panaderia blink

- - - - -
-
-
\ No newline at end of file + + +
hola
+ + +
hola
+ + +
hola
+ + +
hola
+ + \ No newline at end of file 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 e69de29..e42935e 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 @@ -0,0 +1,17 @@ +.carousel{ + width: 30rem; +} + + +.slide{ + color: white; + font-size: 20px; + margin: 20px 0; + border-radius: 20px; + box-shadow: 0px 4px 15px rgba(0,0,0,0.2); + color: black; + height:12.5rem; + width:25rem; + /* background: url('../../../../../../assets/images/svg/restaurant.svg'); */ +} + 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 cf49c6c..60a711b 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,18 +1,54 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, 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', - styleUrls: ['./slide-sites.component.scss'] + styleUrls: ['./slide-sites.component.scss'], }) export class SlideSitesComponent implements OnInit { - icon_chevron_up = faChevronCircleUp; - - constructor() { } - - ngOnInit() { + @ViewChild('album-rotator-holder') albumRotator: any; + + customOptions: OwlOptions = { + loop: true, + mouseDrag: true, + autoplay: false, + autoplayTimeout: 2000, + autoplayHoverPause:true, + touchDrag: false, + pullDrag: false, + dots: false, + margin:10, + navSpeed: 700, + navText : ['',''], + nav: true, + responsive: { + 0: { + items: 1, + nav: true + }, + 600: { + items: 1, + nav: true + }, + 1000: { + items: 2, + nav: true, + loop: true + }, + 1500: { + items: 4, + nav: true, + loop: true + } + } } + constructor() {} + + ngOnInit() {} } diff --git a/src/app/modules/public/discover/discover.component.html b/src/app/modules/public/discover/discover.component.html index 9b2eaf3..4c9fcf5 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -1,31 +1,9 @@
-
- +
+
-
-
- - -
-

Todos los sitios

-
- Ordenar: - -
-
diff --git a/src/app/modules/public/discover/discover.component.scss b/src/app/modules/public/discover/discover.component.scss index 608f8dd..d6abbc1 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,20 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); + +.discover__content{ + width: 100%; } + .discover__filters{ display: none; transition: 2s; } .discover__filters-show{ display: flex; + height: 100%; max-width: 20rem; min-width: 20rem; transition: 2s; + right: 0; + background-color:white; + z-index: 70; + } \ No newline at end of file diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 461df86..87bebfb 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -13,7 +13,12 @@ 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'; +import 'swiper/scss'; +import 'swiper/scss/navigation'; +import 'swiper/scss/pagination'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -32,6 +37,8 @@ FontAwesomeModule, FormsModule, GoogleMapsModule, + CarouselModule, + SwiperModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/shared/components/brand/brand.component.html b/src/app/shared/components/brand/brand.component.html index 325d09d..c11c9c2 100644 --- a/src/app/shared/components/brand/brand.component.html +++ b/src/app/shared/components/brand/brand.component.html @@ -1,12 +1,14 @@ -
-
- +
+
+
-
+

CÁMARA DE COMERCIO

PAMPLONA

-
+
+ + diff --git a/src/app/shared/components/brand/brand.component.scss b/src/app/shared/components/brand/brand.component.scss index e8de728..7010198 100644 --- a/src/app/shared/components/brand/brand.component.scss +++ b/src/app/shared/components/brand/brand.component.scss @@ -5,15 +5,12 @@ .title{ color: var(--base-color-dark); font-style: normal; + font-family: var(--font-work-sans); + font-weight:500; } .container-image{ display: flex; justify-content: center; align-items: center; - margin-bottom: 30px; } - -img { - width: 150px; -} \ No newline at end of file diff --git a/src/app/shared/components/brand/brand.component.ts b/src/app/shared/components/brand/brand.component.ts index c99868c..8110487 100644 --- a/src/app/shared/components/brand/brand.component.ts +++ b/src/app/shared/components/brand/brand.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; @Component({ selector: 'app-brand', @@ -6,6 +6,7 @@ styleUrls: ['./brand.component.scss'] }) export class BrandComponent implements OnInit { + @Input() is_in_home: boolean = true; constructor() { } diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index fb6fa23..6da7e5e 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,7 +1,7 @@ -
+
- +
@@ -20,9 +20,8 @@ >
-
- -
+ + diff --git a/src/app/shared/components/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss index f6ea421..8fdcd41 100644 --- a/src/app/shared/components/navbar/navbar.component.scss +++ b/src/app/shared/components/navbar/navbar.component.scss @@ -1,7 +1,9 @@ .navbar__discover { background: #ffffff; + border-bottom: 4px solid var(--base-color-primary); position: sticky; top: 0; + height: 4.375rem; z-index: 999; box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); p { @@ -20,7 +22,7 @@ border-radius: var(--rounded-small); } .navbar__brand{ - width: 2rem; + width: 7.5rem; font-size: .2em; margin-left: 1.5rem; } diff --git a/src/app/shared/components/search/search.component.html b/src/app/shared/components/search/search.component.html index 6fed7bf..b980906 100644 --- a/src/app/shared/components/search/search.component.html +++ b/src/app/shared/components/search/search.component.html @@ -7,7 +7,15 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" /> - diff --git a/src/app/shared/components/search/search.component.scss b/src/app/shared/components/search/search.component.scss index ea2ca86..76b88c6 100644 --- a/src/app/shared/components/search/search.component.scss +++ b/src/app/shared/components/search/search.component.scss @@ -5,27 +5,27 @@ .main-container { padding: 0.5rem 1rem; - input { - width: --webkit-fill-available; - border: none; - background: var(--base-color-gray-light); - padding: 0.5rem 1rem; - border-top: 1px solid var(--base-color-dark); - border-bottom: 1px solid var(--base-color-dark); - border-left: 1px solid var(--base-color-dark); - border-radius: var(--base-rounded-medium) 0px 0px var(--base-rounded-medium); - } + label { + border: 1px solid var(--base-color-dark); + border-radius: var(--base-rounded-medium); + width: 100%; + input { + width: -webkit-fill-available; + min-width: 10rem; + border: none; + background: var(--base-color-gray-light); + padding: 0.5rem 1rem; + border-radius: 8.5px 0px 0px 8.5px; + } - input:focus { - outline: none; - } - button { - width: 3rem; - border: none; - padding: 0.5rem; - border-top: 1px solid #000000; - border-right: 1px solid #000000; - border-bottom: 1px solid #000000; - border-radius: 0px var(--base-rounded-medium) var(--base-rounded-medium) 0px; + input:focus { + outline: none; + } + button { + width: 3rem; + border: none; + padding: 0.5rem; + border-radius: 0px 8.5px 8.5px 0px; + } } } diff --git a/src/app/shared/components/search/search.component.ts b/src/app/shared/components/search/search.component.ts index a78440f..636edb1 100644 --- a/src/app/shared/components/search/search.component.ts +++ b/src/app/shared/components/search/search.component.ts @@ -11,6 +11,8 @@ @Output() search_change = new EventEmitter(); @Input() search_placeholder: string = 'Search'; + + @Input() is_in_home: boolean = true; icon_search = faSearch; search: string = '' diff --git a/src/assets/images/restaurant_135621509.jpg b/src/assets/images/restaurant_135621509.jpg new file mode 100644 index 0000000..ec741a7 --- /dev/null +++ b/src/assets/images/restaurant_135621509.jpg Binary files differ diff --git a/src/assets/images/svg/arow-right.svg b/src/assets/images/svg/arow-right.svg new file mode 100644 index 0000000..519f663 --- /dev/null +++ b/src/assets/images/svg/arow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/svg/arro b/src/assets/images/svg/arro new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/assets/images/svg/arro diff --git a/src/assets/images/svg/arrow-left.svg b/src/assets/images/svg/arrow-left.svg new file mode 100644 index 0000000..9e57567 --- /dev/null +++ b/src/assets/images/svg/arrow-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/assets/images/svg/medium-star.svg b/src/assets/images/svg/medium-star.svg new file mode 100644 index 0000000..91ed073 --- /dev/null +++ b/src/assets/images/svg/medium-star.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/svg/restaurant.svg b/src/assets/images/svg/restaurant.svg new file mode 100644 index 0000000..a4e7f5a --- /dev/null +++ b/src/assets/images/svg/restaurant.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/index.html b/src/index.html index 9203dd2..d6ceb80 100644 --- a/src/index.html +++ b/src/index.html @@ -9,9 +9,12 @@ + + + diff --git a/src/styles.scss b/src/styles.scss index 4038561..506fa5e 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,18 +1,51 @@ +@import "~ngx-owl-carousel-o/lib/styles/scss/owl.carousel"; +@import "~ngx-owl-carousel-o/lib/styles/scss/owl.theme.default"; /* You can add global styles to this file, and also import other style files */ -@import url('./styles/variables.scss'); -@import url('./styles/shared.scss'); +@import url("./styles/variables.scss"); +@import url("./styles/shared.scss"); - -* { - margin: 0; - width: 100%; +.button-only-icon { + width: 2.5rem; + height: 2.5rem; + border: none; + border-radius: var(--rounded-small); + margin: 0 0.3rem 0 0.3rem; + background: none; } -.button-only-icon{ - width: 2.5rem; - height: 2.5rem; - border: none; - border-radius: var(--rounded-small); - margin: 0 .3rem 0 .3rem ; - background: none; -} \ No newline at end of file +/* Carousel */ +/* .owl-carousel { + width: auto; +} +.owl-carousel .owl-nav .owl-prev { + height: 47px; + position: absolute; + width: 26px; + cursor: pointer; + top: 100px !important; + left: 50px; +} + +.owl-carousel .owl-nav .owl-next { + height: 47px; + position: absolute; + width: 26px; + cursor: pointer; + top: 100px !important; + right: 50px !important; +} + +.owl-carousel .owl-item img { + width: 25px; + margin-right: 20px; +} + +.owl-carousel .owl-item span { + width: auto; + margin-right: 10px; +} + +.owl-carousel .owl-item i { + width: auto; + margin-left: 20px; + } */