Merge branch 'master' of https://repo.hurasoft.com/tieptk/admin_hura_8

product list
2024-01-29 15:23:48 +07:00 · 2024-01-29 15:22:43 +07:00 · 2024-01-29 15:22:13 +07:00 · 2024-01-29 10:46:02 +07:00 · 2024-01-29 08:54:51 +07:00 · 2024-01-27 10:48:34 +07:00
5 changed files with 379 additions and 342 deletions
--- a/assets/script/pc_style.css
+++ b/assets/script/pc_style.css
@@ -698,6 +698,11 @@ input[type=radio]:focus:before {
  height: 20px;
  background-position: -43px -83px;
 }
+.icons.icon-edit {
+  width: 16px;
+  height: 16px;
+  background-position: -114px -89px;
+}

 .admin-header-container .menu-hide {
  margin-left: 30px;
@@ -707,13 +712,13 @@ input[type=radio]:focus:before {
 .order-page .order-page-title a {
  margin: 0 2px 0 0;
  border-radius: 4px 4px 0px 0px;
-  background: #F6F6F6;
+  background: #f6f6f6;
  color: #919699;
  font-weight: 500;
  padding: 0 24px;
 }
 .order-page .order-page-title a:hover, .order-page .order-page-title a.current, .order-page .order-page-title a.active {
-  background: #0041E8;
+  background: #0041e8;
  color: #fff;
 }
 .order-page .order-page-table {
@@ -731,13 +736,13 @@ input[type=radio]:focus:before {
 .order-page .order-page-table .icons {
  width: 30px;
  height: 30px;
-  border: 1px solid #ECECEC;
-  background-color: #F9F9F9;
+  border: 1px solid #ececec;
+  background-color: #f9f9f9;
  border-radius: 5px;
 }
 .order-page .order-page-table .icon-edit {
-  border: 1px solid #0041E8;
-  background-color: #F5F7FF;
+  border: 1px solid #0041e8;
+  background-color: #f5f7ff;
  background-position: -108px -82px;
  margin-right: 6px;
 }
@@ -749,7 +754,7 @@ input[type=radio]:focus:before {
  line-height: 20px;
 }
 .order-page-table a {
-  color: #0041E8;
+  color: #0041e8;
 }
 .order-page-table a:hover {
  text-decoration: underline;
@@ -758,7 +763,7 @@ input[type=radio]:focus:before {
  width: 100%;
 }
 .order-page-table thead {
-  background: #F6F6F6;
+  background: #f6f6f6;
  font-weight: 600;
  text-align: center;
 }
@@ -767,7 +772,7 @@ input[type=radio]:focus:before {
 }
 .order-page-table td {
  padding: 10px;
-  border: 1px solid #ECECEC;
+  border: 1px solid #ececec;
  text-transform: capitalize;
 }
 .order-page-table td * {
@@ -775,7 +780,7 @@ input[type=radio]:focus:before {
 }
 .order-page-table select {
  border-radius: 4px;
-  border: 1px solid #D8D8D8;
+  border: 1px solid #d8d8d8;
  box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.12);
  height: 32px;
  display: block;
@@ -784,11 +789,11 @@ input[type=radio]:focus:before {
 }

 .is-close-btn {
-  background: #ECECEC !important;
+  background: #ececec !important;
  border-radius: 50%;
  top: 10px !important;
  right: 10px !important;
-  color: #9E9E9E !important;
+  color: #9e9e9e !important;
 }

 .paging {
@@ -807,7 +812,7 @@ input[type=radio]:focus:before {
  border-radius: 4px;
 }
 .paging a:hover, .paging a.current, .paging a.active {
-  background: #0041E8;
+  background: #0041e8;
  color: #fff;
 }

@@ -819,7 +824,7 @@ input[type=radio]:focus:before {
  display: inline-block;
 }
 .global-breadcrumb-container a:hover {
-  color: #0041E8;
+  color: #0041e8;
 }
 .global-breadcrumb-container a::after {
  content: "\f054";
@@ -828,7 +833,7 @@ input[type=radio]:focus:before {
  margin: 0 5px;
 }
 .global-breadcrumb-container a:last-child {
-  color: #0041E8;
+  color: #0041e8;
 }
 .global-breadcrumb-container a:last-child::after {
  content: none;
--- a/assets/script/pc_style.css.map
+++ b/assets/script/pc_style.css.map
--- a/assets/script/pc_style.scss
+++ b/assets/script/pc_style.scss
@@ -334,8 +334,8 @@ a {
            height: 41px;
            display: none;
        }
-        &:nth-child(n+13){
-            .sub-menu{
+        &:nth-child(n + 13) {
+            .sub-menu {
                top: unset;
            }
        }
@@ -705,6 +705,11 @@ input[type="radio"] {
        height: 20px;
        background-position: -43px -83px;
    }
+    &.icon-edit {
+        width: 16px;
+        height: 16px;
+        background-position: -114px -89px;
+    }
 }

 .admin-header-container {
@@ -715,16 +720,18 @@ input[type="radio"] {

 /* Bán hàng */
 .order-page {
-    .order-page-title{
+    .order-page-title {
        a {
            margin: 0 2px 0 0;
            border-radius: 4px 4px 0px 0px;
-            background: #F6F6F6;
+            background: #f6f6f6;
            color: #919699;
            font-weight: 500;
            padding: 0 24px;
-            &:hover, &.current, &.active {
-                background: #0041E8;
+            &:hover,
+            &.current,
+            &.active {
+                background: #0041e8;
                color: #fff;
            }
        }
@@ -732,26 +739,27 @@ input[type="radio"] {
    .order-page-table {
        text-align: center;
        thead {
-            td{
+            td {
                padding: 8px;
            }
        }
-        td{
+        td {
            padding: 14px 8px;
-            &:nth-child(4), &:nth-child(10){
+            &:nth-child(4),
+            &:nth-child(10) {
                text-align: left;
            }
        }
        .icons {
            width: 30px;
            height: 30px;
-            border: 1px solid #ECECEC;
-            background-color: #F9F9F9;
+            border: 1px solid #ececec;
+            background-color: #f9f9f9;
            border-radius: 5px;
        }
        .icon-edit {
-            border: 1px solid #0041E8;
-            background-color: #F5F7FF;
+            border: 1px solid #0041e8;
+            background-color: #f5f7ff;
            background-position: -108px -82px;
            margin-right: 6px;
        }
@@ -762,48 +770,47 @@ input[type="radio"] {
 }
 .order-page-table {
    line-height: 20px;
-    a{
-        color: #0041E8;
-        &:hover{
+    a {
+        color: #0041e8;
+        &:hover {
            text-decoration: underline;
        }
    }
-    table{ 
+    table {
        width: 100%;
    }
    thead {
-        background: #F6F6F6;
+        background: #f6f6f6;
        font-weight: 600;
        text-align: center;
-        td{
+        td {
            padding: 8px;
        }
    }
-    td{
+    td {
        padding: 10px;
-        border: 1px solid #ECECEC;
+        border: 1px solid #ececec;
        text-transform: capitalize;
-        *{
+        * {
            display: inline-block;
        }
    }
    select {
        border-radius: 4px;
-        border: 1px solid #D8D8D8;
+        border: 1px solid #d8d8d8;
        box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.12);
        height: 32px;
        display: block;
        width: 100%;
        padding: 0 0 0 5px;
    }
-    
 }
 .is-close-btn {
-    background: #ECECEC !important;
+    background: #ececec !important;
    border-radius: 50%;
    top: 10px !important;
    right: 10px !important;
-    color: #9E9E9E !important;
+    color: #9e9e9e !important;
 }
 .paging {
    margin: 30px 0;
@@ -811,15 +818,17 @@ input[type="radio"] {
    align-items: center;
    justify-content: center;
    line-height: 28px;
-    a{
+    a {
        margin: 0 3px;
        min-width: 28px;
        text-align: center;
        font-size: 16px;
        padding: 0 10px;
        border-radius: 4px;
-        &:hover, &.current, &.active {
-            background: #0041E8;
+        &:hover,
+        &.current,
+        &.active {
+            background: #0041e8;
            color: #fff;
        }
    }
@@ -827,20 +836,20 @@ input[type="radio"] {
 .global-breadcrumb-container {
    padding: 16px;
    line-height: 20px;
-    a{
+    a {
        display: inline-block;
-        &:hover{
-            color: #0041E8;
+        &:hover {
+            color: #0041e8;
        }
-        &::after{
-            content: '\f054';
+        &::after {
+            content: "\f054";
            font-family: Fontawesome;
            font-size: 10px;
            margin: 0 5px;
        }
-        &:last-child{
-            color: #0041E8;
-            &::after{
+        &:last-child {
+            color: #0041e8;
+            &::after {
                content: none;
            }
        }
--- a/template/product/home.html
+++ b/template/product/home.html
@@ -1,6 +1,3 @@
-
-{{ page | show_var }}
-
 <div class="grid w-[100%] ">
    <div class="m-[15px] px-[15px] py-[20px] rounded-[15px] bg-white shadow-[0_1px_1px_0_rgba(0,0,0,0.1)]">
        <h1 class="text-2xl font-[700] mb-3">Danh sách sản phẩm</h1>
@@ -90,7 +87,7 @@
                    <th>ID</th>
                    <th>Ảnh</th>
                    <th>Sản phẩm (Tổng số: 1.742)</th>
-                    <th>Người dùng</th>
+                    <th class="whitespace-nowrap">Người dùng</th>
                    <th>Thông tin bán hàng</th>
                    <th>Thông tin khác</th>
                    <th>
@@ -104,72 +101,74 @@
                </tr>
            </thead>
            <tbody>
+                {% assign counter = 0 %}
+                {% for item in page.item_list %}
+                {% increment counter %}
                <tr>
-                    <td>1</td>
-                    <td>#2105</td>
+                    <td>{{ counter }}</td>
+                    <td>#{{item.id}}</td>
                    <td>
-                        <img class="block m-auto" src="./images/img-product.png" alt="">
-                        <span class="text-center block">6 ảnh</span>
-                        <a href="" class="text-center flex justify-center">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="12" height="13" viewBox="0 0 12 13"
-                                fill="none">
-                                <path fill-rule="evenodd" clip-rule="evenodd"
-                                    d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                                    fill="#0041E8" />
-                                <path fill-rule="evenodd" clip-rule="evenodd"
-                                    d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                                    fill="#0041E8" />
-                            </svg>
-                        </a>
+                        <img class="block m-auto" src="{{item.image.thumb}}" alt="">
+                        <span class="text-center block">{{item.image_count}} ảnh</span>
+                        <i class="icons icon-edit"></i>
                    </td>
                    <td>
-                        <a href="" class="text-[#0041E8]">Chăn hè đũi xơ đậu nành mã 32 Gấu xanh</a>
-                        <p class="text-[#FFC700]">[Có cấu hình]</p>
+                        <a href="{{item.request_path}}" class="text-[#0041E8] w-[300px] inline-block">{{item.title}}</a>
+                        {% if item.config_count > 0 %}<p class="text-[#FFC700]">[Có cấu hình]</p>{% endif %}
                        <div class="flex items-center">
                            <span>Danh mục:</span>
                            <b class="mx-[10px]">Màn hình Máy tính</b>
-                            <a href=""><svg xmlns="http://www.w3.org/2000/svg" width="12" height="13"
-                                    viewBox="0 0 12 13" fill="none">
-                                    <path fill-rule="evenodd" clip-rule="evenodd"
-                                        d="M6.67307 0.173073C6.90384 -0.0576911 7.27798 -0.0576911 7.50875 0.173073L9.87238 2.53671C10.1031 2.76747 10.1031 3.14162 9.87238 3.37238L3.37238 9.87238C3.26156 9.9832 3.11126 10.0455 2.95455 10.0455H0.590909C0.264559 10.0455 0 9.7809 0 9.45455V7.09091C0 6.93419 0.0622563 6.78389 0.173073 6.67307L6.67307 0.173073ZM1.18182 7.33567V8.86364H2.70978L8.61887 2.95455L7.09091 1.42658L1.18182 7.33567Z"
-                                        fill="#0041E8" />
-                                    <path fill-rule="evenodd" clip-rule="evenodd"
-                                        d="M0 12.4091C0 12.0828 0.264559 11.8182 0.590909 11.8182H11.2273C11.5536 11.8182 11.8182 12.0828 11.8182 12.4091C11.8182 12.7355 11.5536 13.0001 11.2273 13.0001H0.590909C0.264559 13.0001 0 12.7355 0 12.4091Z"
-                                        fill="#0041E8" />
-                                </svg></a>
+                            <a href=""><i class="icons icon-edit"></i></a>
                        </div>
                        <div class="flex items-center">
                            <span>Mã kho</span>
-                            <b class="px-[5px]">MH241</b>
+                            <b class="px-[5px]">{{item.sku}}</b>
                            <span class="text-[#000] font-[500]">|</span>
                            <span class="px-[5px]">Hãng</span>
-                            <p class="text-[#0041E8]">ABS</p>
+                            <p class="text-[#0041E8]">{{item.model}}</p>
                        </div>
-                        <p>Cập nhật: 20-10-2023, 5:48 pm <span class="text-[#E00000]">(49 ngày)</span></p>
-                        <p>Người cập nhật : anhtt@hurasoft.com</p>
+
+                        {% assign date_now = "now" | date: format %}
+                        {% assign date_last = item.last_update %}
+                        {% assign time_conlai = date_now | minus: date_last %}
+
+                        <p>Cập nhật: {{item.last_update | date: "Y-m-d h:i" }} <span class="text-[#E00000]">(
+                                {{ time_conlai | divided_by: 86400 | round}}
+                                ngày)</span></p>
+                        <p>Người cập nhật : {{item.last_update_by}}</p>
                    </td>
                    <td>
-                        <p>- Xem : 0</p>
-                        <p>- Thích : 0</p>
-                        <p>- Mua : 0</p>
+                        <p>- Xem : {{item.visit}}</p>
+                        <p>- Thích : {{item.like_count}}</p>
+                        <p>- Mua : {{item.buy_count}}</p>
                    </td>
                    <td>
                        <div class="flex items-center mb-[1px]">
-                            <span>- Giá bán:</span>
-                            <b class="text-[#E00000] ml-[3px]">300.000 vnd</b>
+                            <span class="whitespace-nowrap">- Giá bán:</span>
+                            <b class="text-[#E00000] ml-[3px] whitespace-nowrap">
+                                {% if item.price > 0 %}
+                                {{item.price | format_price }} vnd
+                                {% else %}
+                                {{item.price }} vnd
+                                {% endif %}
+                            </b>
                        </div>
                        <div class="flex items-center">
                            <span>- Sl tổng:</span>
-                            <b class="ml-[3px]">1</b>
+                            <b class="ml-[3px]">{{item.quantity}}</b>
                        </div>
                    </td>
                    <td>
                        <div class="flex items-center mb-[1px]">
-                            <span>- Giá bán:</span>
-                            <b class="text-[#E00000] ml-[3px]">300.000 vnd</b>
+                            <span class="whitespace-nowrap">- Giá bán:</span>
+                            <b class="text-[#E00000] ml-[3px] whitespace-nowrap">{% if item.price > 0 %}
+                                {{item.price | format_price }} vnd
+                                {% else %}
+                                {{item.price }} vnd
+                                {% endif %}</b>
                        </div>
-                        <p>- Bảo hành: Ato test</p>
-                        <p>- Khuyến mại: + Ato test</p>
+                        <p>- Bảo hành: {{item.warranty}}</p>
+                        <p>- Khuyến mại: {{item.special_offer}}</p>
                    </td>
                    <td>
                        <div>
@@ -262,8 +261,26 @@
                        </div>
                    </td>
                </tr>
+                {% endfor %}
+
            </tbody>
        </table>
+
+        <div class="paging">
+            {% for paging in page.pagination.collection %}
+            <a href="{{paging.url}}" class="{% if paging.is_active == 1 %} current {% endif %}">
+                {% if paging.name == 'next' %}
+                <i class="fas fa-chevron-right"></i>
+                {% elsif paging.name == 'prev' %}
+                <i class="fas fa-chevron-left"></i>
+                {% else %}
+                {{paging.name}}
+                {% endif %}
+            </a>
+
+            {% endfor %}
+        </div>
+
    </div>

 </div>
--- a/template/theme.html
+++ b/template/theme.html
@@ -22,12 +22,11 @@
    <script src="https://cdn.jsdelivr.net/npm/jquery@3.3.1/dist/jquery.min.js"></script>

 </head>
+
 <body>

-<!--
-{{ page | show_var }}-->

-<div class="admin-global-container">
+    <div class="admin-global-container">

        <!-- Menu full  -->
        <div class="admin-menu-container box-menu sticky top-0 bottom-0 h-[100vh] hidden" id="js-menu-big">
@@ -49,7 +48,7 @@
                {% assign _type = _category[0] %}
                {% assign _menuArray = _category[1].menu %}
                {% if _category[1].enable == 1 %}
-            <details {% if _type == global.module %} open {% endif %}>
+                <details {% if _type==global.module %} open {% endif %}>
                    <summary class="item">
                        <div class="flex items-center">

@@ -75,8 +74,8 @@

                    <div class="sub-menu">
                        {% for _item in _menuArray %}
-                    <a href="{{_item.url }}" {% if _item.view == global.view and
-                    _type == global.module %} class="current" {% endif %}> {{ _item.name }} </a>
+                        <a href="{{_item.url }}" {% if _item.view==global.view and _type==global.module %}
+                            class="current" {% endif %}> {{ _item.name }} </a>
                        {% endfor %}
                    </div>
                </details>
@@ -110,9 +109,11 @@
        </div>

        <!-- Menu collapse -->
-	<div class="admin-menu box-menu sticky top-0 bg-[#004E99] flex flex-col justify-between pb-[20px] min-h-[100vh]" id="js-menu-small">
+        <div class="admin-menu box-menu sticky top-0 bg-[#004E99] flex flex-col justify-between pb-[20px] min-h-[100vh]"
+            id="js-menu-small">
            <div>
-            <div class="logo item items-center justify-center border-[rgba(255,255,255,0.15)] border-b p-[20px_0_38px_!important]">
+                <div
+                    class="logo item items-center justify-center border-[rgba(255,255,255,0.15)] border-b p-[20px_0_38px_!important]">
                    <a href="/" class="">
                        <img src="../assets/images/logo_small.png" alt="">
                    </a>
@@ -154,8 +155,8 @@

                        <div class="menu-list">
                            {% for _item in _menuArray %}
-                        <a href="{{ _item.url }}" {% if _item.view == global.view and
-                            _type == global.module %} class="current" {% endif %}> {{ _item.name }} </a>
+                            <a href="{{ _item.url }}" {% if _item.view==global.view and _type==global.module %}
+                                class="current" {% endif %}> {{ _item.name }} </a>
                            {% endfor %}
                        </div>
                    </div>
@@ -235,7 +236,8 @@
                        <i class="icons header-support"></i>
                    </a>

-                <div class="group relative cursor-pointer ml-[20px] mr-[35px] group [&_summary::-webkit-details-marker]:hidden">
+                    <div
+                        class="group relative cursor-pointer ml-[20px] mr-[35px] group [&_summary::-webkit-details-marker]:hidden">
                        <div class="relative flex">
                            <i class="icons icon-notification"></i>

@@ -245,7 +247,8 @@
                            </span>
                        </div>

-                    <div class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-[-10px]">
+                        <div
+                            class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-[-10px]">
                            <a href=""> Menu title </a>
                            <a href=""> Menu title </a>
                            <a href=""> Menu title </a>
@@ -257,12 +260,14 @@
                        <div class="flex items-center">
                            <p class="m-0 mr-[10px]"> ducdt@hurasoft.com </p>

-                        <img src="https://via.placeholder.com/72x72" class="block rounded-[50%] w-[36px] h-[36px] mr-[8px]" />
+                            <img src="https://via.placeholder.com/72x72"
+                                class="block rounded-[50%] w-[36px] h-[36px] mr-[8px]" />

                            <i class="fa-solid fa-sort-down text-[#C9C9C9] mb-[3px]"></i>
                        </div>

-                    <div class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-0">
+                        <div
+                            class="group-hover:opacity-[1] group-hover:z-[1] opacity-0 absolute bg-white leading-[30px] note-list shadow whitespace-nowrap z-[-1] rounded-[4px] right-0">
                            <a href="">Đổi mật khẩu</a>
                            <a href="">Thoát quản trị</a>
                        </div>
@@ -273,10 +278,11 @@
            <!-- Content -->
            {{ page_content }}
        </div>
-</div>
+    </div>


-{% include javascript/index %}
+    {% include javascript/index %}

 </body>
+
 </html>
Author	SHA1	Message	Date
Tieptk	2e4cf30a14	Merge branch 'master' of https://repo.hurasoft.com/tieptk/admin_hura_8	2024-01-29 15:23:48 +07:00
Tieptk	10a9439f28	product list	2024-01-29 15:22:43 +07:00
Tieptk	ac7145c8c1	product list	2024-01-29 15:22:13 +07:00
Tieptk	3cb59f127c	a	2024-01-29 10:46:02 +07:00
Tieptk	3d471965d4	a	2024-01-29 08:54:51 +07:00
Tieptk	382acf8277	Merge branch 'master' of https://repo.hurasoft.com/tieptk/admin_hura_8	2024-01-27 10:48:34 +07:00
Tieptk	0c56e49551	h	2024-01-27 10:48:30 +07:00