McPringle/fitpub
1
0
Fork 0
Code Issues 24 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Add Komoot activity import with guided browser-based batch flow #25

Open
McPringle wants to merge 23 commits from McPringle/komoot-import into main
pull from: McPringle/komoot-import
merge into: McPringle:main
Conversation 5 Commits 23 Files changed 20 +16 -2
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9a9785973d - Show all commits

18
src/main/resources/templates/activities/komoot.html
View file

@ -77,7 +77,7 @@
</span> </span>
<span id="importFirstSpinner" class="d-none"> <span id="importFirstSpinner" class="d-none">
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span> <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
Importing... <span id="importFirstProgressText">Importing...</span>
</span> </span>
</button> </button>
<button type="button" class="btn btn-outline-danger d-none" id="cancelImportBtn"> <button type="button" class="btn btn-outline-danger d-none" id="cancelImportBtn">
@ -139,6 +139,7 @@
const importFirstBtn = document.getElementById('importFirstBtn'); const importFirstBtn = document.getElementById('importFirstBtn');
const importFirstText = document.getElementById('importFirstText'); const importFirstText = document.getElementById('importFirstText');
const importFirstSpinner = document.getElementById('importFirstSpinner'); const importFirstSpinner = document.getElementById('importFirstSpinner');
const importFirstProgressText = document.getElementById('importFirstProgressText');
const cancelImportBtn = document.getElementById('cancelImportBtn'); const cancelImportBtn = document.getElementById('cancelImportBtn');
let currentActivities = []; let currentActivities = [];
let importCancellationRequested = false; let importCancellationRequested = false;
@ -161,6 +162,17 @@
importFirstSpinner.classList.toggle('d-none', !loading); importFirstSpinner.classList.toggle('d-none', !loading);
cancelImportBtn.classList.toggle('d-none', !loading); cancelImportBtn.classList.toggle('d-none', !loading);
cancelImportBtn.disabled = !loading; cancelImportBtn.disabled = !loading;
if (!loading) {
importFirstProgressText.textContent = 'Importing...';
}
}
function updateImportProgress(current, total) {
if (current == null || total == null || total <= 0) {
importFirstProgressText.textContent = 'Importing...';
return;
}
importFirstProgressText.textContent = `Importing ${current}/${total}...`;
} }
function showError(message) { function showError(message) {
@ -429,10 +441,12 @@
let importedCount = 0; let importedCount = 0;
let failedCount = 0; let failedCount = 0;
let cancelled = false; let cancelled = false;
const totalActivitiesToImport = activitiesToImport.length;
for (const activity of activitiesToImport) { for (const [index, activity] of activitiesToImport.entries()) {
activity.uiImportStatus = 'importing'; activity.uiImportStatus = 'importing';
activity.uiImportError = null; activity.uiImportError = null;
updateImportProgress(index + 1, totalActivitiesToImport);
renderActivities(currentActivities); renderActivities(currentActivities);
try { try {