From d4da391a4d507aeee5c0ffdb0a57e0212b7e6d46 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Mon, 1 Aug 2022 18:07:16 +0100 Subject: [PATCH] Various rebase fixes --- assets/javascripts/wizard-qunit.js | 17 ---------- .../admin/wizard/wizard-custom.scss | 14 -------- .../stylesheets/{admin => common}/admin.scss | 8 ++--- .../{admin/wizard => common/admin}/api.scss | 0 .../wizard => common/admin}/manager.scss | 0 .../wizard => common/admin}/mapper.scss | 0 .../wizard => common/admin}/variables.scss | 0 assets/stylesheets/common/wizard.scss | 14 ++++++++ .../wizard}/autocomplete.scss | 0 .../custom => common/wizard}/badges.scss | 0 .../wizard/custom => common/wizard}/base.scss | 0 .../custom => common/wizard}/buttons.scss | 0 .../custom => common/wizard}/composer.scss | 0 .../custom => common/wizard}/events.scss | 0 .../custom => common/wizard}/field.scss | 0 .../custom => common/wizard}/header.scss | 0 .../custom => common/wizard}/locations.scss | 0 .../wizard}/mentionables.scss | 0 .../custom => common/wizard}/mobile.scss | 0 .../wizard/custom => common/wizard}/step.scss | 0 .../custom => common/wizard}/validators.scss | 0 .../custom => common/wizard}/wizard.scss | 0 plugin.rb | 32 ++----------------- 23 files changed, 20 insertions(+), 65 deletions(-) delete mode 100644 assets/javascripts/wizard-qunit.js delete mode 100644 assets/stylesheets/admin/wizard/wizard-custom.scss rename assets/stylesheets/{admin => common}/admin.scss (99%) rename assets/stylesheets/{admin/wizard => common/admin}/api.scss (100%) rename assets/stylesheets/{admin/wizard => common/admin}/manager.scss (100%) rename assets/stylesheets/{admin/wizard => common/admin}/mapper.scss (100%) rename assets/stylesheets/{admin/wizard => common/admin}/variables.scss (100%) create mode 100644 assets/stylesheets/common/wizard.scss rename assets/stylesheets/{admin/wizard/custom => common/wizard}/autocomplete.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/badges.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/base.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/buttons.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/composer.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/events.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/field.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/header.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/locations.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/mentionables.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/mobile.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/step.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/validators.scss (100%) rename assets/stylesheets/{admin/wizard/custom => common/wizard}/wizard.scss (100%) diff --git a/assets/javascripts/wizard-qunit.js b/assets/javascripts/wizard-qunit.js deleted file mode 100644 index 8aaf23ab..00000000 --- a/assets/javascripts/wizard-qunit.js +++ /dev/null @@ -1,17 +0,0 @@ -//= require env -//= require jquery.debug -//= require ember.debug -//= require route-recognizer -//= require fake_xml_http_request -//= require pretender -//= require qunit -//= require ember-qunit -//= require test-shims -//= require ember-template-compiler - -//= require_tree ./wizard/tests/fixtures -//= require ./wizard/tests/pretender -//= require_tree ./wizard/tests/helpers -//= require_tree ./wizard/tests/acceptance - -//= require ./wizard/tests/bootstrap diff --git a/assets/stylesheets/admin/wizard/wizard-custom.scss b/assets/stylesheets/admin/wizard/wizard-custom.scss deleted file mode 100644 index bcf05477..00000000 --- a/assets/stylesheets/admin/wizard/wizard-custom.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import "custom/base"; -@import "custom/wizard"; -@import "custom/header"; -@import "custom/step"; -@import "custom/badges"; -@import "custom/buttons"; -@import "custom/field"; -@import "custom/validators"; -@import "custom/mobile"; -@import "custom/autocomplete"; -@import "custom/composer"; -@import "custom/events"; -@import "custom/locations"; -@import "custom/mentionables"; diff --git a/assets/stylesheets/admin/admin.scss b/assets/stylesheets/common/admin.scss similarity index 99% rename from assets/stylesheets/admin/admin.scss rename to assets/stylesheets/common/admin.scss index d0106337..386fb372 100644 --- a/assets/stylesheets/admin/admin.scss +++ b/assets/stylesheets/common/admin.scss @@ -1,8 +1,8 @@ -@import "wizard/mapper"; -@import "wizard/manager"; -@import "wizard/api"; +@import "admin/mapper"; +@import "admin/manager"; +@import "admin/api"; @import "common/components/buttons"; -@import "wizard/variables"; +@import "admin/variables"; $expired: #339b18; $info: #038ae7; diff --git a/assets/stylesheets/admin/wizard/api.scss b/assets/stylesheets/common/admin/api.scss similarity index 100% rename from assets/stylesheets/admin/wizard/api.scss rename to assets/stylesheets/common/admin/api.scss diff --git a/assets/stylesheets/admin/wizard/manager.scss b/assets/stylesheets/common/admin/manager.scss similarity index 100% rename from assets/stylesheets/admin/wizard/manager.scss rename to assets/stylesheets/common/admin/manager.scss diff --git a/assets/stylesheets/admin/wizard/mapper.scss b/assets/stylesheets/common/admin/mapper.scss similarity index 100% rename from assets/stylesheets/admin/wizard/mapper.scss rename to assets/stylesheets/common/admin/mapper.scss diff --git a/assets/stylesheets/admin/wizard/variables.scss b/assets/stylesheets/common/admin/variables.scss similarity index 100% rename from assets/stylesheets/admin/wizard/variables.scss rename to assets/stylesheets/common/admin/variables.scss diff --git a/assets/stylesheets/common/wizard.scss b/assets/stylesheets/common/wizard.scss new file mode 100644 index 00000000..391c3a78 --- /dev/null +++ b/assets/stylesheets/common/wizard.scss @@ -0,0 +1,14 @@ +@import "wizard/base"; +@import "wizard/wizard"; +@import "wizard/header"; +@import "wizard/step"; +@import "wizard/badges"; +@import "wizard/buttons"; +@import "wizard/field"; +@import "wizard/validators"; +@import "wizard/mobile"; +@import "wizard/autocomplete"; +@import "wizard/composer"; +@import "wizard/events"; +@import "wizard/locations"; +@import "wizard/mentionables"; diff --git a/assets/stylesheets/admin/wizard/custom/autocomplete.scss b/assets/stylesheets/common/wizard/autocomplete.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/autocomplete.scss rename to assets/stylesheets/common/wizard/autocomplete.scss diff --git a/assets/stylesheets/admin/wizard/custom/badges.scss b/assets/stylesheets/common/wizard/badges.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/badges.scss rename to assets/stylesheets/common/wizard/badges.scss diff --git a/assets/stylesheets/admin/wizard/custom/base.scss b/assets/stylesheets/common/wizard/base.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/base.scss rename to assets/stylesheets/common/wizard/base.scss diff --git a/assets/stylesheets/admin/wizard/custom/buttons.scss b/assets/stylesheets/common/wizard/buttons.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/buttons.scss rename to assets/stylesheets/common/wizard/buttons.scss diff --git a/assets/stylesheets/admin/wizard/custom/composer.scss b/assets/stylesheets/common/wizard/composer.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/composer.scss rename to assets/stylesheets/common/wizard/composer.scss diff --git a/assets/stylesheets/admin/wizard/custom/events.scss b/assets/stylesheets/common/wizard/events.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/events.scss rename to assets/stylesheets/common/wizard/events.scss diff --git a/assets/stylesheets/admin/wizard/custom/field.scss b/assets/stylesheets/common/wizard/field.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/field.scss rename to assets/stylesheets/common/wizard/field.scss diff --git a/assets/stylesheets/admin/wizard/custom/header.scss b/assets/stylesheets/common/wizard/header.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/header.scss rename to assets/stylesheets/common/wizard/header.scss diff --git a/assets/stylesheets/admin/wizard/custom/locations.scss b/assets/stylesheets/common/wizard/locations.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/locations.scss rename to assets/stylesheets/common/wizard/locations.scss diff --git a/assets/stylesheets/admin/wizard/custom/mentionables.scss b/assets/stylesheets/common/wizard/mentionables.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/mentionables.scss rename to assets/stylesheets/common/wizard/mentionables.scss diff --git a/assets/stylesheets/admin/wizard/custom/mobile.scss b/assets/stylesheets/common/wizard/mobile.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/mobile.scss rename to assets/stylesheets/common/wizard/mobile.scss diff --git a/assets/stylesheets/admin/wizard/custom/step.scss b/assets/stylesheets/common/wizard/step.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/step.scss rename to assets/stylesheets/common/wizard/step.scss diff --git a/assets/stylesheets/admin/wizard/custom/validators.scss b/assets/stylesheets/common/wizard/validators.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/validators.scss rename to assets/stylesheets/common/wizard/validators.scss diff --git a/assets/stylesheets/admin/wizard/custom/wizard.scss b/assets/stylesheets/common/wizard/wizard.scss similarity index 100% rename from assets/stylesheets/admin/wizard/custom/wizard.scss rename to assets/stylesheets/common/wizard/wizard.scss diff --git a/plugin.rb b/plugin.rb index a8bef80d..ab0fe48c 100644 --- a/plugin.rb +++ b/plugin.rb @@ -8,39 +8,11 @@ # subscription_url: https://coop.pavilion.tech gem 'liquid', '5.0.1', require: true -register_asset 'stylesheets/common/wizard-admin.scss' -register_asset 'stylesheets/common/wizard-mapper.scss' -register_asset 'stylesheets/common/wizard-custom.scss' +register_asset 'stylesheets/common/admin.scss' +register_asset 'stylesheets/common/wizard.scss' enabled_site_setting :custom_wizard_enabled -if Rails.env.production? - Rails.application.config.assets.precompile += %w{ - wizard-custom-guest.js - wizard-custom-start.js - wizard-custom.js - wizard-plugin.js.erb - wizard-raw-templates.js.erb - } -end - -config = Rails.application.config -plugin_asset_path = "#{Rails.root}/plugins/discourse-custom-wizard/assets" -config.assets.paths << "#{plugin_asset_path}/javascripts" -config.assets.paths << "#{plugin_asset_path}/stylesheets/wizard" - -if Rails.env.production? - config.assets.precompile += %w{ - ember_jquery.js - wizard-custom-guest.js - wizard-custom-start.js - wizard-custom.js - wizard-plugin.js.erb - wizard-raw-templates.js.erb - wizard-vendor.js - } -end - if respond_to?(:register_svg_icon) register_svg_icon "far-calendar" register_svg_icon "chevron-right"