collavre 0.1.1 → 0.2.0

data/lib/collavre/engine.rb

@@ -41,12 +41,6 @@ module Collavre
       end
     end
 
-    # Add engine locales to I18n load path
-    # Host app can override these translations by defining the same keys
-    initializer "collavre.i18n" do |app|
-      config.i18n.load_path += Dir[root.join("config/locales/**/*.yml")]
-    end
-
     # Allow engine controllers to fall back to host app views during migration
     # This enables gradual view migration - views can stay in host app until moved to engine
     initializer "collavre.view_paths" do
@@ -73,5 +67,176 @@ module Collavre
         end
       end
     end
+
+    # Reset navigation registry before any registrations (runs first)
+    initializer "collavre.navigation_reset" do
+      ActiveSupport::Reloader.to_prepare(prepend: true) do
+        Navigation::Registry.instance.reset!
+      end
+    end
+
+    # Register core navigation items
+    # Host app or other engines can add/modify items in their own initializers
+    initializer "collavre.navigation", after: "collavre.navigation_reset" do
+      Rails.application.config.to_prepare do
+        # ============================================
+        # Search Section
+        # ============================================
+        Navigation::Registry.instance.register(
+          key: :search,
+          label: "app.search_placeholder",
+          section: :search,
+          type: :partial,
+          partial: "collavre/shared/navigation/search_form",
+          priority: 10
+        )
+
+        # ============================================
+        # Main Section - Mobile Only
+        # ============================================
+        Navigation::Registry.instance.register(
+          key: :mobile_plans,
+          label: "app.plans",
+          type: :partial,
+          partial: "collavre/shared/navigation/mobile_plans_button",
+          priority: 100,
+          requires_auth: true,
+          desktop: false,
+          mobile: true
+        )
+
+        # ============================================
+        # Main Section - Desktop Navigation
+        # ============================================
+        Navigation::Registry.instance.register(
+          key: :home,
+          label: "app.home",
+          type: :button,
+          path: -> { main_app.root_path },
+          priority: 110
+        )
+
+        Navigation::Registry.instance.register(
+          key: :plans,
+          label: "app.plans",
+          type: :partial,
+          partial: "collavre/shared/navigation/plans_button",
+          priority: 120,
+          requires_auth: true,
+          mobile: false
+        )
+
+        Navigation::Registry.instance.register(
+          key: :progress_filter,
+          label: "",
+          type: :component,
+          component: Collavre::ProgressFilterComponent,
+          component_args: {
+            current_state: -> {
+              if params[:min_progress] == "1" && params[:max_progress] == "1"
+                :complete
+              elsif params[:min_progress] == "0" && params[:max_progress] == "0.99"
+                :incomplete
+              else
+                :all
+              end
+            },
+            states: [
+              { name: -> { I18n.t("app.filter_complete") }, value: :complete },
+              { name: -> { I18n.t("app.filter_incomplete") }, value: :incomplete },
+              { name: -> { I18n.t("app.filter_all") }, value: :all }
+            ]
+          },
+          priority: 130,
+          requires_auth: true
+        )
+
+        Navigation::Registry.instance.register(
+          key: :comment_filter,
+          label: "",
+          type: :component,
+          component: Collavre::ProgressFilterComponent,
+          component_args: {
+            current_state: -> { params[:comment] == "true" ? :comment : nil },
+            states: [
+              { name: -> { I18n.t("app.filter_comments") }, value: :comment }
+            ]
+          },
+          priority: 140,
+          requires_auth: true
+        )
+
+        Navigation::Registry.instance.register(
+          key: :inbox,
+          label: "app.inbox",
+          type: :partial,
+          partial: "collavre/shared/navigation/inbox_button",
+          priority: 150,
+          requires_user: true,
+          mobile: false
+        )
+
+        Navigation::Registry.instance.register(
+          key: :mobile_inbox,
+          label: "app.inbox",
+          type: :partial,
+          partial: "collavre/shared/navigation/mobile_inbox_button",
+          priority: 155,
+          requires_user: true,
+          desktop: false,
+          mobile: true
+        )
+
+        Navigation::Registry.instance.register(
+          key: :sign_in,
+          label: "app.sign_in",
+          type: :button,
+          path: -> { Collavre::Engine.routes.url_helpers.new_session_path },
+          priority: 160,
+          visible: -> { !authenticated? }
+        )
+
+        Navigation::Registry.instance.register(
+          key: :help,
+          label: "?",
+          type: :partial,
+          partial: "collavre/shared/navigation/help_button",
+          priority: 170
+        )
+
+        # ============================================
+        # User Section
+        # ============================================
+        Navigation::Registry.instance.register(
+          key: :user_menu,
+          label: "",
+          section: :user,
+          type: :raw,
+          button_content: -> { render(AvatarComponent.new(user: Current.user, size: 32, classes: "nav-avatar avatar")) },
+          menu_id: "user-menu",
+          align: :right,
+          priority: 100,
+          requires_user: true,
+          children: [
+            {
+              key: :profile,
+              label: "collavre.users.profile",
+              type: :button,
+              path: -> { Collavre::Engine.routes.url_helpers.user_path(Current.user) },
+              html_class: "popup-menu-item",
+              priority: 100
+            },
+            {
+              key: :sign_out,
+              label: "app.sign_out",
+              type: :button,
+              path: -> { Collavre::Engine.routes.url_helpers.session_path },
+              method: :delete,
+              priority: 900
+            }
+          ]
+        )
+      end
+    end
   end
 end

