activity_notification 2.0.0 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (195) hide show
  1. checksums.yaml +4 -4
  2. data/.github/ISSUE_TEMPLATE/bug_report.md +22 -0
  3. data/.github/ISSUE_TEMPLATE/feature_request.md +17 -0
  4. data/.github/pull_request_template.md +13 -0
  5. data/.gitignore +10 -3
  6. data/.travis.yml +6 -5
  7. data/CHANGELOG.md +22 -0
  8. data/Gemfile +8 -2
  9. data/Procfile +1 -1
  10. data/README.md +153 -1510
  11. data/activity_notification.gemspec +4 -1
  12. data/app/channels/activity_notification/notification_api_channel.rb +12 -0
  13. data/app/channels/activity_notification/notification_api_with_devise_channel.rb +46 -0
  14. data/app/channels/activity_notification/notification_channel.rb +1 -1
  15. data/app/channels/activity_notification/notification_with_devise_channel.rb +1 -1
  16. data/app/controllers/activity_notification/apidocs_controller.rb +75 -0
  17. data/app/controllers/activity_notification/notifications_api_controller.rb +143 -0
  18. data/app/controllers/activity_notification/notifications_api_with_devise_controller.rb +7 -0
  19. data/app/controllers/activity_notification/notifications_controller.rb +79 -53
  20. data/app/controllers/activity_notification/subscriptions_api_controller.rb +197 -0
  21. data/app/controllers/activity_notification/subscriptions_api_with_devise_controller.rb +7 -0
  22. data/app/controllers/activity_notification/subscriptions_controller.rb +78 -69
  23. data/app/views/activity_notification/notifications/default/_default.html.erb +18 -18
  24. data/app/views/activity_notification/notifications/default/_default_without_grouping.html.erb +14 -14
  25. data/app/views/activity_notification/notifications/default/index.html.erb +6 -6
  26. data/app/views/activity_notification/optional_targets/default/action_cable_channel/_default.html.erb +176 -0
  27. data/app/views/activity_notification/subscriptions/default/_form.html.erb +1 -1
  28. data/app/views/activity_notification/subscriptions/default/_notification_keys.html.erb +3 -31
  29. data/app/views/activity_notification/subscriptions/default/_subscription.html.erb +7 -7
  30. data/app/views/activity_notification/subscriptions/default/index.html.erb +11 -7
  31. data/bin/deploy_on_heroku.sh +3 -1
  32. data/docs/CODE_OF_CONDUCT.md +76 -0
  33. data/docs/CONTRIBUTING.md +36 -0
  34. data/docs/Functions.md +1130 -0
  35. data/docs/Setup.md +674 -0
  36. data/docs/Testing.md +148 -0
  37. data/gemfiles/Gemfile.rails-4.2 +3 -0
  38. data/gemfiles/Gemfile.rails-5.0 +3 -0
  39. data/gemfiles/Gemfile.rails-5.1 +3 -0
  40. data/gemfiles/Gemfile.rails-5.2 +3 -0
  41. data/gemfiles/{Gemfile.rails-6.0.rc → Gemfile.rails-6.0} +5 -3
  42. data/lib/activity_notification.rb +13 -1
  43. data/lib/activity_notification/apis/notification_api.rb +29 -92
  44. data/lib/activity_notification/apis/subscription_api.rb +20 -8
  45. data/lib/activity_notification/apis/swagger.rb +6 -0
  46. data/lib/activity_notification/config.rb +41 -21
  47. data/lib/activity_notification/controllers/common_api_controller.rb +30 -0
  48. data/lib/activity_notification/controllers/common_controller.rb +44 -20
  49. data/lib/activity_notification/controllers/concerns/swagger/error_responses.rb +55 -0
  50. data/lib/activity_notification/controllers/concerns/swagger/notifications_api.rb +273 -0
  51. data/lib/activity_notification/controllers/concerns/swagger/notifications_parameters.rb +92 -0
  52. data/lib/activity_notification/controllers/concerns/swagger/subscriptions_api.rb +405 -0
  53. data/lib/activity_notification/controllers/concerns/swagger/subscriptions_parameters.rb +50 -0
  54. data/lib/activity_notification/controllers/devise_authentication_controller.rb +7 -6
  55. data/lib/activity_notification/gem_version.rb +14 -0
  56. data/lib/activity_notification/helpers/errors.rb +2 -0
  57. data/lib/activity_notification/helpers/view_helpers.rb +4 -0
  58. data/lib/activity_notification/mailers/helpers.rb +17 -10
  59. data/lib/activity_notification/models/concerns/notifiable.rb +26 -10
  60. data/lib/activity_notification/models/concerns/subscriber.rb +12 -1
  61. data/lib/activity_notification/models/concerns/swagger/error_schema.rb +36 -0
  62. data/lib/activity_notification/models/concerns/swagger/notification_schema.rb +209 -0
  63. data/lib/activity_notification/models/concerns/swagger/subscription_schema.rb +162 -0
  64. data/lib/activity_notification/models/concerns/target.rb +36 -10
  65. data/lib/activity_notification/models/notification.rb +1 -0
  66. data/lib/activity_notification/models/subscription.rb +1 -0
  67. data/lib/activity_notification/optional_targets/action_cable_api_channel.rb +69 -0
  68. data/lib/activity_notification/optional_targets/action_cable_channel.rb +68 -0
  69. data/lib/activity_notification/optional_targets/base.rb +7 -13
  70. data/lib/activity_notification/orm/active_record/notification.rb +17 -1
  71. data/lib/activity_notification/orm/active_record/subscription.rb +1 -1
  72. data/lib/activity_notification/orm/dynamoid.rb +28 -0
  73. data/lib/activity_notification/orm/dynamoid/extension.rb +79 -1
  74. data/lib/activity_notification/orm/dynamoid/notification.rb +1 -1
  75. data/lib/activity_notification/orm/dynamoid/subscription.rb +1 -1
  76. data/lib/activity_notification/orm/mongoid.rb +22 -0
  77. data/lib/activity_notification/orm/mongoid/notification.rb +17 -1
  78. data/lib/activity_notification/orm/mongoid/subscription.rb +1 -1
  79. data/lib/activity_notification/rails/routes.rb +132 -48
  80. data/lib/activity_notification/renderable.rb +13 -2
  81. data/lib/activity_notification/roles/acts_as_notifiable.rb +38 -20
  82. data/lib/activity_notification/version.rb +1 -1
  83. data/lib/generators/activity_notification/controllers_generator.rb +2 -1
  84. data/lib/generators/templates/activity_notification.rb +8 -0
  85. data/lib/generators/templates/controllers/notifications_api_controller.rb +31 -0
  86. data/lib/generators/templates/controllers/notifications_api_with_devise_controller.rb +31 -0
  87. data/lib/generators/templates/controllers/notifications_controller.rb +1 -37
  88. data/lib/generators/templates/controllers/notifications_with_devise_controller.rb +1 -45
  89. data/lib/generators/templates/controllers/subscriptions_api_controller.rb +61 -0
  90. data/lib/generators/templates/controllers/subscriptions_api_with_devise_controller.rb +61 -0
  91. data/lib/generators/templates/controllers/subscriptions_controller.rb +14 -37
  92. data/lib/generators/templates/controllers/subscriptions_with_devise_controller.rb +14 -45
  93. data/lib/generators/templates/models/README +8 -4
  94. data/lib/generators/templates/models/notification.rb +1 -1
  95. data/lib/generators/templates/models/subscription.rb +1 -1
  96. data/package.json +8 -0
  97. data/spec/channels/notification_api_channel_shared_examples.rb +59 -0
  98. data/spec/channels/notification_api_channel_spec.rb +51 -0
  99. data/spec/channels/notification_api_with_devise_channel_spec.rb +78 -0
  100. data/spec/concerns/apis/notification_api_spec.rb +37 -2
  101. data/spec/concerns/models/notifiable_spec.rb +64 -0
  102. data/spec/concerns/models/subscriber_spec.rb +13 -16
  103. data/spec/concerns/models/target_spec.rb +32 -0
  104. data/spec/concerns/renderable_spec.rb +2 -2
  105. data/spec/controllers/controller_spec_utility.rb +136 -0
  106. data/spec/controllers/notifications_api_controller_shared_examples.rb +506 -0
  107. data/spec/controllers/notifications_api_controller_spec.rb +19 -0
  108. data/spec/controllers/notifications_api_with_devise_controller_spec.rb +60 -0
  109. data/spec/controllers/notifications_controller_shared_examples.rb +54 -79
  110. data/spec/controllers/notifications_controller_spec.rb +1 -2
  111. data/spec/controllers/notifications_with_devise_controller_spec.rb +3 -12
  112. data/spec/controllers/subscriptions_api_controller_shared_examples.rb +750 -0
  113. data/spec/controllers/subscriptions_api_controller_spec.rb +19 -0
  114. data/spec/controllers/subscriptions_api_with_devise_controller_spec.rb +60 -0
  115. data/spec/controllers/subscriptions_controller_shared_examples.rb +94 -121
  116. data/spec/controllers/subscriptions_controller_spec.rb +1 -2
  117. data/spec/controllers/subscriptions_with_devise_controller_spec.rb +3 -12
  118. data/spec/helpers/view_helpers_spec.rb +4 -11
  119. data/spec/mailers/mailer_spec.rb +41 -0
  120. data/spec/models/notification_spec.rb +17 -0
  121. data/spec/models/subscription_spec.rb +0 -13
  122. data/spec/optional_targets/action_cable_api_channel_spec.rb +37 -0
  123. data/spec/optional_targets/action_cable_channel_spec.rb +44 -0
  124. data/spec/optional_targets/amazon_sns_spec.rb +0 -2
  125. data/spec/optional_targets/slack_spec.rb +0 -2
  126. data/spec/rails_app/Rakefile +9 -0
  127. data/spec/rails_app/app/assets/config/manifest.js +3 -0
  128. data/spec/rails_app/app/assets/images/.keep +0 -0
  129. data/spec/rails_app/app/controllers/admins_controller.rb +21 -0
  130. data/spec/rails_app/app/controllers/application_controller.rb +1 -1
  131. data/spec/rails_app/app/controllers/articles_controller.rb +6 -3
  132. data/spec/rails_app/app/controllers/spa_controller.rb +7 -0
  133. data/spec/rails_app/app/controllers/users/notifications_controller.rb +0 -65
  134. data/spec/rails_app/app/controllers/users/notifications_with_devise_controller.rb +0 -73
  135. data/spec/rails_app/app/controllers/users/subscriptions_controller.rb +0 -77
  136. data/spec/rails_app/app/controllers/users/subscriptions_with_devise_controller.rb +0 -85
  137. data/spec/rails_app/app/controllers/users_controller.rb +21 -0
  138. data/spec/rails_app/app/javascript/App.vue +104 -0
  139. data/spec/rails_app/app/javascript/components/DeviseTokenAuth.vue +83 -0
  140. data/spec/rails_app/app/javascript/components/Top.vue +99 -0
  141. data/spec/rails_app/app/javascript/components/notifications/Index.vue +200 -0
  142. data/spec/rails_app/app/javascript/components/notifications/Notification.vue +133 -0
  143. data/spec/rails_app/app/javascript/components/notifications/NotificationContent.vue +122 -0
  144. data/spec/rails_app/app/javascript/components/subscriptions/Index.vue +279 -0
  145. data/spec/rails_app/app/javascript/components/subscriptions/NewSubscription.vue +112 -0
  146. data/spec/rails_app/app/javascript/components/subscriptions/NotificationKey.vue +141 -0
  147. data/spec/rails_app/app/javascript/components/subscriptions/Subscription.vue +226 -0
  148. data/spec/rails_app/app/javascript/config/development.js +5 -0
  149. data/spec/rails_app/app/javascript/config/environment.js +7 -0
  150. data/spec/rails_app/app/javascript/config/production.js +5 -0
  151. data/spec/rails_app/app/javascript/config/test.js +5 -0
  152. data/spec/rails_app/app/javascript/packs/application.js +18 -0
  153. data/spec/rails_app/app/javascript/packs/spa.js +11 -0
  154. data/spec/rails_app/app/javascript/store/auth.js +37 -0
  155. data/spec/rails_app/app/models/admin.rb +16 -15
  156. data/spec/rails_app/app/models/article.rb +26 -21
  157. data/spec/rails_app/app/models/comment.rb +24 -71
  158. data/spec/rails_app/app/models/user.rb +43 -20
  159. data/spec/rails_app/app/views/activity_notification/notifications/default/article/_update.html.erb +146 -0
  160. data/spec/rails_app/app/views/articles/index.html.erb +51 -7
  161. data/spec/rails_app/app/views/articles/show.html.erb +1 -1
  162. data/spec/rails_app/app/views/layouts/_header.html.erb +8 -10
  163. data/spec/rails_app/app/views/spa/index.html.erb +2 -0
  164. data/spec/rails_app/babel.config.js +72 -0
  165. data/spec/rails_app/bin/webpack +18 -0
  166. data/spec/rails_app/bin/webpack-dev-server +18 -0
  167. data/spec/rails_app/config/application.rb +15 -2
  168. data/spec/rails_app/config/environment.rb +2 -1
  169. data/spec/rails_app/config/environments/development.rb +5 -0
  170. data/spec/rails_app/config/environments/production.rb +3 -0
  171. data/spec/rails_app/config/environments/test.rb +5 -0
  172. data/spec/rails_app/config/initializers/activity_notification.rb +8 -0
  173. data/spec/rails_app/config/initializers/devise_token_auth.rb +55 -0
  174. data/spec/rails_app/config/initializers/mysql.rb +9 -0
  175. data/spec/rails_app/config/locales/activity_notification.en.yml +2 -2
  176. data/spec/rails_app/config/routes.rb +33 -1
  177. data/spec/rails_app/config/webpack/development.js +5 -0
  178. data/spec/rails_app/config/webpack/environment.js +7 -0
  179. data/spec/rails_app/config/webpack/loaders/vue.js +6 -0
  180. data/spec/rails_app/config/webpack/production.js +5 -0
  181. data/spec/rails_app/config/webpack/test.js +5 -0
  182. data/spec/rails_app/config/webpacker.yml +97 -0
  183. data/spec/rails_app/db/migrate/20191201000000_add_tokens_to_users.rb +10 -0
  184. data/spec/rails_app/db/schema.rb +4 -1
  185. data/spec/rails_app/db/seeds.rb +1 -0
  186. data/spec/rails_app/lib/custom_optional_targets/raise_error.rb +14 -0
  187. data/spec/rails_app/package.json +23 -0
  188. data/spec/rails_app/postcss.config.js +12 -0
  189. data/spec/roles/acts_as_group_spec.rb +0 -2
  190. data/spec/roles/acts_as_notifiable_spec.rb +1 -3
  191. data/spec/roles/acts_as_notifier_spec.rb +0 -2
  192. data/spec/roles/acts_as_target_spec.rb +0 -4
  193. data/spec/spec_helper.rb +7 -15
  194. data/spec/version_spec.rb +31 -0
  195. metadata +187 -13
