From c6bd28a22cde2a8993b52c652a124e83ddd104be Mon Sep 17 00:00:00 2001 From: Alexander Chabin Date: Sun, 10 Sep 2023 14:52:27 +0500 Subject: [PATCH] =?UTF-8?q?Change=20ekaterinburg.io=20=E2=86=92=20ekaterin?= =?UTF-8?q?burg.city?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/api/articles/articles.ts | 4 ++-- client/api/main-page/main-page.ts | 4 ++-- client/components/MainPage/Card/Card.tsx | 2 +- client/components/Map/MainContainer/MapMainContainer.tsx | 2 +- client/pages/map.tsx | 4 ++-- common/strapi/constants.js | 2 +- common/strapi/constants.ts | 2 +- package.json | 3 +-- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/client/api/articles/articles.ts b/client/api/articles/articles.ts index da176d4a..8b9f3668 100644 --- a/client/api/articles/articles.ts +++ b/client/api/articles/articles.ts @@ -2,12 +2,12 @@ import { fetchApi } from 'api/utils/fetch'; export const articlesApi = { getArticles: () => - fetchApi('https://transport-cms.ekaterinburg.io/api/articles?fields=slug', { + fetchApi('https://transport-cms.ekaterinburg.city/api/articles?fields=slug', { dataField: 'data', }), getArticle: (slug: string) => fetchApi( - `https://transport-cms.ekaterinburg.io/api/articles?filters[slug][$eq]=${encodeURIComponent( + `https://transport-cms.ekaterinburg.city/api/articles?filters[slug][$eq]=${encodeURIComponent( slug, )}`, { dataField: 'data' }, diff --git a/client/api/main-page/main-page.ts b/client/api/main-page/main-page.ts index 8fe2913e..541eaf7e 100644 --- a/client/api/main-page/main-page.ts +++ b/client/api/main-page/main-page.ts @@ -4,7 +4,7 @@ import { fetchApi } from 'api/utils/fetch'; export const MainPageApi = { getCards: async () => { return await fetchApi( - 'https://transport-cms.ekaterinburg.io/api/cards/?populate=backgroundImage', + 'https://transport-cms.ekaterinburg.city/api/cards/?populate=backgroundImage', { dataField: 'data' }, ); }, @@ -35,7 +35,7 @@ export const MainPageApi = { }, getMarqueeItems: async () => { - return await fetchApi('https://transport-cms.ekaterinburg.io/api/marquees', { + return await fetchApi('https://transport-cms.ekaterinburg.city/api/marquees', { dataField: 'data', }); } diff --git a/client/components/MainPage/Card/Card.tsx b/client/components/MainPage/Card/Card.tsx index 7d214577..7561c977 100644 --- a/client/components/MainPage/Card/Card.tsx +++ b/client/components/MainPage/Card/Card.tsx @@ -31,7 +31,7 @@ export function Card({ "--CardTitleBgrColor": titleBackground, "--CardTitleUnderlineColor": titleColor && hexToRgb(titleColor), "--CardBgrColor": backgroundColor, - "--CardBgrImage": backgroundImage && `url(https://transport-cms.ekaterinburg.io${backgroundImage})`, + "--CardBgrImage": backgroundImage && `url(https://transport-cms.ekaterinburg.city${backgroundImage})`, "--CardSubtitleColor": titleColor } as React.CSSProperties} > diff --git a/client/components/Map/MainContainer/MapMainContainer.tsx b/client/components/Map/MainContainer/MapMainContainer.tsx index 8d04c70c..cb2e2ad8 100644 --- a/client/components/Map/MainContainer/MapMainContainer.tsx +++ b/client/components/Map/MainContainer/MapMainContainer.tsx @@ -14,7 +14,7 @@ import { MapWelcomeMessage } from 'components/Map/WelcomeMessage/MapWelcomeMessa import styles from './MapMainContainer.module.css'; import 'leaflet/dist/leaflet.css'; -const tileServerUrl = `https://tiles.ekaterinburg.io/styles/basic-white/{z}/{x}/{y}${ +const tileServerUrl = `https://tiles.ekaterinburg.city/styles/basic-white/{z}/{x}/{y}${ devicePixelRatio > 1 ? '@2x' : '' }.png`; diff --git a/client/pages/map.tsx b/client/pages/map.tsx index 157fbb51..f8f02204 100644 --- a/client/pages/map.tsx +++ b/client/pages/map.tsx @@ -8,8 +8,8 @@ export default function Map() { <> Карта транспорта Екатеринбурга - - + + diff --git a/common/strapi/constants.js b/common/strapi/constants.js index 75332c44..601ff13b 100644 --- a/common/strapi/constants.js +++ b/common/strapi/constants.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.REQUEST_PAGINATION_SIZE = exports.PASSWORD = exports.EMAIL = exports.STRAPI_URL = void 0; -exports.STRAPI_URL = 'https://transport-cms.ekaterinburg.io'; +exports.STRAPI_URL = 'https://transport-cms.ekaterinburg.city'; // email of Authenticated User exports.EMAIL = process.env.STRAPI_EMAIL; // password of Authenticated User diff --git a/common/strapi/constants.ts b/common/strapi/constants.ts index 65aec36f..31990ab6 100644 --- a/common/strapi/constants.ts +++ b/common/strapi/constants.ts @@ -1,4 +1,4 @@ -export const STRAPI_URL = 'https://transport-cms.ekaterinburg.io'; +export const STRAPI_URL = 'https://transport-cms.ekaterinburg.city'; // email of Authenticated User export const EMAIL = process.env.STRAPI_EMAIL; // password of Authenticated User diff --git a/package.json b/package.json index 77a3bbde..1efe317a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "transport", - "version": "1.0.0", - "homepage": "https://transport.ekaterinburg.io", + "homepage": "https://transport.ekaterinburg.city", "license": "MIT", "private": true, "scripts": {