data/lib/collavre/integration_registry.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Collavre
+  # Registry for third-party integrations (Slack, GitHub, Notion, etc.)
+  # Allows extensions to register themselves and provide UI components
+  # without modifying the core Collavre engine.
+  #
+  # @example Registering an integration
+  #   Collavre::IntegrationRegistry.register(:slack, {
+  #     label: "Slack",
+  #     icon: "slack",
+  #     description: "Sync chat messages with Slack channels",
+  #     routes: CollavreSlack::Engine.routes.url_helpers,
+  #     creative_menu_partial: "collavre_slack/integrations/creative_menu",
+  #     settings_partial: "collavre_slack/integrations/settings"
+  #   })
+  #
+  class IntegrationRegistry
+    include Singleton
+
+    def initialize
+      @integrations = {}
+      @mutex = Mutex.new
+    end
+
+    # Register a new integration
+    # @param name [Symbol] Unique identifier for the integration
+    # @param config [Hash] Configuration options
+    # @option config [String] :label Display name
+    # @option config [String] :icon Icon identifier (optional)
+    # @option config [String] :description Brief description (optional)
+    # @option config [Object] :routes Engine routes url_helpers
+    # @option config [String] :creative_menu_partial Partial for creative action menu
+    # @option config [String] :settings_partial Partial for settings page (optional)
+    # @option config [Proc] :enabled_for Lambda to check if enabled for a creative (optional)
+    def register(name, config)
+      integration = Integration.new(name, config)
+      @mutex.synchronize do
+        @integrations[name.to_sym] = integration
+      end
+      Rails.logger.info("[Collavre] Integration registered: #{name}")
+      integration
+    end
+
+    # Unregister an integration
+    def unregister(name)
+      @mutex.synchronize do
+        @integrations.delete(name.to_sym)
+      end
+    end
+
+    # Get a specific integration by name
+    def find(name)
+      @mutex.synchronize do
+        @integrations[name.to_sym]
+      end
+    end
+
+    # Get all registered integrations
+    def all
+      @mutex.synchronize do
+        @integrations.values
+      end
+    end
+
+    # Iterate over all integrations
+    def each(&block)
+      all.each(&block)
+    end
+
+    # Check if any integrations are registered
+    def any?
+      @mutex.synchronize do
+        @integrations.any?
+      end
+    end
+
+    # Clear all integrations (useful for testing)
+    def reset!
+      @mutex.synchronize do
+        @integrations = {}
+      end
+    end
+
+    # Class methods for convenient access
+    class << self
+      delegate :register, :unregister, :find, :all, :each, :any?, :reset!, to: :instance
+    end
+  end
+
+  # Represents a registered integration
+  class Integration
+    attr_reader :name, :label, :icon, :description, :routes,
+                :creative_menu_partial, :settings_partial, :enabled_for
+
+    def initialize(name, config)
+      @name = name.to_sym
+      @label = config[:label] || name.to_s.titleize
+      @icon = config[:icon]
+      @description = config[:description]
+      @routes = config[:routes]
+      @creative_menu_partial = config[:creative_menu_partial]
+      @settings_partial = config[:settings_partial]
+      @enabled_for = config[:enabled_for] || ->(_creative) { true }
+
+      validate!
+    end
+
+    # Check if this integration is enabled for a specific creative
+    def enabled_for?(creative)
+      return true unless @enabled_for.respond_to?(:call)
+      @enabled_for.call(creative)
+    end
+
+    # Generate a path using the integration's routes
+    def path_for(method_name, **args)
+      return nil unless @routes
+      return nil unless @routes.respond_to?(method_name)
+      @routes.public_send(method_name, **args)
+    end
+
+    private
+
+    def validate!
+      raise ArgumentError, "Integration must have a :label" unless @label.present?
+      raise ArgumentError, "Integration must have a :creative_menu_partial" unless @creative_menu_partial.present?
+    end
+  end
+end

