Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
07b113b
Don't remove session on http error
ivchicano Oct 20, 2021
c7cd1b6
Merge branch 'hotfixes' of https://github.com/codeurjc-students/2019-…
ivchicano Oct 20, 2021
2b89dc3
Only invalidate session on 401
ivchicano Oct 20, 2021
ee69202
Don't try to initialize liveshare if not logged in. Don't show open d…
ivchicano Oct 20, 2021
9ff98e2
Don't invalidate session on non axios error. Improve tests for client…
ivchicano Oct 21, 2021
772944d
Control more exceptions to not show a 500 error on some of them
ivchicano Oct 21, 2021
34e0245
Add error handling to finish exercise requestr
ivchicano Oct 21, 2021
099aa89
Remove duplicated test
ivchicano Oct 21, 2021
d828674
Possible fix to zip duplicating files
ivchicano Oct 25, 2021
b386233
Trim sharing code when importing course
ivchicano Oct 25, 2021
053ceaa
Fix events not being disposed when finishing exercise
ivchicano Oct 25, 2021
5cc90dd
Change order of template and file in diff
ivchicano Oct 25, 2021
fa1281f
Open explorer when content is downloaded
ivchicano Oct 28, 2021
ce1a933
Prepare for next version
ivchicano Oct 28, 2021
f824d15
Fix some bugs and race conditions
ivchicano Oct 28, 2021
1b3495c
Control duplicate exceptions when saving files
ivchicano Oct 28, 2021
16a8d3c
Show warning if dashboard tries to open a file that doesnt exist
ivchicano Oct 29, 2021
290ef3a
Disable buttons while downloading files
ivchicano Oct 29, 2021
1ba1a7d
Add progress notification for longer requests and add spinner in stat…
ivchicano Oct 29, 2021
e362a2c
Improve error messages
ivchicano Oct 29, 2021
db6aaee
Check if file is in db before saving
ivchicano Nov 8, 2021
c4ceef0
Fix duplicate entry when saving superuser
ivchicano Nov 8, 2021
9e419e7
Fix regression in dashboard welcome message showing when it shouldn't
ivchicano Nov 9, 2021
6ad66dc
Fix extensions reloading when opening the same workspace if a new stu…
ivchicano Nov 9, 2021
f99dc6c
Minor fixes to tests
ivchicano Nov 9, 2021
5790a46
Wait 500 ms after a change in a file to upload
ivchicano Nov 10, 2021
82cd849
Disable open and diff buttons when downloading
ivchicano Nov 10, 2021
2ebe57a
Disable all download buttons on dashboard while downloading content
ivchicano Nov 10, 2021
6d0221b
Bump needed vscode version
ivchicano Nov 15, 2021
c6be8f8
Add warning about configuration needed to be able to make api calls
ivchicano Nov 15, 2021
8747bb5
Add notification for dashboard get
ivchicano Nov 16, 2021
5df0c8a
Add message notification to initialization test
ivchicano Nov 16, 2021
01de66a
Hide buttons when uploading template to exercise to avoid accessing a…
ivchicano Nov 16, 2021
6cf019d
Save all modified files instead of the last
ivchicano Nov 16, 2021
9be3210
Add tree view of modified files when opening in dashboard
ivchicano Nov 23, 2021
f038ebe
Change tree view for a list of files when opening in dashboard
ivchicano Nov 23, 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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
- "./mvnw clean package -B -q"
after_script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build -t vscode4teaching/vscode4teaching:2.0.1 .
- docker build -t vscode4teaching/vscode4teaching:2.0.2 .
- docker build -t vscode4teaching/vscode4teaching:latest .
- docker push vscode4teaching/vscode4teaching:2.0.1
- docker push vscode4teaching/vscode4teaching:2.0.2
- docker push vscode4teaching/vscode4teaching:latest
- language: node_js
os:
Expand Down
94 changes: 45 additions & 49 deletions vscode4teaching-extension/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions vscode4teaching-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
},
"displayName": "VS Code 4 Teaching",
"description": "Bring the programming exercises directly to the student’s editor.",
"version": "2.0.1",
"version": "2.0.2",
"engines": {
"vscode": "^1.45.1"
"vscode": "^1.61.0"
},
"categories": [
"Other"
Expand Down Expand Up @@ -310,6 +310,7 @@
"@types/glob": "^7.1.1",
"@types/jest": "^25.2.3",
"@types/jest-cli": "^24.3.0",
"@types/lodash.escaperegexp": "^4.1.6",
"@types/mkdirp": "^1.0.0",
"@types/node": "^10.15.1",
"@types/rimraf": "^3.0.0",
Expand All @@ -332,6 +333,7 @@
"form-data": "^3.0.0",
"ignore": "^5.1.6",
"jszip": "^3.4.0",
"lodash.escaperegexp": "^4.1.2",
"mkdirp": "^1.0.4",
"vsls": "^1.0.3015",
"ws": "^7.4.6"
Expand Down
21 changes: 17 additions & 4 deletions vscode4teaching-extension/resources/dashboard/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,42 @@

window.addEventListener('message', event => {
const message = event.data;
for (const key in message) {
document.getElementById(key).textContent = message[key]
switch (message.type) {
case 'updateDate':
for (const key in message.update) {
document.getElementById(key).textContent = message.update[key]
}
break;
case 'openDone':
document.querySelectorAll(".button-col > button").forEach((e) => {
e.disabled = false;
});
break;
}
})

document.querySelectorAll(".workspace-link").forEach((row) => {
row.addEventListener("click", () => {
document.querySelectorAll(".button-col > button").forEach((e) => {
e.disabled = true;
});
const username = Array.from(row.parentElement.parentElement.children).find(e => e.classList.contains('username')).innerHTML;
vscode.postMessage({
type: "goToWorkspace",
username: username,
lastMod:row.attributes.getNamedItem("data-lastMod").value,
});
});
});

document.querySelectorAll(".workspace-link-diff").forEach((row) => {
row.addEventListener("click", () => {
Array.from(row.parentElement.children).forEach((e) => {
e.disabled = true;
});
const username = Array.from(row.parentElement.parentElement.children).find(e => e.classList.contains('username')).innerHTML;
vscode.postMessage({
type: "diff",
username: username,
lastMod:row.attributes.getNamedItem("data-lastMod-diff").value,
});
});
});
Expand Down
Loading