@@ -0,0 +1,226 @@
1
+ <template>
2
+ <div class="fields_wrapper configured">
3
+ <div class="fields_title_wrapper">
4
+ <h3 class="fields_title">
5
+ {{ subscription.key }}
6
+ </h3>
7
+
8
+ <p>
9
+ <router-link v-bind:to="{ path : $route.path.replace('subscriptions', 'notifications') + '?filtered_by_key=' + subscription.key }">Notifications</router-link>
10
+ </p>
11
+ </div>
12
+
13
+ <div class="field_wrapper subscribing">
14
+ <div class="field_label">
15
+ <label>
16
+ Notification
17
+ </label>
18
+ </div>
19
+ <div class="field">
20
+ <div class="ui checkbox">
21
+ <div v-if="subscription.subscribing">
22
+ <a href="#" v-on:click="unsubscribe(subscription)" data-remote="true">
23
+ <input type="checkbox" checked="checked" />
24
+ <div class="slider" />
25
+ </a>
26
+ </div>
27
+ <div v-else>
28
+ <a href="#" v-on:click="subscribe(subscription)" data-remote="true">
29
+ <input type="checkbox" />
30
+ <div class="slider" />
31
+ </a>
32
+ </div>
33
+ </div>
34
+ </div>
35
+ </div>
36
+
37
+ <div v-bind:class="[subscription.subscribing ? '' : 'hidden', 'field_wrapper subscribing_to_email']">
38
+ <div class="field_label">
39
+ <label>
40
+ Email notification
41
+ </label>
42
+ </div>
43
+ <div class="field">
44
+ <div class="ui checkbox">
45
+ <div v-if="subscription.subscribing_to_email">
46
+ <a href="#" v-on:click="unsubscribe_to_email(subscription)" data-remote="true">
47
+ <label>
48
+ <input type="checkbox" checked="checked" />
49
+ <div class="slider" />
50
+ </label>
51
+ </a>
52
+ </div>
53
+ <div v-else>
54
+ <a href="#" v-on:click="subscribe_to_email(subscription)" data-remote="true">
55
+ <label>
56
+ <input type="checkbox" />
57
+ <div class="slider" />
58
+ </label>
59
+ </a>
60
+ </div>
61
+ </div>
62
+ </div>
63
+ </div>
64
+
65
+ <div v-bind:class="[subscription.subscribing ? '' : 'hidden', 'field_wrapper subscribing_to_optional_targets']">
66
+ <div v-for="(optionalTargetSubscription, optionalTargetName) in subscription.optional_targets" :key="optionalTargetName">
67
+ <div class="field_label">
68
+ <label>
69
+ Optional tagret ({{ optionalTargetName }})
70
+ </label>
71
+ </div>
72
+ <div class="field">
73
+ <div class="ui checkbox">
74
+ <div v-if="optionalTargetSubscription.subscribing">
75
+ <a href="#" v-on:click="unsubscribe_to_optional_target(subscription, optionalTargetName)" data-remote="true">
76
+ <label>
77
+ <input type="checkbox" checked="checked" />
78
+ <div class="slider" />
79
+ </label>
80
+ </a>
81
+ </div>
82
+ <div v-else>
83
+ <a href="#" v-on:click="subscribe_to_optional_target(subscription, optionalTargetName)" data-remote="true">
84
+ <label>
85
+ <input type="checkbox" />
86
+ <div class="slider" />
87
+ </label>
88
+ </a>
89
+ </div>
90
+ </div>
91
+ </div>
92
+ </div>
93
+ </div>
94
+
95
+ <div class="ui button">
96
+ <a href="#" v-on:click="destroy(subscription)" data-confirm="Are you sure?" class="button" data-remote="true">Destroy</a>
97
+ </div>
98
+ </div>
99
+ </template>
100
+
101
+ <script>
102
+ import axios from 'axios'
103
+
104
+ export default {
105
+ name: 'Subscription',
106
+ props: {
107
+ targetSubscription: {
108
+ type: Object,
109
+ required: true
110
+ },
111
+ targetApiPath: {
112
+ type: String,
113
+ required: true
114
+ }
115
+ },
116
+ data () {
117
+ return {
118
+ subscription: this.targetSubscription,
119
+ baseURL: axios.defaults.baseURL + this.targetApiPath
120
+ }
121
+ },
122
+ methods: {
123
+ subscribe (subscription) {
124
+ axios
125
+ .put(this.targetApiPath + '/subscriptions/' + subscription.id + '/subscribe')
126
+ .then(response => {
127
+ if (response.status == 200) {
128
+ this.subscription = response.data
129
+ }
130
+ })
131
+ .catch (error => {
132
+ if (error.response.status == 401) {
133
+ this.$router.push('/logout');
134
+ }
135
+ })
136
+ },
137
+ unsubscribe (subscription) {
138
+ axios
139
+ .put(this.targetApiPath + '/subscriptions/' + subscription.id + '/unsubscribe')
140
+ .then(response => {
141
+ if (response.status == 200) {
142
+ this.subscription = response.data
143
+ }
144
+ })
145
+ .catch (error => {
146
+ if (error.response.status == 401) {
147
+ this.$router.push('/logout');
148
+ }
149
+ })
150
+ },
151
+ subscribe_to_email (subscription) {
152
+ axios
153
+ .put(this.targetApiPath + '/subscriptions/' + subscription.id + '/subscribe_to_email')
154
+ .then(response => {
155
+ if (response.status == 200) {
156
+ this.subscription = response.data
157
+ }
158
+ })
159
+ .catch (error => {
160
+ if (error.response.status == 401) {
161
+ this.$router.push('/logout');
162
+ }
163
+ })
164
+ },
165
+ unsubscribe_to_email (subscription) {
166
+ axios
167
+ .put(this.targetApiPath + '/subscriptions/' + subscription.id + '/unsubscribe_to_email')
168
+ .then(response => {
169
+ if (response.status == 200) {
170
+ this.subscription = response.data
171
+ }
172
+ })
173
+ .catch (error => {
174
+ if (error.response.status == 401) {
175
+ this.$router.push('/logout');
176
+ }
177
+ })
178
+ },
179
+ subscribe_to_optional_target (subscription, optionalTargetName) {
180
+ axios
181
+ .put(this.targetApiPath + '/subscriptions/' + subscription.id + '/subscribe_to_optional_target?optional_target_name=' + optionalTargetName)
182
+ .then(response => {
183
+ if (response.status == 200) {
184
+ this.subscription = response.data
185
+ }
186
+ })
187
+ .catch (error => {
188
+ if (error.response.status == 401) {
189
+ this.$router.push('/logout');
190
+ }
191
+ })
192
+ },
193
+ unsubscribe_to_optional_target (subscription, optionalTargetName) {
194
+ axios
195
+ .put(this.targetApiPath + '/subscriptions/' + subscription.id + '/unsubscribe_to_optional_target?optional_target_name=' + optionalTargetName)
196
+ .then(response => {
197
+ if (response.status == 200) {
198
+ this.subscription = response.data
199
+ }
200
+ })
201
+ .catch (error => {
202
+ if (error.response.status == 401) {
203
+ this.$router.push('/logout');
204
+ }
205
+ })
206
+ },
207
+ destroy (subscription) {
208
+ axios
209
+ .delete(this.targetApiPath + '/subscriptions/' + subscription.id)
210
+ .then(response => {
211
+ if (response.status == 204) {
212
+ this.$emit('getSubscriptions');
213
+ }
214
+ })
215
+ .catch (error => {
216
+ if (error.response.status == 401) {
217
+ this.$router.push('/logout');
218
+ }
219
+ })
220
+ }
221
+ }
222
+ }
223
+ </script>
224
+
225
+ <style scoped>
226
+ </style>
@@ -0,0 +1,5 @@
1
+ const config = {
2
+ ACTION_CABLE_CONNECTION_URL: 'ws://localhost:3000/cable'
3
+ }
4
+
5
+ module.exports = config;
@@ -0,0 +1,7 @@
1
+ const config = require('./' + process.env.NODE_ENV);
2
+
3
+ export default class Environment {
4
+ static get ACTION_CABLE_CONNECTION_URL() {
5
+ return config.ACTION_CABLE_CONNECTION_URL;
6
+ }
7
+ }
@@ -0,0 +1,5 @@
1
+ const config = {
2
+ ACTION_CABLE_CONNECTION_URL: 'wss://activity-notification-example.herokuapp.com/cable'
3
+ }
4
+
5
+ module.exports = config;
@@ -0,0 +1,5 @@
1
+ const config = {
2
+ ACTION_CABLE_CONNECTION_URL: 'ws://localhost:3000/cable'
3
+ }
4
+
5
+ module.exports = config;
@@ -0,0 +1,18 @@
1
+ /* eslint no-console:0 */
2
+ // This file is automatically compiled by Webpack, along with any other files
3
+ // present in this directory. You're encouraged to place your actual application logic in
4
+ // a relevant structure within app/javascript and only use these pack files to reference
5
+ // that code so it'll be compiled.
6
+ //
7
+ // To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate
8
+ // layout file, like app/views/layouts/application.html.erb
9
+
10
+
11
+ // Uncomment to copy all static images under ../images to the output folder and reference
12
+ // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
13
+ // or the `imagePath` JavaScript helper below.
14
+ //
15
+ // const images = require.context('../images', true)
16
+ // const imagePath = (name) => images(name, true)
17
+
18
+ console.log('Hello World from Webpacker')
@@ -0,0 +1,11 @@
1
+ import Vue from 'vue'
2
+ import axios from 'axios'
3
+ import App from '../App.vue'
4
+
5
+ axios.defaults.baseURL = "/api/v2"
6
+
7
+ document.addEventListener('DOMContentLoaded', () => {
8
+ const app = new Vue({
9
+ render: h => h(App)
10
+ }).$mount('#spa')
11
+ })
@@ -0,0 +1,37 @@
1
+ import Vue from 'vue'
2
+ import Vuex from 'vuex'
3
+ import createPersistedState from "vuex-persistedstate"
4
+
5
+ Vue.use(Vuex)
6
+
7
+ export default new Vuex.Store({
8
+ state: {
9
+ signedInStatus: false,
10
+ currentUser: null,
11
+ authHeaders: {}
12
+ },
13
+ mutations: {
14
+ signIn(state, { user, authHeaders }) {
15
+ state.currentUser = user;
16
+ state.authHeaders = authHeaders;
17
+ state.signedInStatus = true;
18
+ },
19
+ signOut(state) {
20
+ state.signedInStatus = false;
21
+ state.currentUser = null;
22
+ state.authHeaders = {};
23
+ }
24
+ },
25
+ getters: {
26
+ userSignedIn(state) {
27
+ return state.signedInStatus;
28
+ },
29
+ currentUser(state) {
30
+ return state.currentUser;
31
+ },
32
+ authHeaders(state) {
33
+ return state.authHeaders;
34
+ }
35
+ },
36
+ plugins: [createPersistedState({storage: window.sessionStorage})]
37
+ });
@@ -1,15 +1,24 @@
1
- unless ENV['AN_TEST_DB'] == 'mongodb'
2
- class Admin < ActiveRecord::Base
1
+ module AdminModel
2
+ extend ActiveSupport::Concern
3
+
4
+ included do
3
5
  belongs_to :user
