diff --git a/app/components/footer/authors_component.html.erb b/app/components/footer/authors_component.html.erb new file mode 100644 index 00000000..504bfa35 --- /dev/null +++ b/app/components/footer/authors_component.html.erb @@ -0,0 +1,37 @@ +

+ Rewards by + <%= link_to "Le Wagon", + "https://www.lewagon.com", + target: :_blank, + rel: :noopener, + class: "link-explicit decoration-wagon-red" %> + & + <%= link_to "ShipOnRails", + "https://shiponrails.com", + target: :_blank, + rel: :noopener, + class: "link-explicit decoration-aoc-green" %> + | Made with ♥️ by + <%= link_to "pil0u", + "https://lewagon-alumni.slack.com/team/URZ0F4TEF", + target: :_blank, + rel: :noopener, + class: "text-white font-semibold hover:text-aoc-atmospheric" %>, + <%= link_to "Aquaj", + "https://lewagon-alumni.slack.com/team/U0J5GUEAW", + target: :_blank, + rel: :noopener, + class: "text-white font-semibold hover:text-aoc-atmospheric" %> & + <%= link_to "Joenn", + "https://lewagon-alumni.slack.com/team/U045Z0313UP", + target: :_blank, + rel: :noopener, + class: "text-white font-semibold hover:text-aoc-atmospheric" %> + → + <%= link_to "https://github.com/pil0u/lewagon-aoc", + target: :_blank, + rel: :noopener, + class: "text-other-green hover:link-external" do %> + <%= inline_svg_tag "icons/github.svg", class: "w-5 h-5 inline-block" %> + <% end %> +

diff --git a/app/components/footer/copyright_component.rb b/app/components/footer/authors_component.rb similarity index 52% rename from app/components/footer/copyright_component.rb rename to app/components/footer/authors_component.rb index 73385e65..acc5a5fa 100644 --- a/app/components/footer/copyright_component.rb +++ b/app/components/footer/authors_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true module Footer - class CopyrightComponent < ApplicationComponent + class AuthorsComponent < ApplicationComponent end end diff --git a/app/components/footer/copyright_component.html.erb b/app/components/footer/copyright_component.html.erb deleted file mode 100644 index d1bb2557..00000000 --- a/app/components/footer/copyright_component.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -

- Made with ♥️ by - <%= link_to "pil0u", "https://lewagon-alumni.slack.com/team/URZ0F4TEF", target: :_blank, rel: :noopener, class: "text-white font-semibold hover:text-aoc-atmospheric" %>, - <%= link_to "Aquaj", "https://lewagon-alumni.slack.com/team/U0J5GUEAW", target: :_blank, rel: :noopener, class: "text-white font-semibold hover:text-aoc-atmospheric" %> & - <%= link_to "Joenn", "https://lewagon-alumni.slack.com/team/U045Z0313UP", target: :_blank, rel: :noopener, class: "text-white font-semibold hover:text-aoc-atmospheric" %> - → - <%= link_to "https://github.com/pil0u/lewagon-aoc", target: :_blank, rel: :noopener, class: "text-other-green hover:link-external" do %> - <%= inline_svg_tag "icons/github.svg", class: "w-5 h-5 inline-block" %> - <% end %> -

diff --git a/app/components/footer/nav_component.html.erb b/app/components/footer/nav_component.html.erb index a2f3817d..83a31493 100644 --- a/app/components/footer/nav_component.html.erb +++ b/app/components/footer/nav_component.html.erb @@ -1,5 +1,4 @@ diff --git a/app/components/header/title_component.html.erb b/app/components/header/title_component.html.erb index d9d4a855..20bd031a 100644 --- a/app/components/header/title_component.html.erb +++ b/app/components/header/title_component.html.erb @@ -8,6 +8,10 @@ <% if current_page?("/") %> - <%= link_to "#aoc on Slack!", Aoc.slack_channel, target: :_blank, rel: :noopener, class: "hidden lg:block absolute top-9 right-9 -rotate-[8deg] text-sm link-slack" %> + <%= link_to "#aoc on Slack!", + Aoc.slack_channel, + target: :_blank, + rel: :noopener, + class: "hidden lg:block absolute top-9 right-9 -rotate-[8deg] text-sm link-slack" %> <% end %> diff --git a/app/components/last_data_update_component.html.erb b/app/components/last_data_update_component.html.erb index adf98cf6..7fcad977 100644 --- a/app/components/last_data_update_component.html.erb +++ b/app/components/last_data_update_component.html.erb @@ -1,4 +1,4 @@

