solara 0.4.0 → 0.6.0

data/solara/lib/core/template/config/flutter_template_config.json

@@ -64,6 +64,41 @@
             "source": "shared/brand_config.json",
             "target": "shared/brand_config.json",
             "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "flutter/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "flutter/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "flutter/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "global/resources_manifest.json",
+            "target": "../../global/resources_manifest.json",
+            "condition": "true"
         }
     ],
     "variables": {

data/solara/lib/core/template/config/ios_template_config.json

@@ -59,6 +59,56 @@
             "source": "shared/brand_config.json",
             "target": "shared/brand_config.json",
             "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "global/resources_manifest.json",
+            "target": "../../global/resources_manifest.json",
+            "condition": "true"
         }
     ],
     "variables": {

data/solara/lib/core/template/configurations.json

@@ -0,0 +1,46 @@
+{
+    "configurations": [
+        {
+            "key": "brand_config.json",
+            "name": "Brand Configuration",
+            "filePath": "shared/brand_config.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/shared/brand_config.json"
+        },
+        {
+            "key": "theme.json",
+            "name": "Theme Configuration",
+            "filePath": "shared/theme.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/shared/theme.json"
+        },
+        {
+            "key": "android_config.json",
+            "name": "Android Configuration",
+            "filePath": "android/android_config.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/android/android_config.json"
+        },
+        {
+            "key": "android_signing.json",
+            "name": "Android Signing",
+            "filePath": "android/android_signing.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/android/android_signing.json"
+        },
+        {
+            "key": "ios_config.json",
+            "name": "iOS Configuration",
+            "filePath": "ios/ios_config.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/ios_config.json"
+        },
+        {
+            "key": "ios_signing.json",
+            "name": "iOS Signing",
+            "filePath": "ios/ios_signing.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/ios_signing.json"
+        },
+        {
+            "key": "InfoPlist.xcstrings",
+            "name": "InfoPlist.xcstrings",
+            "filePath": "ios/InfoPlist.xcstrings",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/InfoPlist.xcstrings"
+        }
+    ]
+}

data/solara/lib/core/template/project_template_generator.rb

@@ -46,6 +46,8 @@ class ProjectTemplateGenerator
       end
     else
       FileUtils.mkdir_p(File.dirname(target))
+      return if File.exist?(target)
+
       if File.exist?(source) && copy_content
         FileUtils.cp(source, target)
       else

data/solara/lib/solara/version.rb

@@ -1,3 +1,3 @@
 module Solara
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/solara/lib/solara.rb

@@ -153,6 +153,25 @@ module Solara
 
         end
 
+        desc "`sync", "Sync the changes of the current brand through switching."
+        def sync
+            check_project_health
+
+            current_brand = BrandsManager.instance.current_brand
+            unless current_brand
+                Solara.logger.fatal("Please switch a brand first in order to enable synchronization.")
+                exit 1
+            end
+            brand_key = current_brand['key']
+
+            begin
+                SolaraManager.new.switch(brand_key)
+            rescue Issue => e
+                Solara.logger.fatal("Switching to #{brand_key} failed.")
+                exit 1
+            end
+        end
+
         desc "dashboard -k YOUR_OPTIONAL_BRAND_KEY", "Open the dashboard for a brand if brank_key is provided."
         method_option :brand_key, :type => :string, :aliases => "-k"
         method_option :port, :type => :numeric, :aliases => "-p"

data/solara/lib/solara_manager.rb

@@ -32,24 +32,32 @@ class SolaraManager
     end
 
     def onboard(brand_key, brand_name, init: false, clone_brand_key: nil, open_dashboard: true, success_message: nil)
-        Solara.logger.header("Onboarding #{brand_key}")
+        begin
+            Solara.logger.header("Onboarding #{brand_key}")
 
-        if !init && BrandsManager.instance.exists(brand_key)
-            Solara.logger.fatal("Brand with key (#{brand_key}) already added to brands!")
-            return
-        end
+            if !init && BrandsManager.instance.exists(brand_key)
+                Solara.logger.fatal("Brand with key (#{brand_key}) already added to brands!")
+                return
+            end
+
+            BrandOnboarder.new(brand_key, brand_name, clone_brand_key: clone_brand_key).onboard
 
-        BrandOnboarder.new(brand_key, brand_name, clone_brand_key: clone_brand_key).onboard
+            switch(brand_key, ignore_health_check: true)
 
-        switch(brand_key, ignore_health_check: true)
 
-        clone_message = clone_brand_key.nil? || clone_brand_key.empty? ? '.' : ", cloned from #{clone_brand_key}."
-        message = success_message || "Onboarded #{brand_key} successfully#{clone_message}"
-        Solara.logger.success(message)
+            clone_message = clone_brand_key.nil? || clone_brand_key.empty? ? '.' : ", cloned from #{clone_brand_key}."
+            message = success_message || "Onboarded #{brand_key} successfully#{clone_message}"
+            Solara.logger.success(message)
 
-        if open_dashboard
-            Solara.logger.success("Openning the dashboard for #{brand_key} to complete its details.")
-            dashboard(brand_key)
+            if open_dashboard
+                Solara.logger.success("Openning the dashboard for #{brand_key} to complete its details.")
+                dashboard(brand_key)
+            end
+        rescue => e
+            # Rollback this brand
+            offboard(brand_key, confirm: false)
+            Solara.logger.debug("Performed rollback for (#{brand_key}).")
+            raise e
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solara
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Malek Kamel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-12 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -176,6 +176,7 @@ files:
 - solara/lib/core/dashboard/brand/BrandDetailModel.js
 - solara/lib/core/dashboard/brand/BrandDetailView.js
 - solara/lib/core/dashboard/brand/InfoPlistStringCatalogManager.js
+- solara/lib/core/dashboard/brand/SectionsFormManager.js
 - solara/lib/core/dashboard/brand/brand.html
 - solara/lib/core/dashboard/brand/source/BrandLocalSource.js
 - solara/lib/core/dashboard/brand/source/BrandRemoteSource.js
@@ -184,17 +185,16 @@ files:
 - solara/lib/core/dashboard/brands/BrandsModel.js
 - solara/lib/core/dashboard/brands/BrandsView.js
 - solara/lib/core/dashboard/brands/brands.html
-- solara/lib/core/dashboard/component/AddFieldSheet.js
 - solara/lib/core/dashboard/component/AliasesBottomSheet.js
 - solara/lib/core/dashboard/component/BrandOptionsBottomSheet.js
 - solara/lib/core/dashboard/component/ConfirmationDialog.js
+- solara/lib/core/dashboard/component/EditJsonSheet.js
 - solara/lib/core/dashboard/component/MessageBottomSheet.js
 - solara/lib/core/dashboard/component/OnboardBrandBottomSheet.js
 - solara/lib/core/dashboard/dashboard_manager.rb
 - solara/lib/core/dashboard/dashboard_server.rb
 - solara/lib/core/dashboard/handler/base_handler.rb
 - solara/lib/core/dashboard/handler/brand_alisases_handler.rb
-- solara/lib/core/dashboard/handler/brand_configurations_manager.rb
 - solara/lib/core/dashboard/handler/brand_details_handler.rb
 - solara/lib/core/dashboard/handler/brand_icon_handler.rb
 - solara/lib/core/dashboard/handler/brands_handler.rb
@@ -221,9 +221,11 @@ files:
 - solara/lib/core/doctor/schema/brand_configurations.json
 - solara/lib/core/doctor/schema/platform/android/android_config.json
 - solara/lib/core/doctor/schema/platform/android/android_signing.json
+- solara/lib/core/doctor/schema/platform/global/resources_manifest.json
 - solara/lib/core/doctor/schema/platform/ios/InfoPlist.xcstrings
 - solara/lib/core/doctor/schema/platform/ios/ios_config.json
 - solara/lib/core/doctor/schema/platform/ios/ios_signing.json
+- solara/lib/core/doctor/schema/platform/json_manifest.json
 - solara/lib/core/doctor/schema/platform/shared/brand_config.json
 - solara/lib/core/doctor/schema/platform/shared/theme.json
 - solara/lib/core/doctor/validator/brand_settings_validator.rb
@@ -237,6 +239,7 @@ files:
 - solara/lib/core/doctor/validator/template/template_validator.rb
 - solara/lib/core/doctor/validator/validation_strategy.rb
 - solara/lib/core/scripts/brand_config_manager.rb
+- solara/lib/core/scripts/brand_configurations_manager.rb
 - solara/lib/core/scripts/brand_exporter.rb
 - solara/lib/core/scripts/brand_importer.rb
 - solara/lib/core/scripts/brand_offboarder.rb
@@ -248,6 +251,7 @@ files:
 - solara/lib/core/scripts/folder_copier.rb
 - solara/lib/core/scripts/gitignore_manager.rb
 - solara/lib/core/scripts/interactive_file_system_validator.rb
+- solara/lib/core/scripts/json_manifest_processor.rb
 - solara/lib/core/scripts/platform/android/android_manifest_switcher.rb
 - solara/lib/core/scripts/platform/android/android_strings_switcher.rb
 - solara/lib/core/scripts/platform/android/gradle_switcher.rb
@@ -261,6 +265,7 @@ files:
 - solara/lib/core/scripts/platform/ios/xcode_project_manager.rb
 - solara/lib/core/scripts/platform/ios/xcode_project_switcher.rb
 - solara/lib/core/scripts/project_settings_manager.rb
+- solara/lib/core/scripts/resource_manifest_processor.rb
 - solara/lib/core/scripts/solara_logger.rb
 - solara/lib/core/scripts/solara_settings_manager.rb
 - solara/lib/core/scripts/solara_status_manager.rb
@@ -285,6 +290,7 @@ files:
 - solara/lib/core/template/brands/android/res/mipmap-xxxhdpi/ic_launcher_round.png
 - solara/lib/core/template/brands/android/res/values/strings.xml
 - solara/lib/core/template/brands/brands.json
+- solara/lib/core/template/brands/global/resources_manifest.json
 - solara/lib/core/template/brands/ios/InfoPlist.xcstrings
 - solara/lib/core/template/brands/ios/ios_config.json
 - solara/lib/core/template/brands/ios/ios_signing.json
@@ -324,12 +330,15 @@ files:
 - solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/88.png
 - solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/92.png
 - solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/Contents.json
+- solara/lib/core/template/brands/json/Json-Manifest.md
+- solara/lib/core/template/brands/json/json_manifest.json
 - solara/lib/core/template/brands/shared/.DS_Store
 - solara/lib/core/template/brands/shared/brand_config.json
 - solara/lib/core/template/brands/shared/theme.json
 - solara/lib/core/template/config/android_template_config.json
 - solara/lib/core/template/config/flutter_template_config.json
 - solara/lib/core/template/config/ios_template_config.json
+- solara/lib/core/template/configurations.json
 - solara/lib/core/template/project_template_generator.rb
 - solara/lib/platform_detector.rb
 - solara/lib/solara.rb

data/solara/lib/core/dashboard/component/AddFieldSheet.js

@@ -1,175 +0,0 @@
-class AddFieldSheet extends HTMLElement {
-    constructor() {
-        super();
-        this.onSubmit = null;
-        this.inputType = null;
-
-        this.attachShadow({mode: 'open'});
-        this.render();
-
-        this.addFieldSheet = this.shadowRoot.querySelector('#addFieldSheet');
-        this.overlay = this.shadowRoot.getElementById('overlay');
-
-        this.shadowRoot.querySelector('#addFieldForm').onsubmit = (e) => this.handleSubmit(e);
-        this.shadowRoot.querySelector('#colorPicker').oninput = (e) => this.updateFieldValue(e);
-        this.overlay.onclick = () => this.hideAddFieldForm();
-    }
-
-    render() {
-        this.shadowRoot.innerHTML = `
-            <style>
-    .bottom-sheet {
-        position: fixed;
-        bottom: -100%;
-        left: 0;
-        right: 0;
-        background-color: white;
-        padding: 21px;
-        box-shadow: 0 -3.5px 14px rgba(0, 0, 0, 0.2);
-        transition: bottom 0.3s ease-out;
-        z-index: 1000;
-        border-top-left-radius: 17.5px;
-        border-top-right-radius: 17.5px;
-        height: 42vh;
-        max-height: 350px;
-        overflow-y: auto;
-        max-width: 420px;
-        margin: 0 auto;
-    }
-    .bottom-sheet.show {
-        bottom: 0;
-    }
-    .bottom-sheet h3 {
-        color: var(--primary-color);
-        margin-top: 0;
-        margin-bottom: 14px;
-        font-size: 16.8px;
-    }
-    .overlay {
-        display: none;
-        position: fixed;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background: rgba(0, 0, 0, 0.5);
-        z-index: 999;
-    }
-    .show {
-        display: block;
-    }
-    .form-group {
-        margin-bottom: 14px;
-    }
-    .form-group label {
-        display: block;
-        margin-bottom: 5.6px;
-        font-weight: bold;
-        font-size: 11.2px;
-    }
-    .form-group input {
-        width: 100%;
-        padding: 8.4px;
-        border: 1px solid var(--border-color);
-        border-radius: 2.8px;
-        font-size: 11.2px;
-    }
-    .add-field-button {
-        width: 100%;
-        padding: 10.5px;
-        font-size: 12.6px;
-        background-color: var(--primary-color);
-        color: white;
-        border: none;
-        border-radius: 2.8px;
-        cursor: pointer;
-        transition: background-color 0.3s ease;
-    }
-    .add-field-button:hover {
-        background-color: #3A7BC8;
-    }
-    .color-picker-container {
-        display: none;
-        margin-top: 7px;
-    }
-    #colorPicker {
-        -webkit-appearance: none;
-        border: none;
-        width: 100%;
-        height: 42px;
-        cursor: pointer;
-        border-radius: 2.8px;
-    }
-    #colorPicker::-webkit-color-swatch {
-        border: none;
-        border-radius: 2.8px;
-    }
-</style>
-
-<div id="overlay" class="overlay"></div>
-<div class="bottom-sheet" id="addFieldSheet">
-    <h3>Add New Field</h3>
-    <form id="addFieldForm">
-        <div class="form-group">
-            <label for="fieldName">Field Name</label>
-            <input type="text" id="fieldName" name="fieldName" required>
-        </div>
-        <div class="form-group">
-            <label for="fieldValue">Field Value</label>
-            <input type="text" id="fieldValue" name="fieldValue" required>
-            <div class="color-picker-container">
-                <input type="color" id="colorPicker" name="colorPicker">
-            </div>
-        </div>
-        <button type="submit" class="add-field-button">Add Field</button>
-    </form>
-</div>
-        `;
-    }
-
-    show(inputType, onSubmit) {
-        this.onSubmit = onSubmit;
-        this.inputType = inputType;
-        const fieldName = this.shadowRoot.querySelector('#fieldName');
-        const fieldValue = this.shadowRoot.querySelector('#fieldValue');
-        const colorPickerContainer = this.shadowRoot.querySelector('.color-picker-container');
-
-        fieldName.value = '';
-        fieldValue.value = '';
-        colorPickerContainer.style.display = inputType === 'color' ? 'block' : 'none';
-
-        this.addFieldSheet.style.display = 'block';
-        this.overlay.classList.add('show');
-        setTimeout(() => this.addFieldSheet.classList.add('show'), 10);
-    }
-
-    hideAddFieldForm() {
-        this.addFieldSheet.classList.remove('show');
-        this.overlay.classList.remove('show');
-        setTimeout(() => {
-            this.addFieldSheet.style.display = 'none';
-        }, 300);
-    }
-
-    handleSubmit(e) {
-        e.preventDefault();
-        const fieldName = this.shadowRoot.querySelector('#fieldName').value;
-        let defaultValue = this.shadowRoot.querySelector('#fieldValue').value;
-
-        if (this.inputType === 'color' && !defaultValue.startsWith('#')) {
-            defaultValue = '#' + defaultValue;
-        }
-
-        if (this.onSubmit) {
-            this.onSubmit(fieldName, defaultValue);
-        }
-        this.hideAddFieldForm();
-    }
-
-    updateFieldValue(event) {
-        const fieldValue = this.shadowRoot.querySelector('#fieldValue');
-        fieldValue.value = event.target.value;
-    }
-}
-
-customElements.define('add-field-sheet', AddFieldSheet);

data/solara/lib/core/dashboard/handler/brand_configurations_manager.rb

@@ -1,73 +0,0 @@
-class BrandConfigurationsManager
-
-    def initialize(brand_key)
-        @brand_key = brand_key
-    end
-
-    def template_with_key(key)
-        templates.select { |section| section[:key] === key }.first
-    end
-
-    def templates
-        [
-            {
-                key: 'brand_config.json',
-                name: 'Brand Configuration',
-                input_type: 'text',
-                path: FilePath.brand_config(@brand_key)
-            },
-            {
-                key: 'theme.json',
-                name: 'Theme Configuration',
-                input_type: 'color',
-                path: FilePath.brand_theme(@brand_key)
-            },
-            {
-                key: 'android_config.json',
-                name: 'Android Configuration',
-                input_type: 'text',
-                path: FilePath.android_brand_config(@brand_key)
-            },
-            {
-                key: 'android_signing.json',
-                name: 'Android Signing',
-                input_type: 'text',
-                path: FilePath.brand_signing(@brand_key, Platform::Android)
-            },
-            {
-                key: 'ios_config.json',
-                name: 'iOS Configuration',
-                input_type: 'text',
-                path: FilePath.ios_config(@brand_key)
-            },
-            {
-                key: 'ios_signing.json',
-                name: 'iOS Signing',
-                input_type: 'text',
-                path: FilePath.brand_signing(@brand_key, Platform::IOS)
-            }
-        ]
-    end
-
-    def create
-        config_templates = templates
-
-        config_templates.map do |template|
-            create_config_item(
-                template[:key],
-                template[:name],
-                template[:input_type],
-                template[:path].tap { |p| File.expand_path(p) }
-            )
-        end
-    end
-
-    def create_config_item(key, name, input_type, path)
-        {
-            key: key,
-            name: name,
-            inputType: input_type,
-            content: JSON.parse(File.read(path)),
-        }
-    end
-end