4
6
  validates :user, presence: true
5
7
 
6
8
  acts_as_notification_target email_allowed: false,
7
9
  subscription_allowed: true,
10
+ action_cable_allowed: true, action_cable_with_devise: true,
8
11
  devise_resource: :user,
9
12
  current_devise_target: ->(current_user) { current_user.admin },
10
- printable_name: ->(admin) { "admin (#{admin.user.name})" },
11
- action_cable_allowed: true, action_cable_with_devise: true
12
- end
13
+ printable_name: ->(admin) { "#{admin.user.name} (admin)" }
14
+ end
15
+ end
16
+
17
+ unless ENV['AN_TEST_DB'] == 'mongodb'
18
+ class Admin < ActiveRecord::Base
19
+ include AdminModel
20
+ default_scope { order(:id) }
21
+ end
13
22
  else
14
23
  require 'mongoid'
15
24
  class Admin
@@ -17,18 +26,10 @@ else
17
26
  include Mongoid::Timestamps
18
27
  include GlobalID::Identification
19
28
 
20
- belongs_to :user
21
- validates :user, presence: true
22
-
23
29
  field :phone_number, type: String
24
30
  field :slack_username, type: String
25
31
 
26
32
  include ActivityNotification::Models
27
- acts_as_notification_target email_allowed: false,
28
- subscription_allowed: true,
29
- devise_resource: :user,
30
- current_devise_target: ->(current_user) { current_user.admin },
31
- printable_name: ->(admin) { "admin (#{admin.user.name})" },
32
- action_cable_allowed: true, action_cable_with_devise: true
33
- end
33
+ include AdminModel
34
+ end
34
35
  end
