Skip to content

chore: move paraglide demo into separate page #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2024
Merged

chore: move paraglide demo into separate page #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba9730
chore: move paraglide demo into seperate page
manuel3108 Oct 16, 2024
8a7fdfa
use shared demo folder
manuel3108 Oct 16, 2024
55d64fd
Merge branch 'main' into chore/move-paraglide-demo
manuel3108 Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/brown-maps-check.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'sv': patch
---

chore: move paraglide demo into seperate page
28 changes: 14 additions & 14 deletions packages/adders/lucia/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,11 @@ export default defineAdder({
// login/register
{
name: ({ kit, typescript }) =>
`${kit!.routesDirectory}/demo/login/+page.server.${typescript ? 'ts' : 'js'}`,
`${kit!.routesDirectory}/demo/lucia/login/+page.server.${typescript ? 'ts' : 'js'}`,
condition: ({ options }) => options.demo,
content({ content, typescript, kit }) {
if (content) {
const filePath = `${kit!.routesDirectory}/demo/login/+page.server.${typescript ? 'ts' : 'js'}`;
const filePath = `${kit!.routesDirectory}/demo/lucia/login/+page.server.${typescript ? 'ts' : 'js'}`;
log.warn(`Existing ${colors.yellow(filePath)} file. Could not update.`);
return content;
}
Expand All @@ -369,7 +369,7 @@ export default defineAdder({
${ts(`import type { Actions, PageServerLoad } from './$types';\n`)}
export const load${ts(': PageServerLoad')} = async (event) => {
if (event.locals.user) {
return redirect(302, '/demo');
return redirect(302, '/demo/lucia');
}
return {};
};
Expand Down Expand Up @@ -416,7 +416,7 @@ export default defineAdder({
secure: !dev
});

return redirect(302, '/demo');
return redirect(302, '/demo/lucia');
},
register: async (event) => {
const formData = await event.request.formData();
Expand Down Expand Up @@ -453,7 +453,7 @@ export default defineAdder({
} catch (e) {
return fail(500, { message: 'An error has occurred' });
}
return redirect(302, '/demo');
return redirect(302, '/demo/lucia');
},
};

Expand Down Expand Up @@ -483,11 +483,11 @@ export default defineAdder({
}
},
{
name: ({ kit }) => `${kit!.routesDirectory}/demo/login/+page.svelte`,
name: ({ kit }) => `${kit!.routesDirectory}/demo/lucia/login/+page.svelte`,
condition: ({ options }) => options.demo,
content({ content, dependencyVersion, typescript, kit }) {
if (content) {
const filePath = `${kit!.routesDirectory}/demo/login/+page.svelte`;
const filePath = `${kit!.routesDirectory}/demo/lucia/login/+page.svelte`;
log.warn(`Existing ${colors.yellow(filePath)} file. Could not update.`);
return content;
}
Expand Down Expand Up @@ -521,11 +521,11 @@ export default defineAdder({
// logout
{
name: ({ kit, typescript }) =>
`${kit!.routesDirectory}/demo/+page.server.${typescript ? 'ts' : 'js'}`,
`${kit!.routesDirectory}/demo/lucia/+page.server.${typescript ? 'ts' : 'js'}`,
condition: ({ options }) => options.demo,
content({ content, typescript, kit }) {
if (content) {
const filePath = `${kit!.routesDirectory}/demo/+page.server.${typescript ? 'ts' : 'js'}`;
const filePath = `${kit!.routesDirectory}/demo/lucia/+page.server.${typescript ? 'ts' : 'js'}`;
log.warn(`Existing ${colors.yellow(filePath)} file. Could not update.`);
return content;
}
Expand All @@ -537,7 +537,7 @@ export default defineAdder({
${ts(`import type { Actions, PageServerLoad } from './$types';\n`)}
export const load${ts(': PageServerLoad')} = async (event) => {
if (!event.locals.user) {
return redirect(302, '/demo/login');
return redirect(302, '/demo/lucia/login');
}
return { user: event.locals.user };
};
Expand All @@ -550,18 +550,18 @@ export default defineAdder({
await auth.invalidateSession(event.locals.session.id);
event.cookies.delete(auth.sessionCookieName, { path: '/' });

return redirect(302, '/demo/login');
return redirect(302, '/demo/lucia/login');
},
};
`;
}
},
{
name: ({ kit }) => `${kit!.routesDirectory}/demo/+page.svelte`,
name: ({ kit }) => `${kit!.routesDirectory}/demo/lucia/+page.svelte`,
condition: ({ options }) => options.demo,
content({ content, dependencyVersion, typescript, kit }) {
if (content) {
const filePath = `${kit!.routesDirectory}/demo/+page.svelte`;
const filePath = `${kit!.routesDirectory}/demo/lucia/+page.svelte`;
log.warn(`Existing ${colors.yellow(filePath)} file. Could not update.`);
return content;
}
Expand All @@ -587,7 +587,7 @@ export default defineAdder({
nextSteps: ({ highlighter, options }) => {
const steps = [`Run ${highlighter.command('npm run db:push')} to update your database schema`];
if (options.demo) {
steps.push(`Visit ${highlighter.route('/demo')} route to view the demo`);
steps.push(`Visit ${highlighter.route('/demo/lucia')} route to view the demo`);
}

return steps;
Expand Down
19 changes: 13 additions & 6 deletions packages/adders/paraglide/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const options = defineAdderOptions({
},
demo: {
type: 'boolean',
default: false,
default: true,
question: 'Do you want to include a demo?'
}
});
Expand Down Expand Up @@ -234,7 +234,7 @@ export default defineAdder({
},
{
// add usage example
name: ({ kit }) => `${kit?.routesDirectory}/+page.svelte`,
name: ({ kit }) => `${kit?.routesDirectory}/demo/paraglide/+page.svelte`,
condition: ({ options }) => options.demo,
content({ content, options, typescript }) {
const { script, template, generateCode } = parseSvelte(content, { typescript });
Expand Down Expand Up @@ -307,10 +307,17 @@ export default defineAdder({
fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2) + '\n');
}
},
nextSteps: ({ highlighter }) => [
`Edit your messages in ${highlighter.path('messages/en.json')}`,
'Consider installing the Sherlock IDE Extension'
]
nextSteps: ({ highlighter }) => {
const steps = [
`Edit your messages in ${highlighter.path('messages/en.json')}`,
'Consider installing the Sherlock IDE Extension'
];
if (options.demo) {
steps.push(`Visit ${highlighter.route('/demo/paraglide')} route to view the demo`);
}

return steps;
}
});

const isValidLanguageTag = (languageTag: string): boolean =>
Expand Down