data/lib/collavre/version.rb

@@ -1,3 +1,3 @@
 module Collavre
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/collavre.rb

@@ -2,6 +2,8 @@ require "collavre/version"
 require "collavre/configuration"
 require "collavre/engine"
 require "collavre/user_extensions"
+require "collavre/integration_registry"
+require "navigation/registry"
 
 module Collavre
   class << self

data/lib/navigation/registry.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+module Navigation
+  class Registry
+    include Singleton
+
+    DEFAULT_PRIORITY = 500
+    DEFAULT_SECTION = :main
+
+    def initialize
+      @items = []
+      @mutex = Mutex.new
+    end
+
+    # Register a new navigation item or replace an existing one with the same key
+    def register(item)
+      item = normalize_item(item)
+      validate_item!(item)
+
+      @mutex.synchronize do
+        # Remove existing item with same key if present
+        @items.reject! { |i| i[:key] == item[:key] }
+        @items << item
+      end
+      item
+    end
+
+    # Remove an item by key
+    def unregister(key)
+      @mutex.synchronize do
+        @items.reject! { |i| i[:key] == key.to_sym }
+      end
+    end
+
+    # Modify an existing item
+    def modify(key, **changes)
+      @mutex.synchronize do
+        item = @items.find { |i| i[:key] == key.to_sym }
+        raise ArgumentError, "Navigation item not found: #{key}" unless item
+
+        item.merge!(changes)
+      end
+    end
+
+    # Add a child item to a parent
+    def add_child(parent_key, child)
+      child = normalize_item(child)
+      validate_item!(child)
+
+      @mutex.synchronize do
+        parent = @items.find { |i| i[:key] == parent_key.to_sym }
+        raise ArgumentError, "Parent navigation item not found: #{parent_key}" unless parent
+
+        parent[:children] ||= []
+        # Remove existing child with same key if present
+        parent[:children].reject! { |c| c[:key] == child[:key] }
+        parent[:children] << child
+        parent[:children].sort_by! { |c| c[:priority] }
+      end
+      child
+    end
+
+    # Get all items for a specific section, sorted by priority
+    def items_for_section(section)
+      @mutex.synchronize do
+        @items
+          .select { |i| i[:section] == section.to_sym }
+          .sort_by { |i| i[:priority] }
+      end
+    end
+
+    # Get all items, sorted by priority
+    def all
+      @mutex.synchronize do
+        @items.sort_by { |i| i[:priority] }
+      end
+    end
+
+    # Get a specific item by key
+    def find(key)
+      @mutex.synchronize do
+        @items.find { |i| i[:key] == key.to_sym }
+      end
+    end
+
+    # Clear all items (useful for testing or reloading)
+    def reset!
+      @mutex.synchronize do
+        @items = []
+      end
+    end
+
+    private
+
+    def normalize_item(item)
+      item = item.dup
+      item[:key] = item[:key]&.to_sym
+      item[:section] ||= DEFAULT_SECTION
+      item[:section] = item[:section].to_sym
+      item[:priority] ||= DEFAULT_PRIORITY
+      item[:type] ||= :button
+      item[:type] = item[:type].to_sym
+      item[:desktop] = true unless item.key?(:desktop)
+      item[:mobile] = true unless item.key?(:mobile)
+      item[:requires_auth] ||= false
+      item[:requires_user] ||= false
+      if item[:children]
+        item[:children].map! { |c| normalize_item(c) }
+        item[:children].sort_by! { |c| c[:priority] }
+      end
+      item
+    end
+
+    def validate_item!(item, parent_key: nil)
+      context = parent_key ? " (child of #{parent_key})" : ""
+      raise ArgumentError, "Navigation item must have a :key#{context}" unless item[:key]
+      raise ArgumentError, "Navigation item must have a :label#{context}" unless item[:label]
+      raise ArgumentError, "Navigation item must have a :key" unless item[:key]
+      raise ArgumentError, "Navigation item must have a :label" unless item[:label]
+
+      valid_types = %i[button link component partial divider raw popup]
+      unless valid_types.include?(item[:type])
+        raise ArgumentError, "Invalid navigation item type: #{item[:type]}#{context}. Valid types: #{valid_types.join(', ')}"
+      end
+
+      # Validate children recursively
+      item[:children]&.each { |child| validate_item!(child, parent_key: item[:key]) }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Collavre
@@ -172,8 +172,11 @@ files:
 - app/channels/collavre/comments_presence_channel.rb
 - app/channels/collavre/slide_view_channel.rb
 - app/channels/collavre/topics_channel.rb
