Fixes#54 Fixes#33 build the root pages & Logout #56
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 9 commits
December 30, 2021 19:26
Current Code Coverage Percent of this PR:94.5 %Files having coverage below 100%
|
akhilgkrishnan
requested changes
Jan 3, 2022
app/views/partial/_navbar.html.erb
Outdated
|
|
||
| <div class="hidden md:mx-3 md:flex md:space-x-2 lg:space-x-8"> | ||
| <!-- Current: "border-indigo-500 text-gray-900", Default: "border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700" --> | ||
| <% if (current_user.role == "admin" || current_user.role == "owner") %> |
There was a problem hiding this comment.
Suggested change
| <% if (current_user.role == "admin" || current_user.role == "owner") %> | |
| <% if (current_user.admin? || current_user.owner?) %> |
There was a problem hiding this comment.
owner is yet to get defined.
There was a problem hiding this comment.
add the owner key to the role enum
akhilgkrishnan
requested changes
Jan 3, 2022
app/views/dashboard/index.html.erb
Outdated
| <p>Find me in app/views/dashboard/index.html.erb</p> | ||
| <div class="" id="root-page"> | ||
| <%= render "partial/navbar" %> | ||
| </div> |
| @@ -0,0 +1,5 @@ | |||
| <% if user_signed_in? %> | |||
There was a problem hiding this comment.
remove this condition.
We already have the athenticate_user! condition in the application controller.
tailwind.config.js
Outdated
| 200: "#BDAEF7", | ||
| 100: "#DED6FB", | ||
| }, | ||
| 'miru-alertgreen': { |
There was a problem hiding this comment.
Suggested change
| 'miru-alertgreen': { | |
| 'miru-alert-green': { |
@aniket-k-kaushik please follow the same pattern in other as well
app/views/partial/_navbar.html.erb
Outdated
| <div class="hidden md:mx-3 md:flex md:space-x-2 lg:space-x-8"> | ||
| <!-- Current: "border-indigo-500 text-gray-900", Default: "border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700" --> | ||
| <% if (current_user.admin?) %> | ||
| <a href="#" class="border-transparent text-gray-500 hover:text-gray-700 inline-flex items-center px-1 pt-1 text-sm font-medium"> |
There was a problem hiding this comment.
<%= request.path == '/' ? '' : '' %>
You can use this condition for active tab checking.
859f07d to
69dc7c6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #54
Images are not working.
added condition, only admin can see option for dashboard, Team, Invoice and Report
Fixes #33
Logout Function is added.