diff --git a/app/assets/images/heart.png b/app/assets/images/heart.png new file mode 100644 index 0000000..99529a2 Binary files /dev/null and b/app/assets/images/heart.png differ diff --git a/app/assets/stylesheets/components/_button.scss b/app/assets/stylesheets/components/_button.scss index f33a086..3b4063a 100644 --- a/app/assets/stylesheets/components/_button.scss +++ b/app/assets/stylesheets/components/_button.scss @@ -1,17 +1,38 @@ -#validatechallenge { +.validatechallenge { color: white; - background-color: $navbar; - margin: 10px 10px; padding: 20px; border-radius: 5px; text-align: center; - font-size: 18px; - // animation-play-state: paused; + font-size: 50px; + width: 80px; + height: 80px; + display: flex; + align-items: center; + position: relative; + padding: 10px 16px; + // border: 2px solid $navbar; + border-radius: 5px; + // animation-play-state: paused; } -#validatechallenge:hover { - transform: scale(1.2); +.dailyactivities { + background-color: $daily-activities; +} + +.futureme { + background-color: $future-me; +} + .interactions { + background-color: $interactions; +} +.curiosity { + background-color: $curiosity; +} + +.validatechallenge:hover { + transform: scale(1.1); + color:white; } .newchallenge { diff --git a/app/assets/stylesheets/pages/_dashboard.scss b/app/assets/stylesheets/pages/_dashboard.scss index 1e82176..d5c5a70 100644 --- a/app/assets/stylesheets/pages/_dashboard.scss +++ b/app/assets/stylesheets/pages/_dashboard.scss @@ -28,6 +28,7 @@ .follow { margin-bottom: 8px; display: flex; + align-items: center; } .inspiration { @@ -43,19 +44,25 @@ margin-bottom: 0px; background: white; padding: 8px 16px; - border: 2px solid rgb(235,235,235); + // border: 2px solid rgb(235,235,235); border-radius: 5px; font-size: 24px; flex-grow: 1; - margin-right: 8px; + margin-right: 15px; } .notification .notification-content { flex-grow: 1; - padding: 0 24px; - display: flex; + padding: 0; + display: block; justify-content: space-between; margin: 18px; + margin-left: 0px; + #sub-description { + font-size: 15px; + color: grey; + max-width: 100ch; + } } .notification p { @@ -74,7 +81,7 @@ align-items: center; background: white; width: 150px; - padding: 8px 16px; + padding: 10px 16px; border: 2px solid rgb(235,235,235); border-radius: 5px; font-size: 18px; diff --git a/app/helpers/meta_tags_helper.rb b/app/helpers/meta_tags_helper.rb index a786404..5353d9b 100644 --- a/app/helpers/meta_tags_helper.rb +++ b/app/helpers/meta_tags_helper.rb @@ -9,7 +9,7 @@ def meta_description def meta_image meta_image = (content_for?(:meta_image) ? content_for(:meta_image) : DEFAULT_META["meta_image"]) - # little twist to make it work equally with an asset or a url + # little twist to make it work equally with an asset or a url meta_image.starts_with?("http") ? meta_image : image_url(meta_image) end end diff --git a/app/views/pages/_non_done_card.html.erb b/app/views/pages/_non_done_card.html.erb index ca69c97..aaa0d44 100644 --- a/app/views/pages/_non_done_card.html.erb +++ b/app/views/pages/_non_done_card.html.erb @@ -2,24 +2,23 @@

<%= participation.challenge.title %>

-
- Validate me -
+

<%= participation.challenge.description %>

+
" role="progressbar" style="width: 20%" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100">
-
-
-
- <%= link_to '', role_model_path(participation.challenge.role_model), class: "stretched-link" %> - <%= image_tag(participation.challenge.role_model.picture, class:"avatar-small", alt:"avatar-small" ) %> -

<%= "#{participation.challenge.role_model.first_name} #{participation.challenge.role_model.last_name}" %>

+ " data-toggle="modal" data-target="#exampleModal<%= participation.id %>"> + +
+
+ +
-
-
+ +
diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb index a2424ad..8d04518 100644 --- a/app/views/pages/dashboard.html.erb +++ b/app/views/pages/dashboard.html.erb @@ -53,32 +53,30 @@
-
-
+
+ <% if @undone_participations.length >= 2 %> +
Ongoing challenges (<%= @undone_participations.length %>)
+ <% else %> +
Ongoing challenge (<%= @undone_participations.length %>)
+ <% end %> +
<% if @undone_participations.empty? %>
<%= link_to "Challenge me", challenges_home_path, class:"newchallenge" %> <%= image_tag "emoji/026-grinning.png", size: 50 %> +
<% else %>
-
- <% if @undone_participations.length >= 2 %> -
Ongoing challenges (<%= @undone_participations.length %>)
- <% else %> -
Ongoing challenge (<%= @undone_participations.length %>)
- <% end %> - -
-
<% @undone_participations.each do |participation| %> <%= render 'non_done_card', participation: participation %> <% end %> - <% end %> -
-
+
+
+ <% end %> +
@@ -95,14 +93,16 @@
<%= simple_form_for participation, remote: false do |f| %> - <%= f.input :feedback, as: :text, label: 'Go on and describe your experience !', error: 'Be able to look back and analyse your experience is a huge part of building self confidence. Put a feedback !', placeholder: 'I was not sure I could it, I waited a lot, then I pulled myself out there and I felt great afterward, because I could push myself.' %> - <%= f.input :appreciation, collection: (1..5).to_a, label: 'How much did you appreciate this challenge ?', input_html: {class: "modal-rating"} %> - <%= f.input :difficulty, collection: (1..5).to_a, label: 'How much did you find it difficult ?', input_html: {class: "modal-rating"} %> + <%= f.input :feedback, as: :text, label: 'Description', error: 'Put a feedback !', placeholder: 'Really great challenge...' %> +
+ <%= f.input :appreciation, collection: (1..5).to_a, label: content_tag(:i, "" , class: "fas fa-heart") + " LIKE", input_html: {class: "modal-rating"} %> + <%= f.input :difficulty, collection: (1..5).to_a, label: image_tag('dragon_logo.png', size: "20") + " DIFFICULTY", input_html: {class: "modal-rating"} %> +
+
<%= f.submit "Validate", id:"btn-confetti#{participation.id}", class: "newchallenge"%> <%= image_tag "emoji/102-love.png", size: 50 %>
- <% end %>