+- app/components/collavre/autocomplete_popup_component.html.erb
+- app/components/collavre/autocomplete_popup_component.rb
 - app/components/collavre/avatar_component.html.erb
 - app/components/collavre/avatar_component.rb
+- app/components/collavre/command_menu_component.rb
 - app/components/collavre/inbox/badge_component.html.erb
 - app/components/collavre/inbox/badge_component.rb
 - app/components/collavre/plans_timeline_component.html.erb
@@ -182,7 +185,6 @@ files:
 - app/components/collavre/popup_menu_component.rb
 - app/components/collavre/progress_filter_component.html.erb
 - app/components/collavre/progress_filter_component.rb
-- app/components/collavre/user_mention_menu_component.html.erb
 - app/components/collavre/user_mention_menu_component.rb
 - app/controllers/collavre/application_controller.rb
 - app/controllers/collavre/attachments_controller.rb
@@ -204,13 +206,14 @@ files:
 - app/controllers/collavre/google_auth_controller.rb
 - app/controllers/collavre/inbox_items_controller.rb
 - app/controllers/collavre/invites_controller.rb
-- app/controllers/collavre/notion_auth_controller.rb
 - app/controllers/collavre/passwords_controller.rb
 - app/controllers/collavre/plans_controller.rb
 - app/controllers/collavre/sessions_controller.rb
 - app/controllers/collavre/topics_controller.rb
 - app/controllers/collavre/user_themes_controller.rb
 - app/controllers/collavre/users_controller.rb
+- app/errors/collavre/approval_pending_error.rb
+- app/errors/collavre/cancelled_error.rb
 - app/helpers/collavre/application_helper.rb
 - app/helpers/collavre/comments_helper.rb
 - app/helpers/collavre/creatives_helper.rb
@@ -271,7 +274,10 @@ files:
 - app/javascript/lib/responsive_images.js
 - app/javascript/lib/turbo_stream_actions.js
 - app/javascript/lib/utils/markdown.js
