Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Feedback #1

Open
wants to merge 143 commits into
base: feedback
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
9da6009
Setting up GitHub Classroom Feedback
github-classroom[bot] May 7, 2024
697606a
add deadline
github-classroom[bot] May 7, 2024
d764ff0
added rematellama
bhandareasmita May 14, 2024
1930c0e
fixed prompt
MasterAirscrachDev May 14, 2024
606d69a
Merge pull request #2 from NM-TAFE/fixed-prompt
20095325 May 14, 2024
c259ac7
updated prompt
MasterAirscrachDev May 14, 2024
53b84a5
further prompt refinement
MasterAirscrachDev May 14, 2024
ed4f062
fixed openai integration
MasterAirscrachDev May 14, 2024
36ee810
feat: project documentation drafts from Cert IV group
Robbo-lab May 20, 2024
e8208bd
chore: remove duplicated license
Robbo-lab May 20, 2024
f1e1601
Update STYLE_GUIDE.md
Robbo-lab May 21, 2024
5ac77d5
Update CODE_OF_CONDUCT.md
Robbo-lab May 21, 2024
9bab514
testing mac and windows
CSMorganDev May 21, 2024
8a7b1e0
Merge remote-tracking branch 'origin/main'
CSMorganDev May 21, 2024
6e8d972
added pre-process function when playing the video.
CSMorganDev May 21, 2024
c13d523
added config to pre-process file
CSMorganDev May 21, 2024
9681429
working video pre processing
MasterAirscrachDev May 21, 2024
77b78d1
better filtering
MasterAirscrachDev May 21, 2024
391690c
Updated Wiki and links
josutcliffe May 27, 2024
7feee20
fix(utils.py): Change subprocess.run shell to false - fixes #5
James-Makela May 27, 2024
677bf03
fix(utils.py): Change subprocess.run remove shell parameter - already…
James-Makela May 27, 2024
f73a8e2
added processing flag to video and added checks
CSMorganDev May 28, 2024
0febf8b
processing doesn't restart
MasterAirscrachDev May 28, 2024
ae5b2c2
Merge pull request #6 from James-Makela/bugfix/open_in_ide
20095325 May 28, 2024
57684c8
Modified player.html
bhandareasmita May 28, 2024
47b93b7
Merge pull request #4 from josutcliffe/wiki-add
20095325 May 28, 2024
2a26fd0
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
bhandareasmita May 28, 2024
f2fbb8e
fixed automatic timestamp update
CSMorganDev May 28, 2024
323ac91
dont add frames twice
MasterAirscrachDev May 28, 2024
36ddd73
test(test_utils): Add test for sending code snippet to IDE.
James-Makela May 29, 2024
d7e0af9
test(test_utils): Clean up imports.
James-Makela May 29, 2024
a0e3e2d
fix(dependencies): Add Flask-SocketIO 5.3.6 to requirement.txt
James-Makela May 29, 2024
f749b5c
Ignore hotkeys in text fields
josutcliffe May 30, 2024
05b50be
added flask_socketio to requirements.txt
CSMorganDev Jun 3, 2024
d8e48ab
Merge remote-tracking branch 'origin/main'
CSMorganDev Jun 3, 2024
3d8eccf
update llama
MasterAirscrachDev Jun 4, 2024
f3db175
use newer llama calls
MasterAirscrachDev Jun 4, 2024
4fb952c
Removed 'Provide OpenAI API Key' from the Welcome menu
Jun 4, 2024
17f0e1c
Merge pull request #16 from LukeyTheFireCube/main
MasterAirscrachDev Jun 4, 2024
cd98306
Fixed test_get_output_path(mocker) in test_utils
Jun 4, 2024
61e3e2c
prompt actually detects code again
MasterAirscrachDev Jun 4, 2024
63c034a
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
MasterAirscrachDev Jun 4, 2024
df829ec
Merge branch 'NM-TAFE:main' into main
LukeyTheFireCube Jun 4, 2024
660c7ab
removed test code from remotellama.py and fixed scaling issue on vide…
CSMorganDev Jun 4, 2024
694f448
Merge remote-tracking branch 'origin/main'
CSMorganDev Jun 4, 2024
006afc2
Create persona.md
bhandareasmita Jun 4, 2024
56e6cbd
updated my journal
CSMorganDev Jun 4, 2024
fc4075d
Merge remote-tracking branch 'origin/main'
CSMorganDev Jun 4, 2024
836e9d7
updated my journal
CSMorganDev Jun 4, 2024
b2e7f04
timestamps can seek
MasterAirscrachDev Jun 4, 2024
dae51db
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
MasterAirscrachDev Jun 4, 2024
072a12c
Merge remote-tracking branch 'origin/main'
CSMorganDev Jun 4, 2024
a1e8c09
Merge pull request #17 from LukeyTheFireCube/main
MasterAirscrachDev Jun 4, 2024
1a62bf3
Merge pull request #11 from James-Makela/fix/pip-requirements
MasterAirscrachDev Jun 4, 2024
385a2cc
fixed wiki
MasterAirscrachDev Jun 4, 2024
8cf5bb1
updated my journal
CSMorganDev Jun 4, 2024
62d485c
Merge pull request #23 from NM-TAFE/fixed-wiki
20095325 Jun 4, 2024
cdc8016
time the processing
MasterAirscrachDev Jun 4, 2024
767a8d5
fixed a misplaced float
MasterAirscrachDev Jun 4, 2024
411ad46
feat: starting to add audio for video data process
Jun 5, 2024
306040e
Merge branch 'main' of https://github.com/LukeyTheFireCube/dip-progra…
Jun 5, 2024
2ea40be
feat: Added feature to navigate through thumbnails and display code s…
bhandareasmita Jun 6, 2024
c831690
Merge pull request #14 from josutcliffe/main
20095325 Jun 6, 2024
7fe848b
hotfixed language clashes
MasterAirscrachDev Jun 7, 2024
1c27dd5
refactored remote Llama
Claire863 Jun 7, 2024
d20970a
fix #28 Refactoring of remotellama
Claire863 Jun 7, 2024
8a6399b
update remote_llama docstring
Claire863 Jun 8, 2024
b873f3d
added requests in Requirements.txt
Claire863 Jun 8, 2024
8328574
Merge pull request #31 from Claire863/fix/updateRequirement.txt
20095325 Jun 8, 2024
4ec3d5a
Merge branch 'NM-TAFE:main' into main
LukeyTheFireCube Jun 9, 2024
4dd10f4
Capture sounds now play
LukeyTheFireCube Jun 9, 2024
fbb5e7a
Added tooltips to player buttons
josutcliffe Jun 9, 2024
fe1c144
Merge branch 'NM-TAFE:main' into fix/refactoringRemotellama
Claire863 Jun 9, 2024
e97ef51
update Llama docstrings
Claire863 Jun 9, 2024
bf2f613
updated Class docstrings
Claire863 Jun 9, 2024
5233abb
modified persona.md
bhandareasmita Jun 10, 2024
bcc0a41
Revert "feat: Added feature to navigate through thumbnails and displa…
bhandareasmita Jun 10, 2024
bb8a025
feat(player.html): group timestamps longer than 5 seconds
sdthinlay Jun 10, 2024
3f4b75b
chore:Updated code display to show the code only when video is paused
bhandareasmita Jun 11, 2024
0c85749
chore(player.html): enhance grouping functionality
sdthinlay Jun 11, 2024
9acd70c
chore(wireframes): add wireframes
sdthinlay Jun 11, 2024
4548b6a
feat(player.html): group timestamps longer than 5 seconds
20095325 Jun 11, 2024
5a20999
fixed conflicts
bhandareasmita Jun 11, 2024
9decf92
git commit -m "feat: Navigate through timestamp"
bhandareasmita Jun 11, 2024
b4a7d27
chore: added persona
20095325 Jun 11, 2024
1ecb6c3
feat: Added feature to navigate through thumbnails and display code s…
20095325 Jun 11, 2024
95120ea
Merge branch 'main' into main
20095325 Jun 11, 2024
f75d819
Fix: Added tooltips to player buttons
20095325 Jun 11, 2024
d5ea1a6
Added journal
bhandareasmita Jun 11, 2024
c8b4611
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
bhandareasmita Jun 11, 2024
8b0bf24
Added journal
bhandareasmita Jun 11, 2024
acdd09a
ready for update
LukeyTheFireCube Jun 11, 2024
2ec3b89
update repo
LukeyTheFireCube Jun 11, 2024
ad2746b
fix: open in ide - Add test case
20095325 Jun 11, 2024
f4197ba
Modify mediaControls to replace <br> tags with new lines
LukeyTheFireCube Jun 11, 2024
e5cfb58
updated my journal week 6
CSMorganDev Jun 11, 2024
3852ae8
Merge remote-tracking branch 'origin/main'
CSMorganDev Jun 11, 2024
f58f965
Merge branch 'NM-TAFE:main' into main
LukeyTheFireCube Jun 12, 2024
d2346a8
Merge branch 'NM-TAFE:main' into fix/refactoringRemotellama
Claire863 Jun 12, 2024
a200a9e
removed header, add post raise error
Claire863 Jun 12, 2024
6d8244a
merge from remote
Claire863 Jun 12, 2024
fdb159b
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
bhandareasmita Jun 13, 2024
8601ae8
feat: add instructions on installing Tesseract OCR
LukeyTheFireCube Jun 13, 2024
aa2d37a
fix: issue #47 - Wikilink Installation Guide. Link to guide from read…
Isaac-Saleh Jun 13, 2024
305050f
fix: issue #47 - Wikilink Installation Guide. Link to guide from read…
Isaac-Saleh Jun 13, 2024
f1a1e7f
Fixed reset button resetting when cancelling action.
josutcliffe Jun 13, 2024
00a6f9f
Corrected reset button action
josutcliffe Jun 13, 2024
e8dde2a
chore: updated wiki link installation guide
20095325 Jun 13, 2024
9bc8449
fix: corrected reset button action
20095325 Jun 13, 2024
4c4bb8e
chore: refactored remote Llama
20095325 Jun 13, 2024
661e24c
remove paths.txt file
LukeyTheFireCube Jun 14, 2024
18493cf
Merge branch 'NM-TAFE:main' into main
LukeyTheFireCube Jun 14, 2024
01f9a3d
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
bhandareasmita Jun 14, 2024
5463a12
update: added the rest of the code of conduct that was written before…
Isaac-Saleh Jun 15, 2024
42d1d44
Removed duplicate key bindings, and added placeholders for existing k…
josutcliffe Jun 16, 2024
4ad100b
fix conflicts
LukeyTheFireCube Jun 16, 2024
03d6a31
add instructions to README.md
LukeyTheFireCube Jun 16, 2024
1e94e42
remove paths file
LukeyTheFireCube Jun 16, 2024
e8d0c4b
fix: open_in_IDE function now replaces <br> tags with new lines
20095325 Jun 16, 2024
fb5ef59
update: added the rest of the code of conduct
20095325 Jun 16, 2024
0bbbf69
Fix: Update key bindings listing
20095325 Jun 16, 2024
c82eb24
fix: add Windows heading for tesseract step
LukeyTheFireCube Jun 16, 2024
5ee33fe
added exception handler
Claire863 Jun 16, 2024
2c79294
Merge branch 'NM-TAFE:main' into fix/llama_raise_for_status
Claire863 Jun 16, 2024
341b29f
Added Tesseract instruction for windows
20095325 Jun 16, 2024
baba1e4
chore: llama raise for status
20095325 Jun 16, 2024
9040bf2
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
bhandareasmita Jun 17, 2024
41e7983
feat: Add hotkeys to navigating through timestamps
bhandareasmita Jun 17, 2024
c97768c
Added journal_ASB.md
bhandareasmita Jun 17, 2024
b1e7299
Merge remote-tracking branch 'origin/main' into hotkeys-navigate-time…
bhandareasmita Jun 18, 2024
ab1144c
Merge remote-tracking branch 'origin/main' into hotkeys-navigate-time…
bhandareasmita Jun 18, 2024
4fbf8a5
fix: llama prompt fix
sdthinlay Jun 18, 2024
72d77da
fix: llama prompt fix
20095325 Jun 18, 2024
18f74e3
Feat: Hotkeys navigate timestamps
20095325 Jun 18, 2024
be29bb0
fixed audio
MasterAirscrachDev Jun 18, 2024
3a41127
Merge branch 'main' of https://github.com/NM-TAFE/dip-programming-prj…
bhandareasmita Jun 18, 2024
b001a62
feat: Audio cue plays when code is detected
20095325 Jun 18, 2024
2572be8
fix: delete video file
CSMorganDev Jun 18, 2024
c4cd5c9
Fix: delete video file when delete button is clicked
20095325 Jun 18, 2024
8c30319
chore: redesign wireframes as per feedback
sdthinlay Jun 18, 2024
5cad3d0
chore: redesign wireframes as per feedback
20095325 Jun 18, 2024
a52e115
chore: modify persona.md as per guidelines
bhandareasmita Jun 18, 2024
d951d93
Modified persona.md as per feedback
20095325 Jun 18, 2024
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
Prev Previous commit
Next Next commit
chore(player.html): enhance grouping functionality
sdthinlay committed Jun 11, 2024
commit 0c85749084629c7dc3154a3724403cab40830123
Binary file modified app/temp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions app/templates/player.html
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ <h2 class="text-2xl">Code Captures</h2>
currentGroup.push({ capture, totalSeconds });
} else {
const lastCaptureTime = currentGroup[currentGroup.length - 1].totalSeconds;
if (totalSeconds - lastCaptureTime === 1) {
if (totalSeconds - lastCaptureTime <= 3) {
currentGroup.push({ capture, totalSeconds });
} else {
processGroup(currentGroup, filteredCaptures);
@@ -154,8 +154,6 @@ <h2 class="text-2xl">Code Captures</h2>
function processGroup(group, output) {
if (group.length >= 5) {
output.push(group[0].capture);
} else {
group.forEach(item => output.push(item.capture));
}
}
});