PeterSurda/inoreader2readwise
1
0
Fork 2
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Separate services - app, db, and job #1

Open
swapnil wants to merge 36 commits from swapnil/inoreader2readwise:main into main
pull from: swapnil/inoreader2readwise:main
merge into: PeterSurda:main
Conversation 1 Commits 36 Files Changed 14 +748 -125
swapnil commented 2024-02-01 12:09:49 +01:00
Collaborator
Copy Link
No description provided.
swapnil added 35 commits 2024-02-01 12:09:50 +01:00 
- check, deactivate, & refresh token
- better logging
swapnil requested review from PeterSurda 2024-02-01 16:01:42 +01:00
PeterSurda requested changes 2024-02-06 04:49:37 +01:00
app/templates/login.html
@ -0,0 +6,4 @@
<title>Inoreader To Readwise</title>
</head>
<body>
<button onclick="redirectToOAuth()">Login using inoreader</button>
PeterSurda commented 2024-02-06 04:44:04 +01:00
Owner
Copy Link

why not just a simple a href? It doesn't need to be a button.

why not just a simple a href? It doesn't need to be a button.
swapnil added 1 commit 2024-02-07 08:13:39 +01:00
swapnil commented 2024-02-07 09:14:58 +01:00
Author
Collaborator
Copy Link

@shailaja As suggested by Peter, we need to split this PR into 5 relatively small PRs. Splitting will be as we have discussed in the call. Pasting here the parts for your reference:

split it into

  1. templates
  2. Dockerfiles and envs
  3. web app (app)
  4. db gateway (database)
  5. loop app (job)
@shailaja As suggested by Peter, we need to split this PR into 5 relatively small PRs. Splitting will be as we have discussed in the call. Pasting here the parts for your reference: > split it into > 1. templates > 2. Dockerfiles and envs > 3. web app (app) > 4. db gateway (database) > 5. loop app (job)
This pull request has changes conflicting with the target branch.
  • app/templates/login.html
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u main:swapnil-main
git checkout swapnil-main

Merge

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff swapnil-main
git checkout main
git merge --ff-only swapnil-main
git checkout swapnil-main
git rebase main
git checkout main
git merge --no-ff swapnil-main
git checkout main
git merge --squash swapnil-main
git checkout main
git merge --ff-only swapnil-main
git checkout main
git merge swapnil-main
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
PeterSurda
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: PeterSurda/inoreader2readwise#1
No description provided.
Delete Branch "swapnil/inoreader2readwise:main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?