Improve job board (ocaml#499)

* Rename opportunities to jobs

* Add a few jobs to the board

* Remove job board search bar

* Improve UI of cards in job board

Author: tmattio

CONTRIBUTING.md

@@ -58,15 +58,15 @@ Where `<id>` is the ID of the Discuss post.
 
 ### <a name="content-job"></a> Add an entry to the job board
 
-> Contribute to the [Job Board](https://ocaml.org/opportunities).
+> Contribute to the [Job Board](https://ocaml.org/jobs).
 
 The job board displays OCaml job opportunities.
 
 To add a new entry to the job board, you can add it to [`data/jobs.yml`](data/jobs.yml).
 
-Please make sure that the opportunity involves mostly writing OCaml. Contributions to add opportunities unrelated to OCaml, or where OCaml is a negligible part of the opportunity won't be accepted.
+Please make sure that the job involves mostly writing OCaml. Contributions to add jobs unrelated to OCaml, or where OCaml is a negligible part of the job won't be accepted.
 
-If you notice that a job opportunity is outdated (e.g. already fullfilled, or not opened anymore), PRs to remove it are welcome as well.
+If you notice that a job opportunity is outdated (e.g. already fulfilled, or not opened anymore), PRs to remove it are welcome as well.
 
 ### <a name="content-success-story"></a> Add a success story
 

data/jobs.yml

@@ -1,6 +1,36 @@
 jobs:
-  - title: Benchmark Tooling Engineer
-    link: https://tarides.com/jobs/benchmark-tooling-engineer
+  - title: Compiler Engineer
+    link: https://mina-foundation.breezy.hr/p/5d51e6552a93-site-reliability-engineer-sre
+    location: France
+    company: DGFiP
+    company_logo: https://upload.wikimedia.org/wikipedia/fr/thumb/6/6d/Logo_DGFP-fr.svg/2560px-Logo_DGFP-fr.svg.png
+  - title: Cryptography Engineer
+    link: https://boards.greenhouse.io/o1labs/jobs/4023646004
+    location: Remote
+    company: O(1) Labs
+    company_logo: https://workshub.imgix.net/7b409fdc3bc46438b64686a627d56b2b?fit=clip&crop=entropy&auto=format&w=60&h=60&q=40&dpr=2
+  - title: Site Reliability Engineer (SRE)
+    link: https://mina-foundation.breezy.hr/p/5d51e6552a93-site-reliability-engineer-sre
+    location: Remote
+    company: Mina Foundation
+    company_logo: https://gallery-cdn.breezy.hr/32bca23d-fe68-4510-be6d-a3857ea72141/CompanyProfilePic.png
+  - title: Team Lead - Software Engineering
+    link: https://tarides.com/jobs/team-lead-software-engineering
+    location: Remote
+    company: Tarides
+    company_logo: https://tarides.com/static/logo_tarides-52f91b59a8657d768e013129896b63e0.png
+  - title: Remote Senior Full Stack Engineer
+    link: https://heliax.dev/jobs/senior-full-stack-engineer/
+    location: Remote
+    company: Heliax
+    company_logo: https://workshub.imgix.net/e52e257a6a9cdbc2bc868a5991ccd717?fit=clip&crop=entropy&auto=format
+  - title: Senior Software Engineer - Irmin
+    link: https://tarides.com/jobs/senior-software-engineer-irmin
+    location: Remote
+    company: Tarides
+    company_logo: https://tarides.com/static/logo_tarides-52f91b59a8657d768e013129896b63e0.png
+  - title: Senior Software Engineer - Tooling team
+    link: https://tarides.com/jobs/senior-software-engineer-tooling-team
     location: Remote
     company: Tarides
     company_logo: https://tarides.com/static/logo_tarides-52f91b59a8657d768e013129896b63e0.png
@@ -24,11 +54,6 @@ jobs:
     location: United-Kingdom
     company: Jane Street
     company_logo: /logos/janestreet.svg
-  - title: Developer Educator
-    link: https://www.janestreet.com/join-jane-street/position/5596802002/
-    location: United States
-    company: Jane Street
-    company_logo: /logos/janestreet.svg
   - title: Senior Software Engineer
     link: https://www.marigold.dev/job-offers/software-engineer-senior-1
     location: France

src/ocamlorg_frontend/components/footer.eml

@@ -77,7 +77,7 @@ let render () =
         <ul>
           <li class="text-lg font-semibold pb-3">Community</li>
           <li class="py-3"><a href="<%s Url.blog %>">Blog</a></li>
-          <li class="py-3"><a href="<%s Url.opportunities %>">Opportunities</a></li>
+          <li class="py-3"><a href="<%s Url.jobs %>">Jobs</a></li>
         </ul>
 
         <ul>

src/ocamlorg_frontend/dune

@@ -90,8 +90,8 @@
   (action
    (run %{bin:dream_eml} %{deps} --workspace %{workspace_root})))
  (rule
-  (targets opportunities.ml)
-  (deps opportunities.eml)
+  (targets jobs.ml)
+  (deps jobs.eml)
   (action
    (run %{bin:dream_eml} %{deps} --workspace %{workspace_root})))
  (rule

src/ocamlorg_frontend/ocamlorg_frontend.ml

@@ -22,9 +22,7 @@ let blog ~featured ~rss ~rss_page ~rss_pages_number ~news =
 
 let news ~page ~pages_number news = News.render ~page ~pages_number news
 let news_post news = News_post.render news
-
-let opportunities ?search ?location ~locations opportunities =
-  Opportunities.render ?search ?location ~locations opportunities
+let jobs ?location ~locations jobs = Jobs.render ?location ~locations jobs
 
 let package_overview ~readme ~readme_title ~dependencies ~rev_dependencies
     ~homepages ~source package =

src/ocamlorg_frontend/pages/community.eml

@@ -171,12 +171,12 @@ Layout.render
 <div class="bg-primary-600">
   <div class="container-fluid">
     <div class="text-center text-white lg:p-16 py-10">
-      <h3 class="font-bold mb-6">Opportunities</h3>
+      <h3 class="font-bold mb-6">OCaml Jobs</h3>
       <div class="text-lg mb-8 lg:px-28">This is a space where groups, companies, and organisations can advertise their projects directly to the OCaml community.</div>
       <div class="space-x-0 md:space-x-5 space-y-5 md:space-y-0">
-        <a href="<%s Url.opportunities %>">
+        <a href="<%s Url.jobs %>">
           <button class="btn btn-lg btn-tertiary">
-            <span>View Opportunities</span>
+            <span>View OCaml Jobs</span>
             <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
             </svg>

src/ocamlorg_frontend/pages/opportunities.eml renamed to src/ocamlorg_frontend/pages/jobs.eml

@@ -1,44 +1,27 @@
-let render ?(search = "") ?(location = "All") ~locations (opportunities : Ood.Job.t list) =
+let render ?(location = "All") ~locations (jobs : Ood.Job.t list) =
 Layout.render
-~title:"OCaml Opportunities"
+~title:"OCaml Jobs"
 ~description:"This is a space where groups, companies, and organisations can advertise their projects directly to the
 OCaml community." @@
 <div class="intro-section-simple">
     <div class="container-fluid">
         <div class="text-center w-full lg:w-2/3 m-auto">
-            <h1 class="font-bold mb-6">Opportunities</h1>
+            <h1 class="font-bold mb-6">OCaml Job Board</h1>
             <p>This is a space where groups, companies, and organisations can advertise their projects directly to the
                 OCaml community.</p>
-            <div
-                class="flex justify-center flex-col lg:flex-row lg:space-x-6 space-y-5 lg:space-y-0 md:space-y-5 w-full lg:w-auto mt-16">
-                <form action="<%s Url.opportunities %>" method="GET" class="form-input">
-                    <div class="form-input__icon">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-body-400" fill="none"
-                            viewBox="0 0 24 24" stroke="rgba(26, 32, 44, 1)">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
-                        </svg>
-                    </div>
-                    <label for="q" class="sr-only">Opportunities</label>
-                    <input class="focus:ring-orange-500" id="q" name="q" type="search" placeholder="Search for an opportunity" value="<%s search %>">
-                    <button class="btn btn-lg btn-secondary ml-4" type="submit">Search</button>
-                </form>
-            </div>
         </div>
     </div>
 </div>
 
-<div class="py-24 bg-white">
+<div class="py-12 bg-white">
     <div class="container-fluid">
         <div class="flex justify-between items-center">
-            <% let job_num = match List.length opportunities with 0 -> "No Job" | 1 -> "1 Job" | l -> Printf.sprintf "%i Jobs" l in %>
+            <% let job_num = match List.length jobs with 0 -> "No Job" | 1 -> "1 Job" | l -> Printf.sprintf "%i Jobs" l in %>
                 <h5 class="font-bold">
                     <%s job_num %>
                 </h5>
                 <div class="relative h-14 w-64">
-                    <form action="<%s Url.opportunities %>" method="GET">
-                        <input id="q" name="q" type="search" placeholder="Search for an opportunity" class="hidden"
-                            value="<%s search %>">
+                    <form action="<%s Url.jobs %>" method="GET">
                         <label for="c" class="sr-only">Location</label>
                         <select
                             class="w-full w-full appearance-none text-body-600 border rounded-md py-3 pl-6 border-gray-200 pr-20 h-full"
@@ -52,7 +35,7 @@ OCaml community." @@
                     </form>
                 </div>
         </div>
-        <% (match List.length opportunities with | 0 -> %>
+        <% (match List.length jobs with | 0 -> %>
         <div class="flex flex-col items-center justify-center pt-24 space-y-4 text-body-400">
             <div>
                 <svg xmlns="http://www.w3.org/2000/svg" class="h-10 w-10" fill="none" viewBox="0 0 24 24"
@@ -61,20 +44,20 @@ OCaml community." @@
                         d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
                 </svg>
             </div>
-            <div class="text-xl">No Opportunities found matching "<%s search %>"</div>
+            <div class="text-xl">No Jobs found</div>
         </div>
         <% | _ -> %>
-        <div class="grid grid-cols-1 pb-10 lg:grid-cols-3 gap-8 mt-16" x-data="{ location: '<%s location %>' }">
-            <% opportunities |> List.iter (fun (item : Ood.Job.t) -> %>
+        <div class="grid grid-cols-1 pb-8 lg:grid-cols-3 gap-8 mt-12" x-data="{ location: '<%s location %>' }">
+            <% jobs |> List.iter (fun (item : Ood.Job.t) -> %>
             <a href="<%s item.link %>"
                 target="_blank"
                 class="text-left p-8 border border-gray-200 rounded-xl card-hover"
                 :class="{ 'hidden': location != 'All' && location != '<%s item.location %>'  }">
-                <img class="mb-6 max-h-8 max-w-[7rem]" src="<%s item.company_logo %>" alt="">
-                <div class="text-lg mb-3 text-body-600">
+                <img class="mb-4 max-h-8 max-w-[7rem]" src="<%s item.company_logo %>" alt="">
+                <div class="text-base mb-2 text-body-600 opacity-80">
                     <%s item.company %>
                 </div>
-                <div class="text-lg mb-3 font-semibold text-body-600">
+                <div class="text-lg mb-4 font-extrabold text-body-600 truncate">
                     <%s item.title %>
                 </div>
                 <div class="flex items-center space-x-2">

src/ocamlorg_frontend/url.ml

@@ -37,7 +37,7 @@ let workshop v = "/workshops/" ^ v
 let blog = "/blog"
 let news = "/news"
 let news_post v = "/news/" ^ v
-let opportunities = "/opportunities"
+let jobs = "/jobs"
 let carbon_footprint = "/carbon-footprint"
 let privacy_policy = "/privacy-policy"
 let governance = "/governance"

src/ocamlorg_web/lib/handler.ml

@@ -191,35 +191,13 @@ let news_post req =
   | Some news_post -> Dream.html (Ocamlorg_frontend.news_post news_post)
   | None -> not_found req
 
-let opportunities req =
-  let search_job pattern t =
-    let open Ood.Job in
-    let pattern = String.lowercase_ascii pattern in
-    let title_is_s { title; _ } = String.lowercase_ascii title = pattern in
-    let title_contains_s { title; _ } =
-      String.contains_s (String.lowercase_ascii title) pattern
-    in
-    let score job =
-      if title_is_s job then -1
-      else if title_contains_s job then 0
-      else failwith "impossible job score"
-    in
-    t
-    |> List.filter (fun p -> title_contains_s p)
-    |> List.sort (fun job_1 job_2 -> compare (score job_1) (score job_2))
-  in
-  let search = Dream.query req "q" in
-  let jobs =
-    match search with
-    | None -> Ood.Job.all
-    | Some search -> search_job search Ood.Job.all
-  in
+let jobs req =
   let location = Dream.query req "c" in
   let jobs =
     match location with
-    | None | Some "All" -> jobs
+    | None | Some "All" -> Ood.Job.all
     | Some location ->
-        List.filter (fun job -> job.Ood.Job.location = location) jobs
+        List.filter (fun job -> job.Ood.Job.location = location) Ood.Job.all
   in
   let locations =
     List.filter_map
@@ -229,7 +207,7 @@ let opportunities req =
       Ood.Job.all
     |> List.sort_uniq String.compare
   in
-  Dream.html (Ocamlorg_frontend.opportunities ?search ?location ~locations jobs)
+  Dream.html (Ocamlorg_frontend.jobs ?location ~locations jobs)
 
 let page (page : Ood.Page.t) (_req : Dream.request) =
   Dream.html

src/ocamlorg_web/lib/redirection.ml

@@ -637,8 +637,8 @@ let manual =
     fwd_v2 "/releases/4.14/manual/";
   ]
 
-let make ?(permanant = false) t =
-  let status = if permanant then `Moved_Permanently else `See_Other in
+let make ?(permanent = false) t =
+  let status = if permanent then `Moved_Permanently else `See_Other in
   Dream.scope ""
     [ Dream_encoding.compress ]
     (List.filter_map
@@ -654,4 +654,5 @@ let t =
       make from_v2;
       make v2_assets;
       Dream.scope "" [ Dream_encoding.compress ] manual;
+      make ~permanent:true [ ("/opportunities", "/jobs") ];
     ]