From 408724cf67f534f82ffe1a53b7c7265c27cd2ac8 Mon Sep 17 00:00:00 2001 From: Kevser <> Date: Mon, 28 Jul 2025 17:14:07 +0300 Subject: [PATCH 1/2] =?UTF-8?q?-=20dev=20ve=20prod=20i=C3=A7in=20env=20aya?= =?UTF-8?q?rlar=C4=B1=20yap=C4=B1ld=C4=B1.=20-=20test=20sunucusu=20iin=20b?= =?UTF-8?q?uild=20script=20eklendi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + .env.localdev | 1 + .env.production | 1 + env.d.ts | 7 +++++++ package.json | 3 +++ src/init/axios-init.ts | 2 +- src/stores/dataStore.ts | 12 ++++++------ vite.config.ts | 3 +++ 8 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 .env.development create mode 100644 .env.localdev create mode 100644 .env.production diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..01212db --- /dev/null +++ b/.env.development @@ -0,0 +1 @@ +VITE_API_URL=https://panelapi.cekilisevitest.gov.tr/ \ No newline at end of file diff --git a/.env.localdev b/.env.localdev new file mode 100644 index 0000000..eb228c4 --- /dev/null +++ b/.env.localdev @@ -0,0 +1 @@ +VITE_API_URL=https://localhost:7241/ \ No newline at end of file diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..f8e16bb --- /dev/null +++ b/.env.production @@ -0,0 +1 @@ +VITE_API_URL=https://panelapi.cekilisevi.gov.tr/ \ No newline at end of file diff --git a/env.d.ts b/env.d.ts index ed77210..2e528ed 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1,2 +1,9 @@ /// +interface ImportMetaEnv { + readonly VITE_API_URL: string; +} + +interface ImportMeta { + readonly env: ImportMetaEnv; +} \ No newline at end of file diff --git a/package.json b/package.json index c5df6a2..bc246eb 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,12 @@ "type": "module", "scripts": { "dev": "vite", + "localdev": "vite", "build": "run-p type-check \"build-only {@}\" --", + "buildtest": "run-p type-check \"build-only-test {@}\" --", "preview": "vite preview", "build-only": "vite build", + "build-only-test": "vite build --mode development", "type-check": "vue-tsc --build --force" }, "dependencies": { diff --git a/src/init/axios-init.ts b/src/init/axios-init.ts index fcbf462..ff4b907 100644 --- a/src/init/axios-init.ts +++ b/src/init/axios-init.ts @@ -2,7 +2,7 @@ import axios from 'axios' import { useUsersStore } from '@/stores/usersStore' import router from '@/router' -axios.defaults.baseURL = 'https://panelapi.cekilisevi.gov.tr/' +axios.defaults.baseURL = import.meta.env.VITE_API_URL //axios.defaults.timeout = 2000; axios.defaults.headers['Content-Type'] = 'application/json; charset=utf-8' import { useDataStore } from '@/stores/dataStore' diff --git a/src/stores/dataStore.ts b/src/stores/dataStore.ts index 52cb2b8..20a8368 100644 --- a/src/stores/dataStore.ts +++ b/src/stores/dataStore.ts @@ -8,7 +8,7 @@ export const useDataStore = defineStore('dataStore', () => { const globalDataStore = useGlobalDataStore() const toastStore = useToastStore() - const siteBase = ref('https://panelapi.cekilisevi.gov.tr/') + const siteBase = ref(import.meta.env.VITE_API_URL) const apiBase = ref('api/') const panelData = reactive>({}) const pageData = reactive>({}) @@ -40,7 +40,7 @@ export const useDataStore = defineStore('dataStore', () => { } const response = await axios.get(apiBase.value + api, sendData) - //console.log('response --', api, response) + console.log('response --', api, response) if (data.full !== undefined && data.full) { return response @@ -49,7 +49,7 @@ export const useDataStore = defineStore('dataStore', () => { } } catch (error: any) { CheckApiError(error.response.status, error.response.data) - //console.error('Hata oluştu -:', error) + console.error('Hata oluştu -:', error) return 'errorfalse' } } @@ -86,7 +86,7 @@ export const useDataStore = defineStore('dataStore', () => { } catch (error: any) { CheckApiError(error.response.status, error.response.data) - //console.error('Hata oluştu:', error) + console.error('Hata oluştu:', error) return Promise.resolve('errorfalse') } } @@ -122,7 +122,7 @@ export const useDataStore = defineStore('dataStore', () => { } catch (error: any) { CheckApiError(error.response.status, error.response.data) - //console.error('Hata oluştu:', error) + console.error('Hata oluştu:', error) return Promise.resolve('errorfalse') } } @@ -156,7 +156,7 @@ export const useDataStore = defineStore('dataStore', () => { } } catch (error: any) { CheckApiError(error.response.status, error.response.data) - //console.error('Hata oluştu:', error) + console.error('Hata oluştu:', error) return Promise.resolve('errorfalse') } } diff --git a/vite.config.ts b/vite.config.ts index 2fb21e9..20f81a1 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -11,5 +11,8 @@ export default defineConfig({ alias: { '@': fileURLToPath(new URL('./src', import.meta.url)) } + }, + esbuild: { + drop: process.env.NODE_ENV === 'production' ? ['console', 'debugger'] : [] } }) From 7776e24dddcbedfba5042e5153ff50d6218a84bf Mon Sep 17 00:00:00 2001 From: Kevser <> Date: Mon, 28 Jul 2025 18:52:04 +0300 Subject: [PATCH 2/2] =?UTF-8?q?-=20Teminat=20durumu=20zaman=20a=C5=9F?= =?UTF-8?q?=C4=B1m=C4=B1=20iade=20i=C3=A7in=20de=20ek=20alanlar=20a=C3=A7?= =?UTF-8?q?=C4=B1ld=C4=B1=20-=20iadeSay=C4=B1=20alan=C4=B1=20eklendi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TabPiyangoTeminatDurumu.vue | 16 ++++++++++------ .../panel/PanelPiyangoTeminatDurumuDisplay.vue | 16 ++++++++++++++-- src/module/cekilisler/service/piyangoServices.ts | 5 +++++ .../cekilisler/service/piyangoTeminatService.ts | 3 ++- .../cekilisler/stores/piyangoTeminatStore.ts | 1 + .../validation/piyangoTeminatValidationStore.ts | 6 ++++++ 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue b/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue index 22fbce6..945002d 100644 --- a/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue +++ b/src/module/cekilisler/components/TabPiyangoTeminatDurumu.vue @@ -22,13 +22,20 @@ v-if=" usersStore.isPanelUser || (!usersStore.isPanelUser && + piyangoStore.lotteryApprove !== 0 && + piyangoStore.lotteryApprove !== 1 && + piyangoStore.lotteryApprove !== 2 && piyangoStore.lotteryApprove !== 3 && !piyangoTeminatStore.isNew) " />