daball/dashersupply
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: daball:b95c1e0496ffce5da9c13bc901fa7dfbe3cd82b4
Branches Tags
daball:main
daball:openapi-sdk-migration
daball:native-advertising
...
compare: daball:d50928aa6055a0aef2b656eb070d1ec17af63edb
Branches Tags
daball:main
daball:openapi-sdk-migration
daball:native-advertising

12 Commits
b95c1e0496 ... d50928aa60

Author SHA1 Message Date
David Ball
d50928aa60 Merge pull request 'main' (#5) from main into openapi-sdk-migration 
Reviewed-on: #5
 2024-08-26 18:19:10 -04:00
David Ball
481773f34a Merge pull request 'fix: Some of the release candidate API interface changes were reverted on the upstream.' (#7) from openapi-sdk-migration into main 
Reviewed-on: #7
 2024-08-26 18:18:41 -04:00
David Ball
caa0d93d91 Revert "Merge pull request 'fix: Some of the release candidate API interface changes were reverted on the upstream.' (#6) from openapi-sdk-migration into main" 
This reverts commit 2b87f45069, reversing
changes made to c2a0633f2b.

There was a forced update on the branch.
 2024-08-26 18:15:53 -04:00
David Ball
2b87f45069 Merge pull request 'fix: Some of the release candidate API interface changes were reverted on the upstream.' (#6) from openapi-sdk-migration into main 
Reviewed-on: #6
 2024-08-26 17:38:32 -04:00
David Ball
eb4e0f7f2e fix: Some of the release candidate API interface changes were reverted on the upstream. 2024-08-26 17:36:29 -04:00
David Ball
c2a0633f2b Merge pull request 'Set up redirects from old URLs to new URLs' (#4) from native-advertising into main 
Reviewed-on: #4
 2024-08-26 03:38:01 -04:00
David Ball
c2ffefe251 Set up redirects from old URLs to new URLs 2024-08-26 03:36:04 -04:00
David Ball
851410fbf0 Merge pull request 'Patch Squidex Markdown editor image src paths to render as paths within our app.' (#3) from native-advertising into main 
Reviewed-on: #3
 2024-08-26 02:07:47 -04:00
David Ball
1ce08dbe40 Patch Squidex Markdown editor image src paths to render as paths within our app. 2024-08-26 01:35:09 -04:00
David Ball
49b59400ec Merge pull request 'Updated page template.' (#2) from native-advertising into main 
Reviewed-on: #2
 2024-08-25 23:48:43 -04:00
David Ball
f7f147cfc1 Updated page template. 2024-08-25 23:48:09 -04:00
David Ball
eb0e01a4df Merge pull request 'Migrated to release candidate Squidex SDK' (#1) from openapi-sdk-migration into main 
Reviewed-on: #1
 2024-08-25 23:47:36 -04:00
7 changed files with 44 additions and 22 deletions
Show Stats Expand all files Collapse all files

8
package-lock.json generated
View File

@ -32,6 +32,7 @@
"markdown-it": "^14.0.0",
"markdown-it-attrs": "^4.1.6",
"memfs": "^4.11.1",
"mime-types": "^2.1.35",
"multer": "^1.4.5-lts.1",
"ollama": "^0.5.8",
"playwright": "*",
@ -49,6 +50,7 @@
"@types/luxon": "^3.4.2",
"@types/markdown-it": "^14.1.1",
"@types/markdown-it-attrs": "^4.1.3",
"@types/mime-types": "^2.1.4",
"@types/multer": "^1.4.11",
"@types/node": "^20.0.0",
"ts-node": "^10.9.2",
@ -2829,6 +2831,12 @@
"integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
"dev": true
},
"node_modules/@types/mime-types": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.4.tgz",
"integrity": "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==",
"dev": true
},
"node_modules/@types/ms": {
"version": "0.7.34",
"resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",

2
package.json
View File

@ -39,6 +39,7 @@
"markdown-it": "^14.0.0",
"markdown-it-attrs": "^4.1.6",
"memfs": "^4.11.1",
"mime-types": "^2.1.35",
"multer": "^1.4.5-lts.1",
"ollama": "^0.5.8",
"playwright": "*",
@ -56,6 +57,7 @@
"@types/luxon": "^3.4.2",
"@types/markdown-it": "^14.1.1",
"@types/markdown-it-attrs": "^4.1.3",
"@types/mime-types": "^2.1.4",
"@types/multer": "^1.4.11",
"@types/node": "^20.0.0",
"ts-node": "^10.9.2",

9
src/components/Content.astro
View File

@ -14,7 +14,8 @@ const { editToken, text } = Astro.props;
.content {
margin-bottom: 2rem;
border: 1px solid rgba(var(--accent-light), 25%);
background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%));
/* background: linear-gradient(rgba(var(--accent-dark), 66%), rgba(var(--accent-dark), 33%)); */
background-color: #13151a;
padding: 0.5rem;
border-radius: 8px;
font-family: "Urbanist", sans-serif;
@ -23,4 +24,10 @@ const { editToken, text } = Astro.props;
}
a, a:link, a:visited { text-decoration: none; color: #fff }
a:hover { text-decoration: underline; color: #fff }
</style>
<style is:inline>
.content img {
max-height: 12em;
}
</style>

4
src/config.ts
View File

@ -78,8 +78,8 @@ export const getWebhookPort = () => env.WEBHOOK_PORT ? parseInt(env.WEBHOOK_PORT
export const getSquidexAppName = () => env.SQUIDEX_APP_NAME || undefined;
export const getSquidexClientId = () => env.SQUIDEX_CLIENT_ID || undefined;
export const getSquidexClientSecret = () => env.SQUIDEX_CLIENT_SECRET || undefined;
export const getSquidexEnvironment = () => env.SQUIDEX_ENVIRONMENT || undefined;
export const getSquidexPublicUrl = () => env.SQUIDEX_PUBLIC_URL || getSquidexEnvironment();
export const getSquidexEnvironment = () => trimSlashes(env.SQUIDEX_ENVIRONMENT||'') || undefined;
export const getSquidexPublicUrl = () => trimSlashes(env.SQUIDEX_PUBLIC_URL||'') || getSquidexEnvironment();
export const config: Config = {
// AmazonProductAdvertisingAPIAccessKey: getAmazonProductAdvertisingAPIAccessKey(),

1
src/data/models/multis/Redirect.ts
View File

@ -3,4 +3,5 @@ import type { NonLocalized } from "../../internals/NonLocalizedT";
export interface Redirect {
prevSlug: NonLocalized<string>,
newContent: NonLocalized<string[]>,
newContentSchema: NonLocalized<{ schemaName: string }[]>,
}

7
src/lib/rendering.ts
View File

@ -1,6 +1,7 @@
import markdownIt from "markdown-it";
import markdownItAttrs from "markdown-it-attrs";
import vm from 'node:vm';
import { config } from "../config";
export const md = markdownIt().use(markdownItAttrs, {
});
@ -67,9 +68,15 @@ const renderCodeblock = (lang: string, template: string, templateContext?: any)
return template;
}
const replaceSquidexAssetPathWithOwn = (html: string) => {
let re = new RegExp(`src\\s*=\\s*["']${config.squidexPublicUrl?.replaceAll(`/`, `\\/`).replaceAll(`.`, `\\.`)||''}\\/api\\/assets/${config.squidexAppName||''}/([\\w-\\.\\/]*)["']`, 'g');
return html.replaceAll(re, `src="${config.siteUrl}/img/$1"`);
}
export const renderMarkdown = (template: string, templateContext?: any) => {
// render code blocks inside of the Markdown
template = renderCodeblock('markdown', template, templateContext);
template = md.render(interpolateString(template, templateContext));
template = replaceSquidexAssetPathWithOwn(template);
return template;
}

35
src/pages/[...routeLookup].astro
View File

@ -87,27 +87,24 @@ else {
const redirectDto = await getRedirectsByPreviousSlug(routeLookup!);
console.log("redirectDto:", redirectDto);
if (redirectDto && redirectDto.items && redirectDto.items.length > 0) {
console.log("getting redirectReferencesDto for", SCHEMAS.REDIRECTS, redirectDto.items[0].id);
console.log("getting redirectReferencesDto for", SCHEMAS.REDIRECTS, redirectDto.items[0].data?.newContentSchema[locale]);
// let objectId = redirectDto.items[0].data.newContent[locale];
//next line crashes:
let redirectReferencesDto = await client.contents.getReferences({ schema: SCHEMAS.REDIRECTS, id: redirectDto.items[0].id });
console.log("redirectReferencesDto:", redirectReferencesDto);
// let redirectReferencesDto = await client.contents.getReferences({ schema: SCHEMAS.REDIRECTS, id: redirectDto.items[0].id });
let schemaName = redirectDto.items[0].data?.newContentSchema[locale][0].schemaName;
let whicheverDto = await client.contents.getContent({schema: schemaName, id: redirectDto.items[0].data?.newContent[locale][0]});
// console.log("redirectReferencesDto:", redirectReferencesDto);
// client.contents.getConten
// switch (redirectDto.items[0].data?.referenceSchema.iv) {
// case SCHEMAS.BRANDS:
// return Astro.rewrite(`/view/brands/${locale}/${objectId}`);
// case SCHEMAS.MARKETPLACES:
// return Astro.rewrite(`/view/marketplaces/${locale}/${objectId}`);
// case SCHEMAS.PAGES:
// return Astro.rewrite(`/view/pages/${locale}/${objectId}`);
// case SCHEMAS.PRODUCT_CATEGORIES:
// return Astro.rewrite(`/view/product-categories/${locale}/${objectId}`);
// case SCHEMAS.PRODUCTS:
// return Astro.rewrite(`/view/products/${locale}/${objectId}`);
// case SCHEMAS.SELLERS:
// return Astro.rewrite(`/view/sellers/${locale}/${objectId}`);
// }
// Astro.response.headers.set('Vary', 'Accept-Language');
// return Astro.redirect(,303)
switch (schemaName) {
case SCHEMAS.BRANDS:
case SCHEMAS.MARKETPLACES:
case SCHEMAS.PAGES:
case SCHEMAS.PRODUCT_CATEGORIES:
case SCHEMAS.PRODUCTS:
case SCHEMAS.SELLERS:
Astro.response.headers.set('Vary', 'Accept-Language');
return Astro.redirect(`/${whicheverDto.data.slug[locale]}`, 303);
}
}
return redirect404NotFound();
}