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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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 371cff6..36eb463 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -2563,6 +2566,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", @@ -2587,6 +2598,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", @@ -7913,6 +7929,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", @@ -9133,6 +9154,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", @@ -17720,6 +17754,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", @@ -17744,6 +17786,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", @@ -21939,6 +21986,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", @@ -22889,6 +22941,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", diff --git a/package.json b/package.json index 1becf8e..55daf01 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,9 @@ "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@types/jquery": "^3.5.6", + "jquery": "^3.6.0", + "ngx-owl-carousel-o": "^6.0.0", "rxjs": "~6.6.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0df046d..9786ca6 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..ded4a64 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
+
+ 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..8e35d81 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,12 @@ +.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..47f7426 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 * as $ from 'jquery'; +import { OwlOptions } from 'ngx-owl-carousel-o'; @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 d435f11..1289af0 100644 --- a/src/app/modules/public/discover/discover.component.html +++ b/src/app/modules/public/discover/discover.component.html @@ -10,28 +10,6 @@ loading="lazy" >
-
-
- - -
-

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..d30ea00 100644 --- a/src/app/modules/public/discover/discover.component.scss +++ b/src/app/modules/public/discover/discover.component.scss @@ -1,14 +1,16 @@ -.discover__header-sites{ - padding: .5rem 1rem; - background: rgb(233, 191, 4); -} + .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.component.ts b/src/app/modules/public/discover/discover.component.ts index 4ab6b1a..76a2e5d 100644 --- a/src/app/modules/public/discover/discover.component.ts +++ b/src/app/modules/public/discover/discover.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { faBorderAll } from '@fortawesome/free-solid-svg-icons'; import { Site } from 'src/app/core/interfaces/site'; import { SiteService } from 'src/app/core/services/site/site.service'; @@ -8,8 +7,6 @@ styleUrls: ['./discover.component.scss'] }) export class DiscoverComponent implements OnInit { - - icon_border_all = faBorderAll; sites: Site[] = [] constructor(private site_service: SiteService) { } diff --git a/src/app/modules/public/discover/discover.module.ts b/src/app/modules/public/discover/discover.module.ts index 2c39b94..3deaeb8 100644 --- a/src/app/modules/public/discover/discover.module.ts +++ b/src/app/modules/public/discover/discover.module.ts @@ -11,6 +11,8 @@ import { ListSitesComponent } from './components/list-sites/list-sites.component'; import { HttpClientModule } from '@angular/common/http'; +/* carousel */ +import { CarouselModule } from 'ngx-owl-carousel-o'; @NgModule({ declarations: [ DiscoverComponent, @@ -25,7 +27,8 @@ HttpClientModule, SharedModule, FontAwesomeModule, - FormsModule + FormsModule, + CarouselModule ] }) 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/styles.scss b/src/styles.scss index ad11642..abcfea0 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,17 +1,56 @@ +@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%; + margin: 0; + width: 100%; } -.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 +.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; +} + +/* 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; + }