Browse Source

Adding a less complex router

pull/5/head
Matthew Aaron Raymer 2 years ago
parent
commit
487997b87c
  1. 47
      src/router/index.ts
  2. 9
      src/views/NewEditProjectView.vue
  3. 7
      src/views/ProjectViewView.vue

47
src/router/index.ts

@ -7,13 +7,19 @@ const routes: Array<RouteRecordRaw> = [
name: "home", name: "home",
component: () => component: () =>
import(/* webpackChunkName: "start" */ "../views/DiscoverView.vue"), import(/* webpackChunkName: "start" */ "../views/DiscoverView.vue"),
beforeEnter: (to, from, next) => {
const appStore = useAppStore();
const isAuthenticated = appStore.condition === "registered";
if (isAuthenticated) {
next();
} else {
next({ name: "start" });
}
},
}, },
{ {
path: "/about", path: "/about",
name: "about", name: "about",
// route level code-splitting
// this generates a separate chunk (about.[hash].js) for this route
// which is lazy-loaded when the route is visited.
component: () => component: () =>
import(/* webpackChunkName: "about" */ "../views/AboutView.vue"), import(/* webpackChunkName: "about" */ "../views/AboutView.vue"),
}, },
@ -75,6 +81,12 @@ const routes: Array<RouteRecordRaw> = [
/* webpackChunkName: "new-edit-commitment" */ "../views/NewEditCommitmentView.vue" /* webpackChunkName: "new-edit-commitment" */ "../views/NewEditCommitmentView.vue"
), ),
}, },
{
path: "/project",
name: "project",
component: () =>
import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
},
{ {
path: "/new-edit-project", path: "/new-edit-project",
name: "new-edit-project", name: "new-edit-project",
@ -83,12 +95,6 @@ const routes: Array<RouteRecordRaw> = [
/* webpackChunkName: "new-edit-project" */ "../views/NewEditProjectView.vue" /* webpackChunkName: "new-edit-project" */ "../views/NewEditProjectView.vue"
), ),
}, },
{
path: "/project",
name: "project",
component: () =>
import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
},
{ {
path: "/projects", path: "/projects",
name: "projects", name: "projects",
@ -111,27 +117,4 @@ const router = createRouter({
routes, routes,
}); });
router.beforeEach(async (to, from, next) => {
const publicPages = ["/start", "/account", "/import-account"];
const isPublic = publicPages.includes(to.path);
const appStore = useAppStore();
console.log(to);
if (to.path === "/" && appStore.condition === "registered") {
next({ path: "/account" });
} else if (isPublic) {
switch (appStore.condition) {
case "registered":
next();
break;
default:
next();
break;
}
} else if (appStore.condition === "uninitialized") {
next({ path: "/start" });
} else {
next();
}
});
export default router; export default router;

9
src/views/NewEditProjectView.vue

@ -10,7 +10,6 @@
class="text-lg text-center px-2 py-1 absolute -left-2 -top-1" class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
><fa icon="chevron-left" class="fa-fw"></fa ><fa icon="chevron-left" class="fa-fw"></fa
></router-link> ></router-link>
[New/Edit] Project [New/Edit] Project
</h1> </h1>
</div> </div>
@ -39,7 +38,7 @@
type="text" type="text"
placeholder="Project Name" placeholder="Project Name"
class="block w-full rounded border border-slate-400 mb-4 px-3 py-2" class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
v-modal="projectName" v-model="projectName"
/> />
<textarea <textarea
@ -134,6 +133,12 @@ export default class NewEditProjectView extends Vue {
try { try {
const resp = await this.axios.post(url, payload, { headers }); const resp = await this.axios.post(url, payload, { headers });
console.log(resp.status, resp.data); console.log(resp.status, resp.data);
const route = {
name: "project",
params: { projectId: resp.data },
};
console.log(route);
this.$router.push(route);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }

7
src/views/ProjectViewView.vue

@ -130,5 +130,10 @@ import { Options, Vue } from "vue-class-component";
@Options({ @Options({
components: {}, components: {},
}) })
export default class ProjectViewView extends Vue {} export default class ProjectViewView extends Vue {
projectId = "";
created(): void {
console.log(this.projectId);
}
}
</script> </script>

Loading…
Cancel
Save