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

Jump to bottom

Add favorite shabad functionality for SSO release #1680

Merged
merged 17 commits into from
Oct 4, 2023
Merged

Add favorite shabad functionality for SSO release #1680

merged 17 commits into from
Oct 4, 2023

Conversation

Gauravjeetsingh
Copy link
Collaborator

@saintsoldierx veerji, can you please review the design part here, do we need to change anything here?

fav-shabad

@saintsoldierx
Copy link
Collaborator

  • Make the icon a five-point star which is hollow when when it is not a favorite and filled in when it is.
  • Add a 5px or 10px space between icon and word.
  • Keep the colors white.
  • Make the text read "Add to favorites" and "Remove from favorites".
  • Add an icon to the "show display" button. It should be like a projector screen. This will keep the buttons consistant.
  • Make the text for the screen button read "Show Display" and "Hide Display". Currently it uses two words - screen and display.
  • Add a tooltip for favorites. "Add or remove the current displayed Shabad to your list of favorites. Your favorites are available under the tabs in the bottom right hand panel."
  • Under favorites tab, I should have option to remove the favorite in the list view. This should be a remove-icon button. Also, I would like it to show the date and time the Shabad was favorited.

@saintsoldierx
Copy link
Collaborator

For the date/time, something like this would be awesome or if not, just the date and time for now would suffice.
image

@Gauravjeetsingh
Copy link
Collaborator Author

Thank you @saintsoldierx veerji, will work on these changes.

Also, since this is with SSO, we will be showing shabads marked as favourite from sttm-web in desktop. So will need to make sure all these data points are being saved from web as well.

Gauravjeetsingh and others added 2 commits November 17, 2022 22:07
@Gauravjeetsingh
feat: add date/time in favorite shabad pane
8ef5b30 
- fix the style of add to fav button
- update the button label of show display button
- other minor changes
@theamanjs
Merge branch 'dev' into fav-shabad
eb9b436
@theamanjs theamanjs changed the base branch from dev to 9.2.0 January 6, 2023 15:59
@theamanjs
Copy link
Collaborator

@Gauravjeetsingh veer ji, I have changed the base of this PR to branch 9.2.0. We can now send all the v9.2.0 code to that branch and create one EPIC branch.

PS This PR is still in draft. If you are done with the changes you can mark this ready for review and we can proceed with testing this feature and merge it into 9.2.0

@theamanjs theamanjs added this to the 9.2.0 : SSO - Single sign-on milestone Jan 6, 2023
@theamanjs
Copy link
Collaborator

@Gauravjeetsingh veerji if this PR is ready for review can you change the status? I can review and merge this to our sso code

@theamanjs theamanjs self-requested a review January 30, 2023 18:18
@Gauravjeetsingh Gauravjeetsingh marked this pull request as ready for review January 30, 2023 18:50
@Gauravjeetsingh
Copy link
Collaborator Author

Done @theamanjs veerji. thank you!

theamanjs
theamanjs requested changes Feb 1, 2023
View reviewed changes
www/main/navigator/misc/components/MiscHeader.jsx Outdated Show resolved Hide resolved
www/main/navigator/misc/components/MiscHeader.jsx Outdated Show resolved Hide resolved
www/main/navigator/misc/components/favoritePane.jsx Outdated Show resolved Hide resolved
www/main/navigator/misc/components/favoritePane.jsx Outdated Show resolved Hide resolved
www/main/navigator/shabad/ShabadHeader.jsx Outdated Show resolved Hide resolved
www/main/navigator/single-display/singleDisplayFooter.jsx Outdated Show resolved Hide resolved
www/src/scss/navigator/misc/_misc.scss Outdated Show resolved Hide resolved
www/src/scss/navigator/shabad/_shabad.scss Outdated Show resolved Hide resolved
www/src/scss/navigator/shabad/_shabad.scss Outdated Show resolved Hide resolved
@Gauravjeetsingh
Copy link
Collaborator Author

@theamanjs veerji, done with the changes, can you please have another look

@saintsoldierx
Copy link
Collaborator

Please show the latest UI for this

