From ac267fabafe10b7af43d076c3054365e8213ac1b Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Wed, 11 Sep 2019 17:13:12 +1000 Subject: [PATCH] basic route and template --- app/controllers/patrons_controller.rb | 4 ++++ .../discourse/discourse-patrons-map.js | 12 ------------ .../discourse/patrons-route-map.js.es6 | 4 ++++ .../discourse/routes/patrons.js.es6 | 3 +++ .../discourse/templates/patrons.hbs | 2 ++ config/routes.rb | 5 ++--- config/settings.yml | 18 ------------------ jsapp | 1 - lib/discourse_patrons/engine.rb | 10 ---------- plugin.rb | 14 ++++---------- 10 files changed, 19 insertions(+), 54 deletions(-) create mode 100644 app/controllers/patrons_controller.rb delete mode 100644 assets/javascripts/discourse/discourse-patrons-map.js create mode 100644 assets/javascripts/discourse/patrons-route-map.js.es6 create mode 100644 assets/javascripts/discourse/routes/patrons.js.es6 create mode 100644 assets/javascripts/discourse/templates/patrons.hbs delete mode 120000 jsapp delete mode 100644 lib/discourse_patrons/engine.rb diff --git a/app/controllers/patrons_controller.rb b/app/controllers/patrons_controller.rb new file mode 100644 index 0000000..af41140 --- /dev/null +++ b/app/controllers/patrons_controller.rb @@ -0,0 +1,4 @@ +class PatronsController < ApplicationController + def index + end +end diff --git a/assets/javascripts/discourse/discourse-patrons-map.js b/assets/javascripts/discourse/discourse-patrons-map.js deleted file mode 100644 index 26de642..0000000 --- a/assets/javascripts/discourse/discourse-patrons-map.js +++ /dev/null @@ -1,12 +0,0 @@ - -export default function() { - const { disabled_plugins = [] } = this.site; - - if (disabled_plugins.indexOf("discourse-patrons") !== -1) { - return; - } - - this.route("patrons", function() { - this.route("show", { path: ":payment_id" }); - }); -} diff --git a/assets/javascripts/discourse/patrons-route-map.js.es6 b/assets/javascripts/discourse/patrons-route-map.js.es6 new file mode 100644 index 0000000..e15bc40 --- /dev/null +++ b/assets/javascripts/discourse/patrons-route-map.js.es6 @@ -0,0 +1,4 @@ + +export default function () { + this.route('patrons'); +} diff --git a/assets/javascripts/discourse/routes/patrons.js.es6 b/assets/javascripts/discourse/routes/patrons.js.es6 new file mode 100644 index 0000000..da78be9 --- /dev/null +++ b/assets/javascripts/discourse/routes/patrons.js.es6 @@ -0,0 +1,3 @@ + +export default Discourse.Route.extend({ +}); diff --git a/assets/javascripts/discourse/templates/patrons.hbs b/assets/javascripts/discourse/templates/patrons.hbs new file mode 100644 index 0000000..3a8f1ec --- /dev/null +++ b/assets/javascripts/discourse/templates/patrons.hbs @@ -0,0 +1,2 @@ + +patrons diff --git a/config/routes.rb b/config/routes.rb index 6367814..315c8be 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -DiscoursePatrons::Engine.routes.draw do - get '/' => 'patrons#index' - get '/:id' => 'patrons#show' +Discourse::Application.routes.append do + get '/patrons' => 'patrons#index' end diff --git a/config/settings.yml b/config/settings.yml index de4e71f..f713bd1 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -1,21 +1,3 @@ plugins: discourse_patrons_enabled: default: false - client: true - discourse_patrons_secret_key: - default: '' - client: false - discourse_patrons_public_key: - default: '' - client: true - discourse_patrons_currency: - client: true - default: "USD" - type: enum - choices: - - AUD - - CAD - - EUR - - JPY - - GBP - - USD diff --git a/jsapp b/jsapp deleted file mode 120000 index 4b93014..0000000 --- a/jsapp +++ /dev/null @@ -1 +0,0 @@ -assets/javascripts/discourse/ \ No newline at end of file diff --git a/lib/discourse_patrons/engine.rb b/lib/discourse_patrons/engine.rb deleted file mode 100644 index 37bc3e0..0000000 --- a/lib/discourse_patrons/engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -# frozen_string_literal: true - -module ::DiscoursePatrons - PLUGIN_NAME = "discourse-patrons" - - class Engine < ::Rails::Engine - engine_name DiscoursePatrons::PLUGIN_NAME - isolate_namespace DiscoursePatrons - end -end diff --git a/plugin.rb b/plugin.rb index 4e281ed..0c6dce3 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,15 +1,9 @@ -# frozen_string_literal: true - -# name: discourse-patrons -# about: Integrates Stripe into Discourse to allow visitors to make payments +# name: Discourse Patrons # version: 1.0.0 -# url: https://github.com/rimian/discourse-patrons -# authors: Rimian Perkins enabled_site_setting :discourse_patrons_enabled -load File.expand_path('../lib/discourse_patrons/engine.rb', __FILE__) - -Discourse::Application.routes.append do - mount ::DiscoursePatrons::Engine, at: '/patrons' +after_initialize do + load File.expand_path('../config/routes.rb', __FILE__) + load File.expand_path('../app/controllers/patrons_controller.rb', __FILE__) end