solara 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b672162bbb4a247a016626afacc37b2deaab1dbde0c2f86e30a4ceedeb8a635d
-  data.tar.gz: a0e53ed9ce61d791a50df3c292b1c096414903e7c573164e7553089048f289cc
+  metadata.gz: acd7dd411828a00b018a7ead20fc5f21853c45682a7b21f419377385b7e5cbb4
+  data.tar.gz: 187461f358743a466bcd31971622a32091fc4368264f51f73c7ef73b048ae6c3
 SHA512:
-  metadata.gz: a22345201f6d5756cc2a54702dc8a0db0806d4fd1fd47f9f85dfde81545368908d22408345dae944bc004c4fe3507ceef563e6044cf7a90daad5a157efb1295f
-  data.tar.gz: be3473d1802240cf75b4f934561e22302cbf93dee710dead6c0439b474e3b7c16ca858f3b647e480e04a493622ce9b8da488135179bca97caa808feedd1b2b18
+  metadata.gz: f3e85254b364be2888f9e9a760967bf64e4672df8ae4dde907b6f8a8928afa7266ad9a26f1ff35867ae8b7fb2fc362aa0be6f6a70c7aafb3b29e83fa2c456e72
+  data.tar.gz: ee5abac576555d1415bcaa33cec324bf21dcf0519b28eefc1687b6b129b6a74c1f160eb5f2b30f3037facda8ca163e0867c4a7acd8ecdfe2ef2ab88fcf84e330

data/solara/lib/core/brands/brand_onboarder.rb

@@ -12,7 +12,7 @@ class BrandOnboarder
     end
 
     def onboard
-        if @clone_brand_key.nil? || @clone_brand_key.empty?
+        if @clone_brand_key.nil? || @clone_brand_key.strip.empty?
             generate_brand_template
         else
             clone_brand

data/solara/lib/core/brands/brand_switcher.rb

@@ -30,6 +30,9 @@ class BrandSwitcher
   def switch
     BrandFontSwitcher.new(@brand_key).switch
     
+    ResourceManifestSwitcher.new(@brand_key, ignore_health_check: @ignore_health_check).switch
+    JsonManifestSwitcher.new(@brand_key).switch
+
     case @platform
     when Platform::Flutter
       IOSBrandSwitcher.new(@brand_key).switch
@@ -42,6 +45,94 @@ class BrandSwitcher
     else
       raise ArgumentError, "Invalid platform: #{@platform}"
     end
+
+  end
+
+end
+
+class ResourceManifestSwitcher
+  def initialize(brand_key, ignore_health_check:)
+    @brand_key = brand_key
+    @ignore_health_check = ignore_health_check
+  end
+
+  def switch
+    Solara.logger.start_step("Process resource manifest: #{FilePath.resources_manifest}")
+    brand_resource_copier = ResourceManifestProcessor.new(@brand_key, ignore_health_check: @ignore_health_check)
+    brand_resource_copier.copy
+    Solara.logger.debug("#{@brand_key} resources copied successfully according to the manifest: #{FilePath.resources_manifest}.")
+    Solara.logger.end_step("Process resource manifest: #{FilePath.resources_manifest}")
+  end
+
+end
+
+class JsonManifestSwitcher
+  PLATFORM_CONFIGS = {
+    Platform::Flutter => {
+      language: Language::Dart,
+      output_path: :flutter_lib_artifacts
+    },
+    Platform::IOS => {
+      language: Language::Swift,
+      output_path: :ios_project_root_artifacts
+    },
+    Platform::Android => {
+      language: Language::Kotlin,
+      output_path: :android_project_java_artifacts
+    }
+  }.freeze
+
+  def initialize(brand_key)
+    @brand_key = brand_key
+    @brand_manifest_path = FilePath.brand_json_dir(brand_key)
+    @platform = SolaraSettingsManager.instance.platform
+    validate_inputs
+  end
+
+  def switch
+    with_logging do
+      process_manifests
+    end
+  end
+
+  private
+
+  def validate_inputs
+    raise ArgumentError, "Brand key cannot be nil" if @brand_key.nil?
+    raise ArgumentError, "Invalid platform: #{@platform}" unless PLATFORM_CONFIGS.key?(@platform)
+    raise ArgumentError, "Manifest path not found: #{@brand_manifest_path}" unless File.exist?(@brand_manifest_path)
+  end
+
+  def with_logging
+    log_message = "Process JSON manifest: #{@brand_manifest_path}"
+    Solara.logger.start_step(log_message)
+    yield
+    Solara.logger.end_step(log_message)
+  rescue StandardError => e
+    Solara.logger.error("Failed to process manifest: #{e.message}")
+    raise
+  end
+
+  def process_manifests
+    config = PLATFORM_CONFIGS[@platform]
+    output_path = FilePath.send(config[:output_path])
+
+    [
+      @brand_manifest_path,
+      FilePath.brand_global_json_dir
+    ].each do |manifest_path|
+      process_manifest(config[:language], manifest_path, output_path)
+    end
+  end
+
+  def process_manifest(language, manifest_path, output_path)
+    JsonManifestProcessor.new(
+      manifest_path,
+      language,
+      output_path
+    ).process
+  rescue StandardError => e
+    raise StandardError, "Failed to process #{manifest_path}: #{e.message}"
   end
 end
 