- Data updated <%= distance_of_time_in_words(@last_update, @now) %> ago - + Last API sync: <%= distance_of_time_in_words(@last_update, @now) %> ago +

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3ff328d6..5647a35f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,5 +1,5 @@ - + Le Wagon x Advent of Code @@ -27,7 +27,7 @@ diff --git a/app/views/pages/countdown.html.erb b/app/views/pages/countdown.html.erb index 3ad3f7bf..33807aa6 100644 --- a/app/views/pages/countdown.html.erb +++ b/app/views/pages/countdown.html.erb @@ -1,5 +1,5 @@ - + Le Wagon x Advent of Code diff --git a/app/views/pages/faq.html.erb b/app/views/pages/faq.html.erb index 4df57f15..3941863b 100644 --- a/app/views/pages/faq.html.erb +++ b/app/views/pages/faq.html.erb @@ -158,19 +158,37 @@

- 3 exceptional individuals will receive a golden ticket + Three exceptional individuals will receive a golden ticket <%= inline_svg_tag "icons/golden_ticket.svg", class: "w-6 h-6 inline-block" %> +

    +
  1. The greatest influencer of Le Wagon (see <%= link_to "patrons", + patrons_path, + class: "link-explicit link-internal" %>)
  2. +
  3. Announced soon™
  4. +
  5. Announced soon™
  6. +

- Each golden ticket unlocks a reward worth 500€. -

-

+ Each golden ticket unlocks a reward package worth 919€. More info <%= link_to "on Slack", Aoc.slack_channel, target: :_blank, rel: :noopener, class: "link-explicit link-slack" %>.

+

+ These rewards are gifted by + <%= link_to "Le Wagon", + "https://www.lewagon.com/", + target: :_blank, + rel: :noopener, + class: "text-wagon-red link-explicit" %> + and <%= link_to "ShipOnRails", + "https://shiponrails.com/", + target: :_blank, + rel: :noopener, + class: "link-external link-explicit" %>. +

diff --git a/app/views/pages/patrons.html.erb b/app/views/pages/patrons.html.erb index 6ac4ceac..aee53b6e 100644 --- a/app/views/pages/patrons.html.erb +++ b/app/views/pages/patrons.html.erb @@ -42,7 +42,7 @@ <% if @current_user_referees.any? %>

- You already referred <%= pluralize(@current_user_referees.count, "user") %>: + You already have referred <%= pluralize(@current_user_referees.count, "user") %>: <%= safe_join(@current_user_referees.map do |user| link_to user.username, profile_path(user.uid), class: "strong hover:text-gold" end, ", ") %> @@ -59,10 +59,13 @@ - <% @users.each do |user| %> + <% @users.each_with_index do |user, index| %> <%= link_to user["username"], profile_path(user["uid"]), class: "hover:text-gold" %> + <% if index == 0 %> + <%= inline_svg_tag "icons/golden_ticket.svg", class: "w-6 h-6 inline-block" %> + <% end %> diff --git a/app/views/pages/setup.html.erb b/app/views/pages/setup.html.erb index 4b7ebd48..8f05a90a 100644 --- a/app/views/pages/setup.html.erb +++ b/app/views/pages/setup.html.erb @@ -123,8 +123,8 @@

- Congratulations, your setup is now complete! Every 10 minutes, our platform syncs with adventofcode.com. Soon, this - page will vanish, replaced by your personal advent calendar ✨ + Congratulations, your setup is now complete! Every 10 minutes, our platform syncs with adventofcode.com API. Soon, + this page will vanish, replaced by your personal advent calendar ✨

diff --git a/app/views/pages/stats.html.erb b/app/views/pages/stats.html.erb index c9ee11fc..1574758a 100644 --- a/app/views/pages/stats.html.erb +++ b/app/views/pages/stats.html.erb @@ -17,15 +17,17 @@ -

- Gold indicates users who have completed both parts of a puzzle, - while silver indicates users who have completed only the first half. - Each * or * star represents - up to <%= @users_per_star %> users. -

+<% if @silver_stars + @gold_stars > 0 %> +

+ Gold indicates users who have completed both parts of a puzzle, + while silver indicates users who have completed only the first half. + Each * or * star represents + up to <%= @users_per_star %> users. +

- - - <%= render Stats::TreeRowComponent.with_collection(@daily_completers.reverse, users_per_star: @users_per_star) %> - -
+ + + <%= render Stats::TreeRowComponent.with_collection(@daily_completers.reverse, users_per_star: @users_per_star) %> + +
+<% end %>