This commit is contained in:
gerchek 2022-01-11 11:39:30 +05:00
parent 40ca3639f3
commit b26fa68732
14 changed files with 312 additions and 448 deletions

View File

@ -16,7 +16,7 @@ return [
| |
*/ */
'debug' => true, 'debug' => env('APP_DEBUG', true),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -41,7 +41,7 @@ return [
| |
*/ */
'url' => '192.168.1.2', 'url' => env('APP_URL', '192.168.1.2'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -137,7 +137,7 @@ return [
| |
*/ */
'key' => 'TrXTjFPamGjKKJ47h5ULgIkc7YztmW0p', 'key' => env('APP_KEY', ''),
'cipher' => 'AES-256-CBC', 'cipher' => 'AES-256-CBC',

View File

@ -13,7 +13,7 @@ return [
| |
*/ */
'default' => 'file', 'default' => env('CACHE_DRIVER', 'file'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -156,7 +156,7 @@ return [
| |
*/ */
'enableRoutesCache' => false, 'enableRoutesCache' => env('ROUTES_CACHE', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -196,7 +196,7 @@ return [
| |
*/ */
'enableAssetCache' => false, 'enableAssetCache' => env('ASSET_CACHE', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -250,7 +250,7 @@ return [
| |
*/ */
'databaseTemplates' => false, 'databaseTemplates' => env('DATABASE_TEMPLATES', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -360,7 +360,7 @@ return [
| |
*/ */
'linkPolicy' => 'detect', 'linkPolicy' => env('LINK_POLICY', 'detect'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -396,7 +396,7 @@ return [
| |
*/ */
'enableCsrfProtection' => true, 'enableCsrfProtection' => env('ENABLE_CSRF', true),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -26,7 +26,7 @@ return [
| |
*/ */
'default' => 'mysql', 'default' => env('DB_CONNECTION', 'mysql'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -48,18 +48,18 @@ return [
'sqlite' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => 'storage/database.sqlite', 'database' => env('DB_DATABASE', 'storage/database.sqlite'),
'prefix' => '', 'prefix' => '',
], ],
'mysql' => [ 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'engine' => 'InnoDB', 'engine' => 'InnoDB',
'host' => '127.0.0.1', 'host' => env('DB_HOST', '127.0.0.1'),
'port' => 3306, 'port' => env('DB_PORT', 3306),
'database' => 'etalonn', 'database' => env('DB_DATABASE', 'etalonn'),
'username' => 'root', 'username' => env('DB_USERNAME', ''),
'password' => '', 'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8mb4', 'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci', 'collation' => 'utf8mb4_unicode_ci',
'prefix' => '', 'prefix' => '',
@ -68,11 +68,11 @@ return [
'pgsql' => [ 'pgsql' => [
'driver' => 'pgsql', 'driver' => 'pgsql',
'host' => 'localhost', 'host' => env('DB_HOST', 'localhost'),
'port' => 5432, 'port' => env('DB_PORT', 5432),
'database' => 'database', 'database' => env('DB_DATABASE', 'database'),
'username' => 'root', 'username' => env('DB_USERNAME', ''),
'password' => '', 'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8', 'charset' => 'utf8',
'prefix' => '', 'prefix' => '',
'schema' => 'public', 'schema' => 'public',
@ -80,11 +80,11 @@ return [
'sqlsrv' => [ 'sqlsrv' => [
'driver' => 'sqlsrv', 'driver' => 'sqlsrv',
'host' => 'localhost', 'host' => env('DB_HOST', 'localhost'),
'port' => 1433, 'port' => env('DB_PORT', 5432),
'database' => 'database', 'database' => env('DB_DATABASE', 'database'),
'username' => 'root', 'username' => env('DB_USERNAME', ''),
'password' => '', 'password' => env('DB_PASSWORD', ''),
'prefix' => '', 'prefix' => '',
], ],
@ -120,9 +120,9 @@ return [
'cluster' => false, 'cluster' => false,
'default' => [ 'default' => [
'host' => '127.0.0.1', 'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => null, 'password' => env('REDIS_PASSWORD', null),
'port' => 6379, 'port' => env('REDIS_PORT', 6379),
'database' => 0, 'database' => 0,
], ],
@ -143,6 +143,6 @@ return [
| |
*/ */
'useConfigForTesting' => false, 'useConfigForTesting' => env('DB_USE_CONFIG_FOR_TESTING', false),
]; ];

View File

@ -16,7 +16,7 @@ return [
| |
*/ */
'driver' => 'smtp', 'driver' => env('MAIL_DRIVER', 'smtp'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -29,7 +29,7 @@ return [
| |
*/ */
'host' => 'smtp.mailgun.org', 'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -42,7 +42,7 @@ return [
| |
*/ */
'port' => 587, 'port' => env('MAIL_PORT', 587),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -71,7 +71,7 @@ return [
| |
*/ */
'encryption' => 'tls', 'encryption' => env('MAIL_ENCRYPTION', 'tls'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -84,7 +84,7 @@ return [
| |
*/ */
'username' => null, 'username' => env('MAIL_USERNAME', null),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -97,7 +97,7 @@ return [
| |
*/ */
'password' => null, 'password' => env('MAIL_PASSWORD', null),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -16,7 +16,7 @@ return [
| |
*/ */
'default' => 'sync', 'default' => env('QUEUE_CONNECTION', 'sync'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -16,7 +16,7 @@ return [
| |
*/ */
'driver' => 'file', 'driver' => env('SESSION_DRIVER', 'file'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@ -23,14 +23,14 @@ class categoriesController extends Controller
public function index(){ public function index(){
// $data = $this->Post::with(['translations:locale,model_id,attribute_data','categories'])->get(); // $data = $this->Post::with(['translations:locale,model_id,attribute_data','categories'])->get();
// $data = $this->Category->all()->toArray(); // $data = $this->Category->all()->toArray();
$data = $this->Category::with(['translations:locale,model_id,attribute_data','posts'])->get(); $data = $this->Category::with(['translations:locale,model_id,attribute_data','posts.translations'])->get();
return $this->helpers->apiArrayResponseBuilder(200, 'success', $data); return $this->helpers->apiArrayResponseBuilder(200, 'success', $data);
} }
public function show($id){ public function show($id){
// $data = $this->Post::with(['translations:locale,model_id,attribute_data','categories'])->get(); // $data = $this->Post::with(['translations:locale,model_id,attribute_data','categories'])->get();
$data = $this->Category::with(['translations:locale,model_id,attribute_data','posts.featured_images'])->find($id); $data = $this->Category::with(['translations:locale,model_id,attribute_data','posts.featured_images' , 'posts.translations'])->find($id);
if ($data){ if ($data){
return $this->helpers->apiArrayResponseBuilder(200, 'success', [$data]); return $this->helpers->apiArrayResponseBuilder(200, 'success', [$data]);

File diff suppressed because one or more lines are too long

View File

@ -19,7 +19,7 @@ const resources = {
i18n.use(initReactI18next).init({ i18n.use(initReactI18next).init({
resources, resources,
lng: 'en', lng: 'ru',
keySeparator: false, keySeparator: false,

View File

@ -1,5 +1,9 @@
// IMPORT MODULES // IMPORT MODULES
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import axios from "axios";
import i18n from '../i18n';
import '../i18n';
import { withTranslation } from 'react-i18next';
// IMPORT COMPONENTS // IMPORT COMPONENTS
import Breadcrumb from "../components/Global/Breadcrumb"; import Breadcrumb from "../components/Global/Breadcrumb";
@ -7,28 +11,69 @@ import EtalonsCard from "../components/Etalons/EtalonsCard";
// IMPORT IMAGES // IMPORT IMAGES
import Img_1 from "../img/etalonsImg_1.jpg"; import Img_1 from "../img/etalonsImg_1.jpg";
import Img_2 from "../img/etalonsImg_2.jpg";
import Img_3 from "../img/etalonsImg_3.jpg";
import Img_4 from "../img/etalonsImg_4.jpg";
import Img_5 from "../img/etalonsImg_5.jpg";
import Img_6 from "../img/etalonsImg_6.jpg";
import Img_7 from "../img/etalonsImg_7.jpg";
import Img_8 from "../img/etalonsImg_8.jpg";
import Img_9 from "../img/etalonsImg_9.jpg";
import Img_10 from "../img/etalonsImg_10.jpg";
import Img_11 from "../img/etalonsImg_11.jpg";
import Img_12 from "../img/etalonsImg_12.jpg";
import Img_13 from "../img/etalonsImg_13.jpg";
import Img_14 from "../img/etalonsImg_14.jpg";
import Img_15 from "../img/etalonsImg_15.jpg";
import Img_16 from "../img/etalonsImg_16.jpg";
import Img_17 from "../img/etalonsImg_17.jpg";
const Etalons = () => {
useEffect(() => {
window.scrollTo(0, 0);
}, []);
// const Etalons = () => {
// useEffect(() => {
// window.scrollTo(0, 0);
// }, []);
class Etalons extends React.Component {
_isMounted = false;
constructor(props) {
super(props);
this.state = {
items: [],
DataisLoaded: false
};
}
componentDidMount() {
this.getTodos();
}
async getTodos() {
this._isMounted = true;
await axios.get('http://127.0.0.1:8000/api/v1/categories/5')
.then(res => {
const items = res.data;
if (this._isMounted) {
this.setState({
items: items,
DataisLoaded: true
});
this._isMounted = false;
// console.log(this.state.items['data'][0]['posts']);
console.log('test');
}
})
// console.log('salam');
// console.log(this.state.items['data']);
}
componentWillUnmount() {
console.log("novosti gutardy");
}
render() {
const { DataisLoaded, items } = this.state;
if (!DataisLoaded) return <div>
<h1> Pleses wait some time.... </h1> </div> ;
if(i18n.language == 'en')
{
this.componentDidMount();
console.log('salam-en');
}
else
{
this.componentDidMount();
console.log('salam-ru');
}
return ( return (
<section className="etalons"> <section className="etalons">
<Breadcrumb path_1="Государственные эталоны" currentUrl="../etalons" /> <Breadcrumb path_1="Государственные эталоны" currentUrl="../etalons" />
@ -41,114 +86,25 @@ const Etalons = () => {
<div className="tab-header-line"></div> <div className="tab-header-line"></div>
</div> </div>
<div className="depts-wrapper"> <div className="depts-wrapper">
{items['data'][0]['posts'].map((item) => (
<EtalonsCard <EtalonsCard
key={1} key={item.id}
img={Img_1} img={ item['featured_images'][0]['path'] }
title="Государственный эталон единицы массы" title={item.title}
link="../etalons/1" link="../etalons/1"
/> />
<EtalonsCard
key={2} ))}
img={Img_2}
title="Государственный эталон единицы длины в диапазоне..."
link="../etalons/2"
/>
<EtalonsCard
key={3}
img={Img_3}
title="Государственный эталон единицы силы"
link="../etalons/3"
/>
<EtalonsCard
key={4}
img={Img_4}
title="Государственный эталон единицы давления"
link="../etalons/4"
/>
<EtalonsCard
key={5}
img={Img_5}
title="Государственный эталон единицы температуры"
link="../etalons/5"
/>
<EtalonsCard
key={6}
img={Img_6}
title="Государственный эталон единицы влажности"
link="../etalons/6"
/>
<EtalonsCard
key={7}
img={Img_7}
title="Государственный эталон малого объема"
link="../etalons/7"
/>
<EtalonsCard
key={8}
img={Img_8}
title="Государственный эталон плотности жидкости"
link="../etalons/8"
/>
<EtalonsCard
key={9}
img={Img_9}
title="Государственный эталон шкалы PH жидкости"
link="../etalons/9"
/>
<EtalonsCard
key={10}
img={Img_10}
title="Государственный эталон вязкости жидкости"
link="../etalons/10"
/>
<EtalonsCard
key={11}
img={Img_11}
title="Государственный эталон удельной электролитической..."
link="../etalons/11"
/>
<EtalonsCard
key={12}
img={Img_12}
title="Государственный эталон влажности зерна и зернопро..."
link="../etalons/12"
/>
<EtalonsCard
key={13}
img={Img_13}
title="Государственный эталон электрического напряжения"
link="../etalons/13"
/>
<EtalonsCard
key={14}
img={Img_14}
title="Государственный эталон электрического сопротивления"
link="../etalons/15"
/>
<EtalonsCard
key={15}
img={Img_15}
title="Государственный эталон силы
тока"
link="../etalons/15"
/>
<EtalonsCard
key={16}
img={Img_16}
title="Государственный эталон единицы времени и чистоты"
link="../etalons/16"
/>
<EtalonsCard
key={17}
img={Img_17}
title="Государственный эталон единицы количества и расхо..."
link="../etalons/17"
/>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
); );
}
}; };
export default Etalons; export default withTranslation()(Etalons);

View File

@ -1,13 +1,87 @@
// IMPORT MODULES // IMPORT MODULES
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import axios from "axios";
import i18n from '../i18n';
import '../i18n';
import { withTranslation } from 'react-i18next';
// IMPORT COMPONENTS // IMPORT COMPONENTS
import Breadcrumb from "../components/Global/Breadcrumb"; import Breadcrumb from "../components/Global/Breadcrumb";
const Legislation = () => { // const Legislation = () => {
useEffect(() => { // useEffect(() => {
window.scrollTo(0, 0); // window.scrollTo(0, 0);
}, []); // }, []);
class Legislation extends React.Component {
_isMounted = false;
constructor(props) {
super(props);
this.state = {
items: [],
DataisLoaded: false
};
}
componentDidMount() {
this.getTodos();
}
async getTodos() {
this._isMounted = true;
await axios.get('http://127.0.0.1:8000/api/v1/categories/6')
.then(res => {
const items = res.data;
if (this._isMounted) {
this.setState({
items: items,
DataisLoaded: true
});
// let elem = document.querySelector('.law-card-text');
// if(i18n.language == 'en')
// {
// console.log(JSON.parse(this.state.items['data'][0]['posts'][0]['translations'][1]['attribute_data']).title);
// }
// else if (i18n.language == 'ru')
// {
// elem.innerHTML= this.state.items['data'][0]['posts']['title'];
// }
// else {
// elem.innerHTML= JSON.parse(this.state.items['data'][0]['posts'][1]['translations'][0]['attribute_data']).title;
// }
this._isMounted = false;
// console.log(this.state.items['data'][0]['posts']);
console.log('salam_test');
// console.log(JSON.parse(this.state.items['data'][0]['posts'][0]['translations'][0]['attribute_data']).title );
}
})
// console.log('salam');
// console.log(this.state.items['data']);
}
componentWillUnmount() {
console.log("etalon gutardy");
}
render() {
const { DataisLoaded, items } = this.state;
if (!DataisLoaded) return <div>
<h1> Pleses wait some time.... </h1> </div> ;
if(i18n.language == 'en')
{
this.componentDidMount();
console.log('salam-en');
}
else
{
this.componentDidMount();
console.log('salam-ruru');
}
return ( return (
<section className="legislation"> <section className="legislation">
@ -21,99 +95,43 @@ const Legislation = () => {
<div className="tab-header-line"></div> <div className="tab-header-line"></div>
</div> </div>
<div className="law-card-wrapper"> <div className="law-card-wrapper">
<div className="law-card">
{items['data'][0]['posts'].map((item) => (
<div className="law-card" key={item.id}>
<p className="law-card-text"> <p className="law-card-text">
Утвержденный приказом Главной Государственной службы
«Туркменстандартлары» 1/148 от 05.11.2015г. { i18n.language == 'en' &&
JSON.parse(item['translations'][0]['attribute_data']).title
}
{ i18n.language == 'ru' &&
item.title
}
{ i18n.language == 'tm' &&
JSON.parse(item['translations'][1]['attribute_data']).title
}
</p> </p>
<p className="law-card-bold"> <p className="law-card-bold">
Об утверждении «Порядка о проверке, калибровки и государственных { i18n.language == 'en' &&
метрологических испытаний средств измерений и стандартных JSON.parse(item['translations'][0]['attribute_data']).content
образцов» }
</p> { i18n.language == 'ru' &&
</div> item.content
<div className="law-card"> }
<p className="law-card-text"> { i18n.language == 'tm' &&
Утвержденный приказом Главной Государственной службы JSON.parse(item['translations'][1]['attribute_data']).content
«Туркменстандартлары» 1/153 от 16.11.2015г. }
</p> {/* {item.content} */}
<p className="law-card-bold">
Об утверждении «Порядка проведения измерений и разработки
методики проверки средств измерений и проведения испытаний»
</p>
</div>
<div className="law-card">
<p className="law-card-text">
Утвержденный приказом Главной Государственной службы
«Туркменстандартлары» 1/119 от 14.09.2015г.
</p>
<p className="law-card-bold">
Об утверждении «Порядка проведения измерений и разработки
методики поверки средств измерений и проведения испытаний»
</p>
</div>
<div className="law-card">
<p className="law-card-text">
Утвержденной приказом Главной Государственной службы
«Туркменстандартлары» 1/60 от 27.03.2014г.
</p>
<p className="law-card-bold">
Об утверждении «Порядка сертификации продукции»
</p>
</div>
<div className="law-card">
<p className="law-card-text">
Утвержденный приказом Главной Государственной службы
«Туркменстандартлары» от 25.04.2013г.
</p>
<p className="law-card-bold">
Об утверждении «Перечня единиц величин, не входящих в
международную систему, разрешенных к применению В Туркменистане»
</p>
</div>
<div className="law-card">
<p className="law-card-text">
Постановление Президента от 01.02.2013г.
</p>
<p className="law-card-bold">
Об утверждении «Перечня единиц величин, разрешенных к применению
в Туркменистане»
</p>
</div>
<div className="law-card">
<p className="law-card-text">
Утвержденный приказом Главной Государственной службы
«Туркменстандартлары» 1/108 от 13.08.2015г.
</p>
<p className="law-card-bold">
Об утверждении «Периода проверки и калибровки средств измерений,
подлежащих калибровки и проверки.»
</p>
</div>
<div className="law-card">
<p className="law-card-text">
Утвержденный приказом Главной Государственной службы
«Туркменстандартлары» 1/231 от 25.11.2014г.
</p>
<p className="law-card-bold">
Об утверждении «Порядка проведения консервации резервуаров»
</p>
</div>
<div className="law-card">
<p className="law-card-text">
Утвержденный приказом Главной Государственной службы
«Туркменстандартлары» от 25.04.2013г.
</p>
<p className="law-card-bold">
Об утверждении «Перечня единиц величин не входящих в
международную систему разрешенных к применению В Туркменистане»
</p> </p>
</div> </div>
))}
</div> </div>
</div> </div>
</div> </div>
</section> </section>
); );
}
}; };
export default Legislation; export default withTranslation()(Legislation);

View File

@ -2,6 +2,9 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import axios from "axios"; import axios from "axios";
import i18n from '../i18n';
import '../i18n';
import { withTranslation } from 'react-i18next';
// IMPORT COMPONENTS // IMPORT COMPONENTS
import Breadcrumb from "../components/Global/Breadcrumb"; import Breadcrumb from "../components/Global/Breadcrumb";
@ -11,6 +14,7 @@ import Breadcrumb from "../components/Global/Breadcrumb";
class News extends React.Component { class News extends React.Component {
_isMounted = false;
constructor(props) { constructor(props) {
super(props); super(props);
@ -27,26 +31,51 @@ class News extends React.Component {
componentDidMount() { componentDidMount() {
this.getTodos(); this.getTodos();
// console.log(this.state.items);
} }
async getTodos() { async getTodos() {
axios.get('http://127.0.0.1:8000/api/v1/categories/3') this._isMounted = true;
await axios.get('http://127.0.0.1:8000/api/v1/categories/2')
.then(res => { .then(res => {
const items = res.data; const items = res.data;
if (this._isMounted) {
this.setState({ this.setState({
items: items, items: items,
DataisLoaded: true DataisLoaded: true
}); });
this._isMounted = false;
console.log(this.state.items['data'][0]['posts']);
}
}) })
// console.log(this.state.items); // console.log('salam');
// console.log(this.state.items['data']);
} }
componentWillUnmount() {
console.log("novosti gutardy");
}
render() { render() {
const { DataisLoaded, items } = this.state; const { DataisLoaded, items } = this.state;
if (!DataisLoaded) return <div> if (!DataisLoaded) return <div>
<h1> Pleses wait some time.... </h1> </div> ; <h1> Pleses wait some time.... </h1> </div> ;
// console.log(this.state.items);
if(i18n.language == 'en')
{
this.componentDidMount();
console.log('salam-en');
}
else
{
this.componentDidMount();
console.log('salam-ru');
}
// console.log(this.state.item['data']);
return ( return (
<section className="news"> <section className="news">
<Breadcrumb path_1="Новости" currentUrl="./news" />; <Breadcrumb path_1="Новости" currentUrl="./news" />;
@ -63,11 +92,10 @@ class News extends React.Component {
{ {items['data'][0]['posts'].map((item) => (
items['data'][0]['posts'].map((item) => (
<div className="tab" key={item.id}> <div className="tab" key={item.id}>
<div className="tab-top"> <div className="tab-top">
<div> <div>
<img src={ item['featured_images'][0]['path'] } alt="Turkmen carpets" /> <img src={ item['featured_images'][0]['path'] } alt="Turkmen carpets" />
@ -76,7 +104,29 @@ class News extends React.Component {
<div className="tab-bottom"> <div className="tab-bottom">
<span className="tab-date">30.05.2021</span> <span className="tab-date">30.05.2021</span>
<h2 className="tab-name"> <h2 className="tab-name">
{ item.title } {/* {item.id} */}
{
(() => {
if(i18n.language == 'en')
{
return (
JSON.parse(item['translations'][0]['attribute_data']).title
)
}
else if (i18n.language == 'ru')
{
return (
item.title
)
}
else {
return (
JSON.parse(item['translations'][1]['attribute_data']).title
)
}
})
}
</h2> </h2>
<div className="tab-header-link tab-link"> <div className="tab-header-link tab-link">
<Link to={`/blog/${item.slug}`}> <Link to={`/blog/${item.slug}`}>
@ -88,11 +138,13 @@ class News extends React.Component {
</div> </div>
</div> </div>
</div> </div>
// )
))} ))}
</div> </div>
</div> </div>
</div> </div>
@ -103,4 +155,7 @@ class News extends React.Component {
} }
}; };
export default News; export default withTranslation()(News);
// { JSON.parse(item['translations'][0]['attribute_data']).title }
// elem.innerHTML= JSON.parse(this.state.items['data'][0]['posts'][0]['translations'][0]['attribute_data']).title;

View File

@ -34,9 +34,9 @@ class Novelty extends React.Component {
getTodos() { async getTodos() {
this._isMounted = true; this._isMounted = true;
axios.get('http://127.0.0.1:8000/api/v1/posts/'+this.props.match.params.slug) await axios.get('http://127.0.0.1:8000/api/v1/posts/'+this.props.match.params.slug)
.then(res => .then(res =>
{ {
const items = res.data; const items = res.data;
@ -49,20 +49,25 @@ class Novelty extends React.Component {
if(i18n.language == 'ru') if(i18n.language == 'ru')
{ {
elem.innerHTML= this.state.items['data'][0][0]['content']; elem.innerHTML= this.state.items['data'][0][0]['content'];
this._isMounted = false;
} }
else else
{ {
elem.innerHTML= JSON.parse(this.state.items['data'][0][0]['translations'][0]['attribute_data']).content; elem.innerHTML= JSON.parse(this.state.items['data'][0][0]['translations'][0]['attribute_data']).content;
this._isMounted = false;
} }
// console.log('salamlar');
} }
// console.log('salamlar');
} }
) )
console.log('salamlar');
} }
componentWillUnmount() { componentWillUnmount() {
this._isMounted = false; // this._isMounted = false;
console.log("salam"); console.log("post gutardy");
} }
render() { render() {
@ -75,13 +80,18 @@ class Novelty extends React.Component {
if(i18n.language == 'en') if(i18n.language == 'en')
{ {
this.componentDidMount(); this.componentDidMount();
// this.componentWillUnmount();
console.log('salamlar-en');
} }
else else
{ {
this.componentDidMount(); this.componentDidMount();
// this.componentWillUnmount();
console.log('salamlar-ru');
} }
return ( return (
// {items['data'][0].map((item) => ( // {items['data'][0].map((item) => (
<section className="novelty"> <section className="novelty">
@ -101,7 +111,8 @@ class Novelty extends React.Component {
<img src={ item['featured_images'][0]['path'] } alt="Novelty" /> <img src={ item['featured_images'][0]['path'] } alt="Novelty" />
</div> </div>
<h4 className="novelty-title"> <h4 className="novelty-title">
{ item.title }{t('test')} { item.title }
{/* {t('test')} */}
</h4> </h4>
</div> </div>
<div className="novelty-text"> <div className="novelty-text">