@@ -225,7 +316,7 @@ class ThemeSwitcher
   def generate_theme(name, language, platform)
     Solara.logger.start_step("Generate #{name} for #{platform}")
 
-    theme_manager = ThemeGeneratorManager.new(FilePath.brand_theme(@brand_key))
+    theme_manager = ThemeGenerator.new(FilePath.brand_theme(@brand_key))
     theme_manager.generate(language, FilePath.generated_config(name, platform))
 
     Solara.logger.end_step("Generate #{name} for #{platform}")

data/solara/lib/core/dashboard/brand/BrandDetail.js

@@ -2,6 +2,37 @@ import BrandDetailModel from './BrandDetailModel.js';
 import BrandDetailView from './BrandDetailView.js';
 import BrandDetailController from './BrandDetailController.js';
 
+const modeToggle = document.getElementById('modeToggle');
+const body = document.body;
+const icon = modeToggle.querySelector('i');
+
+function applyMode(mode) {
+    if (mode === 'dark') {
+        body.classList.add('dark-mode');
+        icon.classList.remove('fa-sun');
+        icon.classList.add('fa-moon');
+    } else {
+        body.classList.remove('dark-mode');
+        icon.classList.remove('fa-moon');
+        icon.classList.add('fa-sun');
+    }
+}
+
+const savedMode = localStorage.getItem('mode');
+if (savedMode) {
+    applyMode(savedMode);
+} else {
+    const systemPrefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    applyMode(systemPrefersDark ? 'dark' : 'light');
+}
+
+modeToggle.addEventListener('click', () => {
+    const currentMode = body.classList.contains('dark-mode') ? 'dark' : 'light';
+    const newMode = currentMode === 'dark' ? 'light' : 'dark';
+    applyMode(newMode);
+    localStorage.setItem('mode', newMode);
+});
+
 window.onload = function () {
     document.getElementById('loadingOverlay').style.display = 'none';
 };
@@ -20,10 +51,11 @@ window.addEventListener('scroll', function () {
     }
     lastScrollTop = scrollTop;
 });
-        
+
 document.addEventListener('DOMContentLoaded', async () => {
     const model = new BrandDetailModel();
     const view = new BrandDetailView(model);
     const controller = new BrandDetailController(model, view);
     await controller.initializeApp();
-});
+});
+

data/solara/lib/core/dashboard/brand/BrandDetailController.js

@@ -1,15 +1,10 @@
 import {DataSource} from './BrandDetailModel.js';
