diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..659ccff --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,33 @@ +name: Deploy +run-name: ${{ gitea.actor }} build image and push to container registry + +on: + push: + branches: + - 'main' + - 'staging' + - 'dev' + +jobs: + Publish: + runs-on: ["skeris"] + conainer: + image: gitea.pena:3000/penadevops/container-images/node-compose:main + steps: + - name: Check out repository code + uses: http://gitea.pena:3000/PenaDevops/actions.git/checkout@v1 + - name: Publish + run: | + npm config set registry=http://gitea.pena/api/packages/skeris/npm/ + npm config set -- '//gitea.pena/api/packages/skeris/npm/:_authToken' "1856e802057f59193ca6fdb4068cbea44982bcc2" + if [ "${{ github.ref }}" == "refs/heads/main" ]; then + npm version major + elif [ "${{ github.ref }}" == "refs/heads/staging" ]; then + npm version minor + else + npm version patch + fi + npm publish + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 339d754..85dafdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Теперь запросы не по переменным окружения, а по глобальной переменной - Бог в помощь - Обновлены все пакеты - Убран yarn diff --git a/env.d.ts b/env.d.ts deleted file mode 100644 index 511a1b9..0000000 --- a/env.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -/// - -interface ImportMetaEnv { - readonly VITE_REACT_APP_DOMAIN: string; - readonly VITE_API_KEY: string; - // Добавьте другие переменные окружения, которые вы используете -} - -interface ImportMeta { - readonly env: ImportMetaEnv; -} \ No newline at end of file diff --git a/lib/api/account.ts b/lib/api/account.ts index 51c0f1b..f077a38 100644 --- a/lib/api/account.ts +++ b/lib/api/account.ts @@ -2,7 +2,7 @@ import { UserAccount, UserName } from "../model/account"; import { makeRequest } from "./makeRequest"; -const apiUrl = import.meta.env.VITE__APP_DOMAIN + "/customer"; +const apiUrl = window.the_domain + "/customer"; export function patchUserAccount(user: UserName, version:string | undefined) { return makeRequest({ diff --git a/lib/api/makeRequest.ts b/lib/api/makeRequest.ts index 9eba1d6..b628dbf 100644 --- a/lib/api/makeRequest.ts +++ b/lib/api/makeRequest.ts @@ -66,7 +66,7 @@ export async function makeRequest({ function refresh(token: string) { - return axios>(import.meta.env.VITE__APP_DOMAIN + "/auth/refresh", { + return axios>(window.the_domain + "/auth/refresh", { headers: { "Authorization": `Bearer ${token}`, "Content-Type": "application/json", diff --git a/lib/api/tariff.ts b/lib/api/tariff.ts index 2d4e078..7253301 100644 --- a/lib/api/tariff.ts +++ b/lib/api/tariff.ts @@ -4,7 +4,7 @@ import { makeRequest } from "./makeRequest"; export function getTariffById(tariffId:string){ return makeRequest({ - url: import.meta.env.VITE__APP_DOMAIN + `/strator/tariff/${tariffId}`, + url: window.the_domain + `/strator/tariff/${tariffId}`, method: "get", useToken: true, }); diff --git a/lib/env.d.ts b/lib/env.d.ts deleted file mode 100644 index ae7e762..0000000 --- a/lib/env.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export declare global { - namespace NodeJS { - interface ProcessEnv { - readonly NODE_ENV: 'development' | 'production' | 'test'; - } - } -} \ No newline at end of file diff --git a/lib/global.d.ts b/lib/global.d.ts new file mode 100644 index 0000000..90fefd9 --- /dev/null +++ b/lib/global.d.ts @@ -0,0 +1,3 @@ +interface Window { + the_domain: string; +} \ No newline at end of file diff --git a/lib/hooks/useAllTariffsFetcher.ts b/lib/hooks/useAllTariffsFetcher.ts index 7b48b6f..3869b67 100644 --- a/lib/hooks/useAllTariffsFetcher.ts +++ b/lib/hooks/useAllTariffsFetcher.ts @@ -5,7 +5,7 @@ import { makeRequest } from "../api/makeRequest"; export function useAllTariffsFetcher({ enabled = true, - baseUrl = import.meta.env.VITE__APP_DOMAIN + "/strator/tariff", + baseUrl = window.the_domain + "/strator/tariff", onSuccess, onError, }: { diff --git a/lib/hooks/usePrivilegeFetcher.ts b/lib/hooks/usePrivilegeFetcher.ts index 7508a0b..e9fb263 100644 --- a/lib/hooks/usePrivilegeFetcher.ts +++ b/lib/hooks/usePrivilegeFetcher.ts @@ -5,7 +5,7 @@ import { Privilege } from "../model"; export function usePrivilegeFetcher({ onSuccess, - url = import.meta.env.VITE__APP_DOMAIN + "/strator/privilege", + url = window.the_domain + "/strator/privilege", onError, }: { onSuccess: (response: Privilege[]) => void; diff --git a/lib/utils/backendMessageHandler.ts b/lib/utils/backendMessageHandler.ts index 49f634f..e787e5c 100644 --- a/lib/utils/backendMessageHandler.ts +++ b/lib/utils/backendMessageHandler.ts @@ -24,7 +24,7 @@ export function getMessageFromFetchError(error: any, defaultMessage = "Что-т } } - if (process.env.NODE_ENV === "development") return rawMessage ?? error.message ?? defaultMessage; + if (window.the_domain === "dev") return rawMessage ?? error.message ?? defaultMessage; return defaultMessage; } diff --git a/lib/utils/devlog.ts b/lib/utils/devlog.ts index 0d5c02c..a81b4ba 100644 --- a/lib/utils/devlog.ts +++ b/lib/utils/devlog.ts @@ -1,3 +1,3 @@ export const devlog: typeof console.log = (...args) => { - if (process.env.NODE_ENV === "development") console.log(...args); + if (window.the_domain === "dev") console.log(...args); }; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index c65dea5..cae4c1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@frontend/kitui", - "version": "1.0.92", + "version": "2.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@frontend/kitui", - "version": "1.0.92", + "version": "2.2.0", "license": "MIT", "dependencies": { "immer": "^10.1.1", diff --git a/package.json b/package.json index 3734f98..ea8a8e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@frontend/kitui", - "version": "2.0.2", + "version": "2.1.1", "description": "test", "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts deleted file mode 100644 index 11f02fe..0000000 --- a/src/vite-env.d.ts +++ /dev/null @@ -1 +0,0 @@ -///