Skip to content

Commit d4fe922

Browse files
author
Luferov Victor
committed
feat: Поправлена главная страница
1 parent 9143854 commit d4fe922

File tree

6 files changed

+822
-444
lines changed

6 files changed

+822
-444
lines changed

client/components/raai/RaaiGoals.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<template lang="pug">
2-
v-container
2+
v-sheet
33
v-card.text-center.py-16(flat)
44
v-row.justify-center
55
v-col(cols="12" md="8")
66
v-card-title.justify-center.display-1 Российская ассоциация искусственного интеллекта (РАИИ)
7-
v-card-text.headline Общероссийская общественная организация «Российская ассоциация искусственного интеллекта» является общественным объединением, основанным на членстве лиц, профессиональная деятельность которых связана с теоретическими и прикладными исследованиями и разработками в области искусственного интеллекта.
7+
v-card-text.subtitle-1 Общероссийская общественная организация «Российская ассоциация искусственного интеллекта» является общественным объединением, основанным на членстве лиц, профессиональная деятельность которых связана с теоретическими и прикладными исследованиями и разработками в области искусственного интеллекта.
88
v-card.py-16(flat)
99
v-row.justify-center
10-
v-card-title.display-1 Основные цели РАИИ
10+
v-card-title.my-5.display-1 Основные цели РАИИ
1111
v-item-group
1212
v-row.justify-center
1313
v-col.text-center(cols="12" sm="4" v-for="(item, i) in goals" :key="i")
14-
v-icon.indigo--text.text--accent-4.outlined(size="100" color="indigo accent-4" center="true") mdi-{{ item.icon }}
15-
v-card-text.headline {{ item.text }}
14+
v-icon.indigo--text.text--accent-4.outlined(size="60" color="indigo accent-4" center="true") mdi-{{ item.icon }}
15+
v-card-text.body-1 {{ item.text }}
1616
</template>
1717

1818
<script lang="ts">

client/components/raai/RaaiIndex.vue

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<template lang="pug">
22
v-container
3-
raai-carousel
43
slot
54
raai-goals
65
</template>
76

87
<script lang="ts">
9-
import RaaiCarousel from '~/components/raai/RaaiCarousel.vue'
108
import RaaiGoals from '~/components/raai/RaaiGoals.vue'
119
1210
export default defineComponent({
13-
components: { RaaiCarousel, RaaiGoals }
11+
components: { RaaiGoals }
1412
})
1513
</script>

client/package.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"test": "jest"
1414
},
1515
"dependencies": {
16-
"@babel/preset-env": "^7.18.10",
16+
"@babel/preset-env": "^7.20.2",
1717
"@nuxtjs/apollo": "^4.0.1-rc.5",
1818
"@nuxtjs/i18n": "^7.3.0",
1919
"@nuxtjs/vuetify": "^1.12.3",
2020
"@pinia/nuxt": "^0.4.1",
21-
"@vue/apollo-composable": "^4.0.0-alpha.19",
21+
"@vue/apollo-composable": "^4.0.0-beta.4",
2222
"@vueuse/core": "^9.13.0",
2323
"@vueuse/integrations": "^9.13.0",
2424
"accounting": "^0.4.1",
@@ -33,21 +33,21 @@
3333
"vee-validate": "^3.4.14",
3434
"vue-apexcharts": "^1.6.2",
3535
"vue-rx": "^6.2.0",
36-
"vuetify": "^2.6.9"
36+
"vuetify": "^2.6.14"
3737
},
3838
"devDependencies": {
39-
"@babel/core": "^7.18.13",
40-
"@babel/eslint-parser": "^7.18.9",
41-
"@babel/plugin-proposal-decorators": "^7.18.10",
42-
"@babel/plugin-proposal-optional-chaining": "^7.18.9",
43-
"@graphql-codegen/cli": "^2.11.8",
44-
"@graphql-codegen/schema-ast": "^2.5.1",
45-
"@graphql-codegen/typescript": "^2.7.3",
46-
"@graphql-codegen/typescript-operations": "^2.5.3",
47-
"@graphql-codegen/typescript-vue-apollo": "^3.3.3",
48-
"@mdi/font": "^7.0.96",
39+
"@babel/core": "^7.21.3",
40+
"@babel/eslint-parser": "^7.21.3",
41+
"@babel/plugin-proposal-decorators": "^7.21.0",
42+
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
43+
"@graphql-codegen/cli": "^3.2.2",
44+
"@graphql-codegen/schema-ast": "^3.0.1",
45+
"@graphql-codegen/typescript": "^3.0.2",
46+
"@graphql-codegen/typescript-operations": "^3.0.2",
47+
"@graphql-codegen/typescript-vue-apollo": "^3.3.7",
48+
"@mdi/font": "^7.2.96",
4949
"@nuxt/bridge": "npm:@nuxt/bridge-edge",
50-
"@nuxt/types": "^2.15.8",
50+
"@nuxt/types": "^2.16.2",
5151
"@nuxtjs/color-mode": "^3.1.4",
5252
"@nuxtjs/eslint-config-typescript": "^10.0.0",
5353
"@tiptap/core": "^2.0.0-beta.176",
@@ -81,15 +81,15 @@
8181
"@tiptap/vue-2": "^2.0.0-beta.79",
8282
"@typescript-eslint/eslint-plugin": "^5.36.0",
8383
"@typescript-eslint/parser": "^5.36.0",
84-
"core-js": "^3.25.0",
84+
"core-js": "^3.29.1",
8585
"eslint": "8.22.0",
86-
"eslint-import-resolver-typescript": "^3.5.0",
87-
"eslint-plugin-import": "^2.26.0",
86+
"eslint-import-resolver-typescript": "^3.5.3",
87+
"eslint-plugin-import": "^2.27.5",
8888
"eslint-plugin-nuxt": "^3.2.0",
8989
"pug": "^3.0.2",
9090
"pug-plain-loader": "^1.1.0",
91-
"rxjs": "^7.5.5",
92-
"typescript": "^4.8.2",
91+
"rxjs": "^7.8.0",
92+
"typescript": "^4.9.5",
9393
"vue-class-component": "^7.2.6",
9494
"vue-property-decorator": "^9.1.2"
9595
}

client/pages/index.vue

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<template lang="pug">
2-
component(:is="BUILD === 'raai' ? 'raai-index' : 'v-container'")
2+
raai-index
33
page-segment(v-if="!loading" v-for="segment in segments" :key="segment.id" :segment="segment")
44
v-row(v-else)
55
v-progress-circular.mt-12.mx-auto(size="60" color="primary" indeterminate)
66
</template>
77

88
<script lang="ts">
9-
import { VContainer } from 'vuetify/lib/components'
109
import { defineComponent, useNuxt2Meta, useRuntimeConfig } from '#app'
1110
import { SegmentsQuery, SegmentsQueryVariables } from '~/types/graphql'
1211
import { useCommonQuery, useI18n } from '~/composables'
@@ -15,7 +14,7 @@ import PageSegment from '~/components/pages/PageSegment.vue'
1514
import RaaiIndex from '~/components/raai/RaaiIndex.vue'
1615
1716
export default defineComponent({
18-
components: { RaaiIndex, PageSegment, VContainer },
17+
components: { RaaiIndex, PageSegment },
1918
setup () {
2019
const { BUILD } = useRuntimeConfig()
2120
const { t } = useI18n()

0 commit comments

Comments
 (0)