From 5ca3203149a9010d7e4102304e60a1de11a87f39 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sat, 26 Sep 2020 22:38:17 -0700 Subject: [PATCH 01/23] set pagecollection nav color --- app/controllers/page_collections_controller.rb | 5 +++++ app/models/page_collections/page_collection.rb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index ba13c0ad..eedebd23 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -3,6 +3,7 @@ class PageCollectionsController < ApplicationController before_action :set_sidenav_expansion before_action :set_page_collection, only: [:show, :edit, :update, :destroy, :follow, :unfollow, :report] + before_action :set_navbar_color # GET /page_collections def index @@ -161,6 +162,10 @@ class PageCollectionsController < ApplicationController def set_sidenav_expansion @sidenav_expansion = 'community' end + + def set_navbar_color + @navbar_color = PageCollection.hex_color + end def sort_pages case params.permit(:sort).fetch('sort', nil) diff --git a/app/models/page_collections/page_collection.rb b/app/models/page_collections/page_collection.rb index 062219b5..0347939d 100644 --- a/app/models/page_collections/page_collection.rb +++ b/app/models/page_collections/page_collection.rb @@ -1,3 +1,4 @@ + class PageCollection < ApplicationRecord acts_as_paranoid @@ -66,6 +67,10 @@ class PageCollection < ApplicationRecord 'brown' end + def self.hex_color + '#795548' + end + def self.icon 'layers' end From 2d3b91a6443d0db1f18582b1c9b61289f1444866 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sat, 26 Sep 2020 22:40:54 -0700 Subject: [PATCH 02/23] add collection#index parallax header --- .../content/components/_parallax_header.html.erb | 16 +++++++++------- app/views/page_collections/index.html.erb | 4 ++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/views/content/components/_parallax_header.html.erb b/app/views/content/components/_parallax_header.html.erb index a042409b..ec26797f 100644 --- a/app/views/content/components/_parallax_header.html.erb +++ b/app/views/content/components/_parallax_header.html.erb @@ -2,13 +2,15 @@ diff --git a/app/views/page_collections/index.html.erb b/app/views/page_collections/index.html.erb index 10d48c8a..625d9e82 100644 --- a/app/views/page_collections/index.html.erb +++ b/app/views/page_collections/index.html.erb @@ -1,3 +1,7 @@ +<%= content_for :full_width_page_header do %> + <%= render partial: 'content/components/parallax_header', locals: { content_type: 'PageCollection', content_class: PageCollection, image_only: true } %> +<% end %> + <%= render partial: 'notice_dismissal/messages/15' %> <% if @my_collections.any? || current_user.on_premium_plan? %> From 76558c92a392f06f0b8c50ecbcc2282e00d17b8b Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sat, 26 Sep 2020 23:36:02 -0700 Subject: [PATCH 03/23] share links on collection#show --- app/views/content_page_shares/show.html.erb | 2 +- app/views/page_collections/_sidebar.html.erb | 29 +++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/views/content_page_shares/show.html.erb b/app/views/content_page_shares/show.html.erb index e8bac02a..465259ad 100644 --- a/app/views/content_page_shares/show.html.erb +++ b/app/views/content_page_shares/show.html.erb @@ -67,7 +67,7 @@
-
    +
    • Reshare to...
      • diff --git a/app/views/page_collections/_sidebar.html.erb b/app/views/page_collections/_sidebar.html.erb index 4e7145bc..f84aff76 100644 --- a/app/views/page_collections/_sidebar.html.erb +++ b/app/views/page_collections/_sidebar.html.erb @@ -88,4 +88,31 @@
    • <%= link_to pluralize(@page_collection.pending_submissions.count, 'pending submission'), page_collection_pending_submissions_path(page_collection_id: @page_collection.id) %>
    • <%= link_to 'Edit this collection', edit_page_collection_path(@page_collection) %>
    -<% end %> \ No newline at end of file +<% end %> + +
      +
    • + Share collection to... +
      • +
    • + <%= link_to [ + 'http://twitter.com/share?', + 'url=' + URI::escape(page_collection_url(@page_collection)), + '&text=' + URI::escape("I'm building a collection of fictional " + @page_collection.page_types.map(&:pluralize).map(&:downcase).to_sentence + " on Notebook.ai. Check it out!") + ].join, class: 'blue-text', target: '_blank' do %> + share + Twitter + <% end %> +
      • +
    • + <%= + link_to "https://www.facebook.com/sharer/sharer.php?app_id=1523926344336934&u=#{URI::escape(page_collection_url(@page_collection))}&display=popup&ref=plugin&src=share_button", + class: 'blue-text', + onclick: "return !window.open(this.href, 'Facebook', 'width=640,height=580')" do + %> + share + Facebook + <% end %> +
      • + +
    \ No newline at end of file From 0de4effd601eefd1f4f3bbc07bc2b0876af7a2f3 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 16:29:37 -0700 Subject: [PATCH 04/23] allow all collection viewers to see more posts from a particular user --- app/assets/stylesheets/content.css.scss | 6 +- .../_contributor_highlight_bar.html.erb | 4 + .../page_collections/_quick_add.html.erb | 2 +- app/views/page_collections/show.html.erb | 118 +++++++++++++++++- 4 files changed, 124 insertions(+), 6 deletions(-) create mode 100644 app/views/page_collections/_contributor_highlight_bar.html.erb diff --git a/app/assets/stylesheets/content.css.scss b/app/assets/stylesheets/content.css.scss index 50930eab..f1e18ee1 100644 --- a/app/assets/stylesheets/content.css.scss +++ b/app/assets/stylesheets/content.css.scss @@ -173,4 +173,8 @@ p.long-form { color: orange !important; cursor: pointer; } -} \ No newline at end of file +} + +.spaced-paragraphs p { + margin-bottom: 1em; +} diff --git a/app/views/page_collections/_contributor_highlight_bar.html.erb b/app/views/page_collections/_contributor_highlight_bar.html.erb new file mode 100644 index 00000000..8819d8f2 --- /dev/null +++ b/app/views/page_collections/_contributor_highlight_bar.html.erb @@ -0,0 +1,4 @@ +
    + Showing all submitted pages from <%= link_to contributor.display_name, contributor, class: "#{User.color}-text" %>. + Click <%= link_to 'here', @page_collection, class: 'blue-text text-lighten-3' %> to see all pages regardless of author. +
    \ No newline at end of file diff --git a/app/views/page_collections/_quick_add.html.erb b/app/views/page_collections/_quick_add.html.erb index e5a70fa4..5945b088 100644 --- a/app/views/page_collections/_quick_add.html.erb +++ b/app/views/page_collections/_quick_add.html.erb @@ -1,5 +1,5 @@ <% if user_signed_in? && (@page_collection.allow_submissions? || @page_collection.user == current_user) %> -
      +
      • <%= PageCollection.icon %> diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index 77c0bbdd..eba9e18d 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -1,5 +1,118 @@ <%= content_for :full_width_page_header do %> <%= render partial: 'content/components/collection_header', locals: { collection: @page_collection } %> + +
        +
        +
        +
        +
        + <% if user_signed_in? %> + <% if current_user != @page_collection.user %> + <% if @page_collection.followed_by?(current_user) %> + <%= link_to unfollow_page_collection_path(@page_collection), class: "btn #{PageCollection.color} lighten-2 right" do %> + <%= PageCollection.icon %> + Unfollow + <% end %> + + <% else %> + <%= link_to follow_page_collection_path(@page_collection), class: "btn #{PageCollection.color} right" do %> + <%= PageCollection.icon %> + Follow for updates + <% end %> + <% end %> + <% end %> + <% else %> + <%= link_to '#', class: "btn #{PageCollection.color} lighten-2 right disabled" do %> + <%= PageCollection.icon %> + Follow + <% end %> + <% end %> + + About this collection +
        +
        + <% if user_signed_in? && @page_collection.user == current_user %> + <%= form_for @page_collection do |f| %> +
        + <%= f.text_area :description, class: 'materialize-textarea' %> + <%= f.label :description, 'Collection Description' %> +
        You can add details for this collection to explain what kinds of pages you'd like it to contain.
        +
        + <%= f.submit 'Save changes', class: 'btn right blue white-text' %> +
        + + <% end %> + <% else %> + <% if @page_collection.description? %> +
        + <%= simple_format @page_collection.description %> +
        + <% end %> + <% end %> + +
        +
        +
        +
        +
        +
        +
        In this collection
        + + <%= render partial: 'page_collections/quick_add' %> + +
        + <%= link_to @page_collection, class: "collection-item #{PageCollection.color}-text" do %> + <%= PageCollection.icon %> + All Pages + <%= @page_collection.accepted_submissions.count %> + <% end %> + <% @page_collection.page_types.each do |pt| %> + <% klass = pt.constantize %> + <%= link_to(send(pt.downcase.pluralize + '_page_collection_path', @page_collection), class: "collection-item #{klass.color} white-text") do %> + <%= klass.icon %> + <%= pt.pluralize %> + <%= @page_collection.accepted_submissions.where(content_type: pt).count %> + <% end %> + <% end %> +
        + +
        Curator
        +
        + <%= link_to @page_collection.user, class: "#{User.color}-text" do %> + <%= image_tag @page_collection.user.image_url(size=20), class: 'left circle', style: 'margin-right: 8px;' %> + <%= @page_collection.user.display_name %> + <% end %> +
        + + <% if @page_collection.contributors.any? %> +
        Contributors
        + <% @page_collection.contributors.each do |user| %> +
        + <%= link_to user, class: "#{User.color}-text" do %> + <%= image_tag user.image_url(size=20), class: 'left circle', style: 'margin-right: 8px;' %> + <%= user.display_name %> + <% end %> +
        + <% end %> +
        + <% end %> +
        +
        +
        +
        + + <% if @pages.empty? %> +
        + This collection doesn't have any approved public pages yet. Please check back later! +
        + <% else %> + <%= render partial: 'page_collections/sort_bar' %> + <% if !!@show_contributor_highlight %> + <%= render partial: 'page_collections/contributor_highlight_bar', locals: { contributor: @highlighted_contributor } %> + <% end %> + <%= render partial: 'page_collections/stream', locals: { pages: @pages } %> + <% end %> + <% end %>
        @@ -11,10 +124,7 @@ <% else %> <%= render partial: 'page_collections/sort_bar' %> <% if !!@show_contributor_highlight %> -
        - Showing all submitted pages from <%= link_to @highlighted_contributor.display_name, @highlighted_contributor, class: "#{User.color}-text" %>. - Click <%= link_to 'here', @page_collection, class: 'blue-text text-lighten-3' %> to see all pages regardless of author. -
        + <%= render partial: 'page_collections/contributor_highlight_bar', locals: { contributor: @highlighted_contributor } %> <% end %> <%= render partial: 'page_collections/stream', locals: { pages: @pages } %> <% end %> From f72e87c4e351e2a7b19639742f7b4dd4eef99ef5 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 16:36:52 -0700 Subject: [PATCH 05/23] new collection design with tiles --- app/views/page_collections/_tiles.html.erb | 45 ++++++++ app/views/page_collections/show.html.erb | 24 +--- ...046_add_reference_code_to_notifications.rb | 5 + db/schema.rb | 103 +++++++++++++++++- 4 files changed, 155 insertions(+), 22 deletions(-) create mode 100644 app/views/page_collections/_tiles.html.erb create mode 100644 db/migrate/20201001195046_add_reference_code_to_notifications.rb diff --git a/app/views/page_collections/_tiles.html.erb b/app/views/page_collections/_tiles.html.erb new file mode 100644 index 00000000..ba3fbd83 --- /dev/null +++ b/app/views/page_collections/_tiles.html.erb @@ -0,0 +1,45 @@ +
        + <% pages.each do |page| %> +
        + <% content = page.content %> + <% next unless (current_user || User.new).can_read?(content) %> +
        +
        + <%= image_tag content.random_public_image, class: 'activator' %> +
        +
        + + <%= link_to content.name, content %> + more_vert + +

        + Submitted by + <%= link_to content.user, class: "#{User.color}-text" do %> + <%= content.user.display_name %> + <% end %> +

        +
        +
        + + <%= link_to content.name, content %> + close + + <% if page.explanation? %> +
        + <%= simple_format page.explanation %> +
        + <% end %> +
          +
        • <%= link_to 'View more submissions from this user', page_collection_submissions_by_user_path(page_collection_id: @page_collection.id, user_id: page.user_id) %>
          • + <% if user_signed_in? && current_user == @page_collection.user %> +
        •  
          • +
        • +
        •  
          • +
        • <%= link_to 'Remove from collection', page_collection_submission_path(page), method: :delete, class: 'red-text', data: { confirm: "Are you sure you want to remove this page from this collection?" } %>
          • + <% end %> +
        +
        +
        +
        + <% end %> +
        \ No newline at end of file diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index eba9e18d..66601980 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -85,6 +85,7 @@
        <% if @page_collection.contributors.any? %> +
        Contributors
        <% @page_collection.contributors.each do |user| %>
        @@ -110,26 +111,7 @@ <% if !!@show_contributor_highlight %> <%= render partial: 'page_collections/contributor_highlight_bar', locals: { contributor: @highlighted_contributor } %> <% end %> - <%= render partial: 'page_collections/stream', locals: { pages: @pages } %> + <%= render partial: 'page_collections/tiles', locals: { pages: @pages } %> <% end %> -<% end %> - -
        -
        - <% if @pages.empty? %> -
        - This collection doesn't have any approved public pages yet. Please check back later! -
        - <% else %> - <%= render partial: 'page_collections/sort_bar' %> - <% if !!@show_contributor_highlight %> - <%= render partial: 'page_collections/contributor_highlight_bar', locals: { contributor: @highlighted_contributor } %> - <% end %> - <%= render partial: 'page_collections/stream', locals: { pages: @pages } %> - <% end %> -
        -
        - <%= render partial: 'page_collections/sidebar' %> -
        -
        \ No newline at end of file +<% end %> \ No newline at end of file diff --git a/db/migrate/20201001195046_add_reference_code_to_notifications.rb b/db/migrate/20201001195046_add_reference_code_to_notifications.rb new file mode 100644 index 00000000..5709c826 --- /dev/null +++ b/db/migrate/20201001195046_add_reference_code_to_notifications.rb @@ -0,0 +1,5 @@ +class AddReferenceCodeToNotifications < ActiveRecord::Migration[6.0] + def change + add_column :notifications, :reference_code, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 2aeb90eb..d0236548 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_08_29_011900) do +ActiveRecord::Schema.define(version: 2020_10_01_195046) do create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false @@ -41,6 +41,18 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do t.index ["user_id"], name: "index_api_keys_on_user_id" end + create_table "api_requests", force: :cascade do |t| + t.integer "application_integration_id" + t.integer "integration_authorization_id" + t.string "result" + t.integer "updates_used", default: 0 + t.string "ip_address" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["application_integration_id"], name: "index_api_requests_on_application_integration_id" + t.index ["integration_authorization_id"], name: "index_api_requests_on_integration_authorization_id" + end + create_table "application_integrations", force: :cascade do |t| t.integer "user_id", null: false t.string "name" @@ -1040,6 +1052,19 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do t.integer "interrogative_count" t.integer "proper_noun_count" t.datetime "queued_at" + t.float "linsear_write_grade" + t.float "dale_chall_grade" + t.integer "unique_complex_words_count" + t.integer "unique_simple_words_count" + t.boolean "hate_content_flag", default: false + t.string "hate_trigger_words" + t.boolean "profanity_content_flag", default: false + t.string "profanity_trigger_words" + t.boolean "sex_content_flag", default: false + t.string "sex_trigger_words" + t.boolean "violence_content_flag", default: false + t.string "violence_trigger_words" + t.boolean "adult_content_flag", default: false t.index ["document_id"], name: "index_document_analyses_on_document_id" end @@ -1081,6 +1106,19 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do t.index ["entity_type", "entity_id"], name: "index_document_entities_on_entity_type_and_entity_id" end + create_table "document_revisions", force: :cascade do |t| + t.integer "document_id", null: false + t.string "title" + t.string "body" + t.string "synopsis" + t.integer "universe_id" + t.string "notes_text" + t.datetime "deleted_at" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["document_id"], name: "index_document_revisions_on_document_id" + end + create_table "documents", force: :cascade do |t| t.integer "user_id" t.text "body" @@ -1098,6 +1136,61 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do t.index ["user_id"], name: "index_documents_on_user_id" end + create_table "end_of_day_analytics_reports", force: :cascade do |t| + t.date "day" + t.integer "user_signups" + t.integer "new_monthly_subscriptions" + t.integer "ended_monthly_subscriptions" + t.integer "new_trimonthly_subscriptions" + t.integer "ended_trimonthly_subscriptions" + t.integer "new_annual_subscriptions" + t.integer "ended_annual_subscriptions" + t.integer "paid_paypal_invoices" + t.integer "buildings_created" + t.integer "characters_created" + t.integer "conditions_created" + t.integer "continents_created" + t.integer "countries_created" + t.integer "creatures_created" + t.integer "deities_created" + t.integer "floras_created" + t.integer "foods_created" + t.integer "governments_created" + t.integer "groups_created" + t.integer "items_created" + t.integer "jobs_created" + t.integer "landmarks_created" + t.integer "languages_created" + t.integer "locations_created" + t.integer "lores_created" + t.integer "magics_created" + t.integer "planets_created" + t.integer "races_created" + t.integer "religions_created" + t.integer "scenes_created" + t.integer "schools_created" + t.integer "sports_created" + t.integer "technologies_created" + t.integer "towns_created" + t.integer "traditions_created" + t.integer "universes_created" + t.integer "vehicles_created" + t.integer "documents_created" + t.integer "documents_edited" + t.integer "timelines_created" + t.integer "stream_shares_created" + t.integer "stream_comments" + t.integer "collections_created" + t.integer "collection_submissions_created" + t.integer "thredded_threads_created" + t.integer "thredded_replies_created" + t.integer "thredded_private_messages_created" + t.integer "thredded_private_replies_created" + t.integer "document_analyses_created" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "famous_figureships", force: :cascade do |t| t.integer "user_id" t.integer "race_id" @@ -1446,6 +1539,10 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do t.string "ip_address" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "origin" + t.string "content_type" + t.string "user_agent" + t.string "user_token" t.index ["application_integration_id"], name: "index_integration_authorizations_on_application_integration_id" t.index ["user_id"], name: "index_integration_authorizations_on_user_id" end @@ -2143,6 +2240,7 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do t.datetime "updated_at", precision: 6, null: false t.string "icon_color", default: "blue" t.string "passthrough_link" + t.string "reference_code" t.index ["user_id"], name: "index_notifications_on_user_id" end @@ -3435,6 +3533,8 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "api_keys", "users" + add_foreign_key "api_requests", "application_integrations" + add_foreign_key "api_requests", "integration_authorizations" add_foreign_key "application_integrations", "users" add_foreign_key "buildings", "universes" add_foreign_key "buildings", "users" @@ -3567,6 +3667,7 @@ ActiveRecord::Schema.define(version: 2020_08_29_011900) do add_foreign_key "document_categories", "document_analyses" add_foreign_key "document_concepts", "document_analyses" add_foreign_key "document_entities", "document_analyses" + add_foreign_key "document_revisions", "documents" add_foreign_key "documents", "universes" add_foreign_key "documents", "users" add_foreign_key "floras", "universes" From d4fe1364980024c1d1176b6124c2c093ced6725c Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 16:55:37 -0700 Subject: [PATCH 06/23] more actions on collection tiles --- app/views/page_collections/_tiles.html.erb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/app/views/page_collections/_tiles.html.erb b/app/views/page_collections/_tiles.html.erb index ba3fbd83..74f4d1cd 100644 --- a/app/views/page_collections/_tiles.html.erb +++ b/app/views/page_collections/_tiles.html.erb @@ -30,7 +30,24 @@ <% end %>
          -
        • <%= link_to 'View more submissions from this user', page_collection_submissions_by_user_path(page_collection_id: @page_collection.id, user_id: page.user_id) %>
          • +
        • + <%= link_to content, class: "#{content.class.color}-text" do %> + arrow_right + View <%= content.name %>'s notebook page + <% end %> +
          • +
        • + <%= link_to page_collection_submissions_by_user_path(page_collection_id: @page_collection.id, user_id: page.user_id), class: "#{PageCollection.color}-text" do %> + arrow_right + View more submissions from this user + <% end %> +
          • +
        • + <%= link_to page_collection_submissions_by_user_path(page_collection_id: @page_collection.id, user_id: page.user_id), class: "#{User.color}-text" do %> + arrow_right + View <%= page.user.display_name %>'s profile + <% end %> +
          • <% if user_signed_in? && current_user == @page_collection.user %>
        •  
        • From 35c248a419bef9638404bcfefc98c522d86de69e Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 17:18:04 -0700 Subject: [PATCH 07/23] add chronological and random sorting --- app/controllers/page_collections_controller.rb | 2 ++ app/views/page_collections/_sort_bar.html.erb | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index eedebd23..c914f0ae 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -173,6 +173,8 @@ class PageCollectionsController < ApplicationController @pages = @pages.reorder('cached_content_name ASC') when 'chronological' @pages = @pages.reorder('accepted_at ASC') + when 'shuffle' + @pages = @pages.shuffle when 'recent' @pages = @pages.reorder('accepted_at DESC') when nil diff --git a/app/views/page_collections/_sort_bar.html.erb b/app/views/page_collections/_sort_bar.html.erb index 85efde82..6dcdf878 100644 --- a/app/views/page_collections/_sort_bar.html.erb +++ b/app/views/page_collections/_sort_bar.html.erb @@ -5,12 +5,20 @@ Trending <% end %> --> - <%= link_to params.permit(:sort).merge({sort: 'alphabetical'}), class: 'btn btn-flat' do %> + <%= link_to params.permit(:sort).merge({sort: 'alphabetical'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Show pages in this collection alphabetically, by name" } do %> sort Alphabetical <% end %> - <%= link_to params.permit(:sort).merge({sort: 'recent'}), class: 'btn btn-flat' do %> + <%= link_to params.permit(:sort).merge({sort: 'chronological'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Show pages in this collection in the order they were added" } do %> + sort + Chronological + <% end %> + <%= link_to params.permit(:sort).merge({sort: 'recent'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Sort pages in this collection most-recently-added-first" } do %> sort Recently added <% end %> + <%= link_to params.permit(:sort).merge({sort: 'shuffle'}), class: 'btn btn-flat tooltipped', data: { tooltip: "Show pages in this collection in a random order" } do %> + sort + Shuffle + <% end %>
        \ No newline at end of file From 3bedd6444782f3d41a4701b60306836776abc60a Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 18:10:52 -0700 Subject: [PATCH 08/23] add followed collections to collections#index --- .../page_collections_controller.rb | 2 ++ app/models/users/user.rb | 1 + app/views/page_collections/index.html.erb | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index c914f0ae..8b9b62e3 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -13,6 +13,8 @@ class PageCollectionsController < ApplicationController @network_collections = PageCollection.where(user_id: followed_user_ids, privacy: 'public') @random_collections = PageCollection.where(privacy: 'public').sample(9) + + @followed_collections = current_user.followed_page_collections end # GET /page_collections/1 diff --git a/app/models/users/user.rb b/app/models/users/user.rb index 08b8da8d..5637ba2f 100644 --- a/app/models/users/user.rb +++ b/app/models/users/user.rb @@ -75,6 +75,7 @@ class User < ApplicationRecord @published_in_page_collections ||= PageCollection.where(id: ids) end has_many :page_collection_followings, dependent: :destroy + has_many :followed_page_collections, through: :page_collection_followings, source: :page_collection has_many :page_collection_reports, dependent: :destroy has_many :votes, dependent: :destroy diff --git a/app/views/page_collections/index.html.erb b/app/views/page_collections/index.html.erb index 625d9e82..e0c08608 100644 --- a/app/views/page_collections/index.html.erb +++ b/app/views/page_collections/index.html.erb @@ -46,6 +46,36 @@
        <% end %> +<% if @followed_collections.any? %> +
        +

        + <%= PageCollection.icon %> + Collections you follow +

        + <% @followed_collections.each do |collection| %> +
        + <%= link_to collection do %> +
        +
        + <%= image_tag collection.random_public_image, style: 'max-height: 250px;' %> + + <%= collection.title %> +
        + + <% collection.page_types.each do |icon| %> + <% klass = icon.constantize %> + <%= klass.icon %> + <% end %> + +         +
        +
        + <% end %> +
        + <% end %> +
        +<% end %> + <% if @network_collections.any? %>

        From 6143bebc778da36dcc34c590351abf460592f824 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 18:37:19 -0700 Subject: [PATCH 09/23] clean up collections#index code --- .../_collection_grid.html.erb | 25 +++++ app/views/page_collections/index.html.erb | 105 +----------------- app/views/page_collections/new.html.erb | 2 +- 3 files changed, 31 insertions(+), 101 deletions(-) create mode 100644 app/views/page_collections/_collection_grid.html.erb diff --git a/app/views/page_collections/_collection_grid.html.erb b/app/views/page_collections/_collection_grid.html.erb new file mode 100644 index 00000000..44f6c8c1 --- /dev/null +++ b/app/views/page_collections/_collection_grid.html.erb @@ -0,0 +1,25 @@ +

        + <%= PageCollection.icon %> + <%= title %> +

        +<% collection_list.each do |collection| %> +
        + <%= link_to collection do %> +
        +
        + <%= image_tag collection.random_public_image, style: 'max-height: 250px;' %> + + <%= collection.title %> +
        + + <% collection.page_types.each do |icon| %> + <% klass = icon.constantize %> + <%= klass.icon %> + <% end %> + +         +
        +
        + <% end %> +
        +<% end %> \ No newline at end of file diff --git a/app/views/page_collections/index.html.erb b/app/views/page_collections/index.html.erb index e0c08608..098f7c17 100644 --- a/app/views/page_collections/index.html.erb +++ b/app/views/page_collections/index.html.erb @@ -6,31 +6,8 @@ <% if @my_collections.any? || current_user.on_premium_plan? %>
        -

        - <%= PageCollection.icon %> - Your collections -

        - <% @my_collections.each do |collection| %> -
        - <%= link_to collection do %> -
        -
        - <%= image_tag collection.random_public_image, style: 'max-height: 250px;' %> - - <%= collection.title %> -
        - - <% collection.page_types.each do |icon| %> - <% klass = icon.constantize %> - <%= klass.icon %> - <% end %> - -         -
        -
        - <% end %> -
        - <% end %> + <%= render partial: 'page_collections/collection_grid', locals: { collection_list: @my_collections, title: "Your collections" } %> + <% if current_user.on_premium_plan? %>
        <%= link_to new_page_collection_path do %> @@ -48,90 +25,18 @@ <% if @followed_collections.any? %>
        -

        - <%= PageCollection.icon %> - Collections you follow -

        - <% @followed_collections.each do |collection| %> -
        - <%= link_to collection do %> -
        -
        - <%= image_tag collection.random_public_image, style: 'max-height: 250px;' %> - - <%= collection.title %> -
        - - <% collection.page_types.each do |icon| %> - <% klass = icon.constantize %> - <%= klass.icon %> - <% end %> - -         -
        -
        - <% end %> -
        - <% end %> + <%= render partial: 'page_collections/collection_grid', locals: { collection_list: @followed_collections, title: "Collections you follow" } %>
        <% end %> <% if @network_collections.any? %>
        -

        - <%= PageCollection.icon %> - Collections from your network -

        - <% @network_collections.each do |collection| %> -
        - <%= link_to collection do %> -
        -
        - <%= image_tag collection.random_public_image, style: 'max-height: 250px;' %> - - <%= collection.title %> -
        - - <% collection.page_types.each do |icon| %> - <% klass = icon.constantize %> - <%= klass.icon %> - <% end %> - -         -
        -
        - <% end %> -
        - <% end %> + <%= render partial: 'page_collections/collection_grid', locals: { collection_list: @network_collections, title: "Collections from your network" } %>
        <% end %> <% if @random_collections.any? %>
        -

        - <%= PageCollection.icon %> - Discover more collections -

        - <% @random_collections.each do |collection| %> -
        - <%= link_to collection do %> -
        -
        - <%= image_tag collection.random_public_image, style: 'max-height: 250px;' %> - - <%= collection.title %> -
        - - <% collection.page_types.each do |icon| %> - <% klass = icon.constantize %> - <%= klass.icon %> - <% end %> - -         -
        -
        - <% end %> -
        - <% end %> + <%= render partial: 'page_collections/collection_grid', locals: { collection_list: @random_collections, title: "Discover more collections" } %>
        <% end %> \ No newline at end of file diff --git a/app/views/page_collections/new.html.erb b/app/views/page_collections/new.html.erb index 6177ede3..81ec7e3a 100644 --- a/app/views/page_collections/new.html.erb +++ b/app/views/page_collections/new.html.erb @@ -1,3 +1,3 @@ -

        New Page Collection

        +

        Create a Collection

        <%= render 'form', page_collection: @page_collection %> From c2406dfd6a93d9a989160cbc6907f2cb2d4a70ec Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 18:39:33 -0700 Subject: [PATCH 10/23] lil smarter collection discovery --- app/controllers/page_collections_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index 8b9b62e3..83c2036d 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -11,10 +11,11 @@ class PageCollectionsController < ApplicationController followed_user_ids = UserFollowing.where(user_id: current_user.id).pluck(:followed_user_id) @network_collections = PageCollection.where(user_id: followed_user_ids, privacy: 'public') - - @random_collections = PageCollection.where(privacy: 'public').sample(9) - @followed_collections = current_user.followed_page_collections + + @random_collections = PageCollection.where(privacy: 'public').where.not( + id: @my_collections.pluck(:id) + @network_collections.pluck(:id) + @followed_collections.pluck(:id) + ).sample(9) end # GET /page_collections/1 From c2a9e35efbc2adb4b3ea6238858962037ec990ca Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 1 Oct 2020 18:51:36 -0700 Subject: [PATCH 11/23] polish empty collection ui --- app/views/page_collections/show.html.erb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index 66601980..6fc14a12 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -56,10 +56,10 @@
        -
        In this collection
        - <%= render partial: 'page_collections/quick_add' %> +
        In this collection
        +
        <%= link_to @page_collection, class: "collection-item #{PageCollection.color}-text" do %> <%= PageCollection.icon %> @@ -103,8 +103,12 @@
        <% if @pages.empty? %> -
        - This collection doesn't have any approved public pages yet. Please check back later! +
        +
        +
        + This collection doesn't have any approved public pages yet. Please check back later! +
        +
        <% else %> <%= render partial: 'page_collections/sort_bar' %> From eaf4e3493263e719bada029827c6fe9aee2ce079 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Wed, 7 Oct 2020 00:24:29 -0700 Subject: [PATCH 12/23] rip out wip pccf --- .../components/PageCollectionCreationForm.js | 180 ++++++++++++++++++ app/views/page_collections/_form.html.erb | 8 +- 2 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 app/javascript/components/PageCollectionCreationForm.js diff --git a/app/javascript/components/PageCollectionCreationForm.js b/app/javascript/components/PageCollectionCreationForm.js new file mode 100644 index 00000000..8cf5ca87 --- /dev/null +++ b/app/javascript/components/PageCollectionCreationForm.js @@ -0,0 +1,180 @@ +/* + Usage: + <%= react_component("PageCollectionCreationForm", {}) %> +*/ + +import React from "react" +import PropTypes from "prop-types" + +import Stepper from '@material-ui/core/Stepper'; +import Step from '@material-ui/core/Step'; +import StepLabel from '@material-ui/core/StepLabel'; +import StepContent from '@material-ui/core/StepContent'; +import Button from '@material-ui/core/Button'; +import Paper from '@material-ui/core/Paper'; +import Typography from '@material-ui/core/Typography'; + +class PageCollectionCreationForm extends React.Component { + + constructor(props) { + super(props); + + this.state = { + active_step: 0 + } + + this.handleNext = this.handleNext.bind(this); + this.handleBack = this.handleBack.bind(this); + this.handleReset = this.handleReset.bind(this); + } + + handleNext() { + this.setState({ active_step: this.state.active_step + 1 }); + }; + + handleBack() { + this.setState({ active_step: this.state.active_step - 1 }); + }; + + handleReset() { + this.setState({ active_step: 0 }); + }; + + classIcon(class_name) { + return window.ContentTypeData[class_name].icon; + } + + classColor(class_name) { + return window.ContentTypeData[class_name].color; + } + + steps() { + return ['Basic information', 'Acceptable pages', 'Privacy settings']; + } + + getStepContent(step) { + switch (step) { + case 0: + return( +
        + + Let's get started with some basic information. + +
        + + +
        +
        + + +
        +
        + + +
        +
        +

        Header image (optional)

        +
        +
        + Upload + +
        +
        + +
        +
        +
        + Supported file types: .png, .jpg, .jpeg, .gif +
        +
        +

        +
        + ); + case 1: + return ( +
        + + Please check the types of pages you would like to allow in this collection. A small number of page types is recommended. + +
        + {this.props.all_content_types.map(function(type) { + return( +

        + +

        + ); + })} + +
        +
        + ); + case 2: + return ( +
        + + By default, all Collections are private. However, you can choose to make your Collection public at any time, and you can also choose to + accept submissions from other users! + +
        + ); + + default: + return 'Unknown step'; + } + } + + render () { + return ( +
        + + {this.steps().map((label, index) => ( + + {label} + + {this.getStepContent(index)} +
        +
        + + +
        +
        +         +         + ))} +         + {this.state.active_step === this.steps().length && ( + + All steps completed - you're finished! + + + )} +
        + ); + } +} + +PageCollectionCreationForm.propTypes = { + document_id: PropTypes.number +}; + +export default PageCollectionCreationForm; \ No newline at end of file diff --git a/app/views/page_collections/_form.html.erb b/app/views/page_collections/_form.html.erb index efd45c57..d6a7f583 100644 --- a/app/views/page_collections/_form.html.erb +++ b/app/views/page_collections/_form.html.erb @@ -1,3 +1,8 @@ +<%# react_component("PageCollectionCreationForm", { + all_content_types: Rails.application.config.content_types[:all].map(&:name), + active_content_types: page_collection.page_types +}) %> + <%= form_with(model: page_collection, local: true) do |f| %> <% if page_collection.errors.any? %>
        @@ -62,7 +67,8 @@
        Acceptable pages

        - Please check the types of pages you would like to allow in this collection. A small number of page types is recommended. + Please check the types of pages you'll allow to be submitted or added to this in this collection. A small number of page types is recommended. + You can change this at any time.


        From 451f2345f6c3da7f88383dc8df4d8b7357b28e84 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 11 Oct 2020 14:14:13 -0700 Subject: [PATCH 13/23] redo collection#submit form --- app/views/page_collections/show.html.erb | 136 ++++++++++++++++------- 1 file changed, 95 insertions(+), 41 deletions(-) diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index 6fc14a12..1ed74530 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -54,51 +54,52 @@
        -
        -
        - <%= render partial: 'page_collections/quick_add' %> + <%# render partial: 'page_collections/quick_add' %> + + <%= PageCollection.icon %> + <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page + +

        -
        In this collection
        +
        In this collection
        -
        - <%= link_to @page_collection, class: "collection-item #{PageCollection.color}-text" do %> - <%= PageCollection.icon %> - All Pages - <%= @page_collection.accepted_submissions.count %> - <% end %> - <% @page_collection.page_types.each do |pt| %> - <% klass = pt.constantize %> - <%= link_to(send(pt.downcase.pluralize + '_page_collection_path', @page_collection), class: "collection-item #{klass.color} white-text") do %> - <%= klass.icon %> - <%= pt.pluralize %> - <%= @page_collection.accepted_submissions.where(content_type: pt).count %> - <% end %> - <% end %> -
        - -
        Curator
        -
        - <%= link_to @page_collection.user, class: "#{User.color}-text" do %> - <%= image_tag @page_collection.user.image_url(size=20), class: 'left circle', style: 'margin-right: 8px;' %> - <%= @page_collection.user.display_name %> - <% end %> -
        - - <% if @page_collection.contributors.any? %> -
        -
        Contributors
        - <% @page_collection.contributors.each do |user| %> -
        - <%= link_to user, class: "#{User.color}-text" do %> - <%= image_tag user.image_url(size=20), class: 'left circle', style: 'margin-right: 8px;' %> - <%= user.display_name %> - <% end %> -
        - <% end %> -
        +
        + <%= link_to @page_collection, class: "collection-item #{PageCollection.color}-text" do %> + <%= PageCollection.icon %> + All Pages + <%= @page_collection.accepted_submissions.count %> + <% end %> + <% @page_collection.page_types.each do |pt| %> + <% klass = pt.constantize %> + <%= link_to(send(pt.downcase.pluralize + '_page_collection_path', @page_collection), class: "collection-item #{klass.color} white-text") do %> + <%= klass.icon %> + <%= pt.pluralize %> + <%= @page_collection.accepted_submissions.where(content_type: pt).count %> <% end %> -
        + <% end %>
        + +
        Curator
        +
        + <%= link_to @page_collection.user, class: "#{User.color}-text" do %> + <%= image_tag @page_collection.user.image_url(size=20), class: 'left circle', style: 'margin-right: 8px;' %> + <%= @page_collection.user.display_name %> + <% end %> +
        + + <% if @page_collection.contributors.any? %> +
        +
        Contributors
        + <% @page_collection.contributors.each do |user| %> +
        + <%= link_to user, class: "#{User.color}-text" do %> + <%= image_tag user.image_url(size=20), class: 'left circle', style: 'margin-right: 8px;' %> + <%= user.display_name %> + <% end %> +
        + <% end %> +
        + <% end %>
        @@ -118,4 +119,57 @@ <%= render partial: 'page_collections/tiles', locals: { pages: @pages } %> <% end %> +<% end %> + +<%= form_for PageCollectionSubmission.new do |f| %> +
        +
        +

        <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page

        +
        + <% if @submittable_content.values.flatten.any? %> +
        +
        + <%= f.hidden_field :page_collection_id, value: @page_collection.id %> +
        + <%= f.select :content do %> + <% @submittable_content.each do |content_type, content_list| %> + + <% content_list.each do |content| %> + + <% end %> + + <% end %> + <% end %> + +
        + Submitting a page will automatically change its privacy to "public". +
        +
        +
        +
        +
        + <%= f.text_area :explanation, class: 'materialize-textarea' %> + <%= f.label :explanation, 'Add a message' %> +
        + <% if @page_collection.user == current_user %> + This message will be visible to everyone. + <% else %> + If this submission is accepted, this message will be visible to everyone. + <% end %> + It can be as long or as short as you'd like! +
        +
        +
        +
        + + <% else %> +

        + You don't have any pages to submit to this collection. +

        + <% end %> +
        +
        + <%= f.submit (@page_collection.user == current_user ? 'Add' : 'Submit') + ' page', class: "btn #{PageCollection.color} white-text" %> +
        +
        <% end %> \ No newline at end of file From 77ce20927492d1e023fe492228e56ab5cfaa9475 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 11 Oct 2020 14:35:05 -0700 Subject: [PATCH 14/23] polish ui --- app/views/page_collections/show.html.erb | 39 ++++++++++++++++++------ 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index 1ed74530..4b7dee41 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -55,20 +55,20 @@
        <%# render partial: 'page_collections/quick_add' %> - + <%= PageCollection.icon %> - <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page +
        + <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page + + to this Collection + +


        In this collection
        - <%= link_to @page_collection, class: "collection-item #{PageCollection.color}-text" do %> - <%= PageCollection.icon %> - All Pages - <%= @page_collection.accepted_submissions.count %> - <% end %> <% @page_collection.page_types.each do |pt| %> <% klass = pt.constantize %> <%= link_to(send(pt.downcase.pluralize + '_page_collection_path', @page_collection), class: "collection-item #{klass.color} white-text") do %> @@ -77,6 +77,11 @@ <%= @page_collection.accepted_submissions.where(content_type: pt).count %> <% end %> <% end %> + <%= link_to @page_collection, class: "collection-item #{PageCollection.color}-text" do %> + <%= PageCollection.icon %> + All Pages + <%= @page_collection.accepted_submissions.count %> + <% end %>
        Curator
        @@ -124,13 +129,27 @@ <%= form_for PageCollectionSubmission.new do |f| %>
        -

        <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page

        +

        + <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page + + to this Collection + +


        <% if @submittable_content.values.flatten.any? %>
        <%= f.hidden_field :page_collection_id, value: @page_collection.id %> -
        +
        + <% @submittable_content.keys.each do |submittable_class_name| %> + <% submittable_class = submittable_class_name.constantize %> + <%= submittable_class.icon %>   + <% end %> +
        +
        + +
        <%= f.select :content do %> <% @submittable_content.each do |content_type, content_list| %> @@ -170,6 +189,8 @@
        <%= f.submit (@page_collection.user == current_user ? 'Add' : 'Submit') + ' page', class: "btn #{PageCollection.color} white-text" %> + + Nevermind
        <% end %> \ No newline at end of file From 6a70bafe19c708ba57283199a884da8dedf46694 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 11 Oct 2020 18:56:25 -0700 Subject: [PATCH 15/23] wrap up collections ui improvements --- .../page_collections_controller.rb | 30 ++++++++++--------- .../_page_type_highlight_bar.html.erb | 5 ++++ app/views/page_collections/_tiles.html.erb | 6 ++-- app/views/page_collections/show.html.erb | 23 ++++++++++++-- 4 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 app/views/page_collections/_page_type_highlight_bar.html.erb diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index f6fd3277..8176ee25 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -2,9 +2,11 @@ class PageCollectionsController < ApplicationController before_action :authenticate_user!, except: [:show] before_action :set_sidenav_expansion - before_action :set_page_collection, only: [:show, :edit, :update, :destroy, :follow, :unfollow, :report] before_action :set_navbar_color + before_action :set_page_collection, only: [:show, :edit, :by_user, :update, :destroy, :follow, :unfollow, :report] + before_action :set_submittable_content, only: [:show, :by_user] + # GET /page_collections def index @my_collections = current_user.page_collections @@ -26,12 +28,6 @@ class PageCollectionsController < ApplicationController @pages = @page_collection.accepted_submissions sort_pages - - @submittable_content = if user_signed_in? - @current_user_content.slice(*@page_collection.page_types) - else - [] - end end # GET /page_collections/new @@ -99,7 +95,10 @@ class PageCollectionsController < ApplicationController Rails.application.config.content_types[:all].each do |content_type| define_method(content_type.name.downcase.pluralize.to_sym) do set_page_collection + set_submittable_content + @show_page_type_highlight = true + @page_type = content_type @pages = @page_collection.accepted_submissions.where(content_type: content_type.name) sort_pages @@ -132,12 +131,6 @@ class PageCollectionsController < ApplicationController @pages = @page_collection.accepted_submissions.where(user_id: params[:user_id]) sort_pages - @submittable_content = if user_signed_in? - @current_user_content.slice(*@page_collection.page_types) - else - [] - end - @show_contributor_highlight = true @highlighted_contributor = User.find_by(id: params[:user_id].to_i) render :show @@ -147,7 +140,16 @@ class PageCollectionsController < ApplicationController # Use callbacks to share common setup or constraints between actions. def set_page_collection - @page_collection = PageCollection.find(params[:id]) + @page_collection = PageCollection.find_by(id: params[:id]) + @page_collection ||= PageCollection.find_by(id: params[:page_collection_id]) + end + + def set_submittable_content + @submittable_content ||= if user_signed_in? + @current_user_content.slice(*@page_collection.page_types) + else + {} + end end # Only allow a trusted parameter "white list" through. diff --git a/app/views/page_collections/_page_type_highlight_bar.html.erb b/app/views/page_collections/_page_type_highlight_bar.html.erb new file mode 100644 index 00000000..277aa867 --- /dev/null +++ b/app/views/page_collections/_page_type_highlight_bar.html.erb @@ -0,0 +1,5 @@ +
        + Showing all submitted <%= page_type.name %> pages. + + Click <%= link_to 'here', @page_collection, class: 'blue-text text-lighten-3' %> to see all pages regardless of type. +
        \ No newline at end of file diff --git a/app/views/page_collections/_tiles.html.erb b/app/views/page_collections/_tiles.html.erb index 74f4d1cd..5a99be7d 100644 --- a/app/views/page_collections/_tiles.html.erb +++ b/app/views/page_collections/_tiles.html.erb @@ -3,11 +3,11 @@
        <% content = page.content %> <% next unless (current_user || User.new).can_read?(content) %> -
        +
        - <%= image_tag content.random_public_image, class: 'activator' %> + <%= image_tag content.random_public_image, class: 'activator', style: "height: 300px;" %>
        -
        +
        <%= link_to content.name, content %> more_vert diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index 4b7dee41..45ef2d31 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -54,8 +54,24 @@
        + + <% if user_signed_in? && @page_collection.user_id == current_user.id %> + <% if @page_collection.pending_submissions.count > 0 %> + <%= + link_to page_collection_pending_submissions_path(page_collection_id: @page_collection.id), + class: "#{PageCollection.color} white-text btn btn-large", + style: "width: 100%" do + %> + notifications_active +
        + <%= pluralize(@page_collection.pending_submissions.count, 'pending submission') %> +
        + <% end %> + <% end %> + <% end %> + <%# render partial: 'page_collections/quick_add' %> - + <%= PageCollection.icon %>
        <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page @@ -121,6 +137,9 @@ <% if !!@show_contributor_highlight %> <%= render partial: 'page_collections/contributor_highlight_bar', locals: { contributor: @highlighted_contributor } %> <% end %> + <% if !!@show_page_type_highlight %> + <%= render partial: 'page_collections/page_type_highlight_bar', locals: { page_type: @page_type } %> + <% end %> <%= render partial: 'page_collections/tiles', locals: { pages: @pages } %> <% end %> @@ -129,7 +148,7 @@ <%= form_for PageCollectionSubmission.new do |f| %>
        -

        +

        <%= @page_collection.user == current_user ? 'Add' : 'Submit' %> a page to this Collection From ab8a1b0dcaab839ed3934e49d62caa0f620ef523 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 11 Oct 2020 19:11:25 -0700 Subject: [PATCH 16/23] stylize submission queue --- .../page_collection_submissions/index.html.erb | 12 ++++++++---- .../page_collection_submissions/show.html.erb | 4 ---- app/views/page_collections/show.html.erb | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 app/views/page_collection_submissions/show.html.erb diff --git a/app/views/page_collection_submissions/index.html.erb b/app/views/page_collection_submissions/index.html.erb index 7b572429..1182af51 100644 --- a/app/views/page_collection_submissions/index.html.erb +++ b/app/views/page_collection_submissions/index.html.erb @@ -2,7 +2,11 @@
        -
        Pending submissions
        +
        + You have <%= pluralize @page_collection_submissions.count, 'pending submission' %> + to + <%= link_to @page_collection.name, @page_collection, class: "#{PageCollection.color}-text" %>. +

        Submitters will be notified if you accept their content.

        @@ -30,18 +34,18 @@
        Submitted by - <%= link_to content.user, class: "#{User.color}-text" do %> + <%= link_to content.user, class: "#{User.color}-text text-lighten-3" do %> <%= content.user.display_name %> <% end %> <%= time_ago_in_words page_collection_submission.submitted_at %> ago
        - <%= link_to approve_page_collection_submission_path(page_collection_submission), class: 'green-text' do %> + <%= link_to approve_page_collection_submission_path(page_collection_submission), class: 'btn green white-text' do %> check Approve <% end %> - <%= link_to pass_page_collection_submission_path(page_collection_submission), class: 'red-text right' do %> + <%= link_to pass_page_collection_submission_path(page_collection_submission), class: 'btn red white-text right' do %> close Pass <% end %> diff --git a/app/views/page_collection_submissions/show.html.erb b/app/views/page_collection_submissions/show.html.erb deleted file mode 100644 index 96f36672..00000000 --- a/app/views/page_collection_submissions/show.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -

        <%= notice %>

        - -<%= link_to 'Edit', edit_page_collection_submission_path(@page_collection_submission) %> | -<%= link_to 'Back', page_collection_submissions_path %> diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index 45ef2d31..a0606390 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -128,7 +128,20 @@
        - This collection doesn't have any approved public pages yet. Please check back later! + This collection doesn't have any approved public pages yet. + <% if user_signed_in? %> + <% if current_user == @page_collection.user %> + + Add your first page. + + <% else %> + + Yours could be first! + + <% end %> + <% else %> + Sign in to submit your pages! + <% end %>
        From 2f0d62ce30568a4ed0a0674cebe3442672610191 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 11 Oct 2020 22:31:32 -0700 Subject: [PATCH 17/23] stream events for adding pages to self's collection --- .../page_collection_submissions_controller.rb | 4 +- .../page_collections_controller.rb | 3 + .../page_collection_submission.rb | 14 ++++- .../_stream_added_to_page_collection.html.erb | 56 +++++++++++++++---- app/views/page_collections/_tiles.html.erb | 4 +- app/views/page_collections/index.html.erb | 6 ++ app/views/stream/_share.html.erb | 2 +- app/views/users/show.html.erb | 4 +- 8 files changed, 75 insertions(+), 18 deletions(-) diff --git a/app/controllers/page_collection_submissions_controller.rb b/app/controllers/page_collection_submissions_controller.rb index ca3e069f..e3b0881e 100644 --- a/app/controllers/page_collection_submissions_controller.rb +++ b/app/controllers/page_collection_submissions_controller.rb @@ -25,7 +25,9 @@ class PageCollectionSubmissionsController < ApplicationController @page_collection_submission = PageCollectionSubmission.new(page_collection_submission_params) if @page_collection_submission.save - @page_collection_submission.content.update(privacy: 'public') + if @page_collection_submission.page_collection.try(:privacy) == 'public' + @page_collection_submission.content.update(privacy: 'public') + end redirect_to @page_collection_submission.page_collection, notice: 'Page submitted!' else diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index 8176ee25..16208eff 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -11,6 +11,9 @@ class PageCollectionsController < ApplicationController def index @my_collections = current_user.page_collections + pending_submissions = PageCollectionSubmission.where(accepted_at: nil, page_collection_id: @my_collections.pluck(:id)) + @collections_with_pending = PageCollection.where(id: pending_submissions.pluck(:page_collection_id)) + followed_user_ids = UserFollowing.where(user_id: current_user.id).pluck(:followed_user_id) @network_collections = PageCollection.where(user_id: followed_user_ids, privacy: 'public') @followed_collections = current_user.followed_page_collections diff --git a/app/models/page_collections/page_collection_submission.rb b/app/models/page_collections/page_collection_submission.rb index 471c7fa6..86a9997e 100644 --- a/app/models/page_collections/page_collection_submission.rb +++ b/app/models/page_collections/page_collection_submission.rb @@ -45,7 +45,19 @@ class PageCollectionSubmission < ApplicationRecord if user == page_collection.user || page_collection.auto_accept? update(accepted_at: DateTime.current) - # TODO Create a "user added a page to their collection" event + # Create a "user added a page to their collection" event if the page and the collection are public + if content.try(:privacy) == 'public' && page_collection.try(:privacy) == 'public' + share = ContentPageShare.create( + user_id: self.user_id, + content_page_type: PageCollection.name, + content_page_id: page_collection_id, + secondary_content_page_type: content.class.name, + secondary_content_page_id: content.id, + shared_at: self.created_at, + privacy: 'public', + message: self.explanation + ) + end end end diff --git a/app/views/content_page_shares/_stream_added_to_page_collection.html.erb b/app/views/content_page_shares/_stream_added_to_page_collection.html.erb index 221b9e93..ece8decb 100644 --- a/app/views/content_page_shares/_stream_added_to_page_collection.html.erb +++ b/app/views/content_page_shares/_stream_added_to_page_collection.html.erb @@ -8,7 +8,11 @@ <%= image_tag share.user.image_url(size=20), class: 'left circle avatar' %> <%= share.user.display_name %> <% end %> - got accepted into the + <% if share.user == content.user %> + added a <%= share.secondary_content_page.class.name.downcase %> to their + <% else %> + got accepted into the + <% end %> <%= link_to content.title, content, class: "#{content.class.color}-text text-darken-1" %> Collection! @@ -22,13 +26,28 @@
        - <%= link_to [share.user, share] do %> - <%= image_tag content.random_public_image %> + <% if share.user == content.user %> + <%= link_to [share.user, share] do %> + <%= image_tag secondary_content.random_public_image %> + <% end %> + <% else %> + <%= link_to [share.user, share] do %> + <%= image_tag content.random_public_image %> + <% end %> <% end %> - <%= link_to content do %> - <%= content.class.icon %> - <%= content.title %> + <% if share.user_id == content.user_id %> + <%# if this is a share for adding content you own to your own collection, show the content instead of the collection %> + <%= link_to secondary_content do %> + <%= secondary_content.class.icon %> + <%= secondary_content.name %> + <% end %> + + <% else %> + <%= link_to content do %> + <%= content.class.icon %> + <%= content.title %> + <% end %> <% end %>
        @@ -42,11 +61,26 @@ <%= share.user.display_name %> <% end %> - submitted - <%= link_to share.secondary_content_page.name, share.secondary_content_page, class: "#{share.secondary_content_page.class.color}-text" %> - to - <%= link_to content.title, content, class: "#{content.class.color}-text text-lighten-2" %> - and got accepted! + <% if secondary_content.user_id == share.user_id %> + added + <%= link_to secondary_content.name, secondary_content, class: "#{secondary_content.class.color}-text" %> + to their Collection! + +

        + <%= link_to content, class: "btn #{PageCollection.color} hoverable left white-text clearfix", style: 'width: 100%' do %> + <%= PageCollection.icon %> + <%= content.name %> + arrow_right + <% end %> +
        + + <% else %> + submitted + <%= link_to secondary_content.name, secondary_content, class: "#{secondary_content.class.color}-text" %> + to + <%= link_to content.title, content, class: "#{content.class.color}-text text-lighten-2" %> + and got accepted! + <% end %>
        <% if share.message.present? %> diff --git a/app/views/page_collections/_tiles.html.erb b/app/views/page_collections/_tiles.html.erb index 5a99be7d..fccfd8b4 100644 --- a/app/views/page_collections/_tiles.html.erb +++ b/app/views/page_collections/_tiles.html.erb @@ -7,7 +7,7 @@
        <%= image_tag content.random_public_image, class: 'activator', style: "height: 300px;" %>
        -
        +
        <%= link_to content.name, content %> more_vert @@ -20,7 +20,7 @@

        - + <%= link_to content.name, content %> close diff --git a/app/views/page_collections/index.html.erb b/app/views/page_collections/index.html.erb index 098f7c17..c6df5501 100644 --- a/app/views/page_collections/index.html.erb +++ b/app/views/page_collections/index.html.erb @@ -4,6 +4,12 @@ <%= render partial: 'notice_dismissal/messages/15' %> +<% if @collections_with_pending.any? %> +
        + <%= render partial: 'page_collections/collection_grid', locals: { collection_list: @collections_with_pending, title: "Your collections with pending submissions" } %> +
        +<% end %> + <% if @my_collections.any? || current_user.on_premium_plan? %>
        <%= render partial: 'page_collections/collection_grid', locals: { collection_list: @my_collections, title: "Your collections" } %> diff --git a/app/views/stream/_share.html.erb b/app/views/stream/_share.html.erb index b9ac914b..0f7636c9 100644 --- a/app/views/stream/_share.html.erb +++ b/app/views/stream/_share.html.erb @@ -8,7 +8,7 @@ <% elsif share.content_page_type == PageCollection.name %> <% if share.secondary_content_page.present? %> - <%= render partial: 'content_page_shares/stream_added_to_page_collection', locals: { share: share, content: share.content_page } %> + <%= render partial: 'content_page_shares/stream_added_to_page_collection', locals: { share: share, content: share.content_page, secondary_content: share.secondary_content_page } %> <% else %> <%= render partial: 'content_page_shares/stream_new_page_collection', locals: { share: share, content: share.content_page } %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 00c693d6..a8b345f4 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -38,8 +38,8 @@
          -
        • About Me
          • -
        • Recent Activity
          • +
        • About Me
          • +
        • Recent Activity
        • Universes
          • <% if show_collections_tab %> From 4903fd67f2f1a77151ef6a2601894c5cc9c4bad5 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 12 Oct 2020 01:56:13 -0700 Subject: [PATCH 18/23] pc#show includes --- app/controllers/page_collections_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index 16208eff..31dd1bb1 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -29,7 +29,7 @@ class PageCollectionsController < ApplicationController return redirect_to page_collections_path, notice: "That Collection is not public." end - @pages = @page_collection.accepted_submissions + @pages = @page_collection.accepted_submissions.includes({content: [:universe, :user], user: []}) sort_pages end From 59ba11e104c6c5f02eadbad8c80392500223e26c Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 12 Oct 2020 02:02:10 -0700 Subject: [PATCH 19/23] more includes --- app/controllers/page_collections_controller.rb | 4 ++-- app/views/share_comments/_show.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/page_collections_controller.rb b/app/controllers/page_collections_controller.rb index 31dd1bb1..55ad5398 100644 --- a/app/controllers/page_collections_controller.rb +++ b/app/controllers/page_collections_controller.rb @@ -102,7 +102,7 @@ class PageCollectionsController < ApplicationController @show_page_type_highlight = true @page_type = content_type - @pages = @page_collection.accepted_submissions.where(content_type: content_type.name) + @pages = @page_collection.accepted_submissions.where(content_type: content_type.name).includes({content: [:universe, :user], user: []}) sort_pages render :show @@ -131,7 +131,7 @@ class PageCollectionsController < ApplicationController return redirect_to page_collections_path, notice: "That Collection is not public." end - @pages = @page_collection.accepted_submissions.where(user_id: params[:user_id]) + @pages = @page_collection.accepted_submissions.where(user_id: params[:user_id]).includes({content: [:universe, :user], user: []}) sort_pages @show_contributor_highlight = true diff --git a/app/views/share_comments/_show.html.erb b/app/views/share_comments/_show.html.erb index ef7d94a4..3769e8dc 100644 --- a/app/views/share_comments/_show.html.erb +++ b/app/views/share_comments/_show.html.erb @@ -6,7 +6,7 @@
          <% end %> - <%# Nesting from above %> + <%# Nested indents from above %> <%= simple_format ContentFormatterService.show( text: comment.message, viewing_user: current_user From 74926578fa18534b16c1d70d01943fa2aeed7af1 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 12 Oct 2020 02:08:00 -0700 Subject: [PATCH 20/23] add collection edit link --- app/views/page_collections/_quick_add.html.erb | 5 ++++- app/views/page_collections/show.html.erb | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/views/page_collections/_quick_add.html.erb b/app/views/page_collections/_quick_add.html.erb index 5945b088..21e65472 100644 --- a/app/views/page_collections/_quick_add.html.erb +++ b/app/views/page_collections/_quick_add.html.erb @@ -21,7 +21,10 @@ <% end %>
          - Submitting a page will automatically change its privacy to "public". + Submitting a page will automatically change its privacy to "public" if this collection is public. + <% if @page_collection.privacy == 'public' %> + (It is!) + <% end %>
          diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index a0606390..bba9d3b0 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -20,6 +20,9 @@ Follow for updates <% end %> <% end %> + <% else %> + <%= link_to 'Edit collection', edit_page_collection_path(@page_collection), class: 'btn btn-flat right' %> + <% end %> <% else %> <%= link_to '#', class: "btn #{PageCollection.color} lighten-2 right disabled" do %> @@ -193,7 +196,10 @@ <% end %>
          - Submitting a page will automatically change its privacy to "public". + Submitting a page will automatically change its privacy to "public" if this collection is public. + <% if @page_collection.privacy == 'public' %> + (It is!) + <% end %>
        From 6e1f84e419a5dfe3fb900c39c2bf9316382e7ed3 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 12 Oct 2020 02:16:27 -0700 Subject: [PATCH 21/23] clean up after_creates --- .../page_collection_submission.rb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/models/page_collections/page_collection_submission.rb b/app/models/page_collections/page_collection_submission.rb index 86a9997e..2b682263 100644 --- a/app/models/page_collections/page_collection_submission.rb +++ b/app/models/page_collections/page_collection_submission.rb @@ -5,6 +5,10 @@ class PageCollectionSubmission < ApplicationRecord belongs_to :page_collection belongs_to :user + after_create :mark_related_content_public + after_create :handle_auto_accept + after_create :create_submission_notification + after_create :cache_content_name scope :accepted, -> { where.not(accepted_at: nil).uniq(&:page_collection_id) } @@ -39,14 +43,20 @@ class PageCollectionSubmission < ApplicationRecord page_collection.user.content_page_share_followings.create({content_page_share: share}) end - after_create do + def mark_related_content_public + if page_collection.try(:privacy) == 'public' + content.update(privacy: 'public') + end + end + + def handle_auto_accept # If the submission was created by the collection owner, we want to automatically approve it. # If the collection has opted to automatically accept submissions, we also want to approve it. if user == page_collection.user || page_collection.auto_accept? update(accepted_at: DateTime.current) # Create a "user added a page to their collection" event if the page and the collection are public - if content.try(:privacy) == 'public' && page_collection.try(:privacy) == 'public' + if page_collection.try(:privacy) == 'public' share = ContentPageShare.create( user_id: self.user_id, content_page_type: PageCollection.name, @@ -61,7 +71,7 @@ class PageCollectionSubmission < ApplicationRecord end end - after_create do + def create_submission_notification # If the submission needs reviewed, create a notification for the collection owner if user != page_collection.user && !page_collection.auto_accept? page_collection.user.notifications.create( From 94bc19cff8927da065c0167f6093ca752a18ed80 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 12 Oct 2020 02:23:23 -0700 Subject: [PATCH 22/23] extra includes on stream --- app/controllers/stream_controller.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/stream_controller.rb b/app/controllers/stream_controller.rb index 29c1c570..7ac733b9 100644 --- a/app/controllers/stream_controller.rb +++ b/app/controllers/stream_controller.rb @@ -6,28 +6,30 @@ class StreamController < ApplicationController before_action :cache_linkable_content_for_each_content_type, only: [:index] def index - followed_users = current_user.followed_users.pluck(:id) - blocked_users = current_user.blocked_users.pluck(:id) + followed_users = current_user.followed_users.pluck(:id) + blocked_users = current_user.blocked_users.pluck(:id) blocked_by_users = current_user.blocked_by_users.pluck(:id) @feed = ContentPageShare.where(user_id: followed_users + [current_user.id] - blocked_users - blocked_by_users) .order('created_at DESC') - .includes([:content_page, :user, :share_comments]) - .limit(50) + .includes([:content_page, :secondary_content_page]) + .includes({ share_comments: [:user], user: [:avatar_attachment] }) + .limit(25) end def community end def global - blocked_users = current_user.blocked_users.pluck(:id) + blocked_users = current_user.blocked_users.pluck(:id) blocked_by_users = current_user.blocked_by_users.pluck(:id) @feed = ContentPageShare.all .where.not(user_id: blocked_users + blocked_by_users) .order('created_at DESC') - .includes([:content_page, :user, :share_comments]) - .limit(50) + .includes([:content_page, :secondary_content_page]) + .includes({ share_comments: [:user], user: [:avatar_attachment] }) + .limit(25) end def set_stream_navbar_color From 3228985bb215012952c4b47160a6fb12330c9644 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 12 Oct 2020 03:16:47 -0700 Subject: [PATCH 23/23] open up collection creation to others --- app/views/page_collections/index.html.erb | 4 +-- app/views/page_collections/show.html.erb | 34 ++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/views/page_collections/index.html.erb b/app/views/page_collections/index.html.erb index c6df5501..6c097c29 100644 --- a/app/views/page_collections/index.html.erb +++ b/app/views/page_collections/index.html.erb @@ -10,11 +10,11 @@
        <% end %> -<% if @my_collections.any? || current_user.on_premium_plan? %> +<% if @my_collections.any? || current_user.on_premium_plan? || Date.current < 'October 21, 2020'.to_date %>
        <%= render partial: 'page_collections/collection_grid', locals: { collection_list: @my_collections, title: "Your collections" } %> - <% if current_user.on_premium_plan? %> + <% if current_user.on_premium_plan? || Date.current < 'October 21, 2020'.to_date %>
        <%= link_to new_page_collection_path do %>
        diff --git a/app/views/page_collections/show.html.erb b/app/views/page_collections/show.html.erb index bba9d3b0..4642056e 100644 --- a/app/views/page_collections/show.html.erb +++ b/app/views/page_collections/show.html.erb @@ -115,7 +115,7 @@
        Contributors
        <% @page_collection.contributors.each do |user| %> -
        +
        <%= link_to user, class: "#{User.color}-text" do %> <%= image_tag user.image_url(size=20), class: 'left circle', style: 'margin-right: 8px;' %> <%= user.display_name %> @@ -124,6 +124,38 @@ <% end %>
        <% end %> + +