A platform for community discussion. Free, open, simple.
FEATURE: Replace "Spread the Word" onboarding step with theme picker (#40001)
Keegan Georged844e8a95180
diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scssindex 1ce23f73ef6..e54b2b5709d 100644--- a/app/assets/stylesheets/common/components/_index.scss+++ b/app/assets/stylesheets/common/components/_index.scss@@ -61,6 +61,7 @@@import "table-layout";@import "tap-tile";@import "theme-card";+@import "theme-card-preview";@import "time-input";@import "time-shortcut-picker";@import "topic-map";diff --git a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss b/app/assets/stylesheets/common/components/admin-onboarding-banner.scssindex 1dd18cf995c..846710f9204 100644--- a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss+++ b/app/assets/stylesheets/common/components/admin-onboarding-banner.scss@@ -184,3 +184,61 @@max-width: var(--modal-max-width);}}++.theme-picker-modal {+ &__loading {+ display: flex;+ justify-content: center;+ padding: var(--space-6);+ }++ &__themes {+ display: grid;+ grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));+ gap: var(--space-4);+ }++ &__card {+ display: flex;+ flex-direction: column;+ border: 2px solid var(--content-border-color);+ border-radius: var(--d-border-radius);+ overflow: hidden;+ background: var(--secondary);++ &.--active {+ border-color: var(--tertiary);+ }+ }++ &__card > .btn {+ margin: var(--space-3) var(--space-4) var(--space-4);+ }++ &__card .theme-picker-modal__current-btn.btn {+ color: var(--tertiary);+ pointer-events: none;+ cursor: default;++ .d-icon {+ color: var(--tertiary);+ }+ }++ &__browse-all,+ &__upgrade-text {+ margin-top: var(--space-4);+ font-size: var(--font-down-1);+ color: var(--primary-medium);+ text-align: center;+ }++ &__browse-all a,+ &__upgrade-link {+ color: var(--tertiary);++ &:hover {+ color: var(--tertiary-hover);+ }+ }+}diff --git a/app/assets/stylesheets/common/components/theme-card-preview.scss b/app/assets/stylesheets/common/components/theme-card-preview.scssnew file mode 100644index 00000000000..2520662832b--- /dev/null+++ b/app/assets/stylesheets/common/components/theme-card-preview.scss@@ -0,0 +1,56 @@+.theme-card-preview {+ &__image-wrapper {+ width: 100%;+ height: 160px;+ overflow: hidden;+ display: flex;+ align-items: center;+ position: relative;+ border-bottom: 1px solid var(--content-border-color);++ svg {+ width: 100%;+ top: 0;+ left: 0;+ }++ &:hover .theme-card-preview__screenshot-toggle {+ opacity: 1;+ }+ }++ &__image {+ width: 100%;+ height: 100%;+ flex-shrink: 0;+ object-fit: cover;+ object-position: top left;+ }++ &__screenshot-toggle {+ position: absolute;+ bottom: 0.5rem;+ right: 0.5rem;+ opacity: 0;+ transition: opacity 0.2s ease-in-out;+ }++ &__content {+ padding-inline: 1rem;+ padding-top: 1rem;+ display: flex;+ flex-direction: column;+ flex-grow: 1;+ }++ &__name {+ font-size: var(--font-up-0);+ font-weight: 700;+ overflow-wrap: anywhere;+ color: var(--primary);+ }++ &__description {+ margin: 0 0 10px 0;+ }+}diff --git a/app/assets/stylesheets/common/components/theme-card.scss b/app/assets/stylesheets/common/components/theme-card.scssindex 15cccc0973c..1f2a6b42420 100644--- a/app/assets/stylesheets/common/components/theme-card.scss+++ b/app/assets/stylesheets/common/components/theme-card.scss@@ -88,43 +88,6 @@display: flex;}- &__image-wrapper {- width: 100%;- height: 160px;- overflow: hidden;- display: flex;- align-items: center;- position: relative;- border-bottom: 1px solid var(--content-border-color);- border-top-left-radius: var(--d-border-radius);- border-top-right-radius: var(--d-border-radius);-- svg {- width: 100%;- top: 0;- left: 0;- }-- &:hover .theme-card__screenshot-toggle {- opacity: 1;- }- }-- &__image {- width: 100%;- flex-shrink: 0;- object-fit: cover;- object-position: top left;- }-- &__screenshot-toggle {- position: absolute;- bottom: 0.5rem;- right: 0.5rem;- opacity: 0;- transition: opacity 0.2s ease-in-out;- }-.ember-checkbox {margin: 0 5px 0 0;}@@ -134,14 +97,6 @@font-weight: 400;}- &__content {- padding-inline: 1rem;- padding-top: 1rem;- display: flex;- flex-direction: column;- flex-grow: 1;- }-&__title {font-size: var(--font-up-0);font-weight: 700;@@ -161,10 +116,6 @@}}- &__description {- margin: 0 0 10px 0;- }-&__components {display: -webkit-box;font-size: var(--font-down-1);@@ -272,6 +223,7 @@height: 100%;display: flex;flex-direction: column;+ overflow: hidden;.admin-config-area-card__content {margin: 0;diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 4dd981eab18..429cb4f4b51 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -508,6 +508,17 @@ en:admin_onboarding_banner:launch_in_easy_steps: "Launch in %{step_count} easy steps"congrats_onboarding_complete: "Congratulations on completing the onboarding process!"+ select_theme:+ title: "Customize your site"+ description: "Choose a starting theme for your community"+ action: "Select theme"+ modal_title: "Choose a theme"+ use_theme: "Use this theme"+ currently_selected: "Currently selected"+ theme_set: "%{theme} is now your default theme"+ browse_all: "Browse all themes"+ show_light_screenshot: "Show light screenshot"+ show_dark_screenshot: "Show dark screenshot"invite_collaborators:title: "Invite Collaborators"description: "Early members help bring your community to life"@@ -536,12 +547,6 @@ en:title: "What is your favorite food?"body: "Share your favorite food with the community! I'll start: I love pizza, especially with extra cheese and pepperoni."- spread_the_word:- title: "Spread the Word!"- description: "Share a link with everyone in your network"- action: "Copy link"- copied_to_clipboard: "Link copied to clipboard!"-about:edit: "Edit this page"simple_title: "About"diff --git a/frontend/discourse/admin/components/themes-grid-card.gjs b/frontend/discourse/admin/components/themes-grid-card.gjsindex ac37dc48c5b..d29bcb36ecd 100644--- a/frontend/discourse/admin/components/themes-grid-card.gjs+++ b/frontend/discourse/admin/components/themes-grid-card.gjs@@ -4,10 +4,12 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { dasherize } from "@ember/string";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";+import ThemeCardPreview from "discourse/components/theme-card-preview";import DMenu from "discourse/float-kit/components/d-menu";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import getURL from "discourse/lib/get-url";+import { applyValueTransformer } from "discourse/lib/transformer";import DButton from "discourse/ui-kit/d-button";import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import dIcon from "discourse/ui-kit/helpers/d-icon";@@ -24,11 +26,8 @@ export default class ThemeCard extends Component {@service toasts;@service dialog;@service router;- @service interfaceColor;- @service session;@tracked isUpdating = false;- @tracked showingDarkScreenshot = this.#shouldShowDarkByDefault();get themeCardClasses() {return [@@ -39,41 +38,30 @@ export default class ThemeCard extends Component {].join(" ");}- get themeRouteModels() {- return ["themes", this.args.theme.id];- }-- get themePreviewUrl() {- return getURL(`/admin/themes/${this.args.theme.id}/preview`);+ get themeCardControls() {+ return applyValueTransformer("admin-theme-card-show-full-controls", true, {+ theme: this.args.theme,+ });}- get destroyDisabled() {- return this.args.theme.default || this.args.theme.system;+ get showControls() {+ return this.themeCardControls !== false;}- get currentScreenshotUrl() {- return this.showingDarkScreenshot- ? this.args.theme.screenshot_dark_url- : this.args.theme.screenshot_light_url;+ get showFullControls() {+ return this.themeCardControls === true;}- get screenshotToggleIcon() {- return this.showingDarkScreenshot ? "sun" : "moon";+ get themeRouteModels() {+ return ["themes", this.args.theme.id];}- get hasBothScreenshots() {- return (- this.args.theme.screenshot_light_url &&- this.args.theme.screenshot_dark_url- );+ get themePreviewUrl() {+ return getURL(`/admin/themes/${this.args.theme.id}/preview`);}- #shouldShowDarkByDefault() {- return (- this.interfaceColor.colorModeIsDark ||- window.matchMedia("(prefers-color-scheme: dark)").matches ||- this.session.defaultColorSchemeIsDark- );+ get destroyDisabled() {+ return this.args.theme.default || this.args.theme.system;}get editUrl() {@@ -172,11 +160,6 @@ export default class ThemeCard extends Component {});}- @action- toggleScreenshot() {- this.showingDarkScreenshot = !this.showingDarkScreenshot;- }-@actiondestroyTheme() {return this.dialog.deleteConfirm({@@ -208,153 +191,149 @@ export default class ThemeCard extends Component {data-theme-id={{@theme.id}}><:content>- <div class="theme-card__image-wrapper">- {{#if this.currentScreenshotUrl}}- <img- class="theme-card__image"- src={{this.currentScreenshotUrl}}- alt={{@theme.name}}- />- {{#if this.hasBothScreenshots}}- <DButton- @action={{this.toggleScreenshot}}- @icon={{this.screenshotToggleIcon}}- @preventFocus={{true}}- class="btn-flat theme-card__screenshot-toggle"- />- {{/if}}- {{else}}+ <ThemeCardPreview @theme={{@theme}}>+ <:placeholder><ThemesGridPlaceholder @theme={{@theme}} />- {{/if}}- </div>- <div class="theme-card__content">- <a class="theme-card__title" href={{this.editUrl}}>{{@theme.name}}</a>- {{#if @theme.description}}- <p class="theme-card__description">{{@theme.description}}</p>- {{/if}}- </div>- <div class="theme-card__footer">- <div class="theme-card__badges">- {{#if @theme.isPendingUpdates}}- <span- title={{i18n "admin.customize.theme.updates_available_tooltip"}}- class="theme-card__badge"- >{{dIcon "arrows-rotate"}}- {{i18n "admin.customize.theme.update_available"}}</span>- {{/if}}-- {{#if @theme.default}}- <span- class="theme-card__badge --default"- title={{i18n "admin.customize.theme.default_theme"}}- >{{dIcon "paintbrush"}}- {{i18n "admin.customize.theme.default"}}</span>- {{/if}}-- {{#if @theme.user_selectable}}- <span- title={{i18n "admin.customize.theme.user_selectable"}}- class="theme-card__badge --selectable"- >{{dIcon "user-check"}}- {{i18n- "admin.customize.theme.user_selectable_badge_label"- }}</span>- {{/if}}- </div>-- <div class="theme-card__controls">- <DButton- @translatedLabel={{i18n "admin.customize.theme.edit"}}- @route="adminCustomizeThemes.show"- @routeModels={{this.themeRouteModels}}- class="btn-default theme-card__button edit"- @preventFocus={{true}}- />-- <div class="theme-card__footer-actions">- <DMenu- @identifier="theme-card__footer-menu"- @triggerClass="theme-card__footer-menu btn-flat"- @onRegisterApi={{this.onRegisterApi}}- @modalForMobile={{true}}- @icon="ellipsis"- >- <:content>- <DDropdownMenu as |dropdown|>- {{! TODO: Jordan solutions for broken, disabled states }}- <dropdown.item>- <DButton- @action={{this.setDefault}}- @preventFocus={{true}}- @icon={{if @theme.default "star" "far-star"}}- class="theme-card__button set-default"- @translatedLabel={{i18n- (if- @theme.default- "admin.customize.theme.default_theme"- "admin.customize.theme.set_default_theme"- )- }}- @disabled={{@theme.default}}- />- </dropdown.item>- {{#if @theme.isPendingUpdates}}- <dropdown.item>- <DButton- @action={{this.updateTheme}}- @icon="cloud-arrow-down"- class="theme-card__button update"- @preventFocus={{true}}- @translatedLabel={{i18n- "admin.customize.theme.update_to_latest"- }}- />- </dropdown.item>- {{/if}}- <dropdown.item>- <DButton- @action={{this.toggleUserSelectable}}- @preventFocus={{true}}- @icon={{if- @theme.user_selectable- "user-xmark"- "user-check"- }}- class="theme-card__button set-selectable"- @translatedLabel={{i18n- (if- @theme.user_selectable- "admin.customize.theme.user_selectable_unavailable_button_label"- "admin.customize.theme.user_selectable_button_label"- )- }}- />- </dropdown.item>- <dropdown.item>- <a- href={{this.themePreviewUrl}}- title={{i18n "admin.customize.explain_preview"}}- rel="noopener noreferrer"- target="_blank"- class="btn btn-transparent theme-card__button preview"- >{{dIcon "eye"}}- {{i18n "admin.customize.theme.preview"}}</a>- </dropdown.item>- <dropdown.item>- <DButton- @action={{this.destroyTheme}}- @label="admin.customize.delete"- @icon="trash-can"- @disabled={{this.destroyDisabled}}- class="theme-card__button btn-transparent --danger delete"- />- </dropdown.item>- </DDropdownMenu>- </:content>- </DMenu>+ </:placeholder>+ <:title>+ <a+ class="theme-card__title"+ href={{this.editUrl}}+ >{{@theme.name}}</a>+ </:title>+ <:footer>+ <div class="theme-card__footer">+ <div class="theme-card__badges">+ {{#if @theme.isPendingUpdates}}+ <span+ title={{i18n+ "admin.customize.theme.updates_available_tooltip"+ }}+ class="theme-card__badge"+ >{{dIcon "arrows-rotate"}}+ {{i18n "admin.customize.theme.update_available"}}</span>+ {{/if}}++ {{#if @theme.default}}+ <span+ class="theme-card__badge --default"+ title={{i18n "admin.customize.theme.default_theme"}}+ >{{dIcon "paintbrush"}}+ {{i18n "admin.customize.theme.default"}}</span>+ {{/if}}++ {{#if @theme.user_selectable}}+ <span+ title={{i18n "admin.customize.theme.user_selectable"}}+ class="theme-card__badge --selectable"+ >{{dIcon "user-check"}}+ {{i18n+ "admin.customize.theme.user_selectable_badge_label"+ }}</span>+ {{/if}}+ </div>++ {{#if this.showControls}}+ <div class="theme-card__controls">+ {{#if this.showFullControls}}+ <DButton+ @translatedLabel={{i18n "admin.customize.theme.edit"}}+ @route="adminCustomizeThemes.show"+ @routeModels={{this.themeRouteModels}}+ class="btn-default theme-card__button edit"+ @preventFocus={{true}}+ />+ {{/if}}++ <div class="theme-card__footer-actions">+ <DMenu+ @identifier="theme-card__footer-menu"+ @triggerClass="theme-card__footer-menu btn-flat"+ @onRegisterApi={{this.onRegisterApi}}+ @modalForMobile={{true}}+ @icon="ellipsis"+ >+ <:content>+ <DDropdownMenu as |dropdown|>+ {{! TODO: Jordan solutions for broken, disabled states }}+ <dropdown.item>+ <DButton+ @action={{this.setDefault}}+ @preventFocus={{true}}+ @icon={{if @theme.default "star" "far-star"}}+ class="theme-card__button set-default"+ @translatedLabel={{i18n+ (if+ @theme.default+ "admin.customize.theme.default_theme"+ "admin.customize.theme.set_default_theme"+ )+ }}+ @disabled={{@theme.default}}+ />+ </dropdown.item>+ {{#if this.showFullControls}}+ {{#if @theme.isPendingUpdates}}+ <dropdown.item>+ <DButton+ @action={{this.updateTheme}}+ @icon="cloud-arrow-down"+ class="theme-card__button update"+ @preventFocus={{true}}+ @translatedLabel={{i18n+ "admin.customize.theme.update_to_latest"+ }}+ />+ </dropdown.item>+ {{/if}}+ <dropdown.item>+ <DButton+ @action={{this.toggleUserSelectable}}+ @preventFocus={{true}}+ @icon={{if+ @theme.user_selectable+ "user-xmark"+ "user-check"+ }}+ class="theme-card__button set-selectable"+ @translatedLabel={{i18n+ (if+ @theme.user_selectable+ "admin.customize.theme.user_selectable_unavailable_button_label"+ "admin.customize.theme.user_selectable_button_label"+ )+ }}+ />+ </dropdown.item>+ <dropdown.item>+ <a+ href={{this.themePreviewUrl}}+ title={{i18n "admin.customize.explain_preview"}}+ rel="noopener noreferrer"+ target="_blank"+ class="btn btn-transparent theme-card__button preview"+ >{{dIcon "eye"}}+ {{i18n "admin.customize.theme.preview"}}</a>+ </dropdown.item>+ <dropdown.item>+ <DButton+ @action={{this.destroyTheme}}+ @label="admin.customize.delete"+ @icon="trash-can"+ @disabled={{this.destroyDisabled}}+ class="theme-card__button btn-transparent --danger delete"+ />+ </dropdown.item>+ {{/if}}+ </DDropdownMenu>+ </:content>+ </DMenu>+ </div>+ </div>+ {{/if}}</div>- </div>- </div>+ </:footer>+ </ThemeCardPreview></:content></AdminConfigAreaCard></template>diff --git a/frontend/discourse/app/components/admin-onboarding/banner.gjs b/frontend/discourse/app/components/admin-onboarding/banner.gjsindex 703c0d62a40..e35afd126ac 100644--- a/frontend/discourse/app/components/admin-onboarding/banner.gjs+++ b/frontend/discourse/app/components/admin-onboarding/banner.gjs@@ -7,16 +7,30 @@ import { service } from "@ember/service";import SiteSetting from "discourse/admin/models/site-setting";import PredefinedTopicsOptionsModal from "discourse/components/admin-onboarding/modal/predefined-topics-options";import StartPostingOptions from "discourse/components/admin-onboarding/modal/start-posting-options";+import ThemePickerModal from "discourse/components/admin-onboarding/modal/theme-picker";import PredefinedTopicOption from "discourse/components/admin-onboarding/predefined-topics-option";import OnboardingStep from "discourse/components/admin-onboarding/step";import CreateInvite from "discourse/components/modal/create-invite";-import { getAbsoluteURL } from "discourse/lib/get-url";import { applyValueTransformer } from "discourse/lib/transformer";-import { clipboardCopy, defaultHomepage } from "discourse/lib/utilities";+import { defaultHomepage } from "discourse/lib/utilities";import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const STEPS = [+ class SelectTheme extends OnboardingStep {+ static name = "select_theme";++ @service modal;++ icon = "paintbrush";++ @action+ performAction() {+ this.modal.show(ThemePickerModal, {+ model: { onThemeSelected: () => this.markAsCompleted() },+ });+ }+ },class InviteCollaborators extends OnboardingStep {static name = "invite_collaborators";@@ -75,7 +89,7 @@ const STEPS = [}completeStep() {- this.markAsCompleted();+ return this.markAsCompleted();}showStartPostingOptions() {@@ -113,56 +127,16 @@ const STEPS = [this.showStartPostingOptions();}},- class SpreadTheWord extends OnboardingStep {- static name = "spread_the_word";- @service toasts;-- @tracked icon = "copy";-- @action- performAction() {- clipboardCopy(getAbsoluteURL("/"));-- this.toasts.success({- data: {- message: i18n(- "admin_onboarding_banner.spread_the_word.copied_to_clipboard"- ),- },- });-- this.markAsCompleted();- }- },];export default class AdminOnboardingBanner extends Component {@service currentUser;- @service appEvents;@service keyValueStore;@service router;@service toasts;@tracked dismissed = false;- constructor() {- super(...arguments);- this.appEvents.on(- "onboarding-step:completed",- this,- this.checkIfOnboardingIsComplete- );- }-- willDestroy() {- super.willDestroy(...arguments);- this.appEvents.off(- "onboarding-step:completed",- this,- this.checkIfOnboardingIsComplete- );- }-get shouldDisplay() {if (this.dismissed) {return false;@@ -176,13 +150,14 @@ export default class AdminOnboardingBanner extends Component {return currentRouteName === `discovery.${defaultHomepage()}`;}- checkIfOnboardingIsComplete() {+ @action+ async checkIfOnboardingIsComplete() {const allStepsAreDone = STEPS.every((Step) => !!this.keyValueStore.get(`onboarding_step_${Step.name}`));if (allStepsAreDone) {- this.endOnboarding({ skipped: false });+ await this.endOnboarding({ skipped: false });}}@@ -223,7 +198,7 @@ export default class AdminOnboardingBanner extends Component {<div class="admin-onboarding-banner__content"><div class="admin-onboarding-banner__steps">{{#each STEPS as |Step|}}- <Step />+ <Step @onCompleted={{this.checkIfOnboardingIsComplete}} />{{/each}}</div></div>diff --git a/frontend/discourse/app/components/admin-onboarding/modal/theme-picker.gjs b/frontend/discourse/app/components/admin-onboarding/modal/theme-picker.gjsnew file mode 100644index 00000000000..07b226e33cc--- /dev/null+++ b/frontend/discourse/app/components/admin-onboarding/modal/theme-picker.gjs@@ -0,0 +1,136 @@+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { fn } from "@ember/helper";+import { action } from "@ember/object";+import { service } from "@ember/service";+import PluginOutlet from "discourse/components/plugin-outlet";+import ThemeCardPreview from "discourse/components/theme-card-preview";+import { ajax } from "discourse/lib/ajax";+import { popupAjaxError } from "discourse/lib/ajax-error";+import getURL from "discourse/lib/get-url";+import {+ FOUNDATION_THEME_ID,+ HORIZON_THEME_ID,+ setLocalTheme,+} from "discourse/lib/theme-selector";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";+import { i18n } from "discourse-i18n";++const ALLOWED_THEME_IDS = [FOUNDATION_THEME_ID, HORIZON_THEME_ID];++const ThemeCard = <template>+ <div class="theme-picker-modal__card {{if @theme.default '--active'}}">+ <ThemeCardPreview @theme={{@theme}}>+ <:footer>+ {{#if @theme.default}}+ <DButton+ @icon="check"+ @translatedLabel={{i18n+ "admin_onboarding_banner.select_theme.currently_selected"+ }}+ class="btn-transparent theme-picker-modal__current-btn"+ />+ {{else}}+ <DButton+ @action={{fn @onSelect @theme}}+ @translatedLabel={{i18n+ "admin_onboarding_banner.select_theme.use_theme"+ }}+ class="btn-primary"+ />+ {{/if}}+ </:footer>+ </ThemeCardPreview>+ </div>+</template>;++export default class ThemePickerModal extends Component {+ @service toasts;++ @tracked themes = [];+ @tracked loading = true;+ @tracked saving = false;++ constructor() {+ super(...arguments);+ this.loadThemes();+ }++ async loadThemes() {+ try {+ const result = await ajax("/admin/themes.json");+ this.themes = result.themes.filter((theme) =>+ ALLOWED_THEME_IDS.includes(theme.id)+ );+ } catch (error) {+ popupAjaxError(error);+ } finally {+ this.loading = false;+ }+ }++ @action+ async selectTheme(theme) {+ if (this.saving) {+ return;+ }++ this.saving = true;++ try {+ await ajax(`/admin/themes/${theme.id}.json`, {+ type: "PUT",+ data: { theme: { default: true } },+ });++ setLocalTheme([], 0);++ this.toasts.success({+ data: {+ message: i18n("admin_onboarding_banner.select_theme.theme_set", {+ theme: theme.name,+ }),+ },+ });++ await this.args.model?.onThemeSelected?.();+ this.args.closeModal();+ window.location.reload();+ } catch (error) {+ popupAjaxError(error);+ } finally {+ this.saving = false;+ }+ }++ <template>+ <DModal+ class="theme-picker-modal"+ @title={{i18n "admin_onboarding_banner.select_theme.modal_title"}}+ @closeModal={{@closeModal}}+ >+ <:body>+ {{#if this.loading}}+ <div class="theme-picker-modal__loading">+ {{dLoadingSpinner}}+ </div>+ {{else}}+ <div class="theme-picker-modal__themes">+ {{#each this.themes as |theme|}}+ <ThemeCard @theme={{theme}} @onSelect={{this.selectTheme}} />+ {{/each}}+ </div>+ <PluginOutlet @name="theme-picker-modal-below-themes">+ <p class="theme-picker-modal__browse-all">+ <a href={{getURL "/admin/config/customize/themes"}}>+ {{i18n "admin_onboarding_banner.select_theme.browse_all"}}+ </a>+ </p>+ </PluginOutlet>+ {{/if}}+ </:body>+ </DModal>+ </template>+}diff --git a/frontend/discourse/app/components/admin-onboarding/step.gjs b/frontend/discourse/app/components/admin-onboarding/step.gjsindex fc0b8c4d58e..04878f5a236 100644--- a/frontend/discourse/app/components/admin-onboarding/step.gjs+++ b/frontend/discourse/app/components/admin-onboarding/step.gjs@@ -47,6 +47,8 @@ export default class OnboardingStep extends Component {});this.completed = true;this.appEvents.trigger(`onboarding-step:completed`, this.name);++ return this.args.onCompleted?.(this.name);}<template>diff --git a/frontend/discourse/app/components/theme-card-preview.gjs b/frontend/discourse/app/components/theme-card-preview.gjsnew file mode 100644index 00000000000..231a3777af5--- /dev/null+++ b/frontend/discourse/app/components/theme-card-preview.gjs@@ -0,0 +1,85 @@+import Component from "@glimmer/component";+import { tracked } from "@glimmer/tracking";+import { action } from "@ember/object";+import { service } from "@ember/service";+import DButton from "discourse/ui-kit/d-button";+import { i18n } from "discourse-i18n";++export default class ThemeCardPreview extends Component {+ @service interfaceColor;+ @service session;++ @tracked showingDarkScreenshot = this.#shouldShowDarkByDefault();++ get currentScreenshotUrl() {+ const { screenshot_dark_url, screenshot_light_url } = this.args.theme;+ return this.showingDarkScreenshot+ ? screenshot_dark_url || screenshot_light_url+ : screenshot_light_url || screenshot_dark_url;+ }++ get hasBothScreenshots() {+ return (+ this.args.theme.screenshot_light_url &&+ this.args.theme.screenshot_dark_url+ );+ }++ get screenshotToggleIcon() {+ return this.showingDarkScreenshot ? "sun" : "moon";+ }++ get screenshotToggleLabel() {+ return this.showingDarkScreenshot+ ? i18n("admin_onboarding_banner.select_theme.show_light_screenshot")+ : i18n("admin_onboarding_banner.select_theme.show_dark_screenshot");+ }++ #shouldShowDarkByDefault() {+ return (+ this.interfaceColor?.colorModeIsDark ||+ window.matchMedia("(prefers-color-scheme: dark)").matches ||+ this.session?.defaultColorSchemeIsDark+ );+ }++ @action+ toggleScreenshot() {+ this.showingDarkScreenshot = !this.showingDarkScreenshot;+ }++ <template>+ <div class="theme-card-preview__image-wrapper">+ {{#if this.currentScreenshotUrl}}+ <img+ class="theme-card-preview__image"+ src={{this.currentScreenshotUrl}}+ alt={{@theme.name}}+ />+ {{#if this.hasBothScreenshots}}+ <DButton+ @action={{this.toggleScreenshot}}+ @translatedAriaLabel={{this.screenshotToggleLabel}}+ @icon={{this.screenshotToggleIcon}}+ @preventFocus={{true}}+ @translatedTitle={{this.screenshotToggleLabel}}+ class="btn-flat theme-card-preview__screenshot-toggle"+ />+ {{/if}}+ {{else}}+ {{yield to="placeholder"}}+ {{/if}}+ </div>+ <div class="theme-card-preview__content">+ {{#if (has-block "title")}}+ {{yield to="title"}}+ {{else}}+ <span class="theme-card-preview__name">{{@theme.name}}</span>+ {{/if}}+ {{#if @theme.description}}+ <p class="theme-card-preview__description">{{@theme.description}}</p>+ {{/if}}+ </div>+ {{yield to="footer"}}+ </template>+}diff --git a/frontend/discourse/app/lib/registry/transformers.js b/frontend/discourse/app/lib/registry/transformers.jsindex 4f9508b8c2f..d9ee30071cf 100644--- a/frontend/discourse/app/lib/registry/transformers.js+++ b/frontend/discourse/app/lib/registry/transformers.js@@ -35,6 +35,7 @@ export const VALUE_TRANSFORMERS = Object.freeze(["admin-onboarding-start-posting-options","admin-plugin-icon","admin-reports-show-query-params",+ "admin-theme-card-show-full-controls","bulk-select-in-nav-controls","category-available-views","category-default-colors",diff --git a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjsindex b9bf0597f7f..1e0ca594714 100644--- a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs+++ b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs@@ -1,8 +1,7 @@import { action } from "@ember/object";import { service } from "@ember/service";-import { click, visit } from "@ember/test-helpers";+import { click, settled, visit } from "@ember/test-helpers";import { test } from "qunit";-import sinon from "sinon";import StartPostingOption from "discourse/components/admin-onboarding/start-posting-option";import { AUTO_GROUPS } from "discourse/lib/constants";import { withPluginApi } from "discourse/lib/plugin-api";@@ -33,14 +32,34 @@ acceptance("Admin - Onboarding Banner", function (needs) {success: "OK",});});- });- needs.hooks.beforeEach(() => {- const mockClipboard = {- writeText: sinon.stub().resolves(true),- write: sinon.stub().resolves(true),- };- sinon.stub(window.navigator, "clipboard").get(() => mockClipboard);+ server.get("/admin/themes.json", () => {+ return helper.response(200, {+ themes: [+ {+ id: -1,+ name: "Foundation",+ default: true,+ screenshot_light_url: null,+ screenshot_dark_url: null,+ },+ {+ id: -2,+ name: "Horizon",+ default: false,+ screenshot_light_url: null,+ screenshot_dark_url: null,+ },+ ],+ extras: { color_schemes: [] },+ });+ });++ server.put("/admin/themes/-2.json", () => {+ return helper.response(200, {+ theme: { id: -2, name: "Horizon", default: true },+ });+ });});const withStep = (id, assert) => {@@ -206,14 +225,19 @@ acceptance("Admin - Onboarding Banner", function (needs) {step.isChecked();});- test("it can complete `spread_the_word` step", async function (assert) {- const step = withStep("spread_the_word", assert);+ test("it can open `select_theme` step", async function (assert) {+ const step = withStep("select_theme", assert);await visit("/");step.isNotChecked();await step.clickAction();- step.isChecked();+ await settled();++ assert.dom(".theme-picker-modal").exists("theme picker modal is shown");+ assert+ .dom(".theme-picker-modal__card")+ .exists({ count: 2 }, "shows Foundation and Horizon");});});diff --git a/spec/system/admin_onboarding_banner_spec.rb b/spec/system/admin_onboarding_banner_spec.rbindex e63a557682c..7cf6256f24a 100644--- a/spec/system/admin_onboarding_banner_spec.rb+++ b/spec/system/admin_onboarding_banner_spec.rb@@ -7,12 +7,14 @@ describe "Admin Onboarding Banner" dolet(:banner) { PageObjects::Components::AdminOnboardingBanner.new }let(:predefined_topics_modal) { PageObjects::Modals::AdminOnboardingPredefinedTopics.new }+ let(:theme_picker_modal) { PageObjects::Modals::AdminOnboardingThemePicker.new }let(:create_invite_modal) { PageObjects::Modals::CreateInvite.new }let(:composer) { PageObjects::Components::Composer.new }let(:toasts) { PageObjects::Components::Toasts.new }before doSiteSetting.enable_site_owner_onboarding = true+ SiteSetting.default_theme_id = Theme.foundation_theme.idsign_in(admin)end@@ -25,9 +27,9 @@ describe "Admin Onboarding Banner" doit "shows all three onboarding steps" dovisit("/")- expect(banner.step("start_posting")).to be_present+ expect(banner.step("select_theme")).to be_presentexpect(banner.step("invite_collaborators")).to be_present- expect(banner.step("spread_the_word")).to be_present+ expect(banner.step("start_posting")).to be_presentendit "can close the banner prematurely" do@@ -102,22 +104,34 @@ describe "Admin Onboarding Banner" doendend- describe "spread the word step" do- it "copies site URL to clipboard and marks step complete" do+ describe "select theme step" do+ it "opens the theme picker modal" dovisit("/")- expect(banner.step_not_completed?("spread_the_word")).to eq(true)+ expect(banner.step_not_completed?("select_theme")).to eq(true)- banner.click_step_action("spread_the_word")+ banner.click_step_action("select_theme")- expect(banner.step_completed?("spread_the_word")).to eq(true)- expect(toasts).to have_success(- I18n.t("js.admin_onboarding_banner.spread_the_word.copied_to_clipboard"),- )+ expect(theme_picker_modal).to be_open+ expect(theme_picker_modal).to have_theme_cards(minimum: 1)+ end++ it "sets a theme as default and marks step complete" do+ visit("/")+ banner.click_step_action("select_theme")++ expect(theme_picker_modal).to be_open++ selected_name = theme_picker_modal.select_first_selectable_theme++ # Page reloads after theme selection; wait for it to complete+ expect(page).to have_css(".admin-onboarding-banner")+ expect(banner.step_completed?("select_theme")).to eq(true)+ expect(Theme.find(SiteSetting.default_theme_id).name).to eq(selected_name)endenddescribe "completing all steps" do- it "disables onboarding when all steps are complete" do+ it "disables onboarding when select theme is completed last" dovisit("/")banner.click_step_action("start_posting")@@ -134,10 +148,11 @@ describe "Admin Onboarding Banner" doexpect(banner.step_completed?("invite_collaborators")).to eq(true)- banner.click_step_action("spread_the_word")-- # banner is hidden after all steps are complete; No need to check for `spread_the_word` step completion+ banner.click_step_action("select_theme")+ expect(theme_picker_modal).to be_open+ theme_picker_modal.select_first_selectable_theme+ # Page reloads after theme selection; banner disappears when all steps completeexpect(banner).to be_not_visibleexpect(SiteSetting.enable_site_owner_onboarding).to eq(false)enddiff --git a/spec/system/page_objects/modals/admin_onboarding_theme_picker.rb b/spec/system/page_objects/modals/admin_onboarding_theme_picker.rbnew file mode 100644index 00000000000..1eeab461d44--- /dev/null+++ b/spec/system/page_objects/modals/admin_onboarding_theme_picker.rb@@ -0,0 +1,31 @@+# frozen_string_literal: true++module PageObjects+ module Modals+ class AdminOnboardingThemePicker < PageObjects::Modals::Base+ MODAL_SELECTOR = ".theme-picker-modal"+ CARD_SELECTOR = ".theme-picker-modal__card"+ NAME_SELECTOR = ".theme-card-preview__name"++ def open?+ has_css?(MODAL_SELECTOR)+ end++ def has_theme_cards?(**options)+ has_css?(CARD_SELECTOR, **options)+ end++ def first_selectable_theme_name+ find("#{CARD_SELECTOR}:not(.--active) #{NAME_SELECTOR}", match: :first).text+ end++ def select_theme(name)+ find(CARD_SELECTOR, text: name).find(".btn-primary").click+ end++ def select_first_selectable_theme+ first_selectable_theme_name.tap { |name| select_theme(name) }+ end+ end+ end+enddiff --git a/spec/system/page_objects/pages/admin_customize_themes_config_area.rb b/spec/system/page_objects/pages/admin_customize_themes_config_area.rbindex e8062c1456b..9e4dbca7ebd 100644--- a/spec/system/page_objects/pages/admin_customize_themes_config_area.rb+++ b/spec/system/page_objects/pages/admin_customize_themes_config_area.rb@@ -98,15 +98,15 @@ module PageObjectsenddef screenshot_toggle_button(theme)- find_theme_card(theme).find(".theme-card__screenshot-toggle")+ find_theme_card(theme).find(".theme-card-preview__screenshot-toggle")enddef has_screenshot_toggle_button?(theme)- find_theme_card(theme).has_css?(".theme-card__screenshot-toggle")+ find_theme_card(theme).has_css?(".theme-card-preview__screenshot-toggle")enddef has_no_screenshot_toggle_button?(theme)- find_theme_card(theme).has_no_css?(".theme-card__screenshot-toggle")+ find_theme_card(theme).has_no_css?(".theme-card-preview__screenshot-toggle")enddef click_screenshot_toggle(theme)@@ -115,12 +115,14 @@ module PageObjectsenddef screenshot_image(theme)- find_theme_card(theme).find(".theme-card__image")+ find_theme_card(theme).find(".theme-card-preview__image")enddef has_screenshot_with_icon?(theme, icon_name)find_theme_card(theme).hover- find_theme_card(theme).has_css?(".theme-card__screenshot-toggle .d-icon-#{icon_name}")+ find_theme_card(theme).has_css?(+ ".theme-card-preview__screenshot-toggle .d-icon-#{icon_name}",+ )endendend