Compare commits
2 Commits
3317926f61
...
f5c25dea75
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5c25dea75 | ||
|
|
4d220e1be7 |
@@ -13,6 +13,7 @@ export async function getAllBlogs(blogSettings: BlogSettings): Promise<BlogPost[
|
|||||||
|
|
||||||
result["Blogs"].forEach((blogRecord: any) => {
|
result["Blogs"].forEach((blogRecord: any) => {
|
||||||
let dates: string[] = [
|
let dates: string[] = [
|
||||||
|
blogSettings.lastModified,
|
||||||
blogRecord["date_created"],
|
blogRecord["date_created"],
|
||||||
blogRecord["date_updated"],
|
blogRecord["date_updated"],
|
||||||
blogRecord["search_engine"][0]["date_created"],
|
blogRecord["search_engine"][0]["date_created"],
|
||||||
|
|||||||
@@ -26,7 +26,10 @@ export async function getSettings(): Promise<GlobalSettings> {
|
|||||||
twitter: {
|
twitter: {
|
||||||
id: websiteResults["twitter_id"],
|
id: websiteResults["twitter_id"],
|
||||||
handle: websiteResults["twitter_handle"]
|
handle: websiteResults["twitter_handle"]
|
||||||
}
|
},
|
||||||
|
lastModified: websiteResults["date_updated"] !== null ?
|
||||||
|
new Date(websiteResults["date_updated"]) :
|
||||||
|
new Date(websiteResults["date_created"])
|
||||||
};
|
};
|
||||||
|
|
||||||
const blogResults = result["Blog_Settings"];
|
const blogResults = result["Blog_Settings"];
|
||||||
@@ -35,7 +38,10 @@ export async function getSettings(): Promise<GlobalSettings> {
|
|||||||
title: blogResults["title"],
|
title: blogResults["title"],
|
||||||
subtext: blogResults["subtext"],
|
subtext: blogResults["subtext"],
|
||||||
indexRouteTemplate: blogResults["index_route_template"],
|
indexRouteTemplate: blogResults["index_route_template"],
|
||||||
blogRouteTemplate: blogResults["blog_route_template"]
|
blogRouteTemplate: blogResults["blog_route_template"],
|
||||||
|
lastModified: blogResults["date_updated"] !== null ?
|
||||||
|
new Date(blogResults["date_updated"]) :
|
||||||
|
new Date(blogResults["date_created"])
|
||||||
};
|
};
|
||||||
|
|
||||||
const projectResults = result["Project_Settings"];
|
const projectResults = result["Project_Settings"];
|
||||||
@@ -44,10 +50,33 @@ export async function getSettings(): Promise<GlobalSettings> {
|
|||||||
title: projectResults["title"],
|
title: projectResults["title"],
|
||||||
subtext: projectResults["subtext"],
|
subtext: projectResults["subtext"],
|
||||||
indexRouteTemplate: projectResults["index_route_template"],
|
indexRouteTemplate: projectResults["index_route_template"],
|
||||||
projectRouteTemplate: projectResults["project_route_template"]
|
projectRouteTemplate: projectResults["project_route_template"],
|
||||||
|
lastModified: projectResults["date_updated"] !== null ?
|
||||||
|
new Date(projectResults["date_updated"]) :
|
||||||
|
new Date(projectResults["date_created"])
|
||||||
};
|
};
|
||||||
|
|
||||||
const photoResults = result["Photo_Settings"];
|
const photoResults = result["Photo_Settings"];
|
||||||
|
let photoResultsLastModifiedTimestamps: string[] = [
|
||||||
|
photoResults["date_created"],
|
||||||
|
photoResults["date_updated"],
|
||||||
|
photoResults["category_icons"]["date_created"],
|
||||||
|
photoResults["category_icons"]["date_updated"],
|
||||||
|
photoResults["category_icons"]["photos_icon"]["created_on"],
|
||||||
|
photoResults["category_icons"]["location_icon"]["created_on"],
|
||||||
|
photoResults["category_icons"]["date_icon"]["created_on"],
|
||||||
|
photoResults["photo_icons"]["date_created"],
|
||||||
|
photoResults["photo_icons"]["date_updated"],
|
||||||
|
photoResults["photo_icons"]["previous_icon"]["created_on"],
|
||||||
|
photoResults["photo_icons"]["next_icon"]["created_on"],
|
||||||
|
photoResults["photo_icons"]["close_icon"]["created_on"],
|
||||||
|
photoResults["photo_icons"]["download_icon"]["created_on"]
|
||||||
|
];
|
||||||
|
|
||||||
|
const photoResultsLastModified = photoResultsLastModifiedTimestamps.sort((a: string, b: string) => {
|
||||||
|
return new Date(b).getTime() - new Date(a).getTime();
|
||||||
|
});
|
||||||
|
|
||||||
const photoSettings: WebsitePhotoSettings = {
|
const photoSettings: WebsitePhotoSettings = {
|
||||||
enabled: photoResults["enabled"],
|
enabled: photoResults["enabled"],
|
||||||
categoryIndex: {
|
categoryIndex: {
|
||||||
@@ -102,12 +131,16 @@ export async function getSettings(): Promise<GlobalSettings> {
|
|||||||
width: photoResults["photo_icons"]["download_icon"]["width"]
|
width: photoResults["photo_icons"]["download_icon"]["width"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
lastModified: new Date(photoResultsLastModified[0])
|
||||||
};
|
};
|
||||||
|
|
||||||
const sitemapResults = result["Sitemap_Settings"];
|
const sitemapResults = result["Sitemap_Settings"];
|
||||||
const sitemapSettings: SitemapSettings = {
|
const sitemapSettings: SitemapSettings = {
|
||||||
perPage: sitemapResults["per_page"]
|
perPage: sitemapResults["per_page"],
|
||||||
|
lastModified: sitemapResults["date_updated"] !== null ?
|
||||||
|
new Date(sitemapResults["date_updated"]) :
|
||||||
|
new Date(sitemapResults["date_created"])
|
||||||
};
|
};
|
||||||
|
|
||||||
const pluginResults = result["Plugin_Settings"];
|
const pluginResults = result["Plugin_Settings"];
|
||||||
@@ -115,7 +148,10 @@ export async function getSettings(): Promise<GlobalSettings> {
|
|||||||
swetrix: {
|
swetrix: {
|
||||||
id: pluginResults["swetrix_id"],
|
id: pluginResults["swetrix_id"],
|
||||||
url: pluginResults["swetrix_url"]
|
url: pluginResults["swetrix_url"]
|
||||||
}
|
},
|
||||||
|
lastModified: pluginResults["date_updated"] !== null ?
|
||||||
|
new Date(pluginResults["date_updated"]) :
|
||||||
|
new Date(pluginResults["date_created"])
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pluginResults["swetrix_id"] === null && pluginResults["swetrix_url"] === null) {
|
if (pluginResults["swetrix_id"] === null && pluginResults["swetrix_url"] === null) {
|
||||||
|
|||||||
2
astro/src/types/settings/blog.d.ts
vendored
2
astro/src/types/settings/blog.d.ts
vendored
@@ -6,4 +6,6 @@ type BlogSettings = {
|
|||||||
|
|
||||||
indexRouteTemplate: string;
|
indexRouteTemplate: string;
|
||||||
blogRouteTemplate: string;
|
blogRouteTemplate: string;
|
||||||
|
|
||||||
|
lastModified: Date;
|
||||||
}
|
}
|
||||||
|
|||||||
2
astro/src/types/settings/photo.d.ts
vendored
2
astro/src/types/settings/photo.d.ts
vendored
@@ -5,6 +5,8 @@ type WebsitePhotoSettings = {
|
|||||||
category: WebsitePhotoSettingsCategory;
|
category: WebsitePhotoSettingsCategory;
|
||||||
album: WebsitePhotoSettingsAlbum;
|
album: WebsitePhotoSettingsAlbum;
|
||||||
photo: WebsitePhotoSettingsPhoto;
|
photo: WebsitePhotoSettingsPhoto;
|
||||||
|
|
||||||
|
lastModified: Date;
|
||||||
}
|
}
|
||||||
|
|
||||||
type WebsitePhotoSettingsCategoryIndex = {
|
type WebsitePhotoSettingsCategoryIndex = {
|
||||||
|
|||||||
2
astro/src/types/settings/plugin.d.ts
vendored
2
astro/src/types/settings/plugin.d.ts
vendored
@@ -1,5 +1,7 @@
|
|||||||
type PluginSettings = {
|
type PluginSettings = {
|
||||||
swetrix: PluginSettingsSwetrix | null;
|
swetrix: PluginSettingsSwetrix | null;
|
||||||
|
|
||||||
|
lastModified: Date;
|
||||||
}
|
}
|
||||||
|
|
||||||
type PluginSettingsSwetrix = {
|
type PluginSettingsSwetrix = {
|
||||||
|
|||||||
2
astro/src/types/settings/project.d.ts
vendored
2
astro/src/types/settings/project.d.ts
vendored
@@ -6,4 +6,6 @@ type ProjectSettings = {
|
|||||||
|
|
||||||
indexRouteTemplate: string;
|
indexRouteTemplate: string;
|
||||||
projectRouteTemplate: string;
|
projectRouteTemplate: string;
|
||||||
|
|
||||||
|
lastModified: Date;
|
||||||
}
|
}
|
||||||
|
|||||||
2
astro/src/types/settings/sitemap.d.ts
vendored
2
astro/src/types/settings/sitemap.d.ts
vendored
@@ -1,3 +1,5 @@
|
|||||||
type SitemapSettings = {
|
type SitemapSettings = {
|
||||||
perPage: number;
|
perPage: number;
|
||||||
|
|
||||||
|
lastModified: Date;
|
||||||
}
|
}
|
||||||
|
|||||||
2
astro/src/types/settings/website.d.ts
vendored
2
astro/src/types/settings/website.d.ts
vendored
@@ -13,6 +13,8 @@ type WebsiteSettings = {
|
|||||||
copyright: string;
|
copyright: string;
|
||||||
|
|
||||||
twitter: WebsiteSettingsTwitter;
|
twitter: WebsiteSettingsTwitter;
|
||||||
|
|
||||||
|
lastModified: Date;
|
||||||
}
|
}
|
||||||
|
|
||||||
type WebsiteSettingsColors = {
|
type WebsiteSettingsColors = {
|
||||||
|
|||||||
Reference in New Issue
Block a user