From 90593798f010848eadd15314b685faa18dfd5069 Mon Sep 17 00:00:00 2001 From: Evgeniy Stashkovyan Date: Mon, 8 Aug 2022 19:30:20 +0300 Subject: [PATCH 1/2] hw5 --- Gemfile | 4 +- Gemfile.lock | 24 +- app/controllers/stories_controller.rb | 9 + app/views/layouts/_top_bar.html.erb | 6 +- case-study.md | 33 + localhost+1-key.pem | 28 + localhost+1.pem | 28 + no-server-push.png | Bin 0 -> 477974 bytes server-push.png | Bin 0 -> 479683 bytes yarn.lock | 8108 +++++++++++++++---------- 10 files changed, 4855 insertions(+), 3385 deletions(-) create mode 100644 case-study.md create mode 100644 localhost+1-key.pem create mode 100644 localhost+1.pem create mode 100644 no-server-push.png create mode 100644 server-push.png diff --git a/Gemfile b/Gemfile index bf57e9a..d5513bc 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ end gem "actionpack-action_caching", "~> 1.2" gem "active_record_union", "~> 1.3" gem "acts-as-taggable-on", "~> 5.0" -gem "acts_as_follower", github: "thepracticaldev/acts_as_follower", branch: "master" +gem "acts_as_follower", github: "forem/acts_as_follower", branch: "master" gem "addressable", "~> 2.5", ">= 2.5.2" gem "administrate", "~> 0.11" gem "ahoy_email", "~> 0.5" @@ -122,7 +122,7 @@ group :development, :test do gem "derailed", "~> 0.1" gem "erb_lint", "~> 0.0", require: false gem "faker", git: "https://github.com/stympy/faker.git", branch: "master" - gem "fix-db-schema-conflicts", github: "thepracticaldev/fix-db-schema-conflicts", branch: "master" + gem "fix-db-schema-conflicts", github: "jakeonrails/fix-db-schema-conflicts", branch: "master" gem "memory_profiler", "~> 0.9" gem "parallel_tests", "~> 2.27" gem "pry-byebug", "~> 3.7" diff --git a/Gemfile.lock b/Gemfile.lock index 331bf9c..574c972 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,26 @@ GIT - remote: https://github.com/stympy/faker.git - revision: 9910aa58d92c018abab25d491191576fcc1a7707 + remote: https://github.com/forem/acts_as_follower.git + revision: 06393d3693a1a3d4b390aec4976c8b8f3a81cf01 branch: master specs: - faker (1.9.1) - i18n (>= 0.7) + acts_as_follower (0.2.1) + activerecord (>= 4.0) GIT - remote: https://github.com/thepracticaldev/acts_as_follower.git - revision: 288690cd99bc470eaee493fce5bfa9fe23157692 + remote: https://github.com/jakeonrails/fix-db-schema-conflicts.git + revision: 1e94f518503f1d1addd6ed052454efcbec0b3c6a branch: master specs: - acts_as_follower (0.2.1) - activerecord (>= 4.0) + fix-db-schema-conflicts (3.1.0) + rubocop (>= 0.38.0) GIT - remote: https://github.com/thepracticaldev/fix-db-schema-conflicts.git - revision: 4172392392e1a8d907f7ab673cb5ddd9a4a31940 + remote: https://github.com/stympy/faker.git + revision: 9910aa58d92c018abab25d491191576fcc1a7707 branch: master specs: - fix-db-schema-conflicts (3.0.2) - rubocop (>= 0.38.0) + faker (1.9.1) + i18n (>= 0.7) GEM remote: https://rubygems.org/ diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb index df60029..255adf2 100644 --- a/app/controllers/stories_controller.rb +++ b/app/controllers/stories_controller.rb @@ -7,6 +7,15 @@ def index return handle_user_or_organization_or_podcast_index if params[:username] return handle_tag_index if params[:tag] + # push_headers = [ + # "<#{view_context.asset_path('bell.svg')}>; rel=preload; as=image", + # "<#{view_context.asset_path('menu.svg')}>; rel=preload; as=image", + # "<#{view_context.asset_path('connect.svg')}>; rel=preload; as=image", + # "<#{view_context.asset_path('stack.svg')}>; rel=preload; as=image", + # "<#{view_context.asset_path('lightning.svg')}>; rel=preload; as=image", + # ] + # response.headers["Link"] = push_headers.join(", ") + handle_base_index end diff --git a/app/views/layouts/_top_bar.html.erb b/app/views/layouts/_top_bar.html.erb index bf2750f..fca6cfe 100644 --- a/app/views/layouts/_top_bar.html.erb +++ b/app/views/layouts/_top_bar.html.erb @@ -13,11 +13,11 @@ WRITE A POST - <%= inline_svg("connect.svg", size: "100% * 100%") %> + <%= image_tag("connect.svg", size: "100% * 100%") %>
- <%= inline_svg("bell.svg", size: "100% * 100%") %> + <%= image_tag("bell.svg", size: "100% * 100%") %>