Split app.js in to smaller chunks
This commit is contained in:
@@ -1,16 +1,12 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="sv-SE">
|
||||
<html lang="sv">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Fredriks todos</title>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
|
||||
<link rel="stylesheet" href="style.css">
|
||||
<link rel="manifest" href="manifest.json" />
|
||||
|
||||
<!-- Flatpickr for dates -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
|
||||
<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
|
||||
<link rel="stylesheet" href="css/style.css">
|
||||
<link rel="manifest" href="manifest.json">
|
||||
</head>
|
||||
<body>
|
||||
<div id="loginContainer" class="container">
|
||||
@@ -69,6 +65,10 @@
|
||||
</div>
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
|
||||
<script src="app.js"></script>
|
||||
<script src="js/auth.js" type="module"></script>
|
||||
<script src="js/tasks.js" type="module"></script>
|
||||
<script src="js/tags.js" type="module"></script>
|
||||
<script src="js/utils.js" type="module"></script>
|
||||
<script src="js/main.js" type="module"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
25
public/js/auth.js
Normal file
25
public/js/auth.js
Normal file
@@ -0,0 +1,25 @@
|
||||
export function checkSession() {
|
||||
return fetch('/check-session')
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
throw new Error('Network response was not ok');
|
||||
}
|
||||
return response.json();
|
||||
});
|
||||
}
|
||||
|
||||
export function login(username, password) {
|
||||
return fetch('/login', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'Basic ' + btoa(username + ':' + password)
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
export function logout() {
|
||||
return fetch('/logout', {
|
||||
method: 'POST'
|
||||
});
|
||||
}
|
||||
171
public/js/main.js
Normal file
171
public/js/main.js
Normal file
@@ -0,0 +1,171 @@
|
||||
import { checkSession, login, logout } from './auth.js';
|
||||
import { saveTask } from './tasks.js';
|
||||
import { saveTags, loadTags } from './tags.js';
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
const loginForm = document.getElementById('loginForm');
|
||||
const loginContainer = document.getElementById('loginContainer');
|
||||
const appContainer = document.getElementById('appContainer');
|
||||
const loginMessage = document.getElementById('loginMessage');
|
||||
const logoutButton = document.getElementById('logoutButton');
|
||||
const taskForm = document.getElementById('taskForm');
|
||||
const sidenav = document.querySelector('.sidenav');
|
||||
|
||||
if (!loginForm || !loginContainer || !appContainer || !loginMessage || !logoutButton || !taskForm || !sidenav) {
|
||||
console.error('One or more elements are missing in the DOM');
|
||||
return;
|
||||
}
|
||||
|
||||
// Initialize Materialize components
|
||||
M.Sidenav.init(sidenav);
|
||||
|
||||
// Calculate tomorrow's date
|
||||
const today = new Date();
|
||||
const tomorrow = new Date(today);
|
||||
tomorrow.setDate(today.getDate() + 1);
|
||||
|
||||
// Initialize datepicker with tomorrow as the default date
|
||||
M.Datepicker.init(document.querySelectorAll('.datepicker'), {
|
||||
format: 'yyyy-mm-dd',
|
||||
defaultDate: tomorrow,
|
||||
setDefaultDate: true,
|
||||
firstDay: 1
|
||||
});
|
||||
|
||||
// Initialize timepicker
|
||||
M.Timepicker.init(document.querySelectorAll('.timepicker'), {
|
||||
twelveHour: false // Use 24-hour format
|
||||
});
|
||||
|
||||
// Check if user is already logged in
|
||||
checkSession()
|
||||
.then(data => {
|
||||
if (data.loggedIn) {
|
||||
loginContainer.style.display = 'none';
|
||||
appContainer.style.display = 'block';
|
||||
loadTags().then(tags => {
|
||||
localStorage.setItem('tags', JSON.stringify(tags));
|
||||
const autocompleteData = {};
|
||||
tags.forEach(tag => {
|
||||
autocompleteData[tag] = null; // Materialize autocomplete requires a key-value pair
|
||||
});
|
||||
|
||||
const tagsInput = document.getElementById('tags');
|
||||
M.Autocomplete.init(tagsInput, {
|
||||
data: autocompleteData,
|
||||
onAutocomplete: function(selectedTag) {
|
||||
const currentTags = tagsInput.value.split(',').map(tag => tag.trim()).filter(tag => tag);
|
||||
if (!currentTags.includes(selectedTag)) {
|
||||
currentTags.push(selectedTag);
|
||||
tagsInput.value = currentTags.join(', ');
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
loginContainer.style.display = 'block';
|
||||
appContainer.style.display = 'none';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error checking session:', error);
|
||||
loginMessage.textContent = 'Error checking session. Please try again later.';
|
||||
});
|
||||
|
||||
loginForm.addEventListener('submit', function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
const username = document.getElementById('username').value;
|
||||
const password = document.getElementById('password').value;
|
||||
|
||||
login(username, password)
|
||||
.then(response => {
|
||||
if (response.ok) {
|
||||
sessionStorage.setItem('loggedIn', 'true');
|
||||
loginContainer.style.display = 'none';
|
||||
appContainer.style.display = 'block';
|
||||
loadTags().then(tags => {
|
||||
localStorage.setItem('tags', JSON.stringify(tags));
|
||||
const autocompleteData = {};
|
||||
tags.forEach(tag => {
|
||||
autocompleteData[tag] = null; // Materialize autocomplete requires a key-value pair
|
||||
});
|
||||
|
||||
const tagsInput = document.getElementById('tags');
|
||||
M.Autocomplete.init(tagsInput, {
|
||||
data: autocompleteData,
|
||||
onAutocomplete: function(selectedTag) {
|
||||
const currentTags = tagsInput.value.split(',').map(tag => tag.trim()).filter(tag => tag);
|
||||
if (!currentTags.includes(selectedTag)) {
|
||||
currentTags.push(selectedTag);
|
||||
tagsInput.value = currentTags.join(', ');
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
loginMessage.textContent = 'Invalid username or password';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
loginMessage.textContent = 'Error logging in';
|
||||
});
|
||||
});
|
||||
|
||||
logoutButton.addEventListener('click', function() {
|
||||
logout()
|
||||
.then(response => {
|
||||
if (response.ok) {
|
||||
sessionStorage.removeItem('loggedIn');
|
||||
loginContainer.style.display = 'block';
|
||||
appContainer.style.display = 'none';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error logging out:', error);
|
||||
});
|
||||
});
|
||||
|
||||
taskForm.addEventListener('submit', async function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
// Get form values
|
||||
const subject = document.getElementById('subject').value;
|
||||
const description = document.getElementById('description').value;
|
||||
const scheduled = document.getElementById('scheduled').value;
|
||||
const time = document.getElementById('time').value;
|
||||
const tagsInput = document.getElementById('tags').value;
|
||||
const tags = tagsInput.split(',').map(tag => tag.trim()).filter(tag => tag).join(':');
|
||||
|
||||
// Combine scheduled date and time if time is provided
|
||||
const scheduledDateTime = time ? `${scheduled}T${time}:00` : scheduled;
|
||||
|
||||
// Structure data for Org mode
|
||||
const taskData = {
|
||||
subject: tags ? `${subject} :${tags}:` : subject,
|
||||
description,
|
||||
scheduled: scheduledDateTime
|
||||
};
|
||||
|
||||
// Save tags to server
|
||||
saveTags(tags.split(',').map(tag => tag.trim()).filter(tag => tag))
|
||||
.then(() => {
|
||||
loadTags(); // Force refresh tags after saving
|
||||
});
|
||||
|
||||
// Save task to server or IndexedDB if offline
|
||||
try {
|
||||
const data = await saveTask(taskData);
|
||||
document.getElementById('responseMessage').textContent = data.message;
|
||||
taskForm.reset(); // Reset the form after saving the task
|
||||
} catch (error) {
|
||||
if (error.status === 401) {
|
||||
sessionStorage.removeItem('loggedIn');
|
||||
loginContainer.style.display = 'block';
|
||||
appContainer.style.display = 'none';
|
||||
} else {
|
||||
document.getElementById('responseMessage').textContent = "Error saving task!";
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
14
public/js/tags.js
Normal file
14
public/js/tags.js
Normal file
@@ -0,0 +1,14 @@
|
||||
export function saveTags(tags) {
|
||||
return fetch('/save-tags', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ tags })
|
||||
});
|
||||
}
|
||||
|
||||
export function loadTags() {
|
||||
return fetch('/get-tags')
|
||||
.then(response => response.json());
|
||||
}
|
||||
30
public/js/tasks.js
Normal file
30
public/js/tasks.js
Normal file
@@ -0,0 +1,30 @@
|
||||
import { idb } from './utils.js';
|
||||
|
||||
export async function saveTask(taskData) {
|
||||
if (navigator.onLine) {
|
||||
try {
|
||||
const response = await fetch('/add-task', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(taskData)
|
||||
});
|
||||
return await response.json();
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
const db = await idb.openDB('org-todo-pwa', 1, {
|
||||
upgrade(db) {
|
||||
db.createObjectStore('tasks', { keyPath: 'id', autoIncrement: true });
|
||||
}
|
||||
});
|
||||
await db.add('tasks', taskData);
|
||||
return { message: "Task saved offline!" };
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
16
public/js/utils.js
Normal file
16
public/js/utils.js
Normal file
@@ -0,0 +1,16 @@
|
||||
export const idb = {
|
||||
openDB(name, version, { upgrade }) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const request = indexedDB.open(name, version);
|
||||
request.onupgradeneeded = (event) => {
|
||||
upgrade(request.result, event.oldVersion, event.newVersion, request.transaction);
|
||||
};
|
||||
request.onsuccess = () => {
|
||||
resolve(request.result);
|
||||
};
|
||||
request.onerror = () => {
|
||||
reject(request.error);
|
||||
};
|
||||
});
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user