Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions views/src/components/admin/ManagementAdmin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,36 +38,4 @@
* {
overflow: hidden;
}

.show {
display: block;
}

.hide {
display: none;
}

.content-management {
margin-left: 40px;
}

.btn-collapse-nav-left {
background-color: #bf1e2d;
color: #ffff;
width: 30px;
height: 100vh;
position: absolute;
margin-right: 10px;
}

.title-managenent-type {
margin-left: 60px;
}

.text-rotate {
width: max-content;
-moz-transform: translateX(-50%) translateY(-50%) rotate(90deg);
-webkit-transform: translateX(-50%) translateY(-50%) rotate(90deg);
transform: translateX(-50%) translateY(-50%) rotate(90deg);
}
</style>
5 changes: 4 additions & 1 deletion views/src/components/admin/create-order/CreateOrderAdmin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
<div class="container-fluid d-flex m-0 p-0">
<NavbarLeftAdmin />
<div class="content-managment">
<h1>Create order</h1>
<h4 class="title-management">
Tạo đơn hàng mới
</h4>
<hr>
</div>
</div>
</div>
Expand Down
Empty file.
52 changes: 52 additions & 0 deletions views/src/components/admin/customer/ManagementCustomerAdmin.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<template>
<div class="admin-management">
<div class="container-fluid d-flex m-0 p-0">
<NavbarLeftAdmin />
<div class="content-managment">
<h4 class="title-management">
Danh sách khách hàng
</h4>
<hr>
</div>

</div>
</div>
</template>

<script>
import NavbarLeftAdmin from "@/components/common/NavbarLeftAdmin.vue";

// import moment from "moment";
// import { commonFunction } from "@/scripts/ulti";
// import axios from "axios";
import { useCookies } from "vue3-cookies";

export default {
components: {
NavbarLeftAdmin,
},
setup() {
const { cookies } = useCookies();
return {
cookies,
};
},

data() {
return {
};
},

// <data, methods...>

mounted() {

},
watch: {
},
};
</script>

<style scoped>

</style>
387 changes: 171 additions & 216 deletions views/src/components/admin/order/ManagementOrderAdmin.vue

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/src/components/common/NavbarAdminItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
Khách hàng
</a>
<div class="list-group" :class="isShowItemNav2 ? 'show' : 'hide'">
<a href="#" class="list-group-item list-group-item-action">Thông tin Khách hàng</a>
<a href="/admin/management/customer" class="list-group-item list-group-item-action">Thông tin Khách hàng</a>
</div>

<!-- group 5-->
Expand Down
2 changes: 1 addition & 1 deletion views/src/components/common/NavbarLeftAdmin.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="navbar-admin d-inline">
<div class="navbar-admin d-inline" :class="isShowNav ? 'default' : 'me-5'">
<button class="btn btn-collapse-nav-left" :class="isShowNav ? 'hide' : 'show'"
v-on:click="toggleCollapseNavbarLeft">
<i class="fa-solid fa-caret-right"></i>
Expand Down
4 changes: 3 additions & 1 deletion views/src/router/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import OrderDetailCustomer from '@/components/order/OrderDetail.vue'
import ManagementAdmin from '@/components/admin/ManagementAdmin.vue'
import ManagementOrderAdmin from '@/components/admin/order/ManagementOrderAdmin.vue'
import CreateOrderAdmin from '@/components/admin/create-order/CreateOrderAdmin.vue'
import ManagementCustomerAdmin from '@/components/admin/customer/ManagementCustomerAdmin.vue'

const history = createWebHistory();
const router = createRouter({
Expand All @@ -33,7 +34,8 @@ const router = createRouter({
{path: '/client/orders/detail/:customerId/:orderId', component: OrderDetailCustomer},
{path: '/admin/management', component: ManagementAdmin},
{path: '/admin/management/order/:status', component: ManagementOrderAdmin},
{path: '/admin/management/create-order', component: CreateOrderAdmin}
{path: '/admin/management/create-order', component: CreateOrderAdmin},
{path: '/admin/management/customer', component: ManagementCustomerAdmin},
]
});

Expand Down
10 changes: 6 additions & 4 deletions views/src/style/css/admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion views/src/style/css/admin.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion views/src/style/scss/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
}

.content-management {
margin-left: 40px;
}

.btn-collapse-nav-left {
Expand All @@ -34,4 +33,10 @@
transform: translateX(-50%) translateY(-50%) rotate(90deg);
}

.content-managment{
width: 100%;
margin-top: 1px;
margin-right: 5px;
}

// sass src/style/scss/admin.scss src/style/css/admin.css