@@ -1,20 +1,38 @@
1
- unless ENV['AN_TEST_DB'] == 'mongodb'
2
- class Article < ActiveRecord::Base
1
+ module ArticleModel
2
+ extend ActiveSupport::Concern
3
+
4
+ included do
3
5
  belongs_to :user
4
6
  has_many :comments, dependent: :destroy
5
- has_many :commented_users, through: :comments, source: :user
6
7
  validates :user, presence: true
7
8
 
8
9
  acts_as_notifiable :users,
9
10
  targets: ->(article) { User.all.to_a - [article.user] },
10
- notifier: :user, email_allowed: true, action_cable_allowed: true,
11
+ notifier: :user, email_allowed: true,
12
+ action_cable_allowed: true, action_cable_api_allowed: true,
13
+ printable_name: ->(article) { "new article \"#{article.title}\"" },
14
+ dependent_notifications: :delete_all
15
+
16
+ acts_as_notifiable :admins,
17
+ targets: ->(article) { Admin.all.to_a },
18
+ notifier: :user,
19
+ action_cable_allowed: true, action_cable_api_allowed: true,
20
+ tracked: Rails.env.test? ? {only: []} : { only: [:create, :update], action_cable_rendering: { fallback: :default } },
11
21
  printable_name: ->(article) { "new article \"#{article.title}\"" },
