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

highlight current page #25

Closed
wants to merge 3 commits into from
Closed

highlight current page #25

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6907b7
highlight current page
Mankavelda Apr 29, 2022
f2d1c7a
updates on page highlight
Mankavelda May 11, 2022
e6ca7c2
new updates
Mankavelda May 17, 2022
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
13 changes: 13 additions & 0 deletions src/helpers/handlebars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,16 @@ export const repoName = (v1: string): string => {
const part: Array<string> = v1.split('/');
return `${part[3]}/${part[4]}`;
}

export const ifContains = (a: string, b: string): boolean => {
return a.slice(-1).includes(b);
}


export const portContains = (a: string, b:string): boolean => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
export const portContains = (a: string, b:string): boolean => {
export const portContains = (a: string, b: string): boolean => {

return a.includes(b);
}

export const not = (a: string): boolean=> {
return (!(a));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return (!(a));
return !a;

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @elhmn. i will make the changes right away!!!

}
21 changes: 18 additions & 3 deletions src/views/partials/pagination.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,32 @@
<li class="disabled page-item"><a class="page-link">...</a></li>
{{/if}}
{{#each (displayPagesNumber interval current pages)}}
{{#if (ifEqual . current 0)}}
{{#if (ifEqual . current 1 0)}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{#if (ifEqual . current 1 0)}}
{{#if (ifEqual . current 1)}}

<li class="active page-item"><a class="page-link">{{ . }}</a></li>
{{else}}
{{#if @root.hasParams}}
{{#if (contains @root.fullUrl "page")}}
<li class="page-item"><a href="{{{constructUrl @root.fullUrl .}}}" class="page-link">{{ . }}</a></li>
{{#if (ifContains @root.fullUrl .)}}
<li class="page-item active"> <a href="{{{constructUrl @root.fullUrl .}}}" class="page-link">{{ . }}</a></li>
{{else}}
<li class="page-item"><a href="{{{constructUrl @root.fullUrl .}}}" class="page-link">{{ . }}</a></li>
{{/if}}
{{else}}
<li class="page-item"><a href="{{@root.fullUrl}}&page={{.}}" class="page-link">{{ . }}</a></li>
{{/if}}
{{else}}
<li class="page-item"><a href="{{@root.fullUrl}}?page={{.}}" class="page-link">{{ . }}</a></li>
{{#if (portContains @root.fullUrl "3000") }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't work in production, as the fullUrl will be something different and probably won't use a port

Comment on lines 21 to +34
Copy link
Member

@elhmn elhmn May 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a little complicated and very difficult to follow, is it possible to simplify this entire logic ?

{{#if (not (contains @root.fullUrl "page"))}}
{{#if (contains @root.fullUrl 0 ) }}
{{#if (ifEqual . 1 0)}}
<li class="page-item active"><a href="{{@root.fullUrl}}?page={{.}}" class="page-link">{{ . }}</a></li>
{{else}}<li class="page-item"><a href="{{@root.fullUrl}}?page={{.}}" class="page-link">{{ . }}</a></li>
{{/if}}
{{/if}}
{{/if}}
{{else}}
<li class="page-item"><a href="{{@root.fullUrl}}?page={{.}}" class="page-link">s{{ . }}</a></li>
{{/if}}
{{/if}}
{{/if}}
{{#if (ifEqual . current 4)}}
Expand Down