diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index b4bfed3..0000000 --- a/.prettierrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": ["prettier-plugin-tailwindcss"] -} diff --git a/assets/main.css b/assets/main.css index 9b59f7b..9ceea97 100644 --- a/assets/main.css +++ b/assets/main.css @@ -16,6 +16,8 @@ --color-text-light: #1a1a1a; --color-text-dark: #fffefb; + --color-bg-block: #E8E7E0; + /* button */ --color-button: #9a7f62; --color-button-hover: #b7946d; @@ -30,11 +32,10 @@ .h4-uppercase { @apply font-inter text-base leading-[150%] font-bold uppercase sm:text-[20px] md:text-[24px]; } -} -.text-inter { - font-family: var(--font-inter); - line-height: 150%; + .text-inter { + @apply font-inter text-sm sm:text-lg; + } } .main { diff --git a/components/ButtonArrow.vue b/components/ButtonArrow.vue index 7c8c8ad..a3d28b7 100644 --- a/components/ButtonArrow.vue +++ b/components/ButtonArrow.vue @@ -2,7 +2,7 @@
+ + + diff --git a/components/HeaderBlock.vue b/components/HeaderBlock.vue index 3f88a2c..18f4ff0 100644 --- a/components/HeaderBlock.vue +++ b/components/HeaderBlock.vue @@ -1,67 +1,218 @@ diff --git a/components/LangSwitcher.vue b/components/LangSwitcher.vue new file mode 100644 index 0000000..25f424e --- /dev/null +++ b/components/LangSwitcher.vue @@ -0,0 +1,52 @@ + + + diff --git a/components/langSwitcher.vue b/components/langSwitcher.vue deleted file mode 100644 index 83098f9..0000000 --- a/components/langSwitcher.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - \ No newline at end of file diff --git a/components/section/main-page/MainHero.vue b/components/section/main-page/MainHero.vue index ae9c436..fa4eb44 100644 --- a/components/section/main-page/MainHero.vue +++ b/components/section/main-page/MainHero.vue @@ -3,7 +3,7 @@ class="mx-auto w-full max-w-[360px] px-[16px] sm:max-w-[768px] sm:px-[17px] md:max-w-[1000px] md:px-[24px] xl:max-w-[1920px] xl:px-[80px]" >
-
+

{{ component.section_lang_data.title }}

