diff --git a/src/lib/components/git/deploymentDomains.svelte b/src/lib/components/git/deploymentDomains.svelte
index 425612558..4ce68b79e 100644
--- a/src/lib/components/git/deploymentDomains.svelte
+++ b/src/lib/components/git/deploymentDomains.svelte
@@ -12,28 +12,37 @@
export let hideQRCode = true;
const dispatch = createEventDispatcher();
+
+ $: sortedDomains = domains?.rules?.sort((a, b) => {
+ if (a?.trigger === 'manual' && b?.trigger !== 'manual') {
+ return -1;
+ } else if (a?.trigger !== 'manual' && b?.trigger === 'manual') {
+ return 1;
+ }
+ return 0;
+ });
{#if domains?.total}
-
+
- {domains.rules[0]?.domain}
+ {sortedDomains[0]?.domain}
- {#if domains.rules.length > 1}
+ {#if sortedDomains.length > 1}
- +{domains.rules.length - 1}
+ +{sortedDomains.length - 1}
- {#each domains.rules as rule, i}
+ {#each sortedDomains as rule, i}
{#if i !== 0}
{#each [...data.frameworks] as framework}
- {#if !framework.toLowerCase().includes('other')}
-
- applyFilter('framework', framework, e)} />
-
- {/if}
- {/each}
- {#if data.frameworks.includes('Other')}
applyFilter('framework', 'Other', e)} />
+ .includes(framework)}
+ on:change={(e) => applyFilter('framework', framework, e)} />
- {/if}
+ {/each}
diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.ts b/src/routes/(console)/project-[project]/sites/create-site/templates/+page.ts
index 939831cf6..487ac79a9 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.ts
+++ b/src/routes/(console)/project-[project]/sites/create-site/templates/+page.ts
@@ -19,7 +19,37 @@ export const load = async ({ url, route }) => {
[new Set(), new Set()]
);
- const frameworks = Array.from(frameworksSet).sort((a, b) => a.localeCompare(b));
+ const frameworkOrder = [
+ 'Next.js',
+ 'Nuxt',
+ 'SvelteKit',
+ 'Astro',
+ 'Remix',
+ 'Flutter',
+ 'React',
+ 'Vue.js',
+ 'Svelte',
+ 'Lynx',
+ 'Angular',
+ 'Analog',
+ 'Vite',
+ 'Other'
+ ];
+ const frameworks = Array.from(frameworksSet)
+ .sort((a, b) => a.localeCompare(b))
+ .sort((a, b) => {
+ const aIndex = frameworkOrder.indexOf(a);
+ const bIndex = frameworkOrder.indexOf(b);
+ if (aIndex === -1 && bIndex === -1) {
+ return a.localeCompare(b);
+ } else if (aIndex === -1) {
+ return 1;
+ } else if (bIndex === -1) {
+ return -1;
+ }
+ return aIndex - bIndex;
+ });
+
const useCases = Array.from(useCasesSet).sort((a, b) => a.localeCompare(b));
const templates = siteTemplatesList.templates.filter((template) => {