Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change ekaterinburg.io → ekaterinburg.city #77

Merged
merged 2 commits into from
Sep 10, 2023
Merged

Change ekaterinburg.io → ekaterinburg.city #77

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6bd28a
Change ekaterinburg.io → ekaterinburg.city
sashachabin Sep 10, 2023
c52851f
Change `map-api` → `transport-cms`
sashachabin Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/api/articles/articles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down
4 changes: 2 additions & 2 deletions client/api/main-page/main-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
);
},
Expand Down Expand Up @@ -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',
});
}
Expand Down
2 changes: 1 addition & 1 deletion client/components/MainPage/Card/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
>
Expand Down
2 changes: 1 addition & 1 deletion client/components/Map/MainContainer/MapMainContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;

Expand Down
4 changes: 2 additions & 2 deletions client/pages/map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export default function Map() {
<>
<Head>
<title>Карта транспорта Екатеринбурга</title>
<link rel="preconnect" href="https://tiles.ekaterinburg.io" />
<link rel="preconnect" href="https://map-api.ekaterinburg.io" />
<link rel="preconnect" href="https://tiles.ekaterinburg.city" />
<link rel="preconnect" href="https://map-api.ekaterinburg.city" />
sashachabin marked this conversation as resolved.
Show resolved Hide resolved
</Head>

<MapComponent />
Expand Down
2 changes: 1 addition & 1 deletion common/strapi/constants.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/strapi/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Loading