+- app/javascript/modules/__tests__/creative_progress.test.js
+- app/javascript/modules/command_menu.js
 - app/javascript/modules/creative_guide.js
+- app/javascript/modules/creative_progress.js
 - app/javascript/modules/creative_row_editor.js
 - app/javascript/modules/creative_row_swipe.js
 - app/javascript/modules/creatives.js
@@ -290,8 +296,6 @@ files:
 - app/javascript/utils/clipboard.js
 - app/jobs/collavre/ai_agent_job.rb
 - app/jobs/collavre/inbox_summary_job.rb
-- app/jobs/collavre/notion_export_job.rb
-- app/jobs/collavre/notion_sync_job.rb
 - app/jobs/collavre/permission_cache_cleanup_job.rb
 - app/jobs/collavre/permission_cache_job.rb
 - app/jobs/collavre/push_notification_job.rb
@@ -322,9 +326,6 @@ files:
 - app/models/collavre/invitation.rb
 - app/models/collavre/label.rb
 - app/models/collavre/mcp_tool.rb
-- app/models/collavre/notion_account.rb
-- app/models/collavre/notion_block_link.rb
-- app/models/collavre/notion_page_link.rb
 - app/models/collavre/plan.rb
 - app/models/collavre/session.rb
 - app/models/collavre/system_setting.rb
@@ -374,15 +375,14 @@ files:
 - app/services/collavre/link_preview_fetcher.rb
 - app/services/collavre/markdown_importer.rb
 - app/services/collavre/mcp_service.rb
-- app/services/collavre/notion_client.rb
-- app/services/collavre/notion_creative_exporter.rb
-- app/services/collavre/notion_service.rb
 - app/services/collavre/ppt_importer.rb
 - app/services/collavre/ruby_llm_interaction_logger.rb
 - app/services/collavre/system_events/context_builder.rb
 - app/services/collavre/system_events/dispatcher.rb
 - app/services/collavre/system_events/router.rb
+- app/services/collavre/tools/creative_create_service.rb
 - app/services/collavre/tools/creative_retrieval_service.rb
+- app/services/collavre/tools/creative_update_service.rb
 - app/views/admin/shared/_tabs.html.erb
 - app/views/collavre/comments/_activity_log_details.html.erb
 - app/views/collavre/comments/_comment.html.erb
@@ -391,13 +391,16 @@ files:
 - app/views/collavre/comments/_presence_avatars.html.erb
 - app/views/collavre/comments/_reaction_picker.html.erb
 - app/views/collavre/comments/_read_receipts.html.erb
+- app/views/collavre/comments/fullscreen.html.erb
 - app/views/collavre/creatives/_add_button.html.erb
 - app/views/collavre/creatives/_delete_button.html.erb
 - app/views/collavre/creatives/_github_integration_modal.html.erb
 - app/views/collavre/creatives/_import_upload_zone.html.erb
 - app/views/collavre/creatives/_inline_edit_form.html.erb
+- app/views/collavre/creatives/_integration_modals.html.erb
+- app/views/collavre/creatives/_integration_triggers.html.erb
+- app/views/collavre/creatives/_integrations_menu.html.erb
 - app/views/collavre/creatives/_mobile_actions_menu.html.erb
-- app/views/collavre/creatives/_notion_integration_modal.html.erb
 - app/views/collavre/creatives/_set_plan_modal.html.erb
 - app/views/collavre/creatives/_share_button.html.erb
 - app/views/collavre/creatives/edit.html.erb
@@ -446,7 +449,10 @@ files:
 - app/views/collavre/users/passkeys.html.erb
 - app/views/collavre/users/show.html.erb
 - app/views/inbox/badge_component/_count.html.erb
+- app/views/layouts/collavre/chat.html.erb
 - app/views/layouts/collavre/slide.html.erb
+- config/locales/ai_agent.en.yml
+- config/locales/ai_agent.ko.yml
 - config/locales/comments.en.yml
 - config/locales/comments.ko.yml
 - config/locales/contacts.en.yml
@@ -464,13 +470,10 @@ files:
 - config/locales/users.en.yml
 - config/locales/users.ko.yml
 - config/routes.rb
