RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor API calls in timeline

pull/37/head
Varun Patil 2022-09-11 19:02:44 -07:00
parent 1d16da7235
commit 44d05ceaa8
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/Timeline.vue
View File

@ -103,6 +103,18 @@ import { NcActions, NcActionButton, NcButton } from '@nextcloud/vue'
const MAX_PHOTO_WIDTH = 175; const MAX_PHOTO_WIDTH = 175;
const MIN_COLS = 3; const MIN_COLS = 3;
// Define API routes
const API_ROUTES = {
DAYS: 'days',
DAY: 'days/{dayId}',
FOLDER_DAYS: 'folder/{folderId}',
FOLDER_DAY: 'folder/{folderId}/{dayId}',
};
for (const [key, value] of Object.entries(API_ROUTES)) {
API_ROUTES[key] = '/apps/memories/api/' + value;
}
export default { export default {
components: { components: {
Folder, Folder,
@ -367,18 +379,23 @@ export default {
/** Fetch timeline main call */ /** Fetch timeline main call */
async fetchDays() { async fetchDays() {
let url = '/apps/memories/api/days'; let url = API_ROUTES.DAYS;
let params = {};
if (this.$route.name === 'folders') { if (this.$route.name === 'folders') {
const id = this.$route.params.id || 0; url = API_ROUTES.FOLDER_DAYS;
url = `/apps/memories/api/folder/${id}`; params.folderId = this.$route.params.id || 0;
} }
const startState = this.state; const startState = this.state;
const res = await axios.get(generateUrl(url)); const res = await axios.get(generateUrl(url, params));
const data = res.data; const data = res.data;
if (this.state !== startState) return; if (this.state !== startState) return;
await this.processDays(data);
},
/** Process the data for days call including folders */
async processDays(data) {
this.days = data; this.days = data;
for (const day of data) { for (const day of data) {
@ -450,11 +467,12 @@ export default {
/** Fetch image data for one dayId */ /** Fetch image data for one dayId */
async fetchDay(dayId) { async fetchDay(dayId) {
let url = `/apps/memories/api/days/${dayId}`; let url = API_ROUTES.DAY;
const params = { dayId };
if (this.$route.name === 'folders') { if (this.$route.name === 'folders') {
const id = this.$route.params.id || 0; url = API_ROUTES.FOLDER_DAY;
url = `/apps/memories/api/folder/${id}/${dayId}`; params.folderId = this.$route.params.id || 0;
} }
// Do this in advance to prevent duplicate requests // Do this in advance to prevent duplicate requests
@ -463,7 +481,7 @@ export default {
try { try {
const startState = this.state; const startState = this.state;
const res = await axios.get(generateUrl(url)); const res = await axios.get(generateUrl(url, params));
const data = res.data; const data = res.data;
if (this.state !== startState) return; if (this.state !== startState) return;