Skip to content

Feature/keyboard shortcuts #160

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

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

Feature/keyboard shortcuts #160

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
07fe63f
add mousetrap lib to keys js files, and load js file in html
YairEn Jan 26, 2021
f9cc030
Merge branch 'develop' into feature/keyboard-shortcuts
YairEn Jan 26, 2021
9813dfb
Merge branch 'develop' into feature/keyboard-shortcuts
YairEn Jan 29, 2021
9aa7e78
Change shortcuts from home page to general
YairEn Jan 29, 2021
ab47c1e
remove home test
YairEn Jan 29, 2021
d70c329
Merge branch 'develop' into feature/keyboard-shortcuts
YairEn Jan 29, 2021
da42ebb
Change navigate to navigation
YairEn Jan 30, 2021
9c29e96
delete profile_shortcuts.js file
YairEn Jan 30, 2021
1cdbfd1
Fix - Pylint check - line too long
YairEn Jan 30, 2021
b257545
Add test to test_keyboard_shortcuts_route.py
YairEn Jan 31, 2021
3615ddc
Add Cypress Test
YairEn Feb 2, 2021
5dba38f
Merge branch 'develop' into feature/keyboard-shortcuts
YairEn Feb 23, 2021
f5e397d
Fix alphabetic order
YairEn Feb 23, 2021
c1c2743
Change indent to 2 spaces
YairEn Feb 23, 2021
b0a5938
Change keyboard_shortcuts to modal
YairEn Feb 25, 2021
2973ec8
Remove keyboard_shortcuts.py
YairEn Feb 25, 2021
0c83116
Merge branch 'develop' into feature/keyboard-shortcuts
YairEn Feb 25, 2021
91e50ce
CHange U letter to u lowercase to check upload
YairEn Feb 25, 2021
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
5 changes: 3 additions & 2 deletions app/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from app.internal.quotes import load_quotes, daily_quotes
from app.routers import (
agenda, dayview, email, event, invitation, profile, search, telegram,
whatsapp
)
keyboard_shortcuts, whatsapp)

from app.telegram.bot import telegram_bot
from app.internal.logger_customizer import LoggerCustomizer
from app import config
Expand Down Expand Up @@ -53,6 +53,7 @@ def create_tables(engine, psql_environment):
app.include_router(invitation.router)
app.include_router(whatsapp.router)
app.include_router(search.router)
app.include_router(keyboard_shortcuts.router)

telegram_bot.set_webhook()

Expand Down
11 changes: 11 additions & 0 deletions app/routers/keyboard_shortcuts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from app.dependencies import templates
from fastapi import APIRouter, Request
from starlette.templating import _TemplateResponse

router = APIRouter()


@router.get("/keyboard_shortcuts")
def keyboard_shortcuts(request: Request) -> _TemplateResponse:
return templates.TemplateResponse("keyboard_shortcuts.html", {
"request": request})
Empty file added app/static/keyboard_shortcuts/__init__.py
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions app/static/keyboard_shortcuts/general_shortcuts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import './mousetrap.js'
import './mousetrap_bind_dict.js'

let key_shortcuts = {
'alt+c+h': function() { window.open('/', '_self'); },
'alt+c+i': function() { window.open('/invitations/', '_self'); },
'alt+c+p': function() { window.open('/profile/', '_self'); },
'alt+c+s': function() { window.open('/search/', '_self'); },
'alt+c+a': function() { window.open('/agenda/', '_self'); },
'ctrl+.': function() { window.open('/keyboard_shortcuts/', '_self'); }
Copy link
Member

Choose a reason for hiding this comment

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

Can you open this using modal instead? It's actually not too hard :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I do not understand, I need to open the page itself , not?
modal open a modal not the page, I need to navigate the user to the page he wanted
Thanks :)

Copy link
Member

Choose a reason for hiding this comment

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

I think it's better not to move the user to a whole new page, but to show him the keyboard shortcuts in the same page. Just like Jupyter Notebook does.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh, do you mean just the /keyboard_shortcuts to open like modal instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey, I created Modal instead of page by using the button in profile page and It's definitely more beautiful, but I was not able to run it nicely by keyboard shortcut. so I removed that shortcut it for now.
All the ways that I found to do so, was by change the visibility (CSS) or using jQuery or JS but by change the button of the modal to use JS function instead.
If you know how to do so I'll be glad to hear

Copy link
Member

Choose a reason for hiding this comment

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

What have you tried?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

$(#keyboard-shortcuts).modal('show') - It did not work
or just change the display of the element to block

Copy link
Member

Choose a reason for hiding this comment

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

It does not work because it assumes jQuery is imported (and also syntactically wrong - there are no quote signs wrapping #keyboard-shortcuts). Look at the relevant documentation of bootstrap 5, not 4

};

Mousetrap.bind(key_shortcuts);
Loading