Skip to content

Implemented voog footer and redis cache #1584

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.

Sign up for GitHub

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
maricavor wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Implemented voog footer and redis cache #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d05f07
Implemented voog footer and redis cache
maricavor May 27, 2026
3d743ef
Removed legacy footer cathcer job
maricavor May 27, 2026
b45a727
Updated jwt
maricavor May 27, 2026
39c37a7
Added dummy secret
maricavor May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,39 @@
# Dependencies
node_modules
package-lock.json
yarn-error.log
npm-debug.log

# VCS
.git
.gitignore

# Editor/OS
.DS_Store
.idea
.vscode

# Rails runtime
log
tmp
tmp/cache
storage
.bundle

# Bundler (keep Gemfile/Gemfile.lock!)
vendor/bundle

# Tests and coverage (not needed in image)
spec
test
coverage

# Env and local overrides
.env
.env.*
.ruby-version

# Docker & CI artifacts
docker-compose*.yml
Dockerfile.*
.cache
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gem 'freezolite', require: false
gem 'hotwire-rails', '~> 0.1.3'
gem 'jbuilder', '~> 2.11'
gem 'jsbundling-rails'
gem 'jwt'
gem 'jwt', '~> 2.10.3'
gem 'lograge'
gem 'mimemagic', '~> 0.4.3'
gem 'money'
Expand Down Expand Up @@ -50,6 +50,7 @@ gem 'dartsass-rails'
gem 'turbo-rails'
gem 'valvat'
gem 'view_component'
gem 'voog_footer', github: 'internetee/voog_footer'
gem 'webpush'

group :development, :test do
Expand Down
15 changes: 10 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ GIT
omniauth (>= 1.9, < 3)
openid_connect (~> 2.2)

GIT
remote: https://github.com/internetee/voog_footer.git
revision: ddbaeef72f380d8798a4df69cc93039a343b66fd
specs:
voog_footer (0.1.0)
nokogiri (~> 1.10)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -261,7 +268,7 @@ GEM
bindata
faraday (~> 2.0)
faraday-follow_redirects
jwt (2.10.2)
jwt (2.10.3)
base64
language_server-protocol (3.17.0.5)
launchy (3.1.1)
Expand Down Expand Up @@ -519,9 +526,6 @@ GEM
faraday-multipart (>= 1)
ruby-progressbar (1.13.0)
rubyzip (3.1.0)
sass-embedded (1.93.2)
google-protobuf (~> 4.31)
rake (>= 13)
sass-embedded (1.93.2-aarch64-linux-gnu)
google-protobuf (~> 4.31)
sass-embedded (1.93.2-aarch64-linux-musl)
Expand Down Expand Up @@ -655,7 +659,7 @@ DEPENDENCIES
i18n-debug
jbuilder (~> 2.11)
jsbundling-rails
jwt
jwt (~> 2.10.3)
letter_opener (~> 1.8)
letter_opener_web (~> 3.0)
listen (>= 3.0.5, < 3.11)
Expand Down Expand Up @@ -699,6 +703,7 @@ DEPENDENCIES
turbo-rails
valvat
view_component
voog_footer!
web-console (>= 3.3.0)
webmock
webpush
Expand Down
110 changes: 38 additions & 72 deletions app/components/common/footer/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,98 +2,64 @@
<div class="o-container">
<div class="c-footer__grid">
<div class="c-footer__highlight">
<%= render 'svg/footer_eis_logo' %>
<a class="layout--footer-logo" href="<%= footer_logo_url %>" target="_blank" rel="noopener">
<%= render 'svg/footer_eis_logo' %>
</a>
<div class="c-footer__highlight__grid c-footer__highlight__grid--row-t">
<div class="c-footer__highlight__grid">
<h3 class="c-footer__highlight__title">
<div>
<%= t('common.footer.copyright') %>
</div>
</h3>
<div class="c-footer__highlight__info">
<%= Setting.find_by(code: 'invoice_issuer_address').retrieve %><br>
<%= t('reg_no') %>: <%= Setting.find_by(code: 'invoice_issuer_reg_no').retrieve %>
<br>
</div>
<h3 class="c-footer__highlight__title"><%= footer_highlight_title %></h3>
<p class="c-footer__highlight__info"><%= footer_highlight_info %></p>
</div>
<div class="c-footer__highlight__contact">
<span>
<%= render 'svg/email' %><a href="mailto:<%= Setting.find_by(code: 'contact_organization_email').retrieve %>"><%= Setting.find_by(code: 'contact_organization_email').retrieve %></a><br>
<%= render 'svg/email' %><a href="<%= footer_email_href %>" target="_blank" rel="noopener"><%= footer_email_text %></a><br>
</span>
<span>
<%= render 'svg/phone' %><a href="tel:<%= Setting.find_by(code: 'organization_phone').retrieve %>"><%= Setting.find_by(code: 'organization_phone').retrieve %></a>
<%= render 'svg/phone' %><%= footer_phone_text %>
</span>
</div>
</div>
</div>
<div class="c-footer__grid__row">
<div class="c-footer__row__col s-footer-col">
<div>
<span style="color: rgb(255, 255, 255);">
<b><span style="font-size: 15px;"><%= t('common.footer.help_and_info') %> <br></span></b>
</span>
</div>
<div>
<span style="color: rgb(255, 255, 255);">
<b><span style="font-size: 15px;"><br></span></b>
</span>
</div>
<div style="line-height: 23px;"><span style="color: rgb(255, 255, 255);"><b></b>
<span style="font-size: 13px;"><a href="<%= footer_link(:domain_regulation) %>" target="_self"><%= t('common.footer.domain_regulation')%></a></span><br>
<span style="font-size: 13px;"><a href="<%= footer_link(:faq) %>" target="_self"><%= t('common.footer.faq')%></a> </span><br>
<span style="font-size: 13px;"><a href="<%= footer_link(:statistics) %>" target="_self"><%= t('common.footer.statistics')%></a></span><br>
<span style="font-size: 13px;"><a href="<%= footer_link(:dispute_committee) %>" target="_self"><%= t('common.footer.dispute_committee') %></a></span><br>
<span style="font-size: 13px;"><a href="<%= Setting.find_by(code: 'terms_and_conditions_link').retrieve %>" target="_self"><%= t('auctions.top_grid.terms_and_conditions_link').capitalize %></a></span>
<b><span style="font-size: 15px;"><br></span></b><br>
</span>
<% footer_navigation_columns.each_with_index do |column, index| %>
<div class="c-footer__row__col s-footer-col">
<div>
<span style="color: rgb(255, 255, 255);">
<b><span style="font-size: 15px;"><%= column[:name] %><br></span></b>
</span>
</div>
<div>
<span style="color: rgb(255, 255, 255);">
<b><span style="font-size: 15px;"><br></span></b>
</span>
</div>
<div style="line-height: 23px;"><span style="color: rgb(255, 255, 255);"><b></b>
<% column[:links].each do |link| %>
<span style="font-size: 13px;"><%= link_to link[:label], link[:url], link[:html_options] %></span><br>
<% end %>
<% if index == 0 %>
<span style="font-size: 13px;"><a href="<%= Setting.find_by(code: 'terms_and_conditions_link').retrieve %>" target="_blank"><%= t('common.footer.labels.terms_and_conditions') %></a></span>
<% end %>
</span>
</div>
</div>
</div>

