Skip to content

Commit f6b5c2d

Browse files
committed
local frontend deploy
1 parent fe213b8 commit f6b5c2d

File tree

12 files changed

+39
-29
lines changed

12 files changed

+39
-29
lines changed

frontend/src/features/authentication/api/authFx.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { AuthRequest } from '../model/AuthRequest.ts'
44
import { AuthResponse } from '../model/AuthResponse.ts'
55
import axios from 'axios'
66
import { AuthState, initialAuthState } from '@/entities'
7-
import { backendAuthikUrl } from '@/shared/api'
7+
import { backendUrl } from '@/shared/api'
88

99
export const $authStore = createStore<AuthState>(initialAuthState)
1010
export const $userIdStore = createStore<number | null>(null)
@@ -19,7 +19,7 @@ export const authFx = createEffect<AuthRequest, AuthState, Error>({
1919
handler: async (authReq) => {
2020
try {
2121
const response = await axios.put<AuthResponse>(
22-
`${backendAuthikUrl}/api/auth/telegram/web-app`,
22+
`${backendUrl}/api/auth/telegram/web-app`,
2323
JSON.stringify(authReq),
2424
{
2525
method: 'PUT',

frontend/src/features/edit-profile/api/editProfile.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Person } from '@/entities/person/model/Person.ts'
2-
import { backendPeopleUrl } from '@/shared/api'
2+
import { backendUrl } from '@/shared/api'
33
import axios from 'axios'
44
import { PersonPatch } from '@/entities/person-patch/model/PersonPatch.ts'
55

66
export function editProfile(profile: Person) {
7-
const url = `${backendPeopleUrl}/api/people/${profile.id}`
7+
const url = `${backendUrl}/api/people/${profile.id}`
88

99
// FIXME jwt token
1010
const basicAuth = 'test basic auth'

frontend/src/features/get-faculties/api/getFaculties.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import axios from 'axios'
22
import React from 'react'
3-
import { backendPeopleUrl } from '@/shared/api'
3+
import { backendUrl } from '@/shared/api'
44
import { Faculty } from '@/entities/registration-data/model/faculty.ts'
55

66
export function getFaculties(
77
setFaculties: React.Dispatch<React.SetStateAction<Array<Faculty>>>,
88
) {
9-
const url = `${backendPeopleUrl}/api/faculties`
9+
const url = `${backendUrl}/api/faculties`
1010

1111
axios
1212
.get(url)

frontend/src/features/get-locations/api/getLocations.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import axios from 'axios'
22
import React from 'react'
3-
import { backendPeopleUrl } from '@/shared/api'
3+
import { backendUrl } from '@/shared/api'
44
import { Location } from '@/entities/registration-data/model/Location.ts'
55

66
export function getLocations(
77
setLocations: React.Dispatch<React.SetStateAction<Array<Location>>>,
88
) {
9-
const url = `${backendPeopleUrl}/api/locations`
9+
const url = `${backendUrl}/api/locations`
1010

1111
axios
1212
.get(url)

frontend/src/features/get-suggestions/api/getSuggestions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import axios from 'axios'
22
import React from 'react'
3-
import { backendMatchmakerUrl } from '@/shared/api'
3+
import { backendUrl } from '@/shared/api'
44
import { $authStore } from '@/features/authentication/api/authFx.ts'
55

66
export function getSuggestions(
77
setPersonIdArray: React.Dispatch<React.SetStateAction<Array<number>>>,
88
limit: number,
99
) {
10-
const url = `${backendMatchmakerUrl}/api/suggestions?limit=${limit}`
10+
const url = `${backendUrl}/api/suggestions?limit=${limit}`
1111
const config = {
1212
method: 'GET',
1313
headers: {

frontend/src/features/get-topics/api/getTopics.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import axios from 'axios'
22
import { Topic } from '@/entities/registration-data/model/topic.ts'
33
import React from 'react'
4-
import { backendPeopleUrl } from '@/shared/api'
4+
import { backendUrl } from '@/shared/api'
55

66
export function getTopics(
77
setTopics: React.Dispatch<React.SetStateAction<Array<Topic>>>,
88
) {
9-
const url = `${backendPeopleUrl}/api/topics`
9+
const url = `${backendUrl}/api/topics`
1010

1111
axios
1212
.get(url)

frontend/src/features/get_user/api/getUser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { PersonLegacy } from '@/entities/person/model/Person.ts'
2-
import { backendPeopleUrl } from '@/shared/api'
2+
import { backendUrl } from '@/shared/api'
33
import axios, { AxiosResponse } from 'axios'
44
import { $authStore } from '@/features/authentication/api/authFx.ts'
55

66
export function getUser(userId: number): Promise<AxiosResponse<PersonLegacy>> {
7-
const url = `${backendPeopleUrl}/api/people/${userId}`
7+
const url = `${backendUrl}/api/people/${userId}`
88

99
// FIXME jwt token
1010
const basicAuth = `Bearer ${$authStore.getState().token}`

frontend/src/features/patch-person/api/patchPerson.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios, { AxiosResponse } from 'axios'
2-
import { backendPeopleUrl } from '@/shared/api'
2+
import { backendUrl } from '@/shared/api'
33
import { RegistrationData } from '@/entities'
44
import {
55
$authStore,
@@ -12,7 +12,7 @@ export function patchPerson(
1212
registartionData: RegistrationData,
1313
status: string,
1414
): Promise<AxiosResponse<void | IError>> {
15-
const url = `${backendPeopleUrl}/api/people/${$userIdStore.getState()}`
15+
const url = `${backendUrl}/api/people/${$userIdStore.getState()}`
1616
const config = {
1717
method: 'PATCH',
1818
headers: {

frontend/src/features/set-attitude/api/setAttitude.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import axios from 'axios'
2-
import { backendMatchmakerUrl } from '@/shared/api'
2+
import { backendUrl } from '@/shared/api'
33

44
export function setAttitude(personId: number, attitude: string) {
5-
const url = `${backendMatchmakerUrl}/api/people/${personId}/attitudes/incoming/${attitude}`
5+
const url = `${backendUrl}/api/people/${personId}/attitudes/incoming/${attitude}`
66

77
// FIXME jwt token
88
const basicAuth = 'test basic auth'

frontend/src/shared/api/api.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ export async function api<T>(url: string): Promise<T> {
88
}
99
export type JwtToken = string
1010

11-
export const backendMatchmakerUrl = 'https://itmodating.3utilities.com:444'
12-
export const backendPeopleUrl = 'https://itmodating.3utilities.com:444'
13-
export const backendAuthikUrl = 'https://itmodating.3utilities.com:444'
11+
export const backendUrl = 'https://localhost:444'
12+
//'https://itmodating.3utilities.com:444'

frontend/src/shared/api/index.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
export {
22
api,
33
type JwtToken,
4-
backendPeopleUrl,
5-
backendMatchmakerUrl,
6-
backendAuthikUrl,
4+
backendUrl,
75
} from './api.ts'
86

97
export { $errorStore, throwErrorFx } from './error.ts'

frontend/vite.config.ts

+18-5
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,32 @@ export default defineConfig({
1010
react(),
1111
tsconfigPaths(),
1212
//dev certificate
13-
// mkcert(),
13+
mkcert({
14+
savePath: './.cert',
15+
force: true,
16+
hosts: ["itmodating.3utilities.com", "127.0.0.1"]
17+
})
1418
],
1519
publicDir: './public',
1620
server: {
1721
host: true,
22+
port: 443,
23+
https: {
24+
cert: './.cert/cert.pem',
25+
key: './.cert/dev.pem'
26+
}
1827
},
1928
preview: {
2029
strictPort: true,
2130
port: 443,
2231
https: {
23-
key: fs.readFileSync('./.cert/privkey.pem'),
24-
cert: fs.readFileSync('./.cert/cert.pem'),
25-
ca: fs.readFileSync('./.cert/chain.pem'),
26-
},
32+
cert: './.cert/cert.pem',
33+
key: './.cert/dev.pem'
34+
}
35+
// https: {
36+
// key: fs.readFileSync('./.cert/le-privkey.pem'),
37+
// cert: fs.readFileSync('./.cert/le-cert.pem'),
38+
// ca: fs.readFileSync('./.cert/le-chain.pem'),
39+
// },
2740
},
2841
})

0 commit comments

Comments
 (0)