[framework] handle image resizing by image proxy (#2924)

shopsys · Dec 7, 2023 · 68be196 · 68be196
2 parents 63f9d4d + 4b6295b
commit 68be196
Show file tree

Hide file tree

Showing 272 changed files with 1,399 additions and 3,624 deletions.
diff --git a/app/.env b/app/.env
@@ -39,6 +39,8 @@ TRUSTED_PROXIES=127.0.0.1
 # When you do not want to use CDN, it is used value '//' as workaround by https://github.com/symfony/symfony/issues/28391
 CDN_DOMAIN=//
 # CDN_DOMAIN=http://127.0.0.1:8001 # uncomment this line if you want to test CDN locally
+CDN_API_KEY=''
+CDN_API_SALT=''
 
 GOPAY_IS_PRODUCTION_MODE=false
 GOPAY_EN_GOID=
@@ -72,3 +74,6 @@ SENTRY_ENVIRONMENT=
 SENTRY_RELEASE=
 
 FORCE_ELASTIC_LIMITS=false
+
+IMG_PROXY_INTERNAL_URL='http://img-proxy:8080'
+WEBSERVER_INTERNAL_URL='http://webserver:8080'
diff --git a/app/composer.json b/app/composer.json
@@ -76,7 +76,7 @@
         "scheb/2fa-qr-code": "^5.7",
         "sensio/framework-extra-bundle": "^5.2",
         "sentry/sentry-symfony": "^4.2.8",
-        "shopsys/deployment": "~1.1.0",
+        "shopsys/deployment": "~2.0.0",
         "shopsys/form-types-bundle": "14.0.x-dev",
         "shopsys/framework": "14.0.x-dev",
         "shopsys/frontend-api": "14.0.x-dev",

diff --git a/app/config/graphql/types/ModelType/Advert/AdvertImage.types.yaml b/app/config/graphql/types/ModelType/Advert/AdvertImage.types.yaml
@@ -7,22 +7,16 @@ AdvertImage:
             images:
                 type: "[Image!]!"
                 description: "Advert images"
-                resolve: '@=query("imagesByAdvertPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByAdvertPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             mainImage:
                 type: "Image"
                 description: "Adverts first image by params"
-                resolve: '@=query("mainImageByAdvertPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByAdvertPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
diff --git a/app/config/graphql/types/ModelType/Blog/Article/BlogArticle.types.yaml b/app/config/graphql/types/ModelType/Blog/Article/BlogArticle.types.yaml
@@ -54,22 +54,16 @@ BlogArticle:
             images:
                 type: "[Image!]!"
                 description: "Blog article images"
-                resolve: '@=query("imagesByBlogArticlePromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByBlogArticlePromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             mainImage:
                 type: "Image"
                 description: "Blog article image by params"
-                resolve: '@=query("mainImageByBlogArticlePromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByBlogArticlePromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
diff --git a/app/config/graphql/types/ModelType/Category/Category.types.yaml b/app/config/graphql/types/ModelType/Category/Category.types.yaml
@@ -34,14 +34,11 @@ Category:
             images:
                 type: "[Image!]!"
                 description: "Category images"
-                resolve: '@=query("imagesByCategoryOrReadyCategorySeoMixPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByCategoryOrReadyCategorySeoMixPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             products:
                 type: "ProductConnection!"
                 description: "Paginated and ordered products of category"
@@ -65,11 +62,8 @@ Category:
             mainImage:
                 type: "Image"
                 description: "Category image by params"
-                resolve: '@=query("mainImageByCategoryOrReadyCategorySeoMixPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByCategoryOrReadyCategorySeoMixPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
diff --git a/app/config/graphql/types/ModelType/Image/Image.types.yaml b/app/config/graphql/types/ModelType/Image/Image.types.yaml
@@ -1,55 +1,4 @@
 Image:
     type: object
-    config:
-        description: "Represents an image"
-        fields:
-            name:
-                type: "String"
-                description: "Image name for ALT attribute"
-            position:
-                type: "Int"
-                description: "Position of image in list"
-            type:
-                type: "String"
-                description: "Image type"
-            sizes:
-                type: "[ImageSize!]!"
-
-ImageSize:
-    type: object
-    config:
-        description: "Represents a single image size"
-        fields:
-            size:
-                type: "String!"
-                description: "Image size defined in images.yaml"
-            url:
-                type: "String!"
-                description: "URL address of image"
-            width:
-                type: "Int"
-                description: "Width in pixels defined in images.yaml"
-            height:
-                type: "Int"
-                description: "Height in pixels defined in images.yaml"
-            additionalSizes:
-                type: "[AdditionalSize!]!"
-                description: "Additional sizes for different screen types"
-
-AdditionalSize:
-    type: object
-    config:
-        description: "Represents a singe additional image size"
-        fields:
-            url:
-                type: "String!"
-                description: "URL address of image"
-            width:
-                type: "Int"
-                description: "Width in pixels defined in images.yaml"
-            height:
-                type: "Int"
-                description: "Height in pixels defined in images.yaml"
-            media:
-                type: "String!"
-                description: "Recommended media query defined in images.yaml"
+    inherits:
+        - 'ImageDecorator'
diff --git a/app/config/graphql/types/ModelType/NotificationBar/NotificationBar.types.yaml b/app/config/graphql/types/ModelType/NotificationBar/NotificationBar.types.yaml
@@ -12,22 +12,16 @@ NotificationBar:
             images:
                 type: "[Image!]!"
                 description: "Notification bar images"
-                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             mainImage:
                 type: "Image"
                 description: "Notification bar image by params"
-                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
diff --git a/app/config/graphql/types/ModelType/Payment/Payment.types.yaml b/app/config/graphql/types/ModelType/Payment/Payment.types.yaml
@@ -21,22 +21,16 @@ Payment:
             images:
                 type: "[Image!]!"
                 description: "Payment images"
-                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             mainImage:
                 type: "Image"
                 description: "Payment image by params"
-                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
diff --git a/app/config/graphql/types/ModelType/Product/Brand/Brand.types.yaml b/app/config/graphql/types/ModelType/Product/Brand/Brand.types.yaml
@@ -14,25 +14,19 @@ Brand:
             images:
                 type: "[Image!]!"
                 description: "Brand images"
-                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             mainImage:
                 type: "Image"
                 description: "Brand image by params"
-                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
             slug:
                 type: "String!"
                 description: "Brand URL slug"

diff --git a/app/config/graphql/types/ModelType/Product/Product.types.yaml b/app/config/graphql/types/ModelType/Product/Product.types.yaml
@@ -60,14 +60,11 @@ Product:
             images:
                 type: "[Image!]!"
                 description: "Product images"
-                resolve: '@=query("imagesByProductPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByProductPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             price:
                 type: "ProductPrice!"
                 description: "Product price"
@@ -79,14 +76,11 @@ Product:
             mainImage:
                 type: "Image"
                 description: "Product image by params"
-                resolve: '@=query("mainImageByProductPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByProductPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
             isMainVariant:
                 type: "Boolean!"
             productVideos:

diff --git a/app/config/graphql/types/ModelType/SeoPage/SeoPage.types.yaml b/app/config/graphql/types/ModelType/SeoPage/SeoPage.types.yaml
@@ -21,8 +21,4 @@ SeoPage:
             ogImage:
                 type: "Image"
                 description: "Image for og image meta tag by params"
-                resolve: '@=query("ogImageBySeoPageQuery", value, args["size"])'
-                args:
-                    size:
-                        type: "String"
-                        defaultValue: null
+                resolve: '@=query("ogImageBySeoPageQuery", value)'
diff --git a/app/config/graphql/types/ModelType/Slider/SliderItem.types.yaml b/app/config/graphql/types/ModelType/Slider/SliderItem.types.yaml
@@ -26,22 +26,16 @@ SliderItem:
             images:
                 type: "[Image!]!"
                 description: "Slider item images"
-                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             mainImage:
                 type: "Image"
                 description: "Slider item image by params"
-                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
diff --git a/app/config/graphql/types/ModelType/Store/Store.types.yaml b/app/config/graphql/types/ModelType/Store/Store.types.yaml
@@ -54,11 +54,8 @@ Store:
             images:
                 type: "[Image!]!"
                 description: "Store images"
-                resolve: '@=query("imagesByStorePromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByStorePromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
diff --git a/app/config/graphql/types/ModelType/Transport/Transport.types.yaml b/app/config/graphql/types/ModelType/Transport/Transport.types.yaml
@@ -25,25 +25,19 @@ Transport:
             images:
                 type: "[Image!]!"
                 description: "Transport images"
-                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"], args["sizes"])'
+                resolve: '@=query("imagesByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    sizes:
-                        type: "[String!]"
-                        defaultValue: null
             mainImage:
                 type: "Image"
                 description: "Transport image by params"
-                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"], args["size"])'
+                resolve: '@=query("mainImageByEntityPromiseQuery", value, args["type"])'
                 args:
                     type:
                         type: "String"
                         defaultValue: null
-                    size:
-                        type: "String"
-                        defaultValue: null
             isPersonalPickup:
                 type: "Boolean!"
                 description: "Pointer telling if the transport is of type personal pickup"