Skip to content

Commit ecc6355

Browse files
committed
Sync with template
1 parent c01a7cc commit ecc6355

File tree

9 files changed

+984
-232
lines changed

9 files changed

+984
-232
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ start_project:
1010

1111
run_server:
1212
docker-compose down -v
13-
docker-compose up backend --build
13+
docker-compose up --build backend
1414

1515
run_tests:
1616
cd frontend; echo "...Starting frontend tests" && \

demo/package-lock.json

Lines changed: 74 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
99
},
1010
"dependencies": {
11+
"pinia": "^2.0.23",
1112
"vue": "^3.2.35",
1213
"vue-router": "^4.0.15"
1314
},

demo/src/components/DemoMenu.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<div class="main-container">
33
<div class="cards">
44
<demo-menu-card
5-
v-for="({ name, text, link }, index) in cards"
5+
v-for="({ name, text, path }, index) in routes"
66
:key="index"
77
:name="name"
88
:text="text"
9-
:link="link"/>
9+
:link="path"/>
1010
</div>
1111
</div>
1212
</template>
1313

1414
<script setup>
1515
import DemoMenuCard from './DemoMenuCard.vue'
16-
import cards from '../routes'
16+
import routes from '../routes'
1717
</script>
1818

1919
<style lang="scss" scoped>

demo/src/components/DemoMenuCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="card">
3-
<h2 class="card__title">{{ name }}</h2>
3+
<h2 class="card__title">{{name}}</h2>
44
<p class="card__apply">
55
<router-link class="card__link" :to="link">Перейти к демонстрации</router-link>
66
</p>

demo/src/main.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createApp } from "vue";
2+
import { createPinia } from "pinia";
23

34
import App from "./App.vue";
45
import router from "./router";
@@ -7,4 +8,6 @@ const app = createApp(App);
78

89
app.use(router);
910

11+
app.use(createPinia());
12+
1013
app.mount("#app");

demo/src/router/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { createRouter, createWebHistory } from "vue-router";
2+
import routes from '../routes'
23

34
const router = createRouter({
45
history: createWebHistory(import.meta.env.BASE_URL),
@@ -7,7 +8,8 @@ const router = createRouter({
78
path: "/",
89
name: "home",
910
component: () => import("../components/DemoMenu.vue"),
10-
}
11+
},
12+
...routes,
1113
],
1214
});
1315

0 commit comments

Comments
 (0)