diff --git a/src/lib/datocms-bypass.ts b/src/lib/datocms-bypass.ts index 3578213..580f797 100644 --- a/src/lib/datocms-bypass.ts +++ b/src/lib/datocms-bypass.ts @@ -227,7 +227,7 @@ function jsonNodesExist(jsonData : any, nodes : any) { export async function getJsonItemsFromDirectory(jsonDirectory : string, pluckerFunction : any, validationNodes : any[]) : Promise { let jsonFiles = await fs.readdir(jsonDirectory); - let returnJson = []; + let returnJson : any[] = []; for (let i = 0; i < jsonFiles.length; i++) { let jsonFile = jsonFiles[i]; @@ -319,7 +319,6 @@ function forceBlogPostsJsonSlugIntegrity(json : any[]) { } function sortBlogPostsJsonByDate(json : any[]) { - let sortedJson : any[] = json.slice().sort((a : any, b: any) => datocmsDateToIng(b.date) - datocmsDateToIng(a.date)); @@ -546,16 +545,16 @@ function getRequiedBlogBlogCategoryNodes() { } -export async function getAllBlogCategoriesJson() : Promise { +export async function getAllBlogCategoriesJson() : Promise { let jsonDirectory = getBlogCategoriesJsonDirectoryPath(); let validationNodes = getRequiedBlogBlogCategoryNodes(); - let allBlogCategoriesJson = await getJsonItemsFromDirectory(jsonDirectory, pluckBlogCategoriesData, validationNodes) + let allBlogCategoriesJson : any[] = await getJsonItemsFromDirectory(jsonDirectory, pluckBlogCategoriesData, validationNodes) return allBlogCategoriesJson; } -export async function getAllBlogPostsCategoriesFromSource() : Promise { - let allBlogPostsCategoriesFromSource = {}; +export async function getAllBlogPostsCategoriesFromSource() : Promise { + let allBlogPostsCategoriesFromSource : any[] = []; if (process.env.NEXT_PUBLIC_DATOCMS_BYPASS_TYPE === "local_json") { allBlogPostsCategoriesFromSource = await getAllBlogCategoriesJson(); @@ -564,6 +563,8 @@ export async function getAllBlogPostsCategoriesFromSource() : Promise { } else { allBlogPostsCategoriesFromSource = serverGetBlogPostsCategories(); } + +console.log(allBlogPostsCategoriesFromSource); return allBlogPostsCategoriesFromSource; @@ -602,9 +603,9 @@ function getRequiedEventNodes() { } -function sortEventsJsonByStartDate(json : any) { +function sortEventsJsonByStartDate(json : any[]) { - let sortedJson = json.slice().sort((a : any, b: any) => datocmsDateToIng(b.eventStartdate) - datocmsDateToIng(a.eventStartdate)); + let sortedJson : any[] = json.slice().sort((a : any, b: any) => datocmsDateToIng(b.eventStartdate) - datocmsDateToIng(a.eventStartdate)); return sortedJson; } @@ -612,8 +613,8 @@ function sortEventsJsonByStartDate(json : any) { async function getAllEventsJson() : Promise { let jsonDirectory = getEventsJsonDirectoryPath(); let validationNodes = getRequiedEventNodes(); - let events = await getJsonItemsFromDirectory(jsonDirectory, pluckEventData, validationNodes); - let sortedEvents = sortEventsJsonByStartDate(events); + let events : any[] = await getJsonItemsFromDirectory(jsonDirectory, pluckEventData, validationNodes); + let sortedEvents : any[] = sortEventsJsonByStartDate(events); let allEventsJson = {allEvents: sortedEvents}; return allEventsJson; @@ -651,9 +652,9 @@ function getRequiedPositionNodes() { } -function sortPositionsJsonById(json : any) { +function sortPositionsJsonById(json : any[]) { - let sortedJson = json.slice().sort((a : any, b: any) => parseInt(a.id) - parseInt(b.id)); + let sortedJson : any[] = json.slice().sort((a : any, b: any) => parseInt(a.id) - parseInt(b.id)); return sortedJson; } @@ -661,8 +662,8 @@ function sortPositionsJsonById(json : any) { async function getAllPositionsJson() : Promise { let jsonDirectory = getPositionsJsonDirectoryPath(); let validationNodes = getRequiedPositionNodes(); - let positions = await getJsonItemsFromDirectory(jsonDirectory, pluckPositionData, validationNodes); - let sortedPositions = sortPositionsJsonById(positions); + let positions : any[] = await getJsonItemsFromDirectory(jsonDirectory, pluckPositionData, validationNodes); + let sortedPositions : any[] = sortPositionsJsonById(positions); let allPositionsJson = {allPositions: sortedPositions}; return allPositionsJson; @@ -701,9 +702,9 @@ function getRequiedPressReleaseNodes() { } -function sortPressReleasesJsonByDate(json : any) { +function sortPressReleasesJsonByDate(json : any[]) { - let sortedJson = json.slice().sort((a : any, b: any) => datocmsDateToIng(b.date) - datocmsDateToIng(a.date)); + let sortedJson : any[] = json.slice().sort((a : any, b: any) => datocmsDateToIng(b.date) - datocmsDateToIng(a.date)); return sortedJson; } @@ -711,8 +712,8 @@ function sortPressReleasesJsonByDate(json : any) { async function getAllPressReleasesJson() : Promise { let jsonDirectory = getPressReleasesJsonDirectoryPath(); let validationNodes = getRequiedPressReleaseNodes(); - let pressReleases = await getJsonItemsFromDirectory(jsonDirectory, pluckPressReleaseData, validationNodes); - let sortedPressReleases = sortPressReleasesJsonByDate(pressReleases); + let pressReleases : any[] = await getJsonItemsFromDirectory(jsonDirectory, pluckPressReleaseData, validationNodes); + let sortedPressReleases : any[] = sortPressReleasesJsonByDate(pressReleases); let allPressReleasesJson = {allPressReleases: sortedPressReleases}; return allPressReleasesJson; @@ -749,9 +750,9 @@ function getRequiedTeamNodes() { } -function sortTeamsJsonById(json : any) { +function sortTeamsJsonById(json : any[]) { - let sortedJson = json.slice().sort((a : any, b: any) => parseInt(a.id) - parseInt(b.id)); + let sortedJson : any[] = json.slice().sort((a : any, b: any) => parseInt(a.id) - parseInt(b.id)); return sortedJson; } @@ -759,8 +760,8 @@ function sortTeamsJsonById(json : any) { async function getAllTeamsJson() : Promise { let jsonDirectory = getTeamsJsonDirectoryPath(); let validationNodes = getRequiedTeamNodes(); - let teams = await getJsonItemsFromDirectory(jsonDirectory, pluckTeamData, validationNodes); - let sortedTeams = sortTeamsJsonById(teams); + let teams : any[] = await getJsonItemsFromDirectory(jsonDirectory, pluckTeamData, validationNodes); + let sortedTeams : any[] = sortTeamsJsonById(teams); let allTeamsJson = {allTeams: sortedTeams}; return allTeamsJson; @@ -799,9 +800,9 @@ function getRequiedTestimonialNodes() { } -function sortTestimonialsJsonById(json : any) { +function sortTestimonialsJsonById(json : any[]) { - let sortedJson = json.slice().sort((a : any, b: any) => parseInt(a.id) - parseInt(b.id)); + let sortedJson : any[] = json.slice().sort((a : any, b: any) => parseInt(a.id) - parseInt(b.id)); return sortedJson; } @@ -809,8 +810,8 @@ function sortTestimonialsJsonById(json : any) { async function getAllTestimonialsJson() : Promise { let jsonDirectory = getTestimonialsJsonDirectoryPath(); let validationNodes = getRequiedTestimonialNodes(); - let testimonials = await getJsonItemsFromDirectory(jsonDirectory, pluckTestimonialData, validationNodes); - let sortedTestimonals = sortTestimonialsJsonById(testimonials); + let testimonials : any[] = await getJsonItemsFromDirectory(jsonDirectory, pluckTestimonialData, validationNodes); + let sortedTestimonals : any[] = sortTestimonialsJsonById(testimonials); let allTestimonialsJson = {allTestimonials: sortedTestimonals}; return allTestimonialsJson;