[WIP] Сделал редирект, поправил стили

This commit is contained in:
megavrilinvv
2022-10-31 19:31:17 +03:00
parent d34343cb6b
commit ec373a9d9b
4 changed files with 8 additions and 31 deletions

View File

@@ -24,21 +24,6 @@
.icon-person.text-xl.icon .icon-person.text-xl.icon
.form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
input.item-input.cursor-text.no-italic.text-base(v-model="eventData.eventClient" type="text" placeholder="ФИО клиента") input.item-input.cursor-text.no-italic.text-base(v-model="eventData.eventClient" type="text" placeholder="ФИО клиента")
//- .flex.flex-col.gap-y-2(class='additional-information')
//- .flex.gap-x-4.items-center
//- span.not-italic.text-xs.opacity-40.leading-3 Дополнительная информация
//- button-plus(id="addInfo" @click="(e)=>addFriendInfo(e)")
//- base-button(
left-icon="icon-plus"
rounded secondary
:size="24"
:icon-left-size="10"
id="addInfo"
@click="(e)=>addFriendInfo(e)")
//- .flex.gap-x-4.items-center(v-for="(info, index) in listFriendInfo" :key="index")
//- span.ml-1 {{info}}
//- .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
//- input.item-input.cursor-pointer.no-italic.text-base(v-model="eventData.friendInfo[info]" type="text" placeholder="Что-то важное")
.flex.flex-col.gap-y-2 .flex.flex-col.gap-y-2
span.not-italic.text-xs.opacity-40.leading-3 Вид события span.not-italic.text-xs.opacity-40.leading-3 Вид события
base-select( base-select(
@@ -91,7 +76,6 @@ export default {
firstTime: "11:00", firstTime: "11:00",
secondTime: "12:30", secondTime: "12:30",
}, },
// friendInfo: {},
kindEvent: "Вид события", kindEvent: "Вид события",
contacts: {}, contacts: {},
}, },

View File

@@ -46,10 +46,6 @@
</template> </template>
<script> <script>
import BaseButtonPlus from "../../../components/base/buttons/BaseButtonPlus.vue";
import BaseOpenButton from "../../../components/base/buttons/BaseOpenButton.vue";
import BaseCreateButton from "../../../components/base/buttons/BaseCreateButton.vue";
import img from "../../../assets/images/team-member.svg";
import BaseButton from "@/components/base/BaseButton"; import BaseButton from "@/components/base/BaseButton";
import BaseAvatar from "@/components/base/BaseAvatar"; import BaseAvatar from "@/components/base/BaseAvatar";
@@ -57,9 +53,6 @@ export default {
name: "CalendarSidebar", name: "CalendarSidebar",
components: { components: {
BaseButton, BaseButton,
BaseButtonPlus,
BaseOpenButton,
BaseCreateButton,
BaseAvatar, BaseAvatar,
}, },
props: { props: {
@@ -79,7 +72,6 @@ export default {
isOpen: false, isOpen: false,
turnButton: "180deg", turnButton: "180deg",
maxLengthLastName: 13, maxLengthLastName: 13,
avatar: img,
}; };
}, },
computed: { computed: {
@@ -118,13 +110,13 @@ export default {
}, },
changeName(lastName, fitstName, patronymic) { changeName(lastName, fitstName, patronymic) {
return lastName.length > this.maxLengthLastName return lastName.length > this.maxLengthLastName
? lastName.slice(0, this.maxLengthLastName) + "... " ? lastName.slice(0, this.maxLengthLastName) +
: lastName + "... " +
" " + fitstName[0] +
fitstName.slice(0, 1) +
"." + "." +
patronymic.slice(0, 1) + patronymic[0] +
"."; "."
: lastName + " " + fitstName[0] + "." + patronymic[0] + ".";
}, },
}, },
}; };

View File

@@ -3,7 +3,7 @@ import TheCalendar from "@/pages/calendar/TheCalendar";
import TheUser from "@/pages/clients/TheClients"; import TheUser from "@/pages/clients/TheClients";
import TheSettings from "@/pages/settings/TheSettings"; import TheSettings from "@/pages/settings/TheSettings";
import TheLogin from "@/pages/login/TheLogin"; import TheLogin from "@/pages/login/TheLogin";
import LoggedInLayout from "@/components/LoggedInLayout/LoggedInLayout"; import LoggedInLayout from "@/components/LoggedInLayout";
export default createRouter({ export default createRouter({
history: createWebHashHistory(), history: createWebHashHistory(),
@@ -16,6 +16,7 @@ export default createRouter({
path: "/", path: "/",
component: LoggedInLayout, component: LoggedInLayout,
children: [ children: [
{ path: "", redirect: "calendar" },
{ path: "calendar", component: TheCalendar }, { path: "calendar", component: TheCalendar },
{ path: "clients", component: TheUser }, { path: "clients", component: TheUser },
{ path: "settings", component: TheSettings }, { path: "settings", component: TheSettings },