12
22
  dependent_notifications: :delete_all
23
+
13
24
  acts_as_notification_group printable_name: ->(article) { "article \"#{article.title}\"" }
25
+ end
14
26
 
15
- def author?(user)
16
- self.user == user
17
- end
27
+ def author?(user)
28
+ self.user == user
29
+ end
30
+ end
31
+
32
+ unless ENV['AN_TEST_DB'] == 'mongodb'
33
+ class Article < ActiveRecord::Base
34
+ include ArticleModel
35
+ has_many :commented_users, through: :comments, source: :user
18
36
  end
19
37
  else
20
38
  require 'mongoid'
@@ -23,27 +41,14 @@ else
23
41
  include Mongoid::Timestamps
24
42
  include GlobalID::Identification
25
43
 
26
- belongs_to :user
27
- has_many :comments, dependent: :destroy
28
- validates :user, presence: true
29
-
30
44
  field :title, type: String
31
45
  field :body, type: String
32
46
 
33
47
  include ActivityNotification::Models
34
- acts_as_notifiable :users,
35
- targets: ->(article) { User.all.to_a - [article.user] },
36
- notifier: :user, email_allowed: true, action_cable_allowed: true,
37
- printable_name: ->(article) { "new article \"#{article.title}\"" },
38
- dependent_notifications: :delete_all
39
- acts_as_notification_group printable_name: ->(article) { "article \"#{article.title}\"" }
48
+ include ArticleModel
40
49
 
41
50
  def commented_users
42
51
  User.where(:id.in => comments.pluck(:user_id))
43
52
  end
44
-
45
- def author?(user)
46
- self.user == user
47
- end
48
53
  end
49
54
  end