-
Notifications
You must be signed in to change notification settings - Fork 9
homework #6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
yarafan
wants to merge
1
commit into
spajic:master
Choose a base branch
from
yarafan:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
homework #6
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <div class="navigation-progress" id="navigation-progress"> | ||
| </div> | ||
| <div class="top-bar" id="top-bar"> | ||
| <nav> | ||
| <a href="#articles-list" class="skip-content-link">Skip to content</a> | ||
| <a href="/" class="logo-link" id="logo-link" aria-label="DEV Home"><%= logo_svg %></a> | ||
| <div id="nav-search-form-root"> | ||
| <div class="nav-search-form"> | ||
| <form acceptCharset="UTF-8" method="get"> | ||
| <input class="nav-search-form__input" type="text" name="q" id="nav-search" placeholder="search" autoComplete="off" /> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| <a href="/new" id="write-link" class="cta nav-link write">WRITE A POST</a> | ||
| <a href="/connect" id="connect-link" class="nav-link connect-icon" aria-label="Connect"> | ||
| <%= image_tag("connect.svg", size: "100% * 100%") %> | ||
| <div class="connect-number" id="connect-number"></div> | ||
| </a> | ||
| <a href="/notifications" id="notifications-link" class="nav-link notifications-icon" aria-label="Notifications"> | ||
| <%= image_tag("bell.svg", size: "100% * 100%") %> | ||
| <div class="notifications-number" id="notifications-number"></div> | ||
| </a> | ||
| <div class="navbar-menu-wrapper" id="navbar-menu-wrapper"> | ||
| <button class="navigation-butt" id="navigation-butt" aria-label="Navigation"> | ||
| <% if user_signed_in? %> | ||
| <div class="nav-profile-image-wrapper"><img alt="" class="nav-profile-image" id="nav-profile-image" /></div> | ||
| <% else %> | ||
| <%= image_tag("menu.svg", class: "bars", size: "20% * 20%") %> | ||
| <% end %> | ||
| </button> | ||
| <div class="menubg" id="menubg"></div> | ||
| <%= render "layouts/nav_menu" %> | ||
| </div> | ||
| </nav> | ||
| </div> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # HTTP2 | ||
| ## Сравнение рендеринга картинок | ||
| По ощущениям и визуально наиболее быстрым является inline картинки (из-за отсутствия необходимости в доп. запросе), однако у этого подхода есть минус - увеличение размера документа. С точки зрения пользователя - загрузки картинок не видно. | ||
|
|
||
| Стандартный вывод через src упирается в один полноценный rtt и визуально кажется, что картинки загружаются последовательно | ||
|
|
||
| При server-push ресурсы передаются c первым запросом, что позволяет избежать лишнего rtt, и существенно сокращает время загрузки и визуально кажется, что картинки загружаются параллельно и отрисовываются в один момент. По-сути, время тратится на поиск ресурса в push-кеше исходя из заголовков (https://habr.com/ru/company/badoo/blog/331216/) | ||
|
|
||
|  | ||
|
|
||
| Однако при грамотном кешировании принципиальной разницы между server-push и стандартным подходом нет - так как все будет упираться в кеш браузера. | ||
|
|
||
| ## Аудит dev.to | ||
| https://www.webpagetest.org/result/190518_H1_b1463619c62c557ca58ff87f833861f1/1/performance_optimization/ | ||
|
|
||
| Исходя из отчета можно увидеть, что есть крайне незначительная проблема с сжатием изображений (потенциальное уменьшение размера - 16,6 Кб) и кешированием статичных ресурсов. Ни одну из этих проблем не решит использование http2 и server-push в частности. Однако утверждать, что использование server-push не имеет смысла также нельзя, например, через него можно передвать картинки для layout. Необходимо более детальное тестирование с включенным http2 | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # минимально работающий конфиг, можно запускать независимо от основного конфига через | ||
| # nginx -c nginx.conf | ||
|
|
||
| worker_processes 1; | ||
| daemon off; | ||
|
|
||
| events { | ||
| worker_connections 1024; | ||
| } | ||
|
|
||
| http { | ||
| default_type application/octet-stream; | ||
| sendfile on; | ||
| keepalive_timeout 65; | ||
|
|
||
| server { | ||
| listen 443 http2 ssl; | ||
| server_name localhost; | ||
|
|
||
| ssl_certificate ./certs/localhost.pem; | ||
| ssl_certificate_key ./certs/localhost-key.pem; | ||
| ssl_session_timeout 5m; | ||
| ssl_protocols TLSv1 TLSv1.1 TLSv1.2; | ||
| ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:DES-CBC3-SHA:!RC4:!aNULL:!eNULL:!MD5:!EXPORT:!EXP:!LOW:!SEED:!CAMELLIA:!IDEA:!PSK:!SRP:!SSLv:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA'; | ||
| ssl_prefer_server_ciphers on; | ||
|
|
||
| location / { | ||
| http2_push_preload on; | ||
|
|
||
| proxy_set_header Host $host; | ||
| proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; | ||
| proxy_set_header X-Forwarded-Proto https; | ||
| proxy_redirect off; | ||
| proxy_pass http://127.0.0.1:3000; | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,280 @@ | ||
| class StoriesController < ApplicationController | ||
| before_action :authenticate_user!, except: %i[index search show feed new] | ||
| before_action :set_cache_control_headers, only: %i[index search show] | ||
|
|
||
| def index | ||
| 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(', ') | ||
| add_param_context(:username, :tag) | ||
| return handle_user_or_organization_or_podcast_index if params[:username] | ||
| return handle_tag_index if params[:tag] | ||
|
|
||
| handle_base_index | ||
| end | ||
|
|
||
| def search | ||
| @query = "...searching" | ||
| @article_index = true | ||
| set_surrogate_key_header "articles-page-with-query" | ||
| render template: "articles/search" | ||
| end | ||
|
|
||
| def show | ||
| @story_show = true | ||
| add_param_context(:username, :slug) | ||
| if (@article = Article.find_by_path("/#{params[:username].downcase}/#{params[:slug]}")&.decorate) | ||
| handle_article_show | ||
| elsif (@article = Article.find_by_slug(params[:slug])&.decorate) | ||
| handle_possible_redirect | ||
| else | ||
| @podcast = Podcast.find_by_slug(params[:username]) || not_found | ||
| @episode = PodcastEpisode.find_by_slug(params[:slug]) || not_found | ||
| handle_podcast_show | ||
| end | ||
| end | ||
|
|
||
| def warm_comments | ||
| @article = Article.find_by_path("/#{params[:username].downcase}/#{params[:slug]}")&.decorate || not_found | ||
| @warm_only = true | ||
| assign_article_show_variables | ||
| render partial: "articles/full_comment_area" | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def redirect_to_changed_username_profile | ||
| potential_username = params[:username].tr("@", "").downcase | ||
| user_or_org = User.find_by("old_username = ? OR old_old_username = ?", potential_username, potential_username) || | ||
| Organization.find_by("old_slug = ? OR old_old_slug = ?", potential_username, potential_username) | ||
| if user_or_org.present? | ||
| redirect_to user_or_org.path | ||
| return | ||
| else | ||
| not_found | ||
| end | ||
| end | ||
|
|
||
| def handle_possible_redirect | ||
| potential_username = params[:username].tr("@", "").downcase | ||
| @user = User.find_by("old_username = ? OR old_old_username = ?", potential_username, potential_username) | ||
| if @user&.articles&.find_by_slug(params[:slug]) | ||
| redirect_to "/#{@user.username}/#{params[:slug]}" | ||
| return | ||
| elsif (@organization = @article.organization) | ||
| redirect_to "/#{@organization.slug}/#{params[:slug]}" | ||
| return | ||
| end | ||
| not_found | ||
| end | ||
|
|
||
| def handle_user_or_organization_or_podcast_index | ||
| @podcast = Podcast.find_by_slug(params[:username].downcase) | ||
| @organization = Organization.find_by_slug(params[:username].downcase) | ||
| if @podcast | ||
| handle_podcast_index | ||
| elsif @organization | ||
| handle_organization_index | ||
| else | ||
| handle_user_index | ||
| end | ||
| end | ||
|
|
||
| def handle_tag_index | ||
| @tag = params[:tag].downcase | ||
| @page = (params[:page] || 1).to_i | ||
| @tag_model = Tag.find_by_name(@tag) || not_found | ||
| @moderators = User.with_role(:tag_moderator, @tag_model) | ||
| add_param_context(:tag, :page) | ||
| if @tag_model.alias_for.present? | ||
| redirect_to "/t/#{@tag_model.alias_for}" | ||
| return | ||
| end | ||
|
|
||
| @stories = article_finder(8) | ||
|
|
||
| @stories = @stories.where(approved: true) if @tag_model&.requires_approval | ||
|
|
||
| @stories = stories_by_timeframe | ||
| @stories = @stories.decorate | ||
|
|
||
| @article_index = true | ||
| set_surrogate_key_header "articles-#{@tag}", @stories.map(&:record_key) | ||
| response.headers["Surrogate-Control"] = "max-age=600, stale-while-revalidate=30, stale-if-error=86400" | ||
| render template: "articles/tag_index" | ||
| end | ||
|
|
||
| def handle_base_index | ||
| @home_page = true | ||
| @page = (params[:page] || 1).to_i | ||
| num_articles = 30 | ||
| @stories = article_finder(num_articles) | ||
| add_param_context(:page, :timeframe) | ||
| if %w[week month year infinity].include?(params[:timeframe]) | ||
| @stories = @stories.where("published_at > ?", Timeframer.new(params[:timeframe]).datetime). | ||
| order("score DESC") | ||
| @featured_story = @stories.where.not(main_image: nil).first&.decorate || Article.new | ||
| elsif params[:timeframe] == "latest" | ||
| @stories = @stories.order("published_at DESC"). | ||
| where("featured_number > ? AND score > ?", 1_449_999_999, -40) | ||
| @featured_story = Article.new | ||
| else | ||
| @default_home_feed = true | ||
| @stories = @stories. | ||
| where("score > ? OR featured = ?", 9, true). | ||
| order("hotness_score DESC") | ||
| if user_signed_in? | ||
| offset = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 5, 6, 7, 8, 9].sample # random offset, weighted more towards zero | ||
| @stories = @stories.offset(offset) | ||
| end | ||
| @featured_story = @stories.where.not(main_image: nil).first&.decorate || Article.new | ||
| end | ||
| @stories = @stories.decorate | ||
| assign_podcasts | ||
| @article_index = true | ||
| set_surrogate_key_header "main_app_home_page" | ||
| response.headers["Surrogate-Control"] = "max-age=600, stale-while-revalidate=30, stale-if-error=86400" | ||
| render template: "articles/index" | ||
| end | ||
|
|
||
| def handle_podcast_index | ||
| @podcast_index = true | ||
| @article_index = true | ||
| @list_of = "podcast-episodes" | ||
| @podcast_episodes = @podcast.podcast_episodes.order("published_at DESC").limit(30) | ||
| set_surrogate_key_header "podcast_episodes", (@podcast_episodes.map { |e| e["record_key"] }) | ||
| render template: "podcast_episodes/index" | ||
| end | ||
|
|
||
| def handle_organization_index | ||
| @user = @organization | ||
| @stories = ArticleDecorator.decorate_collection(@organization.articles. | ||
| where(published: true). | ||
| limited_column_select. | ||
| includes(:user). | ||
| order("published_at DESC").page(@page).per(8)) | ||
| @article_index = true | ||
| @organization_article_index = true | ||
| set_surrogate_key_header "articles-org-#{@organization.id}", @stories.map(&:record_key) | ||
| render template: "organizations/show" | ||
| end | ||
|
|
||
| def handle_user_index | ||
| @user = User.find_by_username(params[:username].tr("@", "").downcase) | ||
| unless @user | ||
| redirect_to_changed_username_profile | ||
| return | ||
| end | ||
| assign_user_comments | ||
| @stories = ArticleDecorator.decorate_collection(@user. | ||
| articles.where(published: true). | ||
| limited_column_select. | ||
| order("published_at DESC").page(@page).per(user_signed_in? ? 2 : 5)) | ||
| @article_index = true | ||
| @list_of = "articles" | ||
| redirect_if_view_param | ||
| return if performed? | ||
|
|
||
| set_surrogate_key_header "articles-user-#{@user.id}", @stories.map(&:record_key) | ||
| render template: "users/show" | ||
| end | ||
|
|
||
| def handle_podcast_show | ||
| set_surrogate_key_header @episode.record_key | ||
| @podcast_episode_show = true | ||
| @comments_to_show_count = 25 | ||
| @comment = Comment.new | ||
| render template: "podcast_episodes/show" | ||
| nil | ||
| end | ||
|
|
||
| def redirect_if_view_param | ||
| redirect_to "/internal/users/#{@user.id}" if params[:view] == "moderate" | ||
| redirect_to "/admin/users/#{@user.id}/edit" if params[:view] == "admin" | ||
| end | ||
|
|
||
| def redirect_if_show_view_param | ||
| redirect_to "/internal/articles/#{@article.id}" if params[:view] == "moderate" | ||
| end | ||
|
|
||
| def handle_article_show | ||
| assign_article_show_variables | ||
| set_surrogate_key_header @article.record_key | ||
| redirect_if_show_view_param | ||
| return if performed? | ||
|
|
||
| render template: "articles/show" | ||
| end | ||
|
|
||
| def assign_article_show_variables | ||
| @article_show = true | ||
| @variant_number = params[:variant_version] || (user_signed_in? ? 0 : rand(2)) | ||
| assign_user_and_org | ||
| @comments_to_show_count = @article.cached_tag_list_array.include?("discuss") ? 50 : 30 | ||
| assign_second_and_third_user | ||
| not_found if permission_denied? | ||
| @comment = Comment.new(body_markdown: @article&.comment_template) | ||
| end | ||
|
|
||
| def permission_denied? | ||
| !@article.published && params[:preview] != @article.password | ||
| end | ||
|
|
||
| def assign_user_and_org | ||
| @user = @article.user || not_found | ||
| @organization = @article.organization if @article.organization_id.present? | ||
| end | ||
|
|
||
| def assign_second_and_third_user | ||
| return unless @article.second_user_id.present? | ||
|
|
||
| @second_user = User.find(@article.second_user_id) | ||
| @third_user = User.find(@article.third_user_id) if @article.third_user_id.present? | ||
| end | ||
|
|
||
| def assign_user_comments | ||
| comment_count = params[:view] == "comments" ? 250 : 8 | ||
| @comments = if @user.comments_count.positive? | ||
| @user.comments.where(deleted: false). | ||
| order("created_at DESC").includes(:commentable).limit(comment_count) | ||
| else | ||
| [] | ||
| end | ||
| end | ||
|
|
||
| def stories_by_timeframe | ||
| if %w[week month year infinity].include?(params[:timeframe]) | ||
| @stories.where("published_at > ?", Timeframer.new(params[:timeframe]).datetime). | ||
| order("positive_reactions_count DESC") | ||
| elsif params[:timeframe] == "latest" | ||
| @stories.where("score > ?", -40).order("published_at DESC") | ||
| else | ||
| @stories.order("hotness_score DESC") | ||
| end | ||
| end | ||
|
|
||
| def assign_podcasts | ||
| return unless user_signed_in? | ||
|
|
||
| @podcast_episodes = PodcastEpisode. | ||
| includes(:podcast). | ||
| order("published_at desc"). | ||
| select(:slug, :title, :podcast_id).limit(5) | ||
| end | ||
|
|
||
| def article_finder(num_articles) | ||
| tag = params[:tag] | ||
| articles = Article.where(published: true). | ||
| includes(:user). | ||
| limited_column_select. | ||
| page(@page). | ||
| per(num_articles) | ||
| articles = articles.cached_tagged_with(tag) if tag.present? # More efficient than tagged_with | ||
| articles | ||
| end | ||
| end |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 плюсик за статью