Skip to content

Add a two-player bargain template #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Add a two-player bargain template #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3591fa0
add new bargain template
KeHang-Zhu Oct 27, 2025
c037732
fix the mug in turn making
KeHang-Zhu Oct 29, 2025
474c32e
fix the validatiom
KeHang-Zhu Nov 4, 2025
78cfe93
Add bargain game: payout calculation, UI fixes, validation, and type …
KeHang-Zhu Nov 4, 2025
5496108
revert some changes
KeHang-Zhu Nov 4, 2025
a383f82
edit according to Viv
KeHang-Zhu Nov 7, 2025
0ad9e64
add randomization for each cohort
KeHang-Zhu Nov 7, 2025
1608e72
add a new start game button
KeHang-Zhu Nov 14, 2025
2e902c9
address issues in bargain.utils.ts
KeHang-Zhu Dec 3, 2025
c9f5202
address other issues in bargain.utils.ts
KeHang-Zhu Dec 3, 2025
e4e83ef
address issues in payout_summary.ts
KeHang-Zhu Dec 3, 2025
f58a427
address issues in participant.triggers.ts, cleaned up unused trigger
KeHang-Zhu Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
node_modules/

# Packed shared utils package
*deliberation-lab-utils-*.tgz
*deliberation-lab-utils-*.tgz
Copy link
Collaborator

@vivtsai vivtsai Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't add extra blank lines here



36 changes: 21 additions & 15 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions frontend/src/components/experiment_builder/experiment_builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import '../../pair-components/icon_button';
import '../../pair-components/tooltip';
import '../experimenter/experimenter_data_editor';
import '../stages/asset_allocation_editor';
import '../stages/bargain_editor';
import '../stages/base_stage_editor';
import '../stages/comprehension_editor';
import '../stages/group_chat_editor';
Expand Down Expand Up @@ -695,6 +696,13 @@ export class ExperimentBuilder extends MobxLitElement {
<transfer-editor .stage=${stage}></transfer-editor>
</base-stage-editor>
`;
case StageKind.BARGAIN:
return html`
<base-stage-editor .stage=${stage}>
<div slot="title">Bargain settings</div>
<bargain-editor .stage=${stage}></bargain-editor>
</base-stage-editor>
`;
default:
return html` Stage editor not found. `;
}
Expand Down
20 changes: 19 additions & 1 deletion frontend/src/components/experiment_builder/stage_builder_dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ import {
POLICY_METADATA,
getPolicyExperimentTemplate,
} from '../../shared/templates/policy';
import {
getBargainMetadata,
getBargainStageConfigs,
} from '../../shared/templates/bargain';

import {styles} from './stage_builder_dialog.scss';

Expand Down Expand Up @@ -173,7 +177,8 @@ export class StageBuilderDialog extends MobxLitElement {
<div class="card-gallery-wrapper">
${this.renderLASCard()} ${this.renderLASCard(true)}
${this.renderRealityTVCard()} ${this.renderChipNegotiationCard()}
${this.renderSalespersonGameCard()} ${this.renderFlipCardTemplateCard()}
${this.renderBargainCard()} ${this.renderSalespersonGameCard()}
${this.renderFlipCardTemplateCard()}
${this.renderFruitTestTemplateCard()} ${this.renderStockInfoGameCard()}
${this.renderAssetAllocationTemplateCard()}
${this.renderConditionalSurveyTemplateCard()}
Expand Down Expand Up @@ -292,6 +297,19 @@ export class StageBuilderDialog extends MobxLitElement {
`;
}

private renderBargainCard() {
const addGame = () => {
this.addGame(getBargainMetadata(), getBargainStageConfigs());
};

return html`
<div class="card" @click=${addGame}>
<div class="title">${getBargainMetadata().name}</div>
<div>${getBargainMetadata().description}</div>
</div>
`;
}

private renderSalespersonGameCard() {
const addGame = () => {
this.addGame(SALESPERSON_GAME_METADATA, getSalespersonStageConfigs());
Expand Down
6 changes: 6 additions & 0 deletions frontend/src/components/participant_view/participant_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import '../progress/progress_stage_waiting';
import '../stages/group_chat_participant_view';
import '../stages/private_chat_participant_view';
import '../stages/chip_participant_view';
import '../stages/bargain_participant_view';
import '../stages/comprehension_participant_view';
import '../stages/flipcard_participant_view';
import '../stages/ranking_participant_view';
Expand Down Expand Up @@ -242,6 +243,11 @@ export class ParticipantView extends MobxLitElement {
<chip-participant-view .stage=${stage} .answer=${answer}>
</chip-participant-view>
`;
case StageKind.BARGAIN:
return html`
<bargain-participant-view .stage=${stage} .answer=${answer}>
</bargain-participant-view>
`;
case StageKind.COMPREHENSION:
return html`
<comprehension-participant-view .stage=${stage}>
Expand Down
Loading