wip

Gemfile

@@ -21,7 +21,7 @@ gem 'delayed_job_web'
 gem 'devise'
 gem 'devise-i18n'
 gem 'enum_help'
-gem 'faceted_search'#, path: '../faceted_search'
+gem 'faceted_search'#, path: '../../noesya/faceted_search'
 gem 'front_matter_parser'
 gem 'gdpr'
 gem 'gitlab'

Gemfile.lock

@@ -90,8 +90,8 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.648.0)
-    aws-sdk-core (3.162.0)
+    aws-partitions (1.649.0)
+    aws-sdk-core (3.164.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -99,7 +99,7 @@ GEM
     aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.115.0)
+    aws-sdk-s3 (1.116.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -173,7 +173,7 @@ GEM
     ethon (0.15.0)
       ffi (>= 1.15.0)
     execjs (2.8.1)
-    faceted_search (3.5.15)
+    faceted_search (3.5.16)
       font-awesome-sass
       rails (>= 5.2.0)
     faraday (2.6.0)
@@ -309,7 +309,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    octokit (5.6.1)
+    octokit (6.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     omniauth (2.1.0)
@@ -551,4 +551,4 @@ RUBY VERSION
    ruby 2.7.6p219
 
 BUNDLED WITH
-   2.3.22
+   2.3.12

app/assets/stylesheets/extranet/layout/_nav.sass

@@ -16,6 +16,8 @@
     .navbar-nav
         > .nav-item
             margin-left: 20px
+        &__account
+            margin-left: 30px
     .dropdown-menu
         background: transparent
         border: 0
@@ -26,6 +28,16 @@
         line-height: px2rem(28)
         padding-right: 0
         text-transform: uppercase
+    .dropdown-toggle
+        &::after
+            width: 6px
+            height: 6px
+            border-bottom: 1px solid black
+            border-left: 0
+            border-right: 1px solid black
+            border-top: 0
+            transform: rotate(45deg)
+
     @include media-breakpoint-up(md)
         .navbar-nav
             li:last-child .nav-link

app/assets/stylesheets/extranet/layout/_typography.sass

@@ -24,7 +24,7 @@ h1
     font-weight: 500
     line-height: 125%
     @include media-breakpoint-up(md)
-        max-width: 75vw
+        max-width: 70vw
     @include media-breakpoint-down(md)
         font-size: px2rem(30)
     a

app/assets/stylesheets/extranet/pages/_home.sass

 .home-index
+    h1
+        margin-bottom: 60px
     .experiences
         ul
             padding-left: 0

app/views/extranet/application/_nav.html.erb

@@ -9,10 +9,15 @@
     <div class="collapse navbar-collapse" id="menu">
       <%= render_navigation context: :extranet %>
       <ul class="navbar-nav navbar-nav__account">
-        <li class="nav-item dropdown">
-          <%= link_to t('extranet.account.my'), "#", class: "nav-link dropdown-toggle", data: { "bs-toggle": "dropdown" }, aria: { expanded: false } %>
-          <ul class="dropdown-menu dropdown-menu-end">
+        <li class="nav-item dropdown<%= ' active' if '/account'.in?(request.path) %>">
+          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            <i class="bi bi-person-circle"></i>
+            <%= t('extranet.account.my') %>
+          </a>
+          <ul class="dropdown-menu dropdown-menu-end text-end">
             <li><%= link_to current_user.to_s, account_path, class: "dropdown-item" %></li>
+            <li><%= link_to t('extranet.account.edit'), edit_account_path, class: "dropdown-item" %></li>
+            <li><%= link_to t('extranet.account.edit_personal_data'), edit_personal_data_path, class: "dropdown-item" %></li>
             <li><%= link_to t('extranet.account.logout'), destroy_user_session_path, method: :delete, class: "dropdown-item" %></li>
           </ul>
         </li>

app/views/extranet/cohorts/show.html.erb

 <% content_for :title, @cohort %>
 <% content_for :header_right do %>
-  <%= @count %>
+  <%= @cohort.people.count %>
   <%= University::Person::Alumnus.model_name.human(count: @cohort.people.count).downcase %>
 <% end %>
 

app/views/extranet/home/index.html.erb

 <% content_for :title, current_context %>
 <% content_for :header do %>
   <h1>
-    Bienvenue sur l’extranet <%= current_context %>.<br>
+    Bienvenue sur l’extranet <%= current_context %>. 
     Retrouvez les <%= link_to University::Person::Alumnus.model_name.human(count: 2).downcase, university_persons_path %>, 
     <% if current_extranet.should_show_years? %>
     recherchez par <%= link_to Education::AcademicYear.model_name.human(count: 2).downcase, education_academic_years_path %>, 

app/views/extranet/persons/_person.html.erb

 <article class="mb-4 person">
-  <% if person.best_picture.attached? %>
-    <%= kamifusen_tag person.best_picture, width: 400, class: 'img-fluid mb-2',
-      sizes: {
-          '(max-width: 576px)': '400px',
-          '(max-width: 991px)': '200px'
-      } %>
-  <% else %>
-    <%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid mb-2' %>
-  <% end %>
-  <%= link_to person, class: 'stretched-link' do %>
-    <%= person.first_name %> <%= person.last_name %>
-  <% end %>
+  <div class="row g-3">
+    <div class="col-3 col-md-12 mb-2">
+      <% if person.best_picture.attached? %>
+        <%= kamifusen_tag person.best_picture, width: 400, class: 'img-fluid',
+          sizes: {
+              '(max-width: 576px)': '400px',
+              '(max-width: 991px)': '200px'
+          } %>
+      <% else %>
+        <%= image_tag 'extranet/avatar.png', width: 400, class: 'img-fluid' %>
+      <% end %>
+    </div>
+    <div class="col-9 col-md-12">
+      <%= link_to person, class: 'stretched-link' do %>
+        <%= person.first_name %> <%= person.last_name %>
+      <% end %>
+    </div>
 </article>

config/routes/extranet.rb

@@ -12,7 +12,7 @@ get 'account/edit' => 'extranet/account#edit', as: :edit_account
 patch 'account' => 'extranet/account#update'
 scope :account do
   resources :experiences, controller: 'extranet/experiences', except: [:index, :show]
+  get 'personal_data' => 'extranet/personal_data#edit', as: :edit_personal_data
+  patch 'personal_data' => 'extranet/personal_data#update', as: :personal_data
 end
-get 'personal_data/edit' => 'extranet/personal_data#edit', as: :edit_personal_data
-patch 'personal_data' => 'extranet/personal_data#update', as: :personal_data
 root to: 'extranet/home#index'