Task/change to jsbundling 931 #933
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…om/NUARIG/competitions into feature/clean-refactor-banners-881 # Conflicts: # app/views/grant_reviewers/index.html.haml
# Conflicts: # app/assets/stylesheets/app.scss
# Conflicts: # Gemfile.lock # app/views/devise/sessions/_form.html.erb # app/views/layouts/application.html.haml # db/schema.rb
jseraf
reviewed
Apr 26, 2022
Comment on lines
1
to
7
| import { Controller } from "@hotwired/stimulus" | ||
|
|
||
| export default class extends Controller { | ||
| connect() { | ||
| this.element.textContent = "Hello World!" | ||
| } | ||
| } |
jseraf
reviewed
Apr 26, 2022
app/javascript/controllers/index.js
Outdated
Comment on lines
6
to
7
| import HelloController from "./hello_controller.js" | ||
| application.register("hello", HelloController) |
jseraf
reviewed
Apr 26, 2022
jseraf
reviewed
Apr 26, 2022
app/models/banner.rb
Outdated
Comment on lines
9
to
44
|
|
||
| # TURBO BANNER WORK | ||
| # has_paper_trail versions: { class_name: 'PaperTrail::BannerVersion' } | ||
|
|
||
| # scope :visible, -> { where(visible: true) } | ||
| # scope :invisible, -> { where(visible: false) } | ||
| # scope :by_created_at, -> { order(created_at: :desc) } | ||
|
|
||
| # validates_presence_of :body | ||
|
|
||
| # # broadcasts_to ->(banner) { :banners }, inserts_by: :prepend | ||
|
|
||
| # # after_create_commit { broadcast_prehttps://blog.cloud66.com/content/images/size/w1000/2021/02/making-hotwire-and-devise-play-nicely.pngpend_to "banners" } | ||
| # # after_update_commit { broadcast_replace_to "banners" } | ||
| # # after_destroy_commit { broadcast_remove_to "banners" } | ||
|
|
||
| # after_create_commit :create_banner_view | ||
|
|
||
| # after_update_commit :update_banner_view | ||
| # after_destroy_commit :destroy_banner_view | ||
|
|
||
| # private | ||
| # def create_banner_view | ||
| # broadcast_prepend_to "banners" | ||
| # # broadcast_replace_to "new_banner_form", partial: 'banners/banner_form', banner: Banner.new | ||
| # # broadcast_replace_to "format_flash_messages" | ||
|
|
||
| # end | ||
|
|
||
| # def update_banner_view | ||
| # broadcast_replace_to "banners" | ||
| # end | ||
|
|
||
| # def destroy_banner_view | ||
| # broadcast_remove_to "banners" | ||
| # end |
There was a problem hiding this comment.
stash this if you need it later, otherwise, remove it.
jseraf
reviewed
Apr 26, 2022
Comment on lines
+28
to
+31
| // $(document).on('nested:fieldRemoved', function(event) { | ||
| // console.log("I AM IN THIS JS FUNCTION.") | ||
| // confirm('Please submit the form to confirm your changes.'); | ||
| // }); |
jseraf
reviewed
Apr 26, 2022
| @@ -1,8 +1,8 @@ | |||
| %fieldset.fieldset.form_builder_question_fieldset | |||
| %fieldset.fieldset.form_builder_question_fieldset{id: "question-fieldset"} | |||
There was a problem hiding this comment.
this may not what you want here. multiple question_fieldset will all have the same id.
jseraf
reviewed
Apr 27, 2022
Comment on lines
41
to
42
| Unassigned Submissions | ||
| Reviewers and Submissions | ||
| %p |
There was a problem hiding this comment.
still not convinced changes to this file should be in the PR
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Incorporates changes for jsbundling from banners work into develop without switching banners to work with turbo.
closes #931