From 06930454150ce6411792305300d1b310b928f4c7 Mon Sep 17 00:00:00 2001 From: Katerina Conios Date: Tue, 14 Mar 2023 12:19:51 +0000 Subject: [PATCH 1/3] dashboard-updated --- app/assets/stylesheets/pages/_dashboard.scss | 2 +- app/views/pages/dashboard.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/pages/_dashboard.scss b/app/assets/stylesheets/pages/_dashboard.scss index 35428e9..7943c96 100644 --- a/app/assets/stylesheets/pages/_dashboard.scss +++ b/app/assets/stylesheets/pages/_dashboard.scss @@ -73,7 +73,7 @@ width: 35%; bottom: auto; position: absolute; left: 950px; -top: 26%; +top: 28%; img { width: 100%; diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb index 3da8eb5..c28e6a5 100644 --- a/app/views/pages/dashboard.html.erb +++ b/app/views/pages/dashboard.html.erb @@ -5,7 +5,7 @@ <%#

Click on the light question mark to start your next super secret spy challenge....

%> -

+
<%= image_tag "tree branch.png", class:"tree" %>
From 6aec6bd35e9fd92e48a3b016e90e66e148cb9a70 Mon Sep 17 00:00:00 2001 From: Katerina Conios Date: Tue, 14 Mar 2023 14:23:17 +0000 Subject: [PATCH 2/3] dashboard completed --- app/views/pages/dashboard.html.erb | 12 +++++++++++- db/seeds.rb | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb index c28e6a5..77d122a 100644 --- a/app/views/pages/dashboard.html.erb +++ b/app/views/pages/dashboard.html.erb @@ -34,7 +34,17 @@ <% end %>
+
- <%= image_tag "Original Sammy" , class:"squirrel" %> + <% if current_user.level == 0 %> + <%= image_tag "Original Sammy.png", class:"squirrel" %> + <% elsif current_user.level== 1%> + <%= image_tag "Sammy Chal 1.png", class:"squirrel" %> + <% elsif current_user.level == 2 %> + <%= image_tag "Sammy Chal 2.png", class:"squirrel" %> + <% else %> + <%= image_tag "Sammy Chal 3.png", class:"squirrel" %> + <% end %> +
diff --git a/db/seeds.rb b/db/seeds.rb index 13101bc..f00d7e5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -21,7 +21,7 @@ user4 = User.new(email: "zac@test.com", password: "123456", first_name: "Zac", level: 3) user4.save! -user5 = User.new(email: "dilber@test.com", password: "123456", first_name: "Dilbur", level: 3) +user5 = User.new(email: "dilber@test.com", password: "123456", first_name: "Dilber", level: 3) user5.save! user6 = User.new(email: "matilda@test.com", password: "123456", first_name: "Matilda", level: 0) From f8a6ddba8a5798d51f3b51d9a547f97209845025 Mon Sep 17 00:00:00 2001 From: Katerina Conios Date: Tue, 14 Mar 2023 14:29:56 +0000 Subject: [PATCH 3/3] re-sized image --- app/assets/stylesheets/pages/_dashboard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/_dashboard.scss b/app/assets/stylesheets/pages/_dashboard.scss index 7943c96..0422a34 100644 --- a/app/assets/stylesheets/pages/_dashboard.scss +++ b/app/assets/stylesheets/pages/_dashboard.scss @@ -73,7 +73,7 @@ width: 35%; bottom: auto; position: absolute; left: 950px; -top: 28%; +top: 30%; img { width: 100%;