Merge pull request 'chore: update' (#3) from develop into production
All checks were successful
Deploy Application / deploy (push) Successful in 5s
All checks were successful
Deploy Application / deploy (push) Successful in 5s
Reviewed-on: #3
This commit is contained in:
@ -1,10 +1,17 @@
|
||||
<!DOCTYPE html>
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<link href="/src/style.css" rel="stylesheet" />
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap"
|
||||
rel="stylesheet"
|
||||
/>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Russo+One&display=swap" rel="stylesheet" />
|
||||
<title>e-book</title>
|
||||
</head>
|
||||
<body>
|
||||
|
33
src/App.vue
33
src/App.vue
@ -1,30 +1,9 @@
|
||||
<script setup lang="ts">
|
||||
import HelloWorld from './components/HelloWorld.vue'
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="bg-red-700">
|
||||
<a href="https://vite.dev" target="_blank">
|
||||
<img src="/vite.svg" class="logo" alt="Vite logo" />
|
||||
</a>
|
||||
<a href="https://vuejs.org/" target="_blank">
|
||||
<img src="./assets/vue.svg" class="logo vue" alt="Vue logo" />
|
||||
</a>
|
||||
</div>
|
||||
<HelloWorld msg="Vite + Vue" />
|
||||
<UiLayout>
|
||||
<RouterView />
|
||||
</UiLayout>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.logo {
|
||||
height: 6em;
|
||||
padding: 1.5em;
|
||||
will-change: filter;
|
||||
transition: filter 300ms;
|
||||
}
|
||||
.logo:hover {
|
||||
filter: drop-shadow(0 0 2em #646cffaa);
|
||||
}
|
||||
.logo.vue:hover {
|
||||
filter: drop-shadow(0 0 2em #42b883aa);
|
||||
}
|
||||
</style>
|
||||
<script setup lang="ts">
|
||||
import UiLayout from './layout/UiLayout.vue'
|
||||
</script>
|
||||
|
BIN
src/assets/img/png/bg.png
Normal file
BIN
src/assets/img/png/bg.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 77 KiB |
BIN
src/assets/img/webp/footer-flowers.webp
Normal file
BIN
src/assets/img/webp/footer-flowers.webp
Normal file
Binary file not shown.
After Width: | Height: | Size: 206 KiB |
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<component
|
||||
:is="as"
|
||||
class="text-gray-900"
|
||||
class="text-primary"
|
||||
:class="[
|
||||
{
|
||||
'text-2xl lg:text-3xl 2xl:text-4xl': size === '600',
|
||||
@ -13,7 +13,7 @@
|
||||
'text-lg lg:text-xl 2xl:text-2xl': size === '400',
|
||||
}, // 18px
|
||||
{
|
||||
'text-base lg:text-lg': size === '300',
|
||||
'text-lg lg:text-[20px]': size === '300',
|
||||
}, // 16px
|
||||
{
|
||||
'text-sm': size === '200',
|
||||
|
25
src/components/UiNav/UiNav.vue
Normal file
25
src/components/UiNav/UiNav.vue
Normal file
@ -0,0 +1,25 @@
|
||||
<template>
|
||||
<UiParagraph
|
||||
class="cursor-pointer"
|
||||
tag="span"
|
||||
size="300"
|
||||
v-for="({ path, name, target }, index) in navContent"
|
||||
:key="index"
|
||||
>
|
||||
<component :is="target ? 'a' : 'RouterLink'" :to="path" :href="path" :target="target">{{
|
||||
name
|
||||
}}</component>
|
||||
</UiParagraph>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import UiParagraph from '../Typography/UiParagraph.vue'
|
||||
|
||||
interface NavContent {
|
||||
name: string
|
||||
path: string
|
||||
target?: string
|
||||
}
|
||||
const { navContent = undefined } = defineProps<{
|
||||
navContent: NavContent[] | undefined
|
||||
}>()
|
||||
</script>
|
@ -1,5 +1,33 @@
|
||||
<template>
|
||||
<footer>tesst</footer>
|
||||
<footer class="mx-auto container">
|
||||
<div class="relative z-10">
|
||||
<div class="flex space-x-[51px] mb-5">
|
||||
<UiNav :nav-content="footerNavigation" />
|
||||
</div>
|
||||
<div class="xl:max-w-[1225px] pb-7 flex justify-between">
|
||||
<div>
|
||||
<UiParagraph tag="span" size="300"
|
||||
>По всем вопросам:<br />
|
||||
<a href="mailto:vinogalante@yandex.ru" target="_blank">
|
||||
vinogalante@yandex.ru
|
||||
</a></UiParagraph
|
||||
>
|
||||
</div>
|
||||
<div>
|
||||
<UiParagraph tag="span" size="300" class="[&]:text-secondary"
|
||||
><a href="https://www.litres.ru/" target="_blank">
|
||||
Реферальная ссылка на ЛитРес
|
||||
</a></UiParagraph
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <img class="absolute top-6" src="/src/assets/img/webp/footer-flowers.webp" /> -->
|
||||
</footer>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts"></script>
|
||||
<script setup lang="ts">
|
||||
import UiParagraph from '@/components/Typography/UiParagraph.vue'
|
||||
import UiNav from '@/components/UiNav/UiNav.vue'
|
||||
import { footerNavigation } from '@/layout/UiFooter/_data'
|
||||
</script>
|
||||
|
1
src/layout/UiFooter/_data/index.ts
Normal file
1
src/layout/UiFooter/_data/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export { default as footerNavigation } from '@/layout/UiFooter/_data/footer-navigation.data'
|
@ -1,11 +1,22 @@
|
||||
<template>
|
||||
<header class="[&]:bg-accent text-white py-4 px-2 border-b border-b-white">
|
||||
<header class="[&]:bg-accent text-white py-4 container mx-auto">
|
||||
<div class="flex flex-row-reverse justify-end gap-4 items-center">
|
||||
<slot name="content" />
|
||||
<div class="flex"></div>
|
||||
<div class="flex items-center gap-32">
|
||||
<div class="russo-one-regular">
|
||||
<UiParagraph tag="span" class="[&]:text-5xl">Vino Galante</UiParagraph>
|
||||
</div>
|
||||
<div class="flex space-x-10">
|
||||
<UiNav :nav-content="headerNavigation" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<slot name="right-icons" />
|
||||
</header>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts"></script>
|
||||
<script setup lang="ts">
|
||||
import UiNav from '@/components/UiNav/UiNav.vue'
|
||||
import { headerNavigation } from './_data'
|
||||
import UiParagraph from '@/components/Typography/UiParagraph.vue'
|
||||
</script>
|
||||
|
24
src/layout/UiHeader/_data/header-navigation.data.ts
Normal file
24
src/layout/UiHeader/_data/header-navigation.data.ts
Normal file
@ -0,0 +1,24 @@
|
||||
const headerNavigation = [
|
||||
{
|
||||
name: 'Главная',
|
||||
path: '/',
|
||||
},
|
||||
{
|
||||
name: 'Книга I',
|
||||
path: '/books/1',
|
||||
},
|
||||
{
|
||||
name: 'Книга II',
|
||||
path: '/books/2',
|
||||
},
|
||||
{
|
||||
name: 'Купить',
|
||||
path: '/buy',
|
||||
},
|
||||
{
|
||||
name: 'Отзывы',
|
||||
path: '/feedback',
|
||||
},
|
||||
]
|
||||
|
||||
export default headerNavigation
|
1
src/layout/UiHeader/_data/index.ts
Normal file
1
src/layout/UiHeader/_data/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export { default as headerNavigation } from '@/layout/UiHeader/_data/header-navigation.data'
|
@ -1,5 +1,7 @@
|
||||
<template>
|
||||
<div class="min-h-screen">
|
||||
<div
|
||||
class="min-h-svh bg-black-50 lato-regular relative overflow-visible before:content-[''] before:absolute before:bottom-0 before:h-[520px] before:w-full before:bg-[url(/src/assets/img/webp/footer-flowers.webp)] before:bg-no-repeat before:bg-bottom before:bg-cover before:z-0"
|
||||
>
|
||||
<UiHeader />
|
||||
<UiMain />
|
||||
<UiFooter />
|
||||
|
@ -1,5 +1,12 @@
|
||||
import { createApp } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import './style.css'
|
||||
import App from './App.vue'
|
||||
import router from '@/config/router/index'
|
||||
|
||||
createApp(App).mount('#app')
|
||||
const app = createApp(App)
|
||||
|
||||
app.use(createPinia())
|
||||
app.use(router)
|
||||
|
||||
app.mount('#app')
|
||||
|
@ -1,14 +1,16 @@
|
||||
@import 'tailwindcss';
|
||||
|
||||
@theme {
|
||||
--color-primary: #ffffff;
|
||||
--color-secondary: #f54b7e;
|
||||
--color-primary: rgba(255, 255, 255, 1);
|
||||
--color-secondary: rgba(229, 30, 125, 1);
|
||||
--color-three: #e20c66;
|
||||
|
||||
--color-accent-50: #f54378;
|
||||
--color-accent-100: #e51e7d;
|
||||
--color-accent-150: #c4035f;
|
||||
|
||||
--color-black-50: #0c1018;
|
||||
|
||||
/*system colors*/
|
||||
--color-error: oklch(57.7% 0.245 27.325);
|
||||
--color-warning: oklch(76.9% 0.188 70.08);
|
||||
@ -17,3 +19,69 @@
|
||||
--color-text-disabled: oklch(55.1% 0.027 264.364);
|
||||
--color-bg-disabled: oklch(92.8% 0.006 264.531);
|
||||
}
|
||||
|
||||
.lato-thin {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 100;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.lato-light {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.lato-regular {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 400;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.lato-bold {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 700;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.lato-black {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 900;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.lato-thin-italic {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 100;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.lato-light-italic {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 300;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.lato-regular-italic {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 400;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.lato-bold-italic {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 700;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.lato-black-italic {
|
||||
font-family: 'Lato', sans-serif;
|
||||
font-weight: 900;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.russo-one-regular {
|
||||
font-family: 'Russo One', sans-serif;
|
||||
font-weight: 700;
|
||||
font-style: normal;
|
||||
}
|
||||
|
Reference in New Issue
Block a user