Skip to content
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

Jump to bottom

Skill Tag Component [Learn Area Redesign] #1427

Merged
merged 5 commits into from
Aug 2, 2023
Merged

Skill Tag Component [Learn Area Redesign] #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
810d894
skill tag component
SaySayo Jul 20, 2023
c5a2da1
removed height to center text
SaySayo Jul 20, 2023
d18831e
fixed padding and background
SaySayo Jul 29, 2023
abbcb48
updated bg color according to figma design
SaySayo Jul 29, 2023
e742aa8
added skill tag to books page
SaySayo Aug 1, 2023
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
15 changes: 15 additions & 0 deletions src/ocamlorg_frontend/components/learn_components.eml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
let skill_tag
difficulty
class_
=
match difficulty with
| Some "beginner" ->
<div class="<%s class_ %> px-2 py-1 inline-block bg-teal-700 rounded-3xl border-2 border-teal-700 font-normal text-center text-white"> Beginner </div>
| Some "intermediate" ->
<div class="<%s class_ %> px-2 py-1 inline-block bg-[#040113] rounded-3xl border-2 border-[#040113] font-normal text-center text-white"> Intermediate </div>
| Some "advanced" ->
<div class="<%s class_ %> px-2 py-1 inline-block bg-primary-700 rounded-3xl border-2 border-primary-700 font-normal text-center text-white"> Advanced </div>
| None ->
<></>
| Some _ ->
<></>
8 changes: 8 additions & 0 deletions src/ocamlorg_frontend/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,12 @@
%{bin:dream_eml}
%{dep:learn_sidebar.eml}
--workspace
%{workspace_root})))
(rule
(target learn_components.ml)
(action
(run
%{bin:dream_eml}
%{dep:learn_components.eml}
--workspace
%{workspace_root}))))
19 changes: 6 additions & 13 deletions src/ocamlorg_frontend/pages/books.eml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,14 @@ let render_books books =
<% books |> List.iter (fun (item : Data.Book.t) -> %>
<div
class="flex space-y-10 lg:space-y-0 lg:space-x-16 pb-10 lg:pb-20 border-b border-gray-200 mt-10 lg:mt-20 flex-col lg:flex-row">
<img src="<%s Ocamlorg_static.Media.url item.cover %>"
class="m-auto h-48 w-32 lg:w-64 lg:h-96 md:w-64 md:h-96 rounded-2xl border border-gray-200"
alt="">
<div class="flex flex-col gap-y-4">
<img src="<%s Ocamlorg_static.Media.url item.cover %>"
class="m-4 h-48 w-32 lg:w-64 lg:h-96 md:w-64 md:h-96 rounded-2xl border border-gray-200"
alt="">
<%s! Learn_components.skill_tag item.difficulty "mx-4 w-32 lg:w-64 md:w-64" %>
</div>
<div class="flex-col flex-1">
<h4 class="font-bold mb-6"><%s item.title %></h4>
<% (match item.rating with | None -> () | Some rating -> %>
<div class="flex space-x-1 mb-6 text-primary-600">
<% List.init rating (fun _ -> ()) |> List.iter (fun () -> %>
<%s! Icons.star_2 "h-6 w-6 text-yellow-300" %>
<% ); %>
<% List.init (5 - rating) (fun _ -> ()) |> List.iter (fun () -> %>
<%s! Icons.star_2 "h-6 w-6 text-gray-300" %>
<% ); %>
</div>
<% ); %>
<div class="font-semibold text-base mb-6 uppercase"><%s item.authors |> String.concat ", " %></div>
<div class="prose prose-orange mb-6"><%s! item.body_html %></div>
<% item.links |> List.iter (fun (link : Data.Book.link) -> %>
Expand Down
Loading