Skip to content

Commit f88fe38

Browse files
JudahSanJudahSan
authored
Merge pull request #105 from nairuby/feat-fixes
Landing UI Improvements
2 parents 3831036 + 0160550 commit f88fe38

File tree

11 files changed

+99
-64
lines changed

11 files changed

+99
-64
lines changed

‎Dockerfile‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,23 @@ ENV TMP_PATH /tmp/
77
ENV RAILS_LOG_TO_STDOUT true
88
ENV RAILS_PORT 3000
99

10-
# copy entrypoint scripts and grant execution permissions
11-
COPY ./dev-docker-entrypoint.sh /usr/local/bin/dev-entrypoint.sh
12-
COPY ./test-docker-entrypoint.sh /usr/local/bin/test-entrypoint.sh
13-
RUN chmod +x /usr/local/bin/dev-entrypoint.sh && chmod +x /usr/local/bin/test-entrypoint.sh
14-
15-
# install dependencies for application
16-
RUN apk -U add --no-cache \
17-
build-base \
18-
git \
19-
postgresql-dev \
20-
postgresql-client \
21-
libxml2-dev \
22-
libxslt-dev \
23-
nodejs \
24-
yarn \
25-
imagemagick \
26-
tzdata \
27-
less \
28-
&& rm -rf /var/cache/apk/* \
29-
&& mkdir -p $APP_PATH
10+
# Install system dependencies
11+
RUN apt-get update && apt-get install -y \
12+
build-essential \
13+
git \
14+
postgresql-client \
15+
libxml2-dev \
16+
libxslt-dev \
17+
nodejs \
18+
npm \
19+
imagemagick \
20+
tzdata \
21+
less \
22+
&& rm -rf /var/lib/apt/lists/* \
23+
&& mkdir -p $APP_PATH
3024

3125
RUN gem install bundler --version "$BUNDLE_VERSION" \
32-
&& rm -rf $GEM_HOME/cache/*
26+
&& rm -rf $GEM_HOME/cache/*
3327

3428
# navigate to app directory
3529
WORKDIR $APP_PATH

‎app/assets/config/manifest.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
//= link_tree ../images
22
//= link_tree ../builds
33
//= link mailgun_mails.css
4+
//= link application.tailwind.css
5+
//= link_tree ../../javascript .js

‎app/assets/images/intro-landing.jpg‎

592 KB
Loading

‎app/assets/stylesheets/application.tailwind.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,21 @@
6060
height: 167px;
6161
}
6262
}
63+
64+
.rounded-box {
65+
position: relative;
66+
overflow: hidden;
67+
}
68+
69+
.rounded-box .absolute {
70+
position: absolute;
71+
top: 0;
72+
left: 0;
73+
right: 0;
74+
bottom: 0;
75+
display: flex;
76+
align-items: center;
77+
justify-content: center;
78+
z-index: 10;
79+
}
6380
}

‎app/helpers/chapters_helper.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ module ChaptersHelper
1818

1919
FEATURED_SPONSORS = [
2020
{ image: 'sponsors/current/solutech_official.svg', link: 'https://solutech.co.ke', alt: 'Solutech' },
21-
{ image: 'sponsors/current/finplus.png', link: 'https://finplusgroup.com', alt: 'Finplus Group' },
21+
{ image: 'sponsors/current/microverse.png', link: 'https://www.microverse.org/', alt: 'Microverse' },
2222
{ image: 'sponsors/current/app_signal.png', link: 'https://www.appsignal.com', alt: 'App Signal' },
2323
{ image: 'sponsors/current/ruby_central.png', link: 'https://rubycentral.org/', alt: 'Ruby Central' },
2424

2525
{ image: 'sponsors/current/kopo_kopo.png', link: 'https://kopokopo.co.ke', alt: 'Kopo Kopo' },
26+
{ image: 'sponsors/current/finplus.png', link: 'https://finplusgroup.com', alt: 'Finplus Group' },
2627
{ image: 'sponsors/current/planet_argon.png', link: 'https://www.planetargon.com', alt: 'Planet Argon' },
2728
{ image: 'sponsors/current/friendly_rb.jpg', link: 'https://friendlyrb.com/', alt: 'FriendlyRB' },
28-
{ image: 'sponsors/current/microverse.png', link: 'https://www.microverse.org/', alt: 'Microverse' },
2929
{ image: 'sponsors/current/kca.png', link: 'https://www.kcau.ac.ke', alt: 'KCA University' },
3030
{ image: 'sponsors/current/nairobits.png', link: 'https://www.nairobits.com/', alt: 'Nairobits' }
3131
].freeze

‎app/views/landing/home/_featured_sponsors.html.erb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
Featured Sponsors
2020
</h1>
2121

22-
<div class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-3 xl:grid-cols-3 gap-2 lg:ml-28">
22+
<div class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-6 px-20 place-content-center">
2323
<% featured_sponsors.each do |sponsor| %>
2424
<%= link_to sponsor[:link], target: '_blank' do %>
2525
<div class="flex items-center justify-center w-full">
26-
<div class="w-36 h-40 card">
27-
<%= image_tag sponsor[:image], alt: sponsor[:alt] %>
26+
<div class="min-w-[8rem] min-h-[8rem] max-w-[9rem] max-h-[9rem] lg:max-w-[8rem] lg:max-h-[8rem] xl:max-w-[12rem] xl:max-h-[12rem] card flex items-center justify-center overflow-hidden">
27+
<%= image_tag sponsor[:image], alt: sponsor[:alt], class: 'w-full h-full object-contain' %>
2828
</div>
2929
</div>
3030
<% end %>

‎app/views/landing/home/_intro.html.erb‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,56 @@
1-
<div class="text-center shadow-lg rounded-box mx-auto">
2-
<a href="https://rubyconf.africa" title="Click to visit Ruby Conf Africa 2025" class="btn btn-lg btn-primary btn-block text-xl sm:text-l font-extrabold flex items-center justify-center space-x-3 underline decoration-dashed hover:decoration-solid">
3-
<span class="text-xl font-bold tracking-wide">Ruby Conf Africa 2025 🔗</span>
4-
</a>
1+
<div class="text-center rounded-box mx-auto relative">
2+
<div class="relative">
3+
<%= image_tag 'intro-landing.jpg', alt: "Ruby Conf Africa 2025", class: "w-full object-cover rounded-lg" %>
4+
<div class="absolute inset-0 bg-black bg-opacity-40 rounded-lg"></div>
5+
<div class="absolute inset-0 flex items-center justify-center">
6+
<%= link_to "https://rubyconf.africa", title: "Click to visit Ruby Conf Africa 2025", class: "block relative z-10" do %>
7+
<div class="text-center">
8+
<span class="text-2xl md:text-4xl font-extrabold text-white bg-red-600 bg-opacity-90 px-6 py-3 rounded-lg shadow-lg inline-block transform hover:scale-105 transition-transform duration-300 sm:inline-block group-hover:inline-block">
9+
Ruby Conf Africa 2025 🔗
10+
<p class="mt-4 text-white text-lg md:text-lg font-medium hidden sm:block">Join the largest Ruby conference in Africa!</p>
11+
</span>
12+
<% end %>
13+
</div>
14+
</div>
515
</div>
616

717
<div class="grid md:grid-cols-2 pt-10 pb-10 gap-10">
8-
<div class="md:pt-12 md:px-12 flex flex-col gap-8">
9-
<h1 class="text-5xl font-semibold capitalize text-red-600 leading-[60px]">African Ruby Community</h1>
18+
<div class="md:pt-12 md:px-12 flex flex-col gap-8 text-center md:text-left">
19+
<h1 class="text-5xl font-semibold capitalize text-red-600 leading-[60px]">
20+
African Ruby Community
21+
</h1>
1022

11-
<p class="text-base sm:w-3/4 leading-7 text-black font-normal">
23+
<p class="text-base sm:w-3/4 leading-7 text-black font-normal mx-auto md:mx-0">
1224
A community organization that seeks to promote computer software programming skills with
1325
the Ruby programming language.
1426
</p>
1527

16-
<%= link_to new_user_registration_path do %>
17-
<button class="btn btn-primary rounded-full py-4 px-8 text-white flex justify-center items-center gap-2">
18-
<span>Join Us</span>
19-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4">
20-
<path fill-rule="evenodd" d="M2 10a.75.75 0 01.75-.75h12.59l-2.1-1.95a.75.75 0
21-
111.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0
22-
11-1.02-1.1l2.1-1.95H2.75A.75.75 0 012 10z" clip-rule="evenodd"/>
23-
</svg>
24-
</button>
25-
<% end %>
28+
<div class="flex justify-center md:justify-start">
29+
<%= link_to new_user_registration_path do %>
30+
<button class="btn btn-primary rounded-full py-4 px-8 text-white flex justify-center items-center gap-2">
31+
<span>Join Us</span>
32+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4">
33+
<path fill-rule="evenodd" d="M2 10a.75.75 0 01.75-.75h12.59l-2.1-1.95a.75.75 0
34+
111.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0
35+
11-1.02-1.1l2.1-1.95H2.75A.75.75 0 012 10z" clip-rule="evenodd"/>
36+
</svg>
37+
</button>
38+
<% end %>
39+
</div>
2640
</div>
2741

2842
<div class="grid lg:grid-cols-2 grid-cols-1 lg:gap-0 gap-5 lg:-ml-10">
29-
<div class="bg-red-600 text-white rounded-lg p-10 w-64 h-40 text flex flex-col gap-3 justify-center items-center">
43+
<div class="bg-red-600 text-white rounded-lg p-10 w-76 h-40 text flex flex-col gap-3 justify-center items-center hover:scale-105 transition-transform duration-300">
3044
<p class="text-5xl font-bold"> 5000 + </p>
3145
<p class="text-sm font-semibold">Members across East Africa</p>
3246
</div>
33-
<div class="rounded-lg lg:-ml-20">
47+
<div class="rounded-lg lg:-ml-20 hover:scale-105 transition-transform duration-300">
3448
<%= image_tag 'developers.jpg', class: 'w-full lg:h-[110%] object-cover rounded-lg lg:rounded-tr-full' %>
3549
</div>
36-
<div class="lg:-mt-28 rounded-lg">
50+
<div class="lg:-mt-28 rounded-lg hover:scale-105 transition-transform duration-300">
3751
<%= image_tag 'conference.jpg', class: 'w-full h-full object-cover rounded-lg lg:rounded-bl-full' %>
3852
</div>
39-
<div class="bg-red-600 text-white rounded-lg lg:rounded-bl-none lg:rounded-tl-none lg:rounded-tr-none p-10 w-76 h-40 text flex flex-col gap-3 justify-center items-center lg:mt-6">
53+
<div class="bg-red-600 text-white rounded-lg lg:rounded-bl-none lg:rounded-tl-none lg:rounded-tr-none p-10 w-76 h-40 text flex flex-col gap-3 justify-center items-center lg:mt-6 hover:scale-105 transition-transform duration-300">
4054
<p class="text-5xl font-bold">
4155
<%= Time.now.year - 2010 %> +
4256
</p>
@@ -45,6 +59,4 @@
4559
</p>
4660
</div>
4761
</div>
48-
4962
</div>
50-

‎app/views/landing/home/_previous_sponsors.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<% previous_sponsors.each do |sponsor| %>
99
<%= link_to sponsor[:link], target: '_blank' do %>
1010
<div class="flex items-center justify-center w-full">
11-
<div class="w-36 h-40 card">
11+
<div class="w-36 h-36 card">
1212
<%= image_tag sponsor[:image], alt: sponsor[:alt] %>
1313
</div>
1414
</div>

‎app/views/landing/home/_who_we_are.html.erb‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@
2121
</p>
2222
</div>
2323

24-
<%= link_to landing_about_path do %>
25-
<button class="btn btn-primary rounded-full py-4 px-8 text-white flex justify-center items-center gap-2">
26-
<span>Read more</span>
27-
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4">
28-
<path fill-rule="evenodd" d="M2 10a.75.75 0 01.75-.75h12.59l-2.1-1.95a.75.75 0
29-
111.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0
30-
11-1.02-1.1l2.1-1.95H2.75A.75.75 0 012 10z" clip-rule="evenodd"/>
31-
</svg>
32-
</button>
33-
<% end %>
24+
<div class="flex justify-center">
25+
<%= link_to landing_about_path do %>
26+
<button class="btn btn-primary rounded-full py-4 px-8 text-white flex justify-center items-center gap-2">
27+
<span>Read more</span>
28+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4">
29+
<path fill-rule="evenodd" d="M2 10a.75.75 0 01.75-.75h12.59l-2.1-1.95a.75.75 0
30+
111.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0
31+
11-1.02-1.1l2.1-1.95H2.75A.75.75 0 012 10z" clip-rule="evenodd"/>
32+
</svg>
33+
</button>
34+
<% end %>
35+
</div>
3436
</div>
3537
</div>
3638
</div>

‎app/views/layouts/_footer.html.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<footer aria-labelledby="footer-heading" class="md:pt-32 pt-24 px-20 lg:ml-20">
2-
<div class="grid md:grid-cols-3 md:gap-4 gap-12 justify-center items-center">
3-
<%= link_to root_path, class: "justify-end pr-20" do %>
1+
<footer aria-labelledby="footer-heading" class="md:pt-32 pt-24 px-8 md:px-20 lg:ml-20">
2+
<div class="grid md:grid-cols-3 gap-12 justify-center items-center text-center md:text-left">
3+
<%= link_to root_path, class: "flex justify-center md:justify-end md:pr-20" do %>
44
<%= image_tag('arc_logo_coloured.png', alt: "Community Logo", class: 'w-32 md:w-48') %>
55
<% end %>
66

@@ -55,5 +55,5 @@
5555
</ul>
5656
</div>
5757

58-
<p class="text-center pt-10 pb-10">All Rights Reserved. Copyright <%= Date.today.year %></p>
58+
<p class="text-center pt-10 pb-10">All Rights Reserved. African Ruby Community. Copyright <%= Date.today.year %></p>
5959
</footer>

0 commit comments

Comments
 (0)