Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Class on dashboard #60

Merged
merged 4 commits into from
Mar 14, 2023
Merged

Class on dashboard #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0693045
dashboard-updated
KaterinaConios Mar 14, 2023
6aec6bd
dashboard completed
KaterinaConios Mar 14, 2023
f8a6ddb
re-sized image
KaterinaConios Mar 14, 2023
3a5ef62
Merge branch 'master' into class-on-dashboard
JessamineCodes Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/pages/_dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ width: 35%;
bottom: auto;
position: absolute;
left: 950px;
top: 26%;
top: 30%;
animation: bounce 2s ease;

img {
Expand Down
14 changes: 12 additions & 2 deletions app/views/pages/dashboard.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%# <p>Click on the light question mark to start your next super secret spy challenge....<p> %>
</div>

<div class="mt-5 d-flex align-items-center">
<div class="mt-3 d-flex align-items-center">
<div class="tree-container">
<%= image_tag "tree branch.png", class:"tree" %>
<div class="acorn acorn-1">
Expand Down Expand Up @@ -46,7 +46,17 @@
<% end %>
</div>
</div>

<div class="squirrel-img">
<%= 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 %>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion db/seeds.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
user4 = User.new(email: "[email protected]", password: "123456", first_name: "Zac", level: 3)
user4.save!

user5 = User.new(email: "[email protected]", password: "123456", first_name: "Dilbur", level: 3)
user5 = User.new(email: "[email protected]", password: "123456", first_name: "Dilber", level: 3)
user5.save!

user6 = User.new(email: "[email protected]", password: "123456", first_name: "Matilda", level: 0)
Expand Down