Merge remote changes: Resolved conflict in 01_documentation.sql by keeping both local shell-empty docs and remote accordion component

a-gonzalo · a-gonzalo · commit e015b5d53e59 · 2025-11-29T18:01:53.000+01:00
diff --git a/examples/official-site/sqlpage/migrations/01_documentation.sql b/examples/official-site/sqlpage/migrations/01_documentation.sql
@@ -1571,4 +1571,16 @@ In this scenario, you can use the `html` property, which serves as an alias for
 This property improves code readability by clearly indicating that you are generating HTML. 
 Since SQLPage returns HTML by default, there is no need to specify the content type in the HTTP header.
 ',
-    json('[{"component":"shell-empty", "html": "<!DOCTYPE html>\n<html>\n<head>\n  <title>My page</title>\n</head>\n<body>\n  <h1>My page</h1>\n</body>\n</html>"}]'));
+    json('[{"component":"shell-empty", "html": "<!DOCTYPE html>\n<html>\n<head>\n  <title>My page</title>\n</head>\n<body>\n  <h1>My page</h1>\n</body>\n</html>"}]'));
+
+INSERT INTO component(name, icon, description) VALUES
+    ('accordion', 'sort-ascending', 'An accordion based list of elements which can be shown individually.');
+INSERT INTO parameter(component, name, description, type, top_level, optional) SELECT 'accordion', * FROM (VALUES
+    -- top level
+    ('id', 'id attribute added to the container in HTML. It can be used to target this item through css or for scrolling to this item through links (use "#id" in link url).', 'TEXT', TRUE, TRUE),
+    -- item level
+    ('title', 'Name of the list item, displayed prominently.', 'TEXT', FALSE, FALSE),
+    ('contents_md', 'A description of the list item, displayed as greyed-out text.', 'TEXT', FALSE, FALSE)
+) x;
+INSERT INTO example(component, description, properties) VALUES
+    ('accordion', 'A basic accordion with Markdown', json('[{"component":"accordion"},{"title":"Beautiful","contents_md": "Lorem *ipsum* dolor sit amet, **consectetur** adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam."},{"title":"Useful","contents_md": "Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis *ipsum*. Praesent **mauris**. Fusce nec tellus sed augue semper porta."},{"title":"Compact","contents_md": "Mauris **ipsum**. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, *nibh*. Quisque volutpat condimentum velit."}]'));
diff --git a/sqlpage/templates/accordion.handlebars b/sqlpage/templates/accordion.handlebars
@@ -0,0 +1,18 @@
+<div class="accordion" id="{{default accordion_id 'accordion_default'}}">
+    {{#each_row}}
+    <div class="accordion-item">
+        <h2 class="accordion-header" id="heading-{{@row_index}}">
+            <button class="accordion-button" type="button" data-bs-toggle="collapse"
+                data-bs-target="#collapse-{{@row_index}}" aria-controls="collapse-{{@index}}">
+                {{title}}
+            </button>
+        </h2>
+        <div id="collapse-{{@row_index}}" class="accordion-collapse collapse {{#if (eq @row_index 0)}}show{{/if}}"
+            aria-labelledby="heading-{{@row_index}}" data-bs-parent="#{{default accordion_id 'accordion_default'}}">
+            <div class="accordion-body">
+                {{{markdown contents_md}}}
+            </div>
+        </div>
+    </div>
+    {{/each_row}}
+</div>
