From daf15dd109dbd186ba6971fed59a4a53f4d49e47 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 13:05:14 +0200 Subject: [PATCH 01/17] implement auto scroll up after pagination --- app/views/admin/auctions/_deposit_participants.html.erb | 2 +- app/views/admin/auctions/index.html.erb | 2 +- app/views/auctions/index.html.erb | 2 +- app/views/histories/index.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/auctions/_deposit_participants.html.erb b/app/views/admin/auctions/_deposit_participants.html.erb index f514a734a..c0cef0d64 100644 --- a/app/views/admin/auctions/_deposit_participants.html.erb +++ b/app/views/admin/auctions/_deposit_participants.html.erb @@ -60,7 +60,7 @@ <% end %> <% end %> - <%= turbo_frame_tag "results" do %> + <%= turbo_frame_tag "results", autoscroll: true, data: { autoscroll_block: "start", autoscroll_behavior: "smooth" } do %>
<% if @pagy.pages > 1 %>
diff --git a/app/views/admin/auctions/index.html.erb b/app/views/admin/auctions/index.html.erb index f5dc54906..d257185c6 100644 --- a/app/views/admin/auctions/index.html.erb +++ b/app/views/admin/auctions/index.html.erb @@ -109,7 +109,7 @@ { column: 'requirement_deposit_in_cents', caption: t('auctions.auctions'), options: { class: 'sorting' } }, { column: 'enable_deposit', caption: t('auctions.enable_deposit'), options: { class: 'sorting' } }] %> - <%= turbo_frame_tag "results" do %> + <%= turbo_frame_tag "results", autoscroll: true, data: { autoscroll_block: "start", autoscroll_behavior: "smooth" } do %> <%= component 'common/table', header_collection:, options: { class: 'js-table-dt dataTable no-footer' } do %> diff --git a/app/views/auctions/index.html.erb b/app/views/auctions/index.html.erb index f9d60598d..295ab492a 100644 --- a/app/views/auctions/index.html.erb +++ b/app/views/auctions/index.html.erb @@ -44,7 +44,7 @@ { column: nil, caption: t('auctions.offer_actions'), options: { class: 'u-text-left u-text-center-l' } }] %> - <%= turbo_frame_tag "results" do %> + <%= turbo_frame_tag "results", autoscroll: true, data: { autoscroll_block: "start", autoscroll_behavior: "smooth" } do %> <%= component 'common/table', header_collection:, options: { class: 'js-table-dt dataTable no-footer' } do %> diff --git a/app/views/histories/index.html.erb b/app/views/histories/index.html.erb index 33840584f..6107df4a2 100644 --- a/app/views/histories/index.html.erb +++ b/app/views/histories/index.html.erb @@ -29,7 +29,7 @@ { column: 'username', caption: t('auctions.offer_owner'), options: { class: "sorting" } }] %> - <%= turbo_frame_tag "results" do %> + <%= turbo_frame_tag "results", autoscroll: true, data: { autoscroll_block: "start", autoscroll_behavior: "smooth" } do %> <%= component 'common/table', header_collection:, options: { class: 'js-table-dt dataTable no-footer' } do %> From afda0d29b2a798be272a57f93ecc2d1b9e7ba279 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 13:12:55 +0200 Subject: [PATCH 02/17] added hover for type of auction icons --- app/components/common/auction_type_icon/component.html.erb | 4 ++-- config/locales/auctions.en.yml | 2 ++ config/locales/auctions.et.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/components/common/auction_type_icon/component.html.erb b/app/components/common/auction_type_icon/component.html.erb index 7fa5ff7ad..0d9c6f81b 100644 --- a/app/components/common/auction_type_icon/component.html.erb +++ b/app/components/common/auction_type_icon/component.html.erb @@ -1,5 +1,5 @@ <% if english? %> - IO + IO <% else %> - PO + PO <% end %> diff --git a/config/locales/auctions.en.yml b/config/locales/auctions.en.yml index cf74009c7..d9cd81cf3 100644 --- a/config/locales/auctions.en.yml +++ b/config/locales/auctions.en.yml @@ -10,6 +10,8 @@ en: auction_type: "Auction type" english: "English" blind: "Blind" + english_auction_tooltip: "English Auction" + blind_auction_tooltip: "Blind Auction" offers: "Offers" turns_count: "Turns count" offer_actions: "Offer actions" diff --git a/config/locales/auctions.et.yml b/config/locales/auctions.et.yml index 30f5e3863..62c6ec136 100644 --- a/config/locales/auctions.et.yml +++ b/config/locales/auctions.et.yml @@ -17,6 +17,8 @@ et: auction_type: "Oksjoni tüüp" english: "Inglise" blind: "Pime" + english_auction_tooltip: "Inglise oksjon" + blind_auction_tooltip: "Pimeoksjon" offers: "Pakkumused" offer_actions: "Pakkumistegevused" your_current_price: "Sinu pakkumus" From a8b58fa3aedc70a539bfa0fd932e43a8f70b3c40 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 13:21:18 +0200 Subject: [PATCH 03/17] autobider format --- app/controllers/autobider_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/autobider_controller.rb b/app/controllers/autobider_controller.rb index 80cf4785e..26f9c3c4f 100644 --- a/app/controllers/autobider_controller.rb +++ b/app/controllers/autobider_controller.rb @@ -2,7 +2,7 @@ class AutobiderController < ApplicationController before_action :authenticate_user! before_action :set_auction, only: %i[new edit update create] before_action :allow_any_action_with_autobider - + include RecaptchaValidatable recaptcha_action 'autobidder' @@ -25,8 +25,9 @@ def update render turbo_stream: [ turbo_stream.replace('flash', partial: 'common/flash', locals: { flash: }), - turbo_stream.update('autobider-status', html: @autobider.enable ? I18n.t('english_offers.form.yep') : I18n.t('english_offers.form.nope')) - ] + turbo_stream.update('autobider-status', + html: @autobider.enable ? I18n.t('english_offers.form.yep') : I18n.t('english_offers.form.nope')) + ] end def edit From 3faffeaa3909e678e5e11d295c8574ec98b1eaae Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 13:53:31 +0200 Subject: [PATCH 04/17] updated notification index page --- .../components/_notifications.scss | 42 +++++++++++++++++++ app/views/notifications/index.html.erb | 29 ++++++++++--- config/locales/notifications.en.yml | 1 + config/locales/notifications.et.yml | 1 + 4 files changed, 68 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/components/_notifications.scss b/app/assets/stylesheets/components/_notifications.scss index c4832f45a..7e4ffa57b 100644 --- a/app/assets/stylesheets/components/_notifications.scss +++ b/app/assets/stylesheets/components/_notifications.scss @@ -96,4 +96,46 @@ border-bottom: 1px solid $grey-200-color; } } +} + +.c-notification__empty-state { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: rem(60px) rem(20px); + text-align: center; + min-height: rem(300px); +} + +.c-notification__empty-icon { + color: #94a3b8; + margin-bottom: rem(24px); + opacity: 0.8; +} + +.c-notification__empty-icon--read { + color: #cbd5e1; + width: 48px; + height: 48px; +} + +.c-notification__empty-title { + font-size: rem(18px); + font-weight: 600; + color: #64748b; + margin: 0 0 rem(8px) 0; + line-height: 1.4; +} + +.c-notification__empty-description { + font-size: rem(14px); + color: #94a3b8; + margin: 0; + line-height: 1.5; +} + +.c-notification__empty-state--read { + min-height: rem(200px); + padding: rem(40px) rem(20px); } \ No newline at end of file diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb index 24089f407..820c98a00 100644 --- a/app/views/notifications/index.html.erb +++ b/app/views/notifications/index.html.erb @@ -2,9 +2,11 @@
-
- <%= component 'common/buttons/button_to', title_caption: t('notifications.read_all'), href: mark_as_read_notifications_path, color: 'orange', options: { method: :patch } %> -
+ <% if @unread_notifications.present? %> +
+ <%= component 'common/buttons/button_to', title_caption: t('notifications.read_all'), href: mark_as_read_notifications_path, color: 'orange', options: { method: :patch } %> +
+ <% end %>

<%= t('notifications.unreaded_notifications') %> (<%= @unread_notifications&.count %>)

<%= turbo_frame_tag :unread_notifications do %> @@ -27,7 +29,17 @@ <%= component 'common/pagy', pagy: @unread_pagy %> <% else %>
-

<%= t('notifications.no_unread_notifications') %>

+
+ + + + + + + +

<%= t('notifications.no_unread_notifications') %>

+

<%= t('notifications.all_caught_up') %>

+
<% end %> <% end %> @@ -55,7 +67,14 @@ <%= component 'common/pagy', pagy: @read_pagy %> <% else %>
-

<%= t('notifications.no_read_notifications') %>

+
+ + + + + +

<%= t('notifications.no_read_notifications') %>

+
<% end %> <% end %> diff --git a/config/locales/notifications.en.yml b/config/locales/notifications.en.yml index 2c6138650..e4d5f6782 100644 --- a/config/locales/notifications.en.yml +++ b/config/locales/notifications.en.yml @@ -7,6 +7,7 @@ en: all_marked_as_read: 'All notifications marked as read' no_notifications: 'No notifications yet' no_unread_notifications: 'No unread notifications' + all_caught_up: 'You are all caught up! 🎉' no_read_notifications: 'No read notifications' index: title: "Notifications" \ No newline at end of file diff --git a/config/locales/notifications.et.yml b/config/locales/notifications.et.yml index bd002e72c..02c94a87a 100644 --- a/config/locales/notifications.et.yml +++ b/config/locales/notifications.et.yml @@ -7,6 +7,7 @@ et: all_marked_as_read: 'Kõik teavitused märgitud loetuks' no_notifications: 'Teavitusi pole veel' no_unread_notifications: 'Lugemata teavitusi pole' + all_caught_up: 'Kõik on loetud! 🎉' no_read_notifications: 'Loetud teavitusi pole' index: title: "Teavitused" From a02954c4a6e017cf2aecb81297f49b7bb5622b01 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 14:29:48 +0200 Subject: [PATCH 05/17] butoon is inactive during domain name fiels is empty on wishlist page --- app/assets/stylesheets/components/_btn.scss | 7 +++++ app/javascript/controllers/index.js | 3 +++ .../controllers/wishlist_controller.js | 27 +++++++++++++++++++ app/views/wishlist_items/index.html.erb | 6 ++--- 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 app/javascript/controllers/wishlist_controller.js diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss index 4534dbcbb..13f408fd8 100644 --- a/app/assets/stylesheets/components/_btn.scss +++ b/app/assets/stylesheets/components/_btn.scss @@ -89,4 +89,11 @@ table { font-size: rem(15px); margin: 2.5rem 0 1.5rem 0; } +} + +.c-btn--disabled, +.c-btn:disabled { + opacity: 0.5; + cursor: not-allowed; + pointer-events: none; } \ No newline at end of file diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js index 493f0bd1c..d2b6a6496 100644 --- a/app/javascript/controllers/index.js +++ b/app/javascript/controllers/index.js @@ -87,3 +87,6 @@ application.register("slashed-zero", SlashedZeroController); import OfferPriceValidatorController from "./offer_price_validator_controller"; application.register("offer-price-validator", OfferPriceValidatorController); + +import WishlistController from "./wishlist_controller"; +application.register("wishlist", WishlistController); \ No newline at end of file diff --git a/app/javascript/controllers/wishlist_controller.js b/app/javascript/controllers/wishlist_controller.js new file mode 100644 index 000000000..45dd849c3 --- /dev/null +++ b/app/javascript/controllers/wishlist_controller.js @@ -0,0 +1,27 @@ +import { Controller } from "@hotwired/stimulus" + +// Connects to data-controller="wishlist" +export default class extends Controller { + static targets = ["input", "submit"] + + connect() { + // Check initial state on connect + this.toggleSubmitButton() + } + + domainCheck() { + this.toggleSubmitButton() + } + + toggleSubmitButton() { + const inputValue = this.inputTarget.value.trim() + + if (inputValue.length > 0) { + this.submitTarget.disabled = false + this.submitTarget.classList.remove('c-btn--disabled') + } else { + this.submitTarget.disabled = true + this.submitTarget.classList.add('c-btn--disabled') + } + } +} diff --git a/app/views/wishlist_items/index.html.erb b/app/views/wishlist_items/index.html.erb index 5b295d073..284e84c22 100644 --- a/app/views/wishlist_items/index.html.erb +++ b/app/views/wishlist_items/index.html.erb @@ -37,10 +37,10 @@
- <%= form_with model: @wishlist_item, url: wishlist_items_path do |f| %> + <%= form_with model: @wishlist_item, url: wishlist_items_path, data: { controller: "wishlist" } do |f| %> <%= f.hidden_field :user_id, value: @wishlist_item.user_id %> - <%= component 'common/form/text_field', form: f, attribute: :domain_name, options: { placeholder: t('auctions.domain_name'), data: { action: 'input->wishlist#domainCheck'} } %> - <%= component 'common/form/form_button', form: f, btn_title: t(:submit), options: { data: { turbo: false }, id: "wishlist_item_form_commit" } %> + <%= component 'common/form/text_field', form: f, attribute: :domain_name, options: { placeholder: t('auctions.domain_name'), data: { action: 'input->wishlist#domainCheck', wishlist_target: 'input' } } %> + <%= component 'common/form/form_button', form: f, btn_title: t(:submit), options: { data: { turbo: false, wishlist_target: 'submit' }, id: "wishlist_item_form_commit", disabled: true } %> <% end %>
From 31d2872f58c109711b8d1d0e2b502d6fdc1fff50 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 14:46:16 +0200 Subject: [PATCH 06/17] fixed view in offer show for english auction --- .../offers/english_auction_offer_table/component.html.erb | 4 ++-- .../pages/offers/english_auction_offer_table/component.rb | 2 +- config/locales/auctions.en.yml | 1 + config/locales/auctions.et.yml | 1 + config/locales/offers.en.yml | 2 +- config/locales/offers.et.yml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/components/pages/offers/english_auction_offer_table/component.html.erb b/app/components/pages/offers/english_auction_offer_table/component.html.erb index 4b4726b50..33578d335 100644 --- a/app/components/pages/offers/english_auction_offer_table/component.html.erb +++ b/app/components/pages/offers/english_auction_offer_table/component.html.erb @@ -24,12 +24,12 @@ <%= component 'common/table', header_collection: bidder_table_headers, options: { class: '' } do %> <%= tag.tbody do %> <% @offer.auction.offers.order(updated_at: :desc).each do |offer| %> - + <%= offer&.billing_profile&.user_id == current_user.id ? "#{offer.username} (You)" : offer.username %> <%= t('offers.price_in_currency', price: offer.price) %> - <%= I18n.l(offer.updated_at) %> + <%= offer.updated_at %> <% end %> <% end %> diff --git a/app/components/pages/offers/english_auction_offer_table/component.rb b/app/components/pages/offers/english_auction_offer_table/component.rb index e2a99f120..138565425 100644 --- a/app/components/pages/offers/english_auction_offer_table/component.rb +++ b/app/components/pages/offers/english_auction_offer_table/component.rb @@ -12,7 +12,7 @@ def initialize(offer:) def overview_table_headers [{ column: nil, caption: t('auctions.domain_name'), options: { class: '' } }, - { column: nil, caption: t('auctions.ends_at'), options: { class: '' } }, + { column: nil, caption: t('auctions.ended_at'), options: { class: '' } }, { column: nil, caption: t('offers.price'), options: { class: '' } }] end diff --git a/config/locales/auctions.en.yml b/config/locales/auctions.en.yml index d9cd81cf3..7b3f748a3 100644 --- a/config/locales/auctions.en.yml +++ b/config/locales/auctions.en.yml @@ -3,6 +3,7 @@ en: domain_name: 'Domain name' starts_at: 'Starts at' ends_at: 'Ends at' + ended_at: 'Ended at' finished_at: "Finished at" finished: "This auction has ended" winning_bid: 'Winning bid' diff --git a/config/locales/auctions.et.yml b/config/locales/auctions.et.yml index 62c6ec136..86715d1f7 100644 --- a/config/locales/auctions.et.yml +++ b/config/locales/auctions.et.yml @@ -10,6 +10,7 @@ et: domain_name: 'Domeeninimi' starts_at: 'Algus' ends_at: 'Oksjoni lõpp' + ended_at: 'Oksjon lõppes' finished_at: "Oksjoni lõppkuupäev" finished: "Oksjon on lõppenud" winning_bid: "Võidupakkumus" diff --git a/config/locales/offers.en.yml b/config/locales/offers.en.yml index f709390ed..15da1987f 100644 --- a/config/locales/offers.en.yml +++ b/config/locales/offers.en.yml @@ -35,7 +35,7 @@ en: Once the auction time has ended, we will send an email to the auction winner. participants: Bidder - your_last_offer: My bid + your_last_offer: Bid offers_time: Time participants_title: Bidders deposit_title: Deposit Payments diff --git a/config/locales/offers.et.yml b/config/locales/offers.et.yml index 255303c99..f36ecd7fc 100644 --- a/config/locales/offers.et.yml +++ b/config/locales/offers.et.yml @@ -36,7 +36,7 @@ et: we_will_contact_winner: | Kui oksjon on lõppenud, saadameoksjoni võitjale e-kirja aadressile participants: Pakkuja - your_last_offer: Minu pakkumus + your_last_offer: Pakkumus offers_time: Aeg participants_title: Pakkujad deposit_title: Deposiidimaksed From bcccc6d8f97378415842bbd5218c6797ba5b9eb8 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 15:04:49 +0200 Subject: [PATCH 07/17] fixed authentication rollback --- app/controllers/application_controller.rb | 6 ++++-- app/controllers/english_offers_controller.rb | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 797f126ef..d9e16fc95 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -80,8 +80,10 @@ def clear_flash protected def authenticate_user! + Rails.logger.debug "=== authenticate_user! called, user_signed_in?: #{user_signed_in?}" return if user_signed_in? + Rails.logger.debug "=== User NOT signed in, redirecting..." store_location_for(:user, request.fullpath) if request.get? || request.head? store_location_for(:user, request.referer) unless request.get? || request.head? @@ -90,9 +92,9 @@ def authenticate_user! flash[:alert] = t('devise.failure.unauthenticated') if turbo_frame_request? - render turbo_stream: turbo_stream.action(:redirect, root_path) + render turbo_stream: turbo_stream.action(:redirect, root_path) and return false else - redirect_to new_user_session_path + redirect_to new_user_session_path and return false end end diff --git a/app/controllers/english_offers_controller.rb b/app/controllers/english_offers_controller.rb index fb14eaf44..592264ff6 100644 --- a/app/controllers/english_offers_controller.rb +++ b/app/controllers/english_offers_controller.rb @@ -1,10 +1,11 @@ # frozen_string_literal: true class EnglishOffersController < ApplicationController - before_action :set_offer, only: %i[show edit update] - include BeforeRender include Offerable + + before_action :set_offer, only: %i[show edit update] + protect_from_forgery with: :null_session # order is important From b7d23d8ac2f7607c8d4be12b65cf5de85c1e7861 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Thu, 13 Nov 2025 15:14:37 +0200 Subject: [PATCH 08/17] added specbook to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index dddc26494..d9067c949 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,5 @@ CLAUDE.md /app/assets/builds/* !/app/assets/builds/.keep +.cursorindexingignore +.specstory/ From b609930ac18345273807d1b5dd0fa9d17ef375ce Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Fri, 14 Nov 2025 11:36:09 +0200 Subject: [PATCH 09/17] added current year in footer --- app/components/common/footer/component.html.erb | 2 +- config/locales/common.en.yml | 2 +- config/locales/common.et.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/common/footer/component.html.erb b/app/components/common/footer/component.html.erb index ba0d5f1cb..8d3ec4bff 100644 --- a/app/components/common/footer/component.html.erb +++ b/app/components/common/footer/component.html.erb @@ -7,7 +7,7 @@