<% end %>
<div class="c-footer__row__col s-footer-col">
<div>
<b><span style="font-size: 14px;"><%= t('common.footer.registrars') %> </span><br></b>
</div>
<div><b><span style="font-size: 14px;"><%= footer_social_column_title %><br></span></b></div>
<div><b><br></b></div>
<div>
<b></b>
<span style="font-size: 13px;"><a href="<%= footer_link(:list_of_accredited_registrars) %>" target="_self"> <%= t('common.footer.list_of_accredited_registrars')%></a></span><br>
<span style="font-size: 13px;">
<a href="<%= footer_link(:terms_and_conditions_for_registrars) %>" target="_self"> <%= t('common.footer.terms_and_conditions_for_registrars') %></a>
</span><br>
<span style="font-size: 13px;"><a href="<%= footer_link(:partner_programme) %>" target="_self"> <%= t('common.footer.partner_programme') %></a></span>
<b><br></b>
</div>
</div>
<div class="c-socials">
<% footer_social_links.each do |social| %>
<% partial = "svg/#{social[:key]}" %>
<% next unless lookup_context.exists?(partial, [], true) %>

<div class="c-footer__row__col s-footer-col">
<div><b><span style="font-size: 14px;"><%= t('common.footer.estonian_internet') %> <br></span></b></div>
<div><b><span style="font-size: 14px;"><br></span></b></div>
<div>
<span style="font-size: 14px;"><a href="<%= footer_link(:contact_us) %>" target="_self"><%= t('common.footer.contact_us') %></a></span><br>
<span style="font-size: 14px;"><a href="<%= footer_link(:management) %>" target="_self"><%= t('common.footer.management') %></a></span>
<b><span style="font-size: 14px;"><br></span></b>
<span style="font-size: 14px;">
<a href="<%= footer_link(:newsletter) %>" target="_self">
<span style="color: rgb(251, 170, 25);"><%= t('common.footer.newsletter') %></span>
<a href="<%= social[:url] %>" title="<%= social[:title] %>" target="_blank" rel="noopener">
<%= render partial %>
</a>
</span><b>
<span style="font-size: 14px;"><br></span></b>
<% end %>
</div>
</div>

<div class="c-footer__row__col s-footer-col">
<div><b><span style="font-size: 14px;"><%= t('common.footer.social_media') %></span><br></b></div>
<div><b><br></b></div>
<div class="c-socials">
<a href="https://www.facebook.com/EE-748656818569233/" class="c-socials__link" target="_blank"><%= render 'svg/facebook' %></a>
<a href="https://twitter.com/Eesti_Internet" class="c-socials__link" target="_blank"><%= render 'svg/twitter' %></a>
<% if false %><a href="" class="c-socials__link" target="_blank"><%= render 'svg/linkedin' %></a><% end %>
<a href="https://www.youtube.com/channel/UC7nTB6zIwZYPFarlbKuEPRA" class="c-socials__link" target="_blank"><%= render 'svg/youtube' %></a>
<a href="https://internet.ee/index.rss" class="c-socials__link" target="_blank"><%= render 'svg/rss' %></a>
</div>
<a target="_blank" href="https://sviiter.ee" class="c-footer__sviiter"><%= render 'svg/sviiter' %></a>
</div>
<a target="_blank" href="https://sviiter.ee" class="c-footer__sviiter"><%= render 'svg/sviiter' %></a>
</div>
</div>
</div>
</footer>
Loading