<% @node.children.viewable.ordered.each do |answer_option| %>
<%= button_to answer_option.title, url_for(action: 'pick', option: answer_option.id), method: :post %>
<% end %>
diff --git a/app/views/stages/game_over.html.erb b/app/views/stages/game_over.html.erb
new file mode 100644
index 0000000..27e5bae
--- /dev/null
+++ b/app/views/stages/game_over.html.erb
@@ -0,0 +1,18 @@
+<%-
+ content_for :title, @node.page_title.blank? ? @node.title : @node.page_title
+ content_for :meta_description, @node.page_description
+
+ content_for :debug, current_player.inspect
+%>
+
+
+
+
+ <% @node.attachments.each do |attachment| %>
+ <%= attachment.body.html_safe %>
+ <% end %>
+
+
+ <%= button_to t("go_again"), go_again_path(), method: :post %>
+
+
\ No newline at end of file
diff --git a/app/views/stages/result.html.erb b/app/views/stages/result.html.erb
index 8efef99..38f76f0 100644
--- a/app/views/stages/result.html.erb
+++ b/app/views/stages/result.html.erb
@@ -12,4 +12,29 @@
<%= attachment.body.html_safe %>
<% end %>
+
+ <% case @result %>
+ <% when "best", "good" %>
+ <%= button_to t("next_stage"), url_for(action: 'next'), method: :post %>
+
+ <% when "bad" %>
+ <% if current_player.extra_lives_stage >= stage_index %>
+ <%= button_to t("use_extra_life"), url_for(action: 'next'), method: :post %>
+ <% else %>
+ <% if stage_index > 1 %>
+ <%= button_to t("get_extra_life"), url_for(action: 'get_extra_life'), method: :post %>
+ <% else %>
+ <%= button_to t("go_again"), go_again_path(), method: :post %>
+ <% end %>
+ <% end %>
+
+ <% when "bonus" %>
+ <%= button_to t("bonus"), url_for(action: 'bonus'), method: :post %>
+
+ <% when "game_over" %>
+ <%= button_to t("go_again"), go_again_path(), method: :post %>
+
+ <% end %>
+
+
\ No newline at end of file
diff --git a/config/importmap.rb b/config/importmap.rb
index 3c499f3..ad7e597 100644
--- a/config/importmap.rb
+++ b/config/importmap.rb
@@ -15,6 +15,4 @@ pin "tom-select/dist/js/tom-select.base.min.js", to: "tom-select--dist--js--tom-
# site_helper
pin "application", preload: false
pin "locale_controller", preload: false
-pin "image_controller", preload: false
-pin "quiz_preloader", preload: false
pin "plausible_controller", preload: false
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 35c13df..ccd1a88 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4,6 +4,11 @@ en:
client_name: IKEA Foundation
let_me_try: Let me try!
+ next_stage: Proceed to the next stage
+ bonus: Bonus
+ go_again: Go again
+ use_extra_life: Use extra life
+ get_extra_life: Get extra life
languages:
@@ -205,6 +210,7 @@ en:
bad: Bad
game_over: Game Over
good: Good
+ bonus: Bonus
categories:
box: Box
diff --git a/config/routes.rb b/config/routes.rb
index 5f271f5..85d1870 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -50,18 +50,26 @@ Rails.application.routes.draw do
end
scope ":locale", constraints: { locale: /en|zh|hr|cs|da|nl|fi|fr|fr-CA|de|hu|it|ja|ko|nb|pl|pt|ro|sr|sk|sl|es|sv|uk/ } do
- post "start", to: "players#create", as: "start"
+ post "start", to: "players#create", as: :start
+ post "go_again", to: "players#go_again", as: :go_again
scope "stages/:id", constraints: { id: /\d+/ } do
- get "", to: "stages#show", as: "stage"
+ get "", to: "stages#show", as: :stage
post "flip", to: "stages#flip"
get "reveal", to: "stages#reveal"
post "pick(/:option)", to: "stages#pick"
get "result", to: "stages#result"
+
+ post "next", to: "stages#next"
+ post "bonus", to: "stages#bonus"
+
+ post "get_extra_life", to: "stages#get_extra_life"
end
+ get "game_over", to: "stages#game_over"
+
get "", to: "languages#show"
# get "*url", to: "site#page", constraints: lambda { |req| req.path.exclude?("storage") }
end
diff --git a/db/migrate/20250527114853_create_players.rb b/db/migrate/20250527114853_create_players.rb
index 5d8da4a..12792f4 100644
--- a/db/migrate/20250527114853_create_players.rb
+++ b/db/migrate/20250527114853_create_players.rb
@@ -3,7 +3,9 @@ class CreatePlayers < ActiveRecord::Migration[8.1]
create_table :players do |t|
t.text :locale
t.integer :current_stage, index: true
+ t.integer :extra_lives_stage, index: true
t.jsonb :progress, default: {}
+ t.boolean :is_done, default: false, index: true
t.timestamps
end
end
diff --git a/db/migrate/20260323110134_add_missing_columns_to_players.rb b/db/migrate/20260323110134_add_missing_columns_to_players.rb
deleted file mode 100644
index fe9759b..0000000
--- a/db/migrate/20260323110134_add_missing_columns_to_players.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddMissingColumnsToPlayers < ActiveRecord::Migration[8.1]
- def change
- add_column :players, :name, :text
- add_column :players, :score, :integer
- add_column :players, :answer_cache, :integer, array: true, default: []
- add_index :players, :answer_cache, using: :gin
- add_index :players, :score
- end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 3e4b07a..533ab8a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.1].define(version: 2026_03_23_110134) do
+ActiveRecord::Schema[8.1].define(version: 2025_05_27_114853) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"
@@ -115,17 +115,16 @@ ActiveRecord::Schema[8.1].define(version: 2026_03_23_110134) do
end
create_table "players", force: :cascade do |t|
- t.integer "answer_cache", default: [], array: true
t.datetime "created_at", null: false
t.integer "current_stage"
+ t.integer "extra_lives_stage"
+ t.boolean "is_done", default: false
t.text "locale"
- t.text "name"
t.jsonb "progress", default: {}
- t.integer "score"
t.datetime "updated_at", null: false
- t.index ["answer_cache"], name: "index_players_on_answer_cache", using: :gin
t.index ["current_stage"], name: "index_players_on_current_stage"
- t.index ["score"], name: "index_players_on_score"
+ t.index ["extra_lives_stage"], name: "index_players_on_extra_lives_stage"
+ t.index ["is_done"], name: "index_players_on_is_done"
end
create_table "quiz_results", force: :cascade do |t|
diff --git a/test/models/node_whitespace_test.rb b/test/models/node_whitespace_test.rb
new file mode 100644
index 0000000..98e9483
--- /dev/null
+++ b/test/models/node_whitespace_test.rb
@@ -0,0 +1,25 @@
+require "test_helper"
+
+class NodeWhitespaceTest < ActiveSupport::TestCase
+ test "title and slug should strip whitespace" do
+ node = Node.new(
+ title_en: " English Title ",
+ slug_en: " english-slug ",
+ title_fr: " Titre Français ",
+ slug_fr: " titre-francais "
+ )
+ node.valid?
+
+ # These should be stripped after implemention
+ # assert_equal "English Title", node.title_en
+ # assert_equal "english-slug", node.slug_en
+ # assert_equal "Titre Français", node.title_fr
+ # assert_equal "titre-francais", node.slug_fr
+
+ # Current behavior (before implementation)
+ puts "Current title_en: '#{node.title_en}'"
+ puts "Current slug_en: '#{node.slug_en}'"
+ puts "Current title_fr: '#{node.title_fr}'"
+ puts "Current slug_fr: '#{node.slug_fr}'"
+ end
+end
diff --git a/vendor/javascript/@orchidjs--sifter.js b/vendor/javascript/@orchidjs--sifter.js
new file mode 100644
index 0000000..0fb4475
--- /dev/null
+++ b/vendor/javascript/@orchidjs--sifter.js
@@ -0,0 +1,17 @@
+// @orchidjs/sifter@1.1.0 downloaded from https://ga.jspm.io/npm:@orchidjs/sifter@1.1.0/dist/esm/sifter.js
+
+import{scoreValue as t,iterate as e,cmp as r,propToArray as i,getAttrNesting as n,getAttr as s}from"./utils.js";import{escape_regex as o,getPattern as c}from"@orchidjs/unicode-variants";export{getPattern}from"@orchidjs/unicode-variants";import"./types.js";class Sifter{items;settings;constructor(t,e){this.items=t;this.settings=e||{diacritics:true}}tokenize(t,e,r){if(!t||!t.length)return[];const i=[];const n=t.split(/\s+/);var s;r&&(s=new RegExp("^("+Object.keys(r).map(o).join("|")+"):(.*)$"));n.forEach((t=>{let r;let n=null;let u=null;if(s&&(r=t.match(s))){n=r[1];t=r[2]}if(t.length>0){u=this.settings.diacritics?c(t)||null:o(t);u&&e&&(u="\\b"+u)}i.push({string:t,regex:u?new RegExp(u,"iu"):null,field:n})}));return i}
+/**
+ * Returns a function to be used to score individual results.
+ *
+ * Good matches will have a higher score than poor matches.
+ * If an item is not a match, 0 will be returned by the function.
+ *
+ * @returns {T.ScoreFn}
+ */
+getScoreFunction(t,e){var r=this.prepareSearch(t,e);return this._getScoreFunction(r)}
+/**
+ * @returns {T.ScoreFn}
+ *
+ */_getScoreFunction(r){const i=r.tokens,n=i.length;if(!n)return function(){return 0};const s=r.options.fields,o=r.weights,c=s.length,u=r.getAttrFn;if(!c)return function(){return 1};const f=function(){return c===1?function(e,r){const i=s[0].field;return t(u(r,i),e,o[i]||1)}:function(r,i){var n=0;if(r.field){const e=u(i,r.field);!r.regex&&e?n+=1/c:n+=t(e,r,1)}else e(o,((e,s)=>{n+=t(u(i,s),r,e)}));return n/c}}();return n===1?function(t){return f(i[0],t)}:r.options.conjunction==="and"?function(t){var e,r=0;for(let n of i){e=f(n,t);if(e<=0)return 0;r+=e}return r/n}:function(t){var r=0;e(i,(e=>{r+=f(e,t)}));return r/n}}getSortFunction(t,e){var r=this.prepareSearch(t,e);return this._getSortFunction(r)}_getSortFunction(t){var e,i=[];const n=this,s=t.options,o=!t.query&&s.sort_empty?s.sort_empty:s.sort;if(typeof o=="function")return o.bind(this);const get_field=function(e,r){return e==="$score"?r.score:t.getAttrFn(n.items[r.id],e)};if(o)for(let e of o)(t.query||e.field!=="$score")&&i.push(e);if(t.query){e=true;for(let t of i)if(t.field==="$score"){e=false;break}e&&i.unshift({field:"$score",direction:"desc"})}else i=i.filter((t=>t.field!=="$score"));const c=i.length;return c?function(t,e){var n,s;for(let o of i){s=o.field;let i=o.direction==="desc"?-1:1;n=i*r(get_field(s,t),get_field(s,e));if(n)return n}return 0}:null}prepareSearch(t,e){const r={};var o=Object.assign({},e);i(o,"sort");i(o,"sort_empty");if(o.fields){i(o,"fields");const t=[];o.fields.forEach((e=>{typeof e=="string"&&(e={field:e,weight:1});t.push(e);r[e.field]="weight"in e?e.weight:1}));o.fields=t}return{options:o,query:t.toLowerCase().trim(),tokens:this.tokenize(t,o.respect_word_boundaries,r),total:0,items:[],weights:r,getAttrFn:o.nesting?n:s}}search(t,r){var i,n,s=this;n=this.prepareSearch(t,r);r=n.options;t=n.query;const o=r.score||s._getScoreFunction(n);t.length?e(s.items,((t,e)=>{i=o(t);(r.filter===false||i>0)&&n.items.push({score:i,id:e})})):e(s.items,((t,e)=>{n.items.push({score:1,id:e})}));const c=s._getSortFunction(n);c&&n.items.sort(c);n.total=n.items.length;typeof r.limit==="number"&&(n.items=n.items.slice(0,r.limit));return n}}export{Sifter,r as cmp,s as getAttr,n as getAttrNesting,e as iterate,i as propToArray,t as scoreValue};
+
diff --git a/vendor/javascript/@orchidjs--unicode-variants.js b/vendor/javascript/@orchidjs--unicode-variants.js
new file mode 100644
index 0000000..9b14c64
--- /dev/null
+++ b/vendor/javascript/@orchidjs--unicode-variants.js
@@ -0,0 +1,11 @@
+// @orchidjs/unicode-variants@1.1.2 downloaded from https://ga.jspm.io/npm:@orchidjs/unicode-variants@1.1.2/dist/esm/index.js
+
+import{setToPattern as t,escape_regex as e,arrayToPattern as s,sequencePattern as n}from"./regex.js";import{allSubstrings as r}from"./strings.js";const o=[[0,65535]];const l="[̀-ͯ·ʾʼ]";let a;let u;const h=3;const c={};const i={"/":"⁄∕",0:"߀",a:"ⱥɐɑ",aa:"ꜳ",ae:"æǽǣ",ao:"ꜵ",au:"ꜷ",av:"ꜹꜻ",ay:"ꜽ",b:"ƀɓƃ",c:"ꜿƈȼↄ",d:"đɗɖᴅƌꮷԁɦ",e:"ɛǝᴇɇ",f:"ꝼƒ",g:"ǥɠꞡᵹꝿɢ",h:"ħⱨⱶɥ",i:"ɨı",j:"ɉȷ",k:"ƙⱪꝁꝃꝅꞣ",l:"łƚɫⱡꝉꝇꞁɭ",m:"ɱɯϻ",n:"ꞥƞɲꞑᴎлԉ",o:"øǿɔɵꝋꝍᴑ",oe:"œ",oi:"ƣ",oo:"ꝏ",ou:"ȣ",p:"ƥᵽꝑꝓꝕρ",q:"ꝗꝙɋ",r:"ɍɽꝛꞧꞃ",s:"ßȿꞩꞅʂ",t:"ŧƭʈⱦꞇ",th:"þ",tz:"ꜩ",u:"ʉ",v:"ʋꝟʌ",vy:"ꝡ",w:"ⱳ",y:"ƴɏỿ",z:"ƶȥɀⱬꝣ",hv:"ƕ"};for(let t in i){let e=i[t]||"";for(let s=0;s
{a===void 0&&(a=generateMap(t||o))};const normalize=(t,e="NFKD")=>t.normalize(e);const asciifold=t=>Array.from(t).reduce((
+/**
+ * @param {string} result
+ * @param {string} char
+ */
+(t,e)=>t+_asciifold(e)),"");const _asciifold=t=>{t=normalize(t).toLowerCase().replace(d,(/** @type {string} */t=>c[t]||""));return normalize(t,"NFC")};function*generator(t){for(const[e,s]of t)for(let t=e;t<=s;t++){let e=String.fromCharCode(t);let s=asciifold(e);s!=e.toLowerCase()&&(s.length>h||s.length!=0&&(yield{folded:s,composed:e,code_point:t}))}}const generateSets=s=>{const n={};const addMatching=(s,r)=>{
+/** @type {Set} */
+const o=n[s]||new Set;const l=new RegExp("^"+t(o)+"$","iu");if(!r.match(l)){o.add(e(r));n[s]=o}};for(let t of generator(s)){addMatching(t.folded,t.folded);addMatching(t.folded,t.composed)}return n};const generateMap=n=>{const r=generateSets(n);const o={};let l=[];for(let s in r){let n=r[s];n&&(o[s]=t(n));s.length>1&&l.push(e(s))}l.sort(((t,e)=>e.length-t.length));const a=s(l);u=new RegExp("^"+a,"u");return o};const mapSequence=(t,e=1)=>{let s=0;t=t.map((t=>{a[t]&&(s+=t.length);return a[t]||t}));return s>=e?n(t):""};const substringsToPattern=(t,e=1)=>{e=Math.max(e,t.length-1);return s(r(t).map((t=>mapSequence(t,e))))};const sequencesToPattern=(t,e=true)=>{let r=t.length>1?1:0;return s(t.map((t=>{let s=[];const o=e?t.length():t.length()-1;for(let e=0;e{for(const s of e){if(s.start!=t.start||s.end!=t.end)continue;if(s.substrs.join("")!==t.substrs.join(""))continue;let e=t.parts;const filter=t=>{for(const s of e){if(s.start===t.start&&s.substr===t.substr)return false;if(t.length!=1&&s.length!=1){if(t.starts.start)return true;if(s.startt.start)return true}}return false};let n=s.parts.filter(filter);if(!(n.length>0))return true}return false};class Sequence{parts;substrs;start;end;constructor(){this.parts=[];this.substrs=[];this.start=0;this.end=0}add(t){if(t){this.parts.push(t);this.substrs.push(t.substr);this.start=Math.min(t.start,this.start);this.end=Math.max(t.end,this.end)}}last(){return this.parts[this.parts.length-1]}length(){return this.parts.length}clone(t,e){let s=new Sequence;let n=JSON.parse(JSON.stringify(this.parts));let r=n.pop();for(const t of n)s.add(t);let o=e.substr.substring(0,t-r.start);let l=o.length;s.add({start:r.start,end:r.start+l,length:l,substr:o});return s}}const getPattern=t=>{initialize();t=asciifold(t);let e="";let s=[new Sequence];for(let n=0;n0){h=h.sort(((t,e)=>t.length()-e.length()));for(let t of h)inSequences(t,s)||s.push(t)}else if(n>0&&c.size==1&&!c.has("3")){e+=sequencesToPattern(s,false);let t=new Sequence;const n=s[0];n&&t.add(n.last());s=[t]}}e+=sequencesToPattern(s,true);return e};export{_asciifold,asciifold,o as code_points,e as escape_regex,generateMap,generateSets,generator,getPattern,initialize,mapSequence,normalize,substringsToPattern,a as unicode_map};
+
diff --git a/vendor/javascript/tom-select.js b/vendor/javascript/tom-select.js
new file mode 100644
index 0000000..6414c54
--- /dev/null
+++ b/vendor/javascript/tom-select.js
@@ -0,0 +1,4 @@
+// tom-select@2.4.3 downloaded from https://ga.jspm.io/npm:tom-select@2.4.3/dist/esm/tom-select.complete.js
+
+import i from"./tom-select.js";import o from"./plugins/change_listener/plugin.js";import n from"./plugins/checkbox_options/plugin.js";import r from"./plugins/clear_button/plugin.js";import e from"./plugins/drag_drop/plugin.js";import p from"./plugins/dropdown_header/plugin.js";import t from"./plugins/caret_position/plugin.js";import s from"./plugins/dropdown_input/plugin.js";import l from"./plugins/input_autogrow/plugin.js";import m from"./plugins/no_backspace_delete/plugin.js";import u from"./plugins/no_active_items/plugin.js";import g from"./plugins/optgroup_columns/plugin.js";import d from"./plugins/remove_button/plugin.js";import c from"./plugins/restore_on_backspace/plugin.js";import _ from"./plugins/virtual_scroll/plugin.js";import"./contrib/microevent.js";import"./contrib/microplugin.js";import"@orchidjs/sifter";import"@orchidjs/unicode-variants";import"./contrib/highlight.js";import"./vanilla.js";import"./utils.js";import"./constants.js";import"./getSettings.js";import"./defaults.js";i.define("change_listener",o);i.define("checkbox_options",n);i.define("clear_button",r);i.define("drag_drop",e);i.define("dropdown_header",p);i.define("caret_position",t);i.define("dropdown_input",s);i.define("input_autogrow",l);i.define("no_backspace_delete",m);i.define("no_active_items",u);i.define("optgroup_columns",g);i.define("remove_button",d);i.define("restore_on_backspace",c);i.define("virtual_scroll",_);export{i as default};
+