- <%= t('common.footer.copyright') %> + <%= t('common.footer.copyright', year: Date.today.year) %>

diff --git a/config/locales/common.en.yml b/config/locales/common.en.yml index 6ea82fc96..e725442b3 100644 --- a/config/locales/common.en.yml +++ b/config/locales/common.en.yml @@ -10,7 +10,7 @@ en: notifications: "Notifications" footer: - copyright: "© 2024 Estonian Internet Foundation" + copyright: "© %{year} Estonian Internet Foundation" address: "Paldiski mnt 80, 10617 Tallinn, Estonia" registration_code: "Registration code: 90010019" diff --git a/config/locales/common.et.yml b/config/locales/common.et.yml index ed22b68e0..9edefffb6 100644 --- a/config/locales/common.et.yml +++ b/config/locales/common.et.yml @@ -10,7 +10,7 @@ et: notifications: "Teavitused" footer: - copyright: "© 2024 Eesti Interneti Sihtasutus" + copyright: "© %{year} Eesti Interneti Sihtasutus" address: "Paldiski mnt 80, 10617 Tallinn" registration_code: "Registrikood: 90010019" From a373d8644bb88aa45659ba1b901f61e49deb0490 Mon Sep 17 00:00:00 2001 From: oleghasjanov Date: Fri, 14 Nov 2025 11:47:05 +0200 Subject: [PATCH 10/17] updated billing profile page --- app/assets/stylesheets/components/_account.scss | 7 +++++++ app/views/billing_profiles/_billing_info.html.erb | 14 +++++++------- config/locales/billing_profiles.en.yml | 1 + config/locales/billing_profiles.et.yml | 1 + 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/components/_account.scss b/app/assets/stylesheets/components/_account.scss index 09b15cc3b..fe406bc4f 100644 --- a/app/assets/stylesheets/components/_account.scss +++ b/app/assets/stylesheets/components/_account.scss @@ -125,6 +125,13 @@ } } +.c-account__input--readonly-field { + border: 1px solid #d1d5db !important; + background-color: #f9fafb; + color: #6b7280; + cursor: not-allowed; +} + .c-account__checkbox { gap: 16px; diff --git a/app/views/billing_profiles/_billing_info.html.erb b/app/views/billing_profiles/_billing_info.html.erb index 85000c09b..39481c65d 100644 --- a/app/views/billing_profiles/_billing_info.html.erb +++ b/app/views/billing_profiles/_billing_info.html.erb @@ -1,8 +1,8 @@ <%= turbo_frame_tag dom_id(billing_profile) do %>