diff --git a/app/assets/images/en-charge-old.jpg b/app/assets/images/en-charge-old.jpg new file mode 100644 index 0000000..a8e21a6 Binary files /dev/null and b/app/assets/images/en-charge-old.jpg differ diff --git a/app/assets/images/en-charge.jpg b/app/assets/images/en-charge.jpg index a8e21a6..998acb7 100644 Binary files a/app/assets/images/en-charge.jpg and b/app/assets/images/en-charge.jpg differ diff --git a/app/assets/stylesheets/kluk.css b/app/assets/stylesheets/kluk.css index 429222c..932895d 100644 --- a/app/assets/stylesheets/kluk.css +++ b/app/assets/stylesheets/kluk.css @@ -16,10 +16,25 @@ body { font-style: normal; } +main { + height: 100vh; +} + +.tracker { + align-content: center; +} + +.logs { + height: 60vh; + overflow: scroll; + scrollbar-width: none; +} + .current-day { background-color: white; position: sticky; - top: 0 + top: 0; + align-content: center; } .bar-afond { diff --git a/app/javascript/controllers/mood_controller.js b/app/javascript/controllers/mood_controller.js index c17d717..e56ef0b 100644 --- a/app/javascript/controllers/mood_controller.js +++ b/app/javascript/controllers/mood_controller.js @@ -1,16 +1,15 @@ import { Controller } from '@hotwired/stimulus' export default class extends Controller { - static targets = [ "image", "day", "dayMobile", "mode" ] + static targets = [ "image", "modeDay", "modeDayMobile" ] updateDayInfo(event) { const image = this.imageTarget; - const day = this.dayTarget; - const dayMobile = this.dayMobileTarget; - const mode = this.modeTarget; + const modeDay = this.modeDayTarget; + const modeDayMobile = this.modeDayMobileTarget; + const modeDayContent = event.target.dataset.day + ' : ' + event.target.dataset.mode; image.src = event.target.dataset.image; - day.textContent = event.target.dataset.day; - dayMobile.textContent = event.target.dataset.day; - mode.textContent = event.target.dataset.mode; + modeDayMobile.textContent = modeDayContent; + modeDay.textContent = modeDayContent; } } diff --git a/app/views/moods/index.html.erb b/app/views/moods/index.html.erb index 942dbca..23efccd 100644 --- a/app/views/moods/index.html.erb +++ b/app/views/moods/index.html.erb @@ -1,49 +1,57 @@
-
- <%= image_tag(@mode + ".jpg", "data-mood-target": "image") %> -
-
-

Comment ça KLUK ?

-
<%= @mode %>
-
Aujourd'hui
-
-
-

Comment ça KLUK ?

-
Aujourd'hui
-
-
-
-
Triste
-
-
-
-
En charge
-
-
-
-
Croisiere
-
-
-
-
Creatif
-
-
-
-
A fond
+
+
+

Comment ça KLUK ?

+
+
Aujourd'hui
+
+ <%= image_tag(@mode + ".jpg", "data-mood-target": "image") %> +
+
+
+
+
+
Aujourd'hui
-
- <% @mood_log.each do |week| %> -
- <% week.each do |d| %> - <% if d[1] %> -
" data-mode="<%= d[1] %>" data-day="<%= d[0] %>" data-action="click->mood#updateDayInfo mouseover->mood#updateDayInfo mouseleave->mood#updateDayInfo" title="<%= d[0] %> : <%= d[1] %>" class="day <%= d[1] %>">
- <% else %> -
- <% end %> +
+
+
+
+
Triste
+
+
+
+
En charge
+
+
+
+
Croisiere
+
+
+
+
Creatif
+
+
+
+
A fond
+
+
+
+
+ <% @mood_log.each do |week| %> +
+ <% week.each do |d| %> + <% if d[1] %> +
" data-mode="<%= d[1] %>" data-day="<%= d[0] %>" data-action="click->mood#updateDayInfo mouseover->mood#updateDayInfo mouseleave->mood#updateDayInfo" title="<%= d[0] %> : <%= d[1] %>" class="day <%= d[1] %>">
+ <% else %> +
+ <% end %> + <% end %> +
<% end %>
- <% end %> +