diff --git a/db.sqlite3 b/db.sqlite3 index d608963..5f977f9 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/main/templates/main/index.html b/main/templates/main/index.html index 61a89a2..82df397 100644 --- a/main/templates/main/index.html +++ b/main/templates/main/index.html @@ -81,7 +81,7 @@

{{ product.name }}

-

{{ product.description }}

+

{{ product.description }}

{{ product.price }}₸

diff --git a/main/templates/main/product/detail.html b/main/templates/main/product/detail.html index ca37263..d6fd9aa 100644 --- a/main/templates/main/product/detail.html +++ b/main/templates/main/product/detail.html @@ -94,12 +94,9 @@

{{ product.name }}

-<<<<<<< HEAD -

{{ product.price }}₸

-======= -

₸{{ product.price }}

->>>>>>> 28b575b35ad3c9232ec053f2e1a0421dfcd41952 -

{{ product.description|linebreaks }}

+ +

{{ product.description }}

+

{{ product.price }}₸

Вернуться на главную diff --git a/media/products/2024/01/25/18894630941_980613013.jpg b/media/products/2024/01/25/18894630941_980613013.jpg new file mode 100644 index 0000000..7912fad Binary files /dev/null and b/media/products/2024/01/25/18894630941_980613013.jpg differ diff --git a/media/products/2024/01/25/1be9c5076d3eeca3319ee1fdef529e69.jpg b/media/products/2024/01/25/1be9c5076d3eeca3319ee1fdef529e69.jpg new file mode 100644 index 0000000..e936ea0 Binary files /dev/null and b/media/products/2024/01/25/1be9c5076d3eeca3319ee1fdef529e69.jpg differ diff --git a/media/products/2024/01/25/O1CN0136OAfC1X8dAg5Qhpq_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN0136OAfC1X8dAg5Qhpq_1689572879-0-cib.jpg new file mode 100644 index 0000000..5de4cf5 Binary files /dev/null and b/media/products/2024/01/25/O1CN0136OAfC1X8dAg5Qhpq_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN019DQk8H1X8d94Mrb4d_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN019DQk8H1X8d94Mrb4d_1689572879-0-cib.jpg new file mode 100644 index 0000000..9ea9e15 Binary files /dev/null and b/media/products/2024/01/25/O1CN019DQk8H1X8d94Mrb4d_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN019vQOcS1X8d4Xa1iHc_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN019vQOcS1X8d4Xa1iHc_1689572879-0-cib.jpg new file mode 100644 index 0000000..e9a3758 Binary files /dev/null and b/media/products/2024/01/25/O1CN019vQOcS1X8d4Xa1iHc_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01AyR91R1X8d5XT8TCO_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01AyR91R1X8d5XT8TCO_1689572879-0-cib.jpg new file mode 100644 index 0000000..511490b Binary files /dev/null and b/media/products/2024/01/25/O1CN01AyR91R1X8d5XT8TCO_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01DNlBMM1X8d25HWDPf_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01DNlBMM1X8d25HWDPf_1689572879-0-cib.jpg new file mode 100644 index 0000000..add9c3d Binary files /dev/null and b/media/products/2024/01/25/O1CN01DNlBMM1X8d25HWDPf_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01DzsxQg1X8dBj1HNlN_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01DzsxQg1X8dBj1HNlN_1689572879-0-cib.jpg new file mode 100644 index 0000000..43b3130 Binary files /dev/null and b/media/products/2024/01/25/O1CN01DzsxQg1X8dBj1HNlN_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01HxuQEh1X8d8AMkWqy_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01HxuQEh1X8d8AMkWqy_1689572879-0-cib.jpg new file mode 100644 index 0000000..1a79d9b Binary files /dev/null and b/media/products/2024/01/25/O1CN01HxuQEh1X8d8AMkWqy_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01IjRVOn1nEbyqf2AYn_2211584355058-0-cib.jpg b/media/products/2024/01/25/O1CN01IjRVOn1nEbyqf2AYn_2211584355058-0-cib.jpg new file mode 100644 index 0000000..5318ac7 Binary files /dev/null and b/media/products/2024/01/25/O1CN01IjRVOn1nEbyqf2AYn_2211584355058-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01MwIKSC2Grec8dOpHf_2211033229069-0-cib.jpg b/media/products/2024/01/25/O1CN01MwIKSC2Grec8dOpHf_2211033229069-0-cib.jpg new file mode 100644 index 0000000..3cc2425 Binary files /dev/null and b/media/products/2024/01/25/O1CN01MwIKSC2Grec8dOpHf_2211033229069-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01ODoani1X8cwyqSNh7_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01ODoani1X8cwyqSNh7_1689572879-0-cib.jpg new file mode 100644 index 0000000..345b2f5 Binary files /dev/null and b/media/products/2024/01/25/O1CN01ODoani1X8cwyqSNh7_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01UGQXFI1X8d5O4veKX_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01UGQXFI1X8d5O4veKX_1689572879-0-cib.jpg new file mode 100644 index 0000000..a937472 Binary files /dev/null and b/media/products/2024/01/25/O1CN01UGQXFI1X8d5O4veKX_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01V3xMYE1kZjVoPDzWQ_2207732794698-0-cib.jpg b/media/products/2024/01/25/O1CN01V3xMYE1kZjVoPDzWQ_2207732794698-0-cib.jpg new file mode 100644 index 0000000..005e34e Binary files /dev/null and b/media/products/2024/01/25/O1CN01V3xMYE1kZjVoPDzWQ_2207732794698-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01XR2tFe1X8d8VVkr8d_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01XR2tFe1X8d8VVkr8d_1689572879-0-cib.jpg new file mode 100644 index 0000000..d5f3dfb Binary files /dev/null and b/media/products/2024/01/25/O1CN01XR2tFe1X8d8VVkr8d_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01bDxklQ1X8d9M5ta6t_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01bDxklQ1X8d9M5ta6t_1689572879-0-cib.jpg new file mode 100644 index 0000000..fe17782 Binary files /dev/null and b/media/products/2024/01/25/O1CN01bDxklQ1X8d9M5ta6t_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01csRIJE1X8d41HnIdf_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01csRIJE1X8d41HnIdf_1689572879-0-cib.jpg new file mode 100644 index 0000000..325857b Binary files /dev/null and b/media/products/2024/01/25/O1CN01csRIJE1X8d41HnIdf_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01h2eHBI1X8d5KytUHK_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01h2eHBI1X8d5KytUHK_1689572879-0-cib.jpg new file mode 100644 index 0000000..71a7e4e Binary files /dev/null and b/media/products/2024/01/25/O1CN01h2eHBI1X8d5KytUHK_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01nfDnUR1X8d8ZXbKaR_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01nfDnUR1X8d8ZXbKaR_1689572879-0-cib.jpg new file mode 100644 index 0000000..f224cd5 Binary files /dev/null and b/media/products/2024/01/25/O1CN01nfDnUR1X8d8ZXbKaR_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01xlF8yb1OtxYOlPa9z_2211249091764-0-cib.jpg b/media/products/2024/01/25/O1CN01xlF8yb1OtxYOlPa9z_2211249091764-0-cib.jpg new file mode 100644 index 0000000..7b441da Binary files /dev/null and b/media/products/2024/01/25/O1CN01xlF8yb1OtxYOlPa9z_2211249091764-0-cib.jpg differ diff --git a/media/products/2024/01/25/O1CN01yfXOG41X8d1l6AAOC_1689572879-0-cib.jpg b/media/products/2024/01/25/O1CN01yfXOG41X8d1l6AAOC_1689572879-0-cib.jpg new file mode 100644 index 0000000..ad06f6c Binary files /dev/null and b/media/products/2024/01/25/O1CN01yfXOG41X8d1l6AAOC_1689572879-0-cib.jpg differ diff --git a/media/products/2024/01/25/a117b6c6d219482bbc87f999f8ed8239xl.webp b/media/products/2024/01/25/a117b6c6d219482bbc87f999f8ed8239xl.webp new file mode 100644 index 0000000..a407bf3 Binary files /dev/null and b/media/products/2024/01/25/a117b6c6d219482bbc87f999f8ed8239xl.webp differ diff --git a/media/products/2024/01/25/figurine-my-hero-academia-endeavor-age-of-heroes.jpg b/media/products/2024/01/25/figurine-my-hero-academia-endeavor-age-of-heroes.jpg new file mode 100644 index 0000000..c9a173c Binary files /dev/null and b/media/products/2024/01/25/figurine-my-hero-academia-endeavor-age-of-heroes.jpg differ diff --git a/media/products/2024/01/25/images.jpg b/media/products/2024/01/25/images.jpg new file mode 100644 index 0000000..6e49a16 Binary files /dev/null and b/media/products/2024/01/25/images.jpg differ diff --git a/media/products/2024/01/25/Снимок_экрана_2024-01-25_164053.png b/media/products/2024/01/25/Снимок_экрана_2024-01-25_164053.png new file mode 100644 index 0000000..f7f16c8 Binary files /dev/null and b/media/products/2024/01/25/Снимок_экрана_2024-01-25_164053.png differ diff --git a/media/products/2024/01/25/Снимок_экрана_2024-01-25_172542.png b/media/products/2024/01/25/Снимок_экрана_2024-01-25_172542.png new file mode 100644 index 0000000..54bcab1 Binary files /dev/null and b/media/products/2024/01/25/Снимок_экрана_2024-01-25_172542.png differ