@Gauravjeetsingh
fix: Bug fixes and style enhancements
2459460 
- change the text color of date/time in fav pane
- change the red color of show display button to match theme
- fix the search verse bug when using keyboard shortcut
@Gauravjeetsingh
Copy link
Collaborator Author

@saintsoldierx veerji, here's the latest UI.

fav-shabad-update

Also, while testing I found a bug when using keyboard shorcut, fixed that with recent commit.

Haven't beautified the dates to today, tomorrow yet. We can do that as part of next iterations, that works?

@saintsoldierx
Copy link
Collaborator

I like it!

@Gauravjeetsingh
Merge branch 'dev' of https://github.com/khalisfoundation/sttm-desktop …
bbdcfeb 
…into fav-shabad
@Gauravjeetsingh
feat: Add SSO implementation with favorite shabad functionality
f71a4ee 
- Add keytar package to save the logged in user token in app
- Add a dialog to login/logout from the app
- Implement deeplink functionality to get the user token from external browser
- Use SP API to add/delete/update the fav shabads from database
@Gauravjeetsingh
Merge branch 'dev' of https://github.com/khalisfoundation/sttm-desktop …
f742a9c 
…into fav-shabad
@Gauravjeetsingh
fix: open the fav shabad on click
8a9946c
@Gauravjeetsingh
chore: fix the formatting and linting issues
3dea663
@Gauravjeetsingh
Copy link
Collaborator Author

Updated UI with login/logout dialog box.

sso

@Gauravjeetsingh Gauravjeetsingh mentioned this pull request May 11, 2023
Closed
This was referenced May 11, 2023
Closed
Closed
Closed
Closed
@saintsoldierx
Copy link
Collaborator

Login box should be at bottom I think above the settings icon for now

@Gauravjeetsingh
fix: move the authentication dialog position above settings
8aef679 
- use i18n locale for descriptions in the login dialog
- show the offline message if not connected to internet
@Gauravjeetsingh
chore: fix the linting errors and formatting
eafc3ec
@Gauravjeetsingh
Copy link
Collaborator Author

@saintsoldierx veerji, updated position, is there any other UI or flow change you would like here?

@theamanjs veerji, can you please code review this PR now, with latest changes.

Logged out view with login button
image

Logged in view with logout button
image

Favorite shabad pane
image

theamanjs
theamanjs requested changes May 17, 2023
View reviewed changes
www/locales/en.json Show resolved Hide resolved
app.js Outdated Show resolved Hide resolved
www/main/navigator/misc/components/RecordPane.jsx Outdated Show resolved Hide resolved
www/main/navigator/misc/components/RecordPane.jsx Outdated Show resolved Hide resolved
www/main/navigator/misc/components/favoritePane.jsx Outdated Show resolved Hide resolved
www/main/navigator/misc/components/favoritePane.jsx Show resolved Hide resolved
www/main/navigator/shabad/ShabadHeader.jsx Outdated Show resolved Hide resolved
www/src/scss/navigator/misc/_misc.scss Show resolved Hide resolved
www/src/scss/navigator/shabad/_shabad.scss Outdated Show resolved Hide resolved
www/src/scss/styles.scss Outdated Show resolved Hide resolved
@theamanjs
Copy link
Collaborator

@Gauravjeetsingh veerji, gentle reminder to look into this PR.

@Gauravjeetsingh Gauravjeetsingh mentioned this pull request Jul 19, 2023
Open
@Gauravjeetsingh Gauravjeetsingh merged commit 2bd487d into KhalisFoundation:9.2.0 Oct 4, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saintsoldierx saintsoldierx Awaiting requested review from saintsoldierx

@inderpreetsingh inderpreetsingh Awaiting requested review from inderpreetsingh

@theamanjs theamanjs Awaiting requested review from theamanjs

Assignees

@Gauravjeetsingh Gauravjeetsingh

Labels
None yet
Projects
None yet
Milestone
Una Release
Development

Successfully merging this pull request may close these issues.
3 participants
@Gauravjeetsingh @saintsoldierx @theamanjs