Skip to content

Commit

Permalink
272 push dynamic top level routes down a level (#275)
Browse files Browse the repository at this point in the history
* chore: Update mikro-orm.config.ts to parse POSTGRES_SSL value as boolean
* chore: Update Node.js and cache actions versions in build workflow
* - pushed pages into 'o' subdirectory.
- updated breadcrumb logic
  • Loading branch information
mlhaufe authored Jul 29, 2024
1 parent ad8bc5b commit 0ba4207
Show file tree
Hide file tree
Showing 30 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 22.x
cache: "npm"
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Restore Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion components/TopNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let getCrumbs = () => {
route: '/' + crumbs.slice(0, index + 1).join('/')
};
})
];
].filter(({ route }) => route !== '/o');
};
const crumbs = ref(getCrumbs());
Expand Down
2 changes: 1 addition & 1 deletion mikro-orm.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const config: Options = {
// https://github.com/mikro-orm/mikro-orm/issues/303
driverOptions: {
connection: {
ssl: Boolean(process.env.POSTGRES_SSL)
ssl: JSON.parse(process.env.POSTGRES_SSL || 'false')
}
},
entities: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ const updateSolution = async () => {
}
});
router.push(`/${organizationslug}/${solutionslug}/`)
router.push({ name: 'Organization', params: { organizationslug } });
}
const cancel = () => {
router.push(`/${organizationslug}/${solutionslug}/`)
router.push({ name: 'Solution', params: { organizationslug, solutionslug } });
}
watch(() => solution.value.name, (newName) => {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const createSolution = async () => {
if (solutionId) {
const newSolution = (await $fetch(`/api/solutions/${solutionId}`));
router.push(`/${organizationslug}/${newSolution.slug}`);
router.push({ name: 'Solution', params: { organizationslug, solutionslug: newSolution.slug } });
} else {
throw new Error('Failed to create solution. No solution ID returned.');
}
Expand All @@ -39,7 +39,7 @@ const createSolution = async () => {
}
const cancel = () => {
router.push(`/${organizationslug}`);
router.push({ name: 'Organization', params: { organizationslug } });
}
watch(() => name.value, (newName) => {
Expand Down
File renamed without changes.

0 comments on commit 0ba4207

Please sign in to comment.