-- db/migrate/20241201000000_create_notion_integrations.rb
 - db/migrate/20250128110017_create_creatives.rb
 - db/migrate/20250128120122_create_users.rb
 - db/migrate/20250128120123_create_sessions.rb
 - db/migrate/20250128123633_create_subscribers.rb
-- db/migrate/20250312000000_create_notion_block_links.rb
-- db/migrate/20250312010000_allow_multiple_notion_blocks_per_creative.rb
 - db/migrate/20250522115048_remove_name_from_creatives.rb
 - db/migrate/20250522190651_add_parent_id_to_creatives.rb
 - db/migrate/20250523133100_rename_inventory_count_to_progress.rb
@@ -557,13 +560,17 @@ files:
 - db/migrate/20260120045354_encrypt_oauth_tokens.rb
 - db/migrate/20260120162259_remove_fk_from_creative_shares_caches.rb
 - db/migrate/20260120163856_remove_timestamps_from_creative_shares_caches.rb
+- db/migrate/20260131100000_migrate_active_storage_attachment_record_types.rb
+- db/migrate/20260201100000_make_google_event_id_nullable.rb
 - lib/collavre.rb
 - lib/collavre/configuration.rb
 - lib/collavre/engine.rb
+- lib/collavre/integration_registry.rb
 - lib/collavre/user_extensions.rb
 - lib/collavre/version.rb
 - lib/generators/collavre/install/install_generator.rb
 - lib/generators/collavre/install/templates/build.cjs.tt
+- lib/navigation/registry.rb
 - lib/tasks/collavre_assets.rake
 homepage: https://collavre.com
 licenses:

data/app/components/collavre/user_mention_menu_component.html.erb

@@ -1,3 +0,0 @@
-<div id="<%= menu_id %>" class="mention-popup common-popup" style="display:none;">
-  <ul class="mention-results common-popup-list" data-popup-list></ul>
-</div>

data/app/controllers/collavre/notion_auth_controller.rb

@@ -1,25 +0,0 @@
-module Collavre
-  class NotionAuthController < ApplicationController
-    allow_unauthenticated_access only: :callback
-    before_action -> { enforce_auth_provider!(:notion) }, only: :callback
-
-    def callback
-      auth = request.env["omniauth.auth"]
-      notion = Collavre::NotionAccount.find_or_initialize_by(notion_uid: auth.uid)
-
-      if notion.new_record?
-        unless Current.user
-          redirect_to collavre.new_session_path, alert: I18n.t("collavre.notion_auth.login_first")
-          return
-        end
-        notion.user = Current.user
-      end
-
-      notion.token = auth.credentials.token
-      notion.workspace_name = auth.info.name
-      notion.save!
-
-      redirect_to creatives_path, notice: I18n.t("collavre.notion_auth.connected")
-    end
-  end
-end

data/app/jobs/collavre/notion_export_job.rb

@@ -1,30 +0,0 @@
-module Collavre
-class NotionExportJob < ApplicationJob
-  queue_as :default
-
-  def perform(creative, notion_account, parent_page_id = nil)
-    service = NotionService.new(user: notion_account.user)
-
-    begin
-      # Export the creative tree to Notion
-      link = service.sync_creative(creative, parent_page_id: parent_page_id)
-
-      Rails.logger.info("Successfully exported creative #{creative.id} to Notion page #{link.page_id}")
-
-      # You could add broadcast/notification logic here if needed
-      # ActionCable.server.broadcast("user_#{notion_account.user.id}", {
-      #   type: 'notion_export_complete',
-      #   creative_id: creative.id,
-      #   page_url: link.page_url
-      # })
-
-    rescue NotionError => e
-      Rails.logger.error("Notion export failed for creative #{creative.id}: #{e.message}")
-      raise e
-    rescue StandardError => e
-      Rails.logger.error("Unexpected error during Notion export for creative #{creative.id}: #{e.message}")
-      raise e
-    end
-  end
-end
-end