diff --git a/components/ui/Container.vue b/components/ui/Container.vue new file mode 100644 index 0000000..c1fad8d --- /dev/null +++ b/components/ui/Container.vue @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/layouts/default.vue b/layouts/default.vue index 1ea6559..a54ce66 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -6,7 +6,7 @@
- +
@@ -14,4 +14,4 @@ useHead({ link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.png" }], }); - \ No newline at end of file + diff --git a/nuxt.config.ts b/nuxt.config.ts index b728e40..330adcd 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -20,9 +20,9 @@ export default defineNuxtConfig({ i18n: { locales: [ - { code: "pl", name: "Polski", icon: "emojione:flag-for-poland" }, - { code: "en", name: "English", icon: "emojione:flag-for-united-kingdom" }, - { code: "cs", name: "Čeština", icon: "emojione:flag-for-chechia" }, + { code: "pl", name: "Pl", icon: "circle-flags:pl" }, + { code: "en", name: "EN", icon: "circle-flags:gb" }, + { code: "cs", name: "CZR", icon: "circle-flags:cz" } ], lazy: true, defaultLocale: "en", diff --git a/pages/index.vue b/pages/index.vue index ac95f58..5b8819c 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -17,7 +17,7 @@ const route = useRoute(); - route.params.id = menuStore.defaultMenu.id + route.params.id = menuStore.defaultMenu.id_page route.params.slug = menuStore.defaultMenu.link_rewrite const store = useStore(); diff --git a/public/logo-footer.svg b/public/logo-footer.svg new file mode 100644 index 0000000..6d4fe4c --- /dev/null +++ b/public/logo-footer.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/stores/store.ts b/stores/store.ts index f65374c..7ee2c90 100644 --- a/stores/store.ts +++ b/stores/store.ts @@ -6,16 +6,16 @@ export const useStore = defineStore("store", () => { const currentPageID = ref(""); const pb = usePB(); const { $i18n } = useNuxtApp(); + const menuStore = useMenuStore() const components = ref({} as PBPageItem[]); const getSections = async (id: string) => { pb.cancelRequest("menu_view"); components.value = ( await pb.collection("page_view").getList(1, 50, { - filter: `page_id="${id}"&&(section_lang_id_lang="${ - $i18n.locale.value - }"||section_is_no_lang=${true})`, - sort: "page_section_id_position", + filter: `id="${id}"&&(section_lang_id_lang="${$i18n.locale.value + }"||section_is_no_lang=${true})`, + sort: "page_section_id_position", }) ).items as PBPageItem[]; }; diff --git a/types/index.ts b/types/index.ts index ca50ef1..d237685 100644 --- a/types/index.ts +++ b/types/index.ts @@ -1,93 +1,97 @@ export interface ListResponse { - page: number; - perPage: number; - totalItems: number; - totalPages: number; - } - - export interface PBMenuItem { - page: number; - page_name: string; - perPage: number; - totalItems: number; - totalPages: number; - is_root: boolean; - is_default: boolean; - id_page: string; - id: string; - id_parent: string; - url: string; - name: string; - link_rewrite: string; - active: boolean; - collectionId: string; - collectionName: string; - created: string; - link_title: string; - meta_description: string; - meta_title: string; - position_id: number; - updated: string; - } - - export interface PBFooterItem { - id: string; - id_lang: string; - address: string; - phone: string; - email: string; - contact_info: Array<{ - field: keyof PBFooterItem; - title: string; - }>; - company_info: Array<{ - data: string; - title: string; - }>; - } - - export interface PBPageItem { - collectionId: string; - collectionName: string; - component_name: string; - id: string; - image_collection: string; - page_created: string; - page_id: string; - page_name: string; - page_section_id_position: number; - page_updated: string; - section_id: string; - section_img: string[]; - section_lang_created: string; - section_lang_data: SectionLangData; - section_lang_id_lang: string; - section_name: string; - } - - import type { DefineComponent } from "vue"; - export interface SectionLangData { - title: string; - description: string; - button: string; - button_call: string; - } + page: number; + perPage: number; + totalItems: number; + totalPages: number; +} - export interface UIMenuItem extends PBMenuItem { - children?: UIMenuItem[]; - } - - export interface MenuListResponse extends ListResponse { - items: PBMenuItem[]; - } - - export interface FooterListResponse extends ListResponse { - items: PBFooterItem[]; - } - - export type componentsListType = { - name: string; - component: PBPageItem; - componentInstance: DefineComponent; - data: SectionLangData; - }; \ No newline at end of file +export interface PBMenuItem { + page: number; + page_name: string; + perPage: number; + totalItems: number; + totalPages: number; + is_root: boolean; + is_default: boolean; + id_page: string; + id: string; + id_parent: string; + url: string; + name: string; + link_rewrite: string; + active: boolean; + collectionId: string; + collectionName: string; + created: string; + link_title: string; + meta_description: string; + meta_title: string; + position_id: number; + updated: string; +} + +export interface PBFooterItem { + id: string; + id_lang: string; + address: string; + phone: string; + email: string; + contact_info: Array<{ + field: keyof PBFooterItem; + title: string; + }>; + data: Array<{ + title: string; + items: Array + }>; + company_info: Array<{ + data: string; + title: string; + }>; +} + +export interface PBPageItem { + collectionId: string; + collectionName: string; + component_name: string; + id: string; + image_collection: string; + page_created: string; + page_id: string; + page_name: string; + page_section_id_position: number; + page_updated: string; + section_id: string; + section_img: string[]; + section_lang_created: string; + section_lang_data: SectionLangData; + section_lang_id_lang: string; + section_name: string; +} + +import type { DefineComponent } from "vue"; +export interface SectionLangData { + title: string; + description: string; + button: string; + button_call: string; +} + +export interface UIMenuItem extends PBMenuItem { + children?: UIMenuItem[]; +} + +export interface MenuListResponse extends ListResponse { + items: PBMenuItem[]; +} + +export interface FooterListResponse extends ListResponse { + items: PBFooterItem[]; +} + +export type componentsListType = { + name: string; + component: PBPageItem; + componentInstance: DefineComponent; + data: SectionLangData; +}; \ No newline at end of file