update api posts

This commit is contained in:
gerchek 2022-01-20 22:03:26 +05:00
parent 89d8fcd467
commit f607dee507
17 changed files with 251 additions and 102 deletions

View File

@ -1,19 +1,19 @@
{
"files": {
"main.css": "/static/css/main.5d6483a7.chunk.css",
"main.js": "/static/js/main.e1f69784.chunk.js",
"main.js.map": "/static/js/main.e1f69784.chunk.js.map",
"main.css": "/static/css/main.d5690b72.chunk.css",
"main.js": "/static/js/main.3c726c7e.chunk.js",
"main.js.map": "/static/js/main.3c726c7e.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.80c04ae7.js",
"runtime-main.js.map": "/static/js/runtime-main.80c04ae7.js.map",
"static/css/2.d555f809.chunk.css": "/static/css/2.d555f809.chunk.css",
"static/js/2.0380cb5b.chunk.js": "/static/js/2.0380cb5b.chunk.js",
"static/js/2.0380cb5b.chunk.js.map": "/static/js/2.0380cb5b.chunk.js.map",
"static/js/2.3f3ab58c.chunk.js": "/static/js/2.3f3ab58c.chunk.js",
"static/js/2.3f3ab58c.chunk.js.map": "/static/js/2.3f3ab58c.chunk.js.map",
"static/js/3.6828d12d.chunk.js": "/static/js/3.6828d12d.chunk.js",
"static/js/3.6828d12d.chunk.js.map": "/static/js/3.6828d12d.chunk.js.map",
"index.html": "/index.html",
"static/css/2.d555f809.chunk.css.map": "/static/css/2.d555f809.chunk.css.map",
"static/css/main.5d6483a7.chunk.css.map": "/static/css/main.5d6483a7.chunk.css.map",
"static/js/2.0380cb5b.chunk.js.LICENSE.txt": "/static/js/2.0380cb5b.chunk.js.LICENSE.txt",
"static/css/main.d5690b72.chunk.css.map": "/static/css/main.d5690b72.chunk.css.map",
"static/js/2.3f3ab58c.chunk.js.LICENSE.txt": "/static/js/2.3f3ab58c.chunk.js.LICENSE.txt",
"static/media/airport.9ca79b5c.jpg": "/static/media/airport.9ca79b5c.jpg",
"static/media/downArrow.0bea9b11.svg": "/static/media/downArrow.0bea9b11.svg",
"static/media/emblemLogo.80dd243c.svg": "/static/media/emblemLogo.80dd243c.svg",
@ -55,8 +55,8 @@
"entrypoints": [
"static/js/runtime-main.80c04ae7.js",
"static/css/2.d555f809.chunk.css",
"static/js/2.0380cb5b.chunk.js",
"static/css/main.5d6483a7.chunk.css",
"static/js/main.e1f69784.chunk.js"
"static/js/2.3f3ab58c.chunk.js",
"static/css/main.d5690b72.chunk.css",
"static/js/main.3c726c7e.chunk.js"
]
}

View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><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=Open+Sans&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Etalon</title><link href="/static/css/2.d555f809.chunk.css" rel="stylesheet"><link href="/static/css/main.5d6483a7.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,i=t[0],c=t[1],l=t[2],s=0,p=[];s<i.length;s++)a=i[s],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&p.push(o[a][0]),o[a]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(t);p.length;)p.shift()();return u.push.apply(u,l||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,i=1;i<r.length;i++){var c=r[i];0!==o[c]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var t=[],r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=function(e){return a.p+"static/js/"+({}[e]||e)+"."+{3:"6828d12d"}[e]+".chunk.js"}(e);var c=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(l);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),u=t&&t.target&&t.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,r[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(t)},a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="/",a.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpreact-etalon"]=this["webpackJsonpreact-etalon"]||[],c=i.push.bind(i);i.push=t,i=i.slice();for(var l=0;l<i.length;l++)t(i[l]);var f=c;r()}([])</script><script src="/static/js/2.0380cb5b.chunk.js"></script><script src="/static/js/main.e1f69784.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><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=Open+Sans&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Etalon</title><link href="/static/css/2.d555f809.chunk.css" rel="stylesheet"><link href="/static/css/main.d5690b72.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,i=t[0],c=t[1],l=t[2],s=0,p=[];s<i.length;s++)a=i[s],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&p.push(o[a][0]),o[a]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(t);p.length;)p.shift()();return u.push.apply(u,l||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,i=1;i<r.length;i++){var c=r[i];0!==o[c]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var t=[],r=o[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=o[e]=[t,n]}));t.push(r[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=function(e){return a.p+"static/js/"+({}[e]||e)+"."+{3:"6828d12d"}[e]+".chunk.js"}(e);var c=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(l);var r=o[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),u=t&&t.target&&t.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,r[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(t)},a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="/",a.oe=function(e){throw console.error(e),e};var i=this["webpackJsonpreact-etalon"]=this["webpackJsonpreact-etalon"]||[],c=i.push.bind(i);i.push=t,i=i.slice();for(var l=0;l<i.length;l++)t(i[l]);var f=c;r()}([])</script><script src="/static/js/2.3f3ab58c.chunk.js"></script><script src="/static/js/main.3c726c7e.chunk.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,8 @@
// IMPORT MODULES
import React from "react";
import { Link } from "react-router-dom";
import i18n from '../../i18n';
import { withTranslation } from 'react-i18next';
// TAB_1
import RightArrowBlue from "../../svg/rightArrowBlue.svg";
@ -8,93 +10,163 @@ import TabIMG1 from "../../img/tabImg_1.jpg";
import TabIMG2 from "../../img/tabImg_2.jpg";
import TabIMG3 from "../../img/tabImg_3.jpg";
const NewsMain = () => {
return (
<div className="news-tab">
<div className="tab-header">
<h4 className="tab-header-text" id="tab-header-text">
Новости
</h4>
<div className="tab-header-line"></div>
<div className="tab-header-link">
<Link to="/news">
<span>Все новости</span>
<div>
<img src={RightArrowBlue} alt="RIGHTARROW" />
</div>
</Link>
</div>
</div>
<div className="tab-wrapper">
<div className="tab">
<div className="tab-top">
<div>
<img src={TabIMG1} alt="Turkmen carpets" />
</div>
</div>
<div className="tab-bottom">
<span className="tab-date">30.05.2021</span>
<h2 className="tab-name">
Состоялись мероприятия, приуроченные к Празднику туркменского
ковра
</h2>
<div className="tab-header-link tab-link">
<Link to="/news/novelty">
<span>Подробнее</span>
// const NewsMain = () => {
class NewsMain extends React.Component {
constructor(props) {
super(props);
this.state = {
items: [],
DataisLoaded: false,
error: null
};
}
componentDidMount() {
this._mounted = true
this.makeRemoteRequest();
}
componentWillUnmount() {
this._mounted = false
}
makeRemoteRequest = () => {
const url = `http://217.174.238.204:8888/api/v1/categories/2`
if (this._mounted) {
this.setState({ DataisLoaded: true });
}
setTimeout(() => {
fetch(url, {
method: 'GET',
})
.then(res => res.json())
.then(res => {
if (this._mounted) {
this.setState({
items: res.data[0]['posts'],
error: res.message || null,
DataisLoaded: true,
})
console.log(res.data)
}
})
.catch(error => {
if (this._mounted) {
this.setState({ error, DataisLoaded: false});
}
});
}, 1500);
};
render() {
// const [pageIndex, setPageIndex] = useState(1);
var {DataisLoaded, items} = this.state;
if(!DataisLoaded){
return <div>Loading ....</div>
}else{
return (
<div className="news-tab">
<div className="tab-header">
<h4 className="tab-header-text" id="tab-header-text">
Новости
</h4>
<div className="tab-header-line"></div>
<div className="tab-header-link">
<Link to="/news">
<span>Все новости</span>
<div>
<img src={RightArrowBlue} alt="RIGHTARROW" />
</div>
</Link>
</div>
</div>
</div>
<div className="tab">
<div className="tab-top">
<div>
<img src={TabIMG2} alt="Turkmen students" />
</div>
</div>
<div className="tab-bottom">
<span className="tab-date">25.05.2021</span>
<h2 className="tab-name">
Состоялись мероприятия, приуроченные к Празднику туркменского
ковра
</h2>
<div className="tab-header-link tab-link">
<Link to="/news/novelty">
<span>Подробнее</span>
<div className="tab-wrapper">
<div className="tab">
<div className="tab-top">
<div>
<img src={RightArrowBlue} alt="RIGHTARROW" />
<img src={TabIMG1} alt="Turkmen carpets" />
</div>
</Link>
</div>
<div className="tab-bottom">
<span className="tab-date">30.05.2021</span>
<h2 className="tab-name">
Состоялись мероприятия, приуроченные к Празднику туркменского
ковра
</h2>
<div className="tab-header-link tab-link">
<Link to="/news/novelty">
<span>Подробнее</span>
<div>
<img src={RightArrowBlue} alt="RIGHTARROW" />
</div>
</Link>
</div>
</div>
</div>
</div>
</div>
<div className="tab">
<div className="tab-top">
<div>
<img src={TabIMG3} alt="Turkmen mothers" />
</div>
</div>
<div className="tab-bottom">
<span className="tab-date">25.05.2021</span>
<h2 className="tab-name">
Родителям первых детей, рождённых в день юбилея Ашхабада, вручены
подарки...
</h2>
<div className="tab-header-link tab-link">
<Link to="/news/novelty">
<span>Подробнее</span>
<div className="tab">
<div className="tab-top">
<div>
<img src={RightArrowBlue} alt="RIGHTARROW" />
<img src={TabIMG2} alt="Turkmen students" />
</div>
</Link>
</div>
<div className="tab-bottom">
<span className="tab-date">25.05.2021</span>
<h2 className="tab-name">
Состоялись мероприятия, приуроченные к Празднику туркменского
ковра
</h2>
<div className="tab-header-link tab-link">
<Link to="/news/novelty">
<span>Подробнее</span>
<div>
<img src={RightArrowBlue} alt="RIGHTARROW" />
</div>
</Link>
</div>
</div>
</div>
<div className="tab">
<div className="tab-top">
<div>
<img src={TabIMG3} alt="Turkmen mothers" />
</div>
</div>
<div className="tab-bottom">
<span className="tab-date">25.05.2021</span>
<h2 className="tab-name">
Родителям первых детей, рождённых в день юбилея Ашхабада, вручены
подарки...
</h2>
<div className="tab-header-link tab-link">
<Link to="/news/novelty">
<span>Подробнее</span>
<div>
<img src={RightArrowBlue} alt="RIGHTARROW" />
</div>
</Link>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
);
);
}
}
};
export default NewsMain;
// export default NewsMain;
export default withTranslation()(NewsMain);

View File

@ -120,8 +120,8 @@ class Main extends React.Component {
<div className="second-slider">
<div className="tab-header">
<h4 className="tab-header-text" id="tab-header-text">
{/* Объявления */}
{t('test')}
Объявления
{/* {t('test')} */}
</h4>
<div className="tab-header-line"></div>
</div>

View File

@ -45,7 +45,7 @@ class News extends React.Component {
makeRemoteRequest = () => {
const url = `http://217.174.238.204:8888/api/v1/categories/2`
const url = `http://127.0.0.1:8000/api/v1/categories/2`
if (this._mounted) {
this.setState({ DataisLoaded: true });
@ -61,11 +61,12 @@ class News extends React.Component {
.then(res => {
if (this._mounted) {
this.setState({
items: res.data[0]['posts'],
items: res.data[0].data,
error: res.message || null,
DataisLoaded: true,
})
console.log(res.data)
// console.log(res.data[0]['data'][0])
// console.log(this.state.items)
}
})
@ -86,6 +87,8 @@ class News extends React.Component {
return <div>Loading ....</div>
}else{
console.log(this.state.items);
return (
<section className="news">
<Breadcrumb path_1="Новости" currentUrl="./news" />;
@ -102,7 +105,7 @@ class News extends React.Component {
{items.map(item=>(
<div className="tab">
<div className="tab" key={item.id}>
<div className="tab-top">
<div>
<img src={ item['featured_images'][0]['path'] } alt="Turkmen carpets" />
@ -134,7 +137,7 @@ class News extends React.Component {
</div>
</div>
))}
))}
</div>
</div>

View File

@ -15,6 +15,10 @@
text-size-adjust: none;
-webkit-text-size-adjust: none;
}
.table-bordered tbody * {
text-size-adjust: none;
-webkit-text-size-adjust: none;
}
// MOBILE
@ -22,4 +26,7 @@
.structure-table tbody * {
font-size: 1.2rem;
}
.table-bordered tbody * {
font-size: 1.2rem;
}
}

View File

@ -38,6 +38,63 @@
border-top: none;
}
* {
text-align: center;
}
span {
font-size: 1.4rem;
}
}
.table-bordered {
width: 100%;
overflow-x: auto;
margin-bottom: 10rem;
}
.structure-table {
width: 128rem;
overflow: hidden;
th {
font-weight: bold;
padding: 3.5rem 1rem;
border: 0.1rem solid #e9ecef;
}
td {
padding: 3.5rem 1rem;
border: 0.1rem solid #e9ecef;
border-top: none;
}
* {
text-align: center;
}
span {
font-size: 1.4rem;
}
}
.table-bordered {
width: 128rem;
overflow: hidden;
th {
font-weight: bold;
padding: 3.5rem 1rem;
border: 0.1rem solid #e9ecef;
}
td {
font-size: 1.2rem;
padding: 1.5rem 0rem;
border: 0.1rem solid #e9ecef;
border-top: none;
width: 10rem;
}
* {
text-align: center;
}
@ -66,15 +123,25 @@
width: 111rem;
margin: 0 auto;
}
.table-bordered {
width: 111rem;
margin: 0 auto;
}
}
@media screen and (max-width: 700px) {
.structure-table {
width: 91rem;
}
.table-bordered {
width: 91rem;
}
}
@media screen and (max-width: 500px) {
.structure-table {
width: 71rem;
}
.table-bordered {
width: 71rem;
}
}