diff --git a/Gemfile.lock b/Gemfile.lock index 38e47ee..ebe174f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: 924eb6317c815c88675e65d72b4da8253bee2aae + revision: df67ed16b51eabb562a22d25778078491d815ac6 specs: merged (0.1.0) active_hash diff --git a/app/assets/images/cms/100.jpg b/app/assets/images/merged/100.jpg similarity index 100% rename from app/assets/images/cms/100.jpg rename to app/assets/images/merged/100.jpg diff --git a/app/assets/images/cms/102.jpg b/app/assets/images/merged/102.jpg similarity index 100% rename from app/assets/images/cms/102.jpg rename to app/assets/images/merged/102.jpg diff --git a/app/assets/images/cms/103.jpg b/app/assets/images/merged/103.jpg similarity index 100% rename from app/assets/images/cms/103.jpg rename to app/assets/images/merged/103.jpg diff --git a/app/assets/images/cms/110.jpg b/app/assets/images/merged/110.jpg similarity index 100% rename from app/assets/images/cms/110.jpg rename to app/assets/images/merged/110.jpg diff --git a/app/assets/images/cms/112.png b/app/assets/images/merged/112.png similarity index 100% rename from app/assets/images/cms/112.png rename to app/assets/images/merged/112.png diff --git a/app/assets/images/cms/113.jpg b/app/assets/images/merged/113.jpg similarity index 100% rename from app/assets/images/cms/113.jpg rename to app/assets/images/merged/113.jpg diff --git a/app/assets/images/cms/114.jpg b/app/assets/images/merged/114.jpg similarity index 100% rename from app/assets/images/cms/114.jpg rename to app/assets/images/merged/114.jpg diff --git a/app/assets/images/cms/115.jpg b/app/assets/images/merged/115.jpg similarity index 100% rename from app/assets/images/cms/115.jpg rename to app/assets/images/merged/115.jpg diff --git a/app/assets/images/cms/116.jpg b/app/assets/images/merged/116.jpg similarity index 100% rename from app/assets/images/cms/116.jpg rename to app/assets/images/merged/116.jpg diff --git a/app/assets/images/cms/117.jpg b/app/assets/images/merged/117.jpg similarity index 100% rename from app/assets/images/cms/117.jpg rename to app/assets/images/merged/117.jpg diff --git a/app/assets/images/cms/118.jpg b/app/assets/images/merged/118.jpg similarity index 100% rename from app/assets/images/cms/118.jpg rename to app/assets/images/merged/118.jpg diff --git a/app/assets/images/cms/12.webp b/app/assets/images/merged/12.webp similarity index 100% rename from app/assets/images/cms/12.webp rename to app/assets/images/merged/12.webp diff --git a/app/assets/images/cms/120.jpg b/app/assets/images/merged/120.jpg similarity index 100% rename from app/assets/images/cms/120.jpg rename to app/assets/images/merged/120.jpg diff --git a/app/assets/images/cms/122.jpg b/app/assets/images/merged/122.jpg similarity index 100% rename from app/assets/images/cms/122.jpg rename to app/assets/images/merged/122.jpg diff --git a/app/assets/images/cms/123.jpg b/app/assets/images/merged/123.jpg similarity index 100% rename from app/assets/images/cms/123.jpg rename to app/assets/images/merged/123.jpg diff --git a/app/assets/images/cms/124.jpg b/app/assets/images/merged/124.jpg similarity index 100% rename from app/assets/images/cms/124.jpg rename to app/assets/images/merged/124.jpg diff --git a/app/assets/images/cms/125.jpg b/app/assets/images/merged/125.jpg similarity index 100% rename from app/assets/images/cms/125.jpg rename to app/assets/images/merged/125.jpg diff --git a/app/assets/images/cms/127.jpg b/app/assets/images/merged/127.jpg similarity index 100% rename from app/assets/images/cms/127.jpg rename to app/assets/images/merged/127.jpg diff --git a/app/assets/images/cms/128.jpg b/app/assets/images/merged/128.jpg similarity index 100% rename from app/assets/images/cms/128.jpg rename to app/assets/images/merged/128.jpg diff --git a/app/assets/images/cms/129.jpg b/app/assets/images/merged/129.jpg similarity index 100% rename from app/assets/images/cms/129.jpg rename to app/assets/images/merged/129.jpg diff --git a/app/assets/images/cms/130.jpg b/app/assets/images/merged/130.jpg similarity index 100% rename from app/assets/images/cms/130.jpg rename to app/assets/images/merged/130.jpg diff --git a/app/assets/images/cms/131.jpg b/app/assets/images/merged/131.jpg similarity index 100% rename from app/assets/images/cms/131.jpg rename to app/assets/images/merged/131.jpg diff --git a/app/assets/images/cms/135.jpg b/app/assets/images/merged/135.jpg similarity index 100% rename from app/assets/images/cms/135.jpg rename to app/assets/images/merged/135.jpg diff --git a/app/assets/images/cms/136.jpg b/app/assets/images/merged/136.jpg similarity index 100% rename from app/assets/images/cms/136.jpg rename to app/assets/images/merged/136.jpg diff --git a/app/assets/images/cms/137.jpg b/app/assets/images/merged/137.jpg similarity index 100% rename from app/assets/images/cms/137.jpg rename to app/assets/images/merged/137.jpg diff --git a/app/assets/images/cms/138.jpg b/app/assets/images/merged/138.jpg similarity index 100% rename from app/assets/images/cms/138.jpg rename to app/assets/images/merged/138.jpg diff --git a/app/assets/images/cms/139.jpg b/app/assets/images/merged/139.jpg similarity index 100% rename from app/assets/images/cms/139.jpg rename to app/assets/images/merged/139.jpg diff --git a/app/assets/images/cms/140.jpg b/app/assets/images/merged/140.jpg similarity index 100% rename from app/assets/images/cms/140.jpg rename to app/assets/images/merged/140.jpg diff --git a/app/assets/images/cms/141.jpg b/app/assets/images/merged/141.jpg similarity index 100% rename from app/assets/images/cms/141.jpg rename to app/assets/images/merged/141.jpg diff --git a/app/assets/images/cms/142.jpg b/app/assets/images/merged/142.jpg similarity index 100% rename from app/assets/images/cms/142.jpg rename to app/assets/images/merged/142.jpg diff --git a/app/assets/images/cms/143.webp b/app/assets/images/merged/143.webp similarity index 100% rename from app/assets/images/cms/143.webp rename to app/assets/images/merged/143.webp diff --git a/app/assets/images/cms/19.webp b/app/assets/images/merged/19.webp similarity index 100% rename from app/assets/images/cms/19.webp rename to app/assets/images/merged/19.webp diff --git a/app/assets/images/cms/2.webp b/app/assets/images/merged/2.webp similarity index 100% rename from app/assets/images/cms/2.webp rename to app/assets/images/merged/2.webp diff --git a/app/assets/images/cms/23.png b/app/assets/images/merged/23.png similarity index 100% rename from app/assets/images/cms/23.png rename to app/assets/images/merged/23.png diff --git a/app/assets/images/cms/3.webp b/app/assets/images/merged/3.webp similarity index 100% rename from app/assets/images/cms/3.webp rename to app/assets/images/merged/3.webp diff --git a/app/assets/images/cms/42.webp b/app/assets/images/merged/42.webp similarity index 100% rename from app/assets/images/cms/42.webp rename to app/assets/images/merged/42.webp diff --git a/app/assets/images/cms/47.jpg b/app/assets/images/merged/47.jpg similarity index 100% rename from app/assets/images/cms/47.jpg rename to app/assets/images/merged/47.jpg diff --git a/app/assets/images/cms/61.png b/app/assets/images/merged/61.png similarity index 100% rename from app/assets/images/cms/61.png rename to app/assets/images/merged/61.png diff --git a/app/assets/images/cms/62.png b/app/assets/images/merged/62.png similarity index 100% rename from app/assets/images/cms/62.png rename to app/assets/images/merged/62.png diff --git a/app/assets/images/cms/63.png b/app/assets/images/merged/63.png similarity index 100% rename from app/assets/images/cms/63.png rename to app/assets/images/merged/63.png diff --git a/app/assets/images/cms/64.png b/app/assets/images/merged/64.png similarity index 100% rename from app/assets/images/cms/64.png rename to app/assets/images/merged/64.png diff --git a/app/assets/images/cms/65.png b/app/assets/images/merged/65.png similarity index 100% rename from app/assets/images/cms/65.png rename to app/assets/images/merged/65.png diff --git a/app/assets/images/cms/69.jpg b/app/assets/images/merged/69.jpg similarity index 100% rename from app/assets/images/cms/69.jpg rename to app/assets/images/merged/69.jpg diff --git a/app/assets/images/cms/70.jpg b/app/assets/images/merged/70.jpg similarity index 100% rename from app/assets/images/cms/70.jpg rename to app/assets/images/merged/70.jpg diff --git a/app/assets/images/cms/71.jpg b/app/assets/images/merged/71.jpg similarity index 100% rename from app/assets/images/cms/71.jpg rename to app/assets/images/merged/71.jpg diff --git a/app/assets/images/cms/72.jpg b/app/assets/images/merged/72.jpg similarity index 100% rename from app/assets/images/cms/72.jpg rename to app/assets/images/merged/72.jpg diff --git a/app/assets/images/cms/73.jpg b/app/assets/images/merged/73.jpg similarity index 100% rename from app/assets/images/cms/73.jpg rename to app/assets/images/merged/73.jpg diff --git a/app/assets/images/cms/74.jpg b/app/assets/images/merged/74.jpg similarity index 100% rename from app/assets/images/cms/74.jpg rename to app/assets/images/merged/74.jpg diff --git a/app/assets/images/cms/75.jpg b/app/assets/images/merged/75.jpg similarity index 100% rename from app/assets/images/cms/75.jpg rename to app/assets/images/merged/75.jpg diff --git a/app/assets/images/cms/76.jpg b/app/assets/images/merged/76.jpg similarity index 100% rename from app/assets/images/cms/76.jpg rename to app/assets/images/merged/76.jpg diff --git a/app/assets/images/cms/77.jpg b/app/assets/images/merged/77.jpg similarity index 100% rename from app/assets/images/cms/77.jpg rename to app/assets/images/merged/77.jpg diff --git a/app/assets/images/cms/78.jpg b/app/assets/images/merged/78.jpg similarity index 100% rename from app/assets/images/cms/78.jpg rename to app/assets/images/merged/78.jpg diff --git a/app/assets/images/cms/79.jpg b/app/assets/images/merged/79.jpg similarity index 100% rename from app/assets/images/cms/79.jpg rename to app/assets/images/merged/79.jpg diff --git a/app/assets/images/cms/81.png b/app/assets/images/merged/81.png similarity index 100% rename from app/assets/images/cms/81.png rename to app/assets/images/merged/81.png diff --git a/app/assets/images/cms/82.png b/app/assets/images/merged/82.png similarity index 100% rename from app/assets/images/cms/82.png rename to app/assets/images/merged/82.png diff --git a/app/assets/images/cms/83.png b/app/assets/images/merged/83.png similarity index 100% rename from app/assets/images/cms/83.png rename to app/assets/images/merged/83.png diff --git a/app/assets/images/cms/9.webp b/app/assets/images/merged/9.webp similarity index 100% rename from app/assets/images/cms/9.webp rename to app/assets/images/merged/9.webp diff --git a/app/assets/images/cms/93.webp b/app/assets/images/merged/93.webp similarity index 100% rename from app/assets/images/cms/93.webp rename to app/assets/images/merged/93.webp diff --git a/app/assets/images/cms/99.jpg b/app/assets/images/merged/99.jpg similarity index 100% rename from app/assets/images/cms/99.jpg rename to app/assets/images/merged/99.jpg diff --git a/config/initializers/merged.rb b/config/initializers/merged.rb new file mode 100644 index 0000000..b335466 --- /dev/null +++ b/config/initializers/merged.rb @@ -0,0 +1,9 @@ +require "merged" + +# directory inside /app/assets/images where the images are kept +Merged.images_dir = "merged" + +# directory where data and styles are kept +# Notice that the data is ALWAYS inside a merged directory, +# so in the default case Rails.root/merged/*.yml +Merged.data_dir = "." diff --git a/merged/card_styles.yml b/merged/card_styles.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/card_styles.yml @@ -0,0 +1 @@ +--- [] diff --git a/merged/option_definitions.yml b/merged/option_definitions.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/option_definitions.yml @@ -0,0 +1 @@ +--- [] diff --git a/merged/page_styles.yml b/merged/page_styles.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/page_styles.yml @@ -0,0 +1 @@ +--- [] diff --git a/merged/section_styles.yml b/merged/section_styles.yml new file mode 100644 index 0000000..dcd024e --- /dev/null +++ b/merged/section_styles.yml @@ -0,0 +1 @@ +--- []