-import InfoPlistStringCatalogManager from "./InfoPlistStringCatalogManager.js";
 
 class BrandDetailController {
     constructor(model, view) {
         this.model = model;
         this.view = view;
-        this.onSectionChanged = this.onSectionChanged.bind(this);
-        this.deleteField = this.deleteField.bind(this);
         this.initializeEventListeners();
-        this.view.setOnSectionChangedHandler(this.onSectionChanged.bind(this));
-        this.view.setOnDeleteFieldHandler(this.deleteField.bind(this));
     }
 
     async initializeApp() {
@@ -80,7 +75,7 @@ class BrandDetailController {
 
     async addNewBrand() {
         this.view.showOnboardBrandForm(async (key, name) => {
-            const configurations = await this.model.createNewBrandConfogurations()
+            const configurations = await this.model.createNewBrandConfigurations()
             await this.addBrand(key, name, configurations)
         })
     }
@@ -96,11 +91,12 @@ class BrandDetailController {
             const response = await this.model.fetchBrandDetails();
             await this.onLoadSections(response.result);
             const {isCurrentBrand, contentChanged} = await this.model.fetchCurrentBrand();
+            this.model.isCurrentBrand = isCurrentBrand
 
-            if (!isCurrentBrand) {
+            if (isCurrentBrand) {
+                this.view.setupSyncBrandButton(contentChanged ? '#ff4136' : '#4A90E2');
+            } else {
                 this.view.showSwitchButton();
-            } else if (contentChanged) {
-                this.view.showApplyChangesButton();
             }
 
             await this.checkBrandHealth();
@@ -114,7 +110,7 @@ class BrandDetailController {
         try {
             this.view.addBrandOverlay.style.display = 'none'
             this.view.header.style.display = 'flex';
-            this.view.updateAppNameTitle(`${configuraationsResult.brand.key} (${configuraationsResult.brand.name})`);
+            this.view.updateAppNameTitle(`${configuraationsResult.brand.name} - ${configuraationsResult.brand.key}`);
             await this.showSections(configuraationsResult);
             this.view.showIndex();
         } catch (error) {
@@ -128,7 +124,12 @@ class BrandDetailController {
             window.location.href = `../brands/brands.html?source=${this.model.source}`;
         });
 
-        document.getElementById('applyChangesButton').addEventListener('click', () => this.switchToBrand());
+        document.getElementById('syncBrandButton').addEventListener(
+            'click',
+            async () => {
+                await this.switchToBrand()
+                await this.view.toast("Synced successfully")
+            });
         document.getElementById('switchButton').addEventListener('click', () => this.switchToBrand());
 
         this.view.exportBrandBtn.addEventListener('click', () => this.exportBrand());
@@ -141,188 +142,39 @@ class BrandDetailController {
 
             const sectionItems = configuraationsResult.configurations
 
-            for (let i = 0; i < sectionItems.length; i++) {
-                const sectionData = sectionItems[i];
-
-                if (sectionData.key === 'theme.json') {
-                    this.createThemeSections(sectionData)
-                } else if (sectionData.key === 'InfoPlist.xcstrings') {
-                    this.createSection(
-                        sectionData.key,
-                        sectionData,
-                        new InfoPlistStringCatalogManager(sectionData.content).extractLocalizations(),
-                        sectionData.name,
-                        sectionData.inputType)
-                } else {
-                    this.createSection(sectionData.key, sectionData, sectionData.content, sectionData.name, sectionData.inputType)
-                }
-            }
+            this.view.sectionsFormManager.display(
+                sectionItems,
+                (section, container) => {
+                    this.onSectionChanged(section, container)
+                })
+
         } catch (error) {
             console.error('Error loading configurations:', error);
             alert(error.message);
         }
     }
 
-    createThemeSections(sectionData) {
-        this.createSection(`${sectionData.key}_colors`,
-            sectionData,
-            sectionData.content.colors,
-            'Theme Colors',
-            'color',
-            'colors')
-        this.createSection(`${sectionData.key}_typography`,
-            sectionData,
-            sectionData.content.typography,
-            'Theme Typography',
-            'text',
-            'typography')
-        this.createSection(`${sectionData.key}_spacing`,
-            sectionData,
-            sectionData.content.spacing,
-            'Theme Spacing', 'text',
-            'spacing')
-        this.createSection(
-            `${sectionData.key}_borderRadius`,
-            sectionData,
-            sectionData.content.borderRadius,
-            'Theme Border Radius',
-            'text',
-            'borderRadius')
-        this.createSection(
-            `${sectionData.key}_elevation`,
-            sectionData,
-            sectionData.content.elevation,
-            'Theme Elevation',
-            'text',
-            'elevation')
-    }
-
-    createSection(id, sectionData, content, sectionName, inputType, propertiesGroupName = null) {
-        const sectionElement = this.view.createSection(sectionData.key, sectionName, inputType);
-        sectionElement.id = id;
-        sectionElement.dataset.propertiesGroupName = propertiesGroupName
-
-        this.view.sectionsContainer.appendChild(sectionElement);
-
-        this.view.populateJsonFields(sectionData, sectionElement, content, inputType);
+    async onSectionChanged(section, container) {
+        if (this.model.isRemote()) return
 
-        const addButton = document.createElement('button');
-        addButton.textContent = 'Add Field';
-        addButton.className = 'add-field-btn';
-        addButton.onclick = () => this.addNewField(sectionData, sectionElement, inputType);
-        sectionElement.appendChild(addButton);
-    }
-
-    async onSectionChanged(sectionItem, sectionElement) {
         try {
-            const configuration = await this.getSectionData(sectionElement.dataset.key)
-            await this.model.saveSection(sectionItem, configuration);
-            this.view.showApplyChangesButton();
+            await this.model.saveSection(container.dataset.key, section.content);
             await this.checkBrandHealth();
+            if (this.model.isCurrentBrand) {
+                await this.switchToBrand(true)
+            }
         } catch (error) {
             console.error('Error saving section:', error);
             alert(error.message);
         }
     }
 
-    collectJsonData(container) {
-        const data = {};
-        const level = container.dataset.level
-
-        const jsonObjects = container.querySelectorAll(`.json-object-${level}`);
-        jsonObjects.forEach(jsonObject => {
-            const jsonObjectLabel = jsonObject.querySelector('label').textContent;
-            data[jsonObjectLabel] = this.collectJsonData(jsonObject);
-
-        });
-
-        const group = container.querySelectorAll(`.json-array-${level}`);
-        group.forEach(arrayItem => {
-            const label = arrayItem.querySelector('label').textContent;
-            const items = arrayItem.querySelectorAll(`.json-array-item-${level}`);
-            const indexed = arrayItem.querySelectorAll(`.json-array-item-indexed-${level}`).length !== 0;
-
-            data[label] = Array.from(items).map((item, index) => {
-                const values = this.collectJsonData(item)
-                if (indexed) {
-                    return values[index]
-                }
-                return values;
-            });
-        });
-
-        const result = this.collectJsonFields(container, level);
-
-        Object.keys(data).forEach(key => {
-            result[key] = data[key];
-        });
-        return result
-    }
-
-    collectJsonFields(container, level) {
-        const result = {};
-
-        const inputFields = container.querySelectorAll(`.json-field-${level}`);
-        inputFields.forEach(inputField => {
-            const values = this.getInputFieldsData(inputField);
-            Object.keys(values).forEach(key => {
-                result[key] = values[key];
-            });
-        })
-        return result
-    }
-
-    getInputFieldsData(container) {
-        const data = {};
-
-        const inputs = container.querySelectorAll('input');
-        inputs.forEach(input => {
-            if (input.type === 'checkbox') {
-                data[input.id] = input.checked;
-            } else {
-                let value = input.value;
-                if (input.type === 'color') {
-                    value = `#${value.substring(1).toUpperCase()}`;
-                } else if (!isNaN(value) && value.trim() !== '') {
-                    // Convert to number if it's a valid number string
-                    value = parseFloat(value);
-                }
-                data[input.id] = value;
-            }
-        });
-
-        return data;
-    }
-
-    addNewField(sectionItem, sectionElement, inputType) {
-        this.view.showAddFieldForm(sectionItem, sectionElement, inputType);
-    }
-
-    deleteField(sectionItem, fieldContainer) {
-        this.view.showConfirmationDialog(
-            'Are you sure you want to delete this item?',
-            () => {
-                const sectionElement = fieldContainer.closest('.section');
-                fieldContainer.remove();
-                this.onSectionChanged(sectionItem, sectionElement);
-            }
-        );
-    }
-
-    getArrayValue(container) {
-        const arrayItems = container.querySelectorAll('.array-item-input');
-        return Array.from(arrayItems).map(item => item.value);
-    }
-
-    async switchToBrand() {
+    async switchToBrand(silentError = false) {
         try {
             await this.model.switchToBrand();
-            const applyChangesButton = document.getElementById('applyChangesButton');
-            applyChangesButton.style.display = 'none';
-            location.reload();
         } catch (error) {
             console.error('Error switching to brand:', error);
-            alert(error.message);
+            if (!silentError) alert(error.message);
         }
     }
 
@@ -350,72 +202,13 @@ class BrandDetailController {
         }
     }
 
-    async getSectionData(sectionKey) {
-        try {
-            const container = this.view.sectionsContainer;
-
-            const sectionElements = Array.from(container.querySelectorAll('.section'))
-                .filter(element => element.dataset.key === sectionKey);
-
-            if (sectionElements.length === 1) {
-                return this.collectJsonData(sectionElements[0])
-            }
-
-            const configurations = sectionElements.map(sectionElement => {
-                const propertiesGroupName = sectionElement.dataset.propertiesGroupName;
-                const config = this.collectJsonData(sectionElement);
-
-                if (propertiesGroupName !== "null") {
-                    return {[propertiesGroupName]: config};
-                } else {
-                    return config;
-                }
-            });
-
-            return configurations.reduce((acc, config) => {
-                const key = Object.keys(config)[0]; // Get the key from the configuration item
-                acc[key] = config[key]; // Assign the value to the dynamic object
-                return acc;
-            }, {});
-
-        } catch (error) {
-            console.error('Error downloading brand:', error);
-            alert(error.message);
-        }
-    }
-
     async exportBrand() {
         try {
-            const sectionsContainer = this.view.sectionsContainer;
+            const result = this.view.sectionsFormManager.data();
 
             const brandKey = this.view.sectionsContainer.dataset.brandKey;
             const brandName = this.view.sectionsContainer.dataset.brandName;
 
-            const sectionElements = Array.from(sectionsContainer.querySelectorAll('.section'));
-
-            const uniqueSections = new Map();
-
-            // The theme section has been divided into multiple categories (e.g., colors, typography).
-            // In the getSectionData function, we merge these sections. To prevent duplication when
-            // processing the sections, we will ensure that each section key is processed only once.
-            await Promise.all(sectionElements.map(async sectionElement => {
-                const key = sectionElement.dataset.key;
-                // Check if the key already exists in the map
-                if (!uniqueSections.has(key)) {
-                    const configurations = await this.getSectionData(key);
-                    uniqueSections.set(
-                        key, {
-                            key: key,
-                            name: sectionElement.dataset.name,
-                            inputType: sectionElement.dataset.inputType,
-                            content: configurations
-                        });
-                }
-            }));
-
-            // Convert the map values to an array
-            const result = Array.from(uniqueSections.values());
-
             this.model.exportBrand(brandKey, brandName, result);
 
         } catch (error) {

data/solara/lib/core/dashboard/brand/BrandDetailModel.js

@@ -10,6 +10,7 @@ class BrandDetailModel {
     constructor() {
         this.localSource = new BrandLocalSource();
         this.remoteSource = new BrandRemoteSource();
+        this.isCurrentBrand = false;
 
         this.brandKey = this.getQueryFromUrl('brand_key');
 
@@ -17,6 +18,14 @@ class BrandDetailModel {
         this.source = sourceFromUrl === DataSource.LOCAL ? DataSource.LOCAL : DataSource.REMOTE;
     }
 
+    isLocal() {
+       return  this.source === DataSource.LOCAL
+    }
+
+    isRemote() {
+       return  this.source === DataSource.REMOTE
+    }
+
     getQueryFromUrl(name) {
         return this.localSource.getQueryFromUrl(name);
     }
@@ -29,10 +38,10 @@ class BrandDetailModel {
         return await this.localSource.fetchCurrentBrand(this.brandKey);
     }
 
-    async saveSection(sectionItem, configuration) {
+    async saveSection(key, configuration) {
         switch (this.source) {
             case DataSource.LOCAL:
-                return await this.localSource.saveSection(sectionItem, configuration, this.brandKey);
+                return await this.localSource.saveSection(key, configuration, this.brandKey);
             case DataSource.REMOTE:
                 // Saving is not supported remotely. Instead, user can export the brand.
                 return
@@ -48,7 +57,7 @@ class BrandDetailModel {
     async checkBrandHealth() {
         switch (this.source) {
             case DataSource.LOCAL:
-        return await this.localSource.checkBrandHealth(this.brandKey);
+                return await this.localSource.checkBrandHealth(this.brandKey);
             case DataSource.REMOTE:
                 // Checking health is not supported remotely yet.
                 return
@@ -57,8 +66,8 @@ class BrandDetailModel {
         }
     }
 
-    async createNewBrandConfogurations() {
-        return await this.remoteSource.createNewBrandConfogurations();
+    async createNewBrandConfigurations() {
+        return await this.remoteSource.createNewBrandConfigurations();
     }
 
     async createBrandConfigurationsFromDirectory(dirHandle) {