search

SimplQ / simplQ-frontend

Modern and fully web based free queue management open source software.
https://simplq.me
GNU General Public License v3.0
175 stars 135 forks source link

Queue History issue #601 completed and continuation of PR #647 #649

Closed Soumit915 closed 2 years ago

Soumit915 commented 3 years ago

This now solves issue #601 with real-time api.

This is basically a continuation of PR #647 .

I have now redesigned the ui for Queue-History. Implemented it with real-time api from the backend. After each add and remove token, the queue-history gets updated within 10 seconds. The user can also update the queue-history by clicking the Refresh Status button.

Please leave your reviews and merge if you like it.

Soumit915 commented 3 years ago

Although there are some merge-conflicts but they are necessary and mandatory. As in the last PR, I have had a static data, things were different than this time

@daltonfury42 , @maaverik can this be a issue or an obstruction to merge?

maaverik commented 3 years ago

Hey, the merge conflicts are a problem. If you look at the modified files in this PR, you'll see a lot of files with changes that were already merged into master. I think it's because you didn't pull from master before making more commits this week, so the history got messed up.

You can try a git pull origin master on your current branch and then push again to this PR or if that doesn't work, checkout to master, run git pull origin master there, make another new branch, add your new changes there and raise a new PR.

There are other ways to fix it, but this might be the easiest. Only the new commits you've made and the files you've intentionally modified should show up in the modified files list in the PR, that's how you can check.