diff --git a/src/components/DataChart.jsx b/src/components/DataChart.jsx
index 124ef39..7447dab 100644
--- a/src/components/DataChart.jsx
+++ b/src/components/DataChart.jsx
@@ -13,13 +13,6 @@ const DataChart = ({ lang }) => {
const [activeTab, setActiveTab] = useState(0);
const [tabIndex, setTabIndex] = useState();
- useEffect(() => {
- // Table data fetch
- const TabData = new Api('http://tmex.gov.tm:8765/api/categories', tabData, setTabData).get({
- 'X-Localization': lang,
- });
- }, []);
-
useEffect(() => {
// Table data fetch
const TabData = new Api('http://tmex.gov.tm:8765/api/categories', tabData, setTabData).get({
@@ -37,7 +30,7 @@ const DataChart = ({ lang }) => {
{tabData
? tabData.data.map((tab, index) => {
- return tab.id <= 3 ? (
+ return index <= 2 ? (
{
const [galleryData, setGalleryData] = useState();
- useEffect(() => {
- const GalleryApi = new Api(
- `http://tmex.gov.tm:8765/api/medias/${imageTabIndex}`,
- galleryData,
- setGalleryData,
- ).get();
- }, []);
-
useEffect(() => {
const GalleryApi = new Api(
`http://tmex.gov.tm:8765/api/medias/${imageTabIndex}`,
diff --git a/src/pages/Contacts.jsx b/src/pages/Contacts.jsx
index 645ec77..29f8201 100644
--- a/src/pages/Contacts.jsx
+++ b/src/pages/Contacts.jsx
@@ -17,14 +17,6 @@ const Contacts = ({ lang }) => {
// Scroll to top
window.scrollTo(0, 0);
- }, []);
-
- useEffect(() => {
- const ContactsApi = new Api(
- 'http://tmex.gov.tm:8765/api/contacts',
- contactsData,
- setContactsData,
- ).get({ 'X-Localization': lang });
}, [lang]);
return (
diff --git a/src/pages/Finance.jsx b/src/pages/Finance.jsx
index c39713b..ac44700 100644
--- a/src/pages/Finance.jsx
+++ b/src/pages/Finance.jsx
@@ -18,15 +18,6 @@ const Finance = ({ lang }) => {
// Scroll to top
window.scrollTo(0, 0);
- }, []);
-
- useEffect(() => {
- // Documents fetch
- const DocumentsApi = new Api(
- 'http://tmex.gov.tm:8765/api/documents',
- docsData,
- setDocsData,
- ).get({ 'X-Localization': lang });
}, [lang]);
return (
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index ff52fab..217ed44 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -29,13 +29,6 @@ const Home = ({ lang, setPostId }) => {
// Scroll to top
window.scrollTo(0, 0);
- }, []);
-
- useEffect(() => {
- // News fetch
- const NewsApi = new Api('http://tmex.gov.tm:8765/api/news', newsData, setNewsData).get({
- 'X-Localization': lang,
- });
}, [lang]);
return (
diff --git a/src/pages/Multimedia.jsx b/src/pages/Multimedia.jsx
index 607f2fc..7d1df5e 100644
--- a/src/pages/Multimedia.jsx
+++ b/src/pages/Multimedia.jsx
@@ -26,14 +26,6 @@ const Multimedia = ({ lang }) => {
// Scroll to top
window.scrollTo(0, 0);
- }, []);
-
- useEffect(() => {
- const MultimediaApi = new Api(
- 'http://tmex.gov.tm:8765/api/media/categories',
- multimediaData,
- setMultimediaData,
- ).get({ 'X-Localization': lang });
}, [lang]);
const imageTabSwitch = (imageIndex, imageTabId) => {
diff --git a/src/pages/NewsPage.jsx b/src/pages/NewsPage.jsx
index 351ce47..2550ea0 100644
--- a/src/pages/NewsPage.jsx
+++ b/src/pages/NewsPage.jsx
@@ -10,13 +10,6 @@ import NewsPost from '../components/NewsPost';
const NewsPage = ({ lang, setPostId }) => {
const [postsData, setPostsData] = useState();
- useEffect(() => {
- // News fetch
- const PostsData = new Api('http://tmex.gov.tm:8765/api/news', postsData, setPostsData).get({
- 'X-Localization': lang,
- });
- }, []);
-
useEffect(() => {
// News fetch
const PostsData = new Api('http://tmex.gov.tm:8765/api/news', postsData, setPostsData).get({
diff --git a/src/pages/NewsPostPage.jsx b/src/pages/NewsPostPage.jsx
index 7c89ff0..8bfe17a 100644
--- a/src/pages/NewsPostPage.jsx
+++ b/src/pages/NewsPostPage.jsx
@@ -10,14 +10,11 @@ const NewsPostPage = ({ postId, lang, setPostId }) => {
const [newsPageData, setNewsPageData] = useState();
useEffect(() => {
- const NewsPageApi = new Api('http://tmex.gov.tm:8765/api/news', newsPageData, setNewsPageData);
- NewsPageApi.get({ 'X-localization': lang });
- console.log(postId);
- }, []);
-
- useEffect(() => {
- const NewsPageApi = new Api('http://tmex.gov.tm:8765/api/news', newsPageData, setNewsPageData);
- NewsPageApi.get({ 'X-localization': lang });
+ const NewsPageApi = new Api(
+ 'http://tmex.gov.tm:8765/api/news',
+ newsPageData,
+ setNewsPageData,
+ ).get({ 'X-localization': lang });
}, [lang]);
return (
diff --git a/src/pages/Normative.jsx b/src/pages/Normative.jsx
index 7bf2c0a..ca8f1a2 100644
--- a/src/pages/Normative.jsx
+++ b/src/pages/Normative.jsx
@@ -19,15 +19,6 @@ export const Normative = ({ lang }) => {
// Scroll to top
window.scrollTo(0, 0);
- }, []);
-
- useEffect(() => {
- // Documents fetch
- const DocumentsApi = new Api(
- 'http://tmex.gov.tm:8765/api/documents',
- docsData,
- setDocsData,
- ).get({ 'X-Localization': lang });
}, [lang]);
return (
diff --git a/src/pages/Register.jsx b/src/pages/Register.jsx
index 84addb1..c3b05d7 100644
--- a/src/pages/Register.jsx
+++ b/src/pages/Register.jsx
@@ -8,15 +8,6 @@ import DocumentLink from '../components/DocumentLink';
export const Register = ({ lang }) => {
const [docsData, setDocsData] = useState();
- useEffect(() => {
- // Documents fetch
- const DocumentsApi = new Api('http://tmex.gov.tm:8765/api/documents', docsData, setDocsData);
- DocumentsApi.get({ 'X-Localization': lang });
-
- // Scroll to top
- window.scrollTo(0, 0);
- }, []);
-
useEffect(() => {
// Documents fetch
const DocumentsApi = new Api(
@@ -24,6 +15,9 @@ export const Register = ({ lang }) => {
docsData,
setDocsData,
).get({ 'X-Localization': lang });
+
+ // Scroll to top
+ window.scrollTo(0, 0);
}, [lang]);
return (
diff --git a/src/pages/Tarif.jsx b/src/pages/Tarif.jsx
index 2308dc4..b7b1453 100644
--- a/src/pages/Tarif.jsx
+++ b/src/pages/Tarif.jsx
@@ -18,12 +18,6 @@ const Tarif = ({ lang }) => {
// Scroll to top
window.scrollTo(0, 0);
- }, []);
-
- useEffect(() => {
- const TarifApi = new Api('http://tmex.gov.tm:8765/api/tariffs', tarifData, setTarifData).get({
- 'X-Localization': lang,
- });
}, [lang]);
return (
diff --git a/src/pages/Trade.jsx b/src/pages/Trade.jsx
index 3f5a41f..2fb07f7 100644
--- a/src/pages/Trade.jsx
+++ b/src/pages/Trade.jsx
@@ -18,15 +18,6 @@ const Trade = ({ lang }) => {
// Scroll to top
window.scrollTo(0, 0);
- }, []);
-
- useEffect(() => {
- // Documents fetch
- const DocumentsApi = new Api(
- 'http://tmex.gov.tm:8765/api/documents',
- docsData,
- setDocsData,
- ).get({ 'X-Localization': lang });
}, [lang]);
return (