sst_main v0

dev
timofejmalinin 3 years ago
parent f0648bcaea
commit 824e9de3e5

@ -25,12 +25,12 @@ pages:
build-remote:
stage: build
only:
- main
- sst_main
script:
- cd /home/toren332/postamates/
- cd /home/toren332/sst_postamates/
- sudo git fetch
- sudo git reset --hard origin/main
- sudo git submodule foreach git pull origin main
- sudo git reset --hard origin/sst_main
- sudo git submodule foreach git pull origin sst_main
- sudo git add postamates_frontend
- sudo git commit -m "new frontend"
- sudo git push
@ -40,13 +40,13 @@ build-remote:
deploy-remote:
stage: deploy
only:
- main
- sst_main
script:
- cd /home/toren332/postamates/
- cd /home/toren332/sst_postamates/
- sudo docker-compose down
- sudo git fetch
- sudo git reset --hard origin/main
- sudo git submodule foreach git pull origin main
- sudo git reset --hard origin/sst_main
- sudo git submodule foreach git pull origin sst_main
- sudo docker-compose build --no-cache frontend
- sudo docker-compose up -d
tags:

@ -4,7 +4,7 @@ export const api = axios.create({
baseURL:
import.meta.env.MODE === "development"
? "http://localhost:5173/"
: "https://property.spatiality.website/",
: "https://postnet-dev.selftech.ru/",
withCredentials: true,
xsrfHeaderName: "X-CSRFToken",
xsrfCookieName: "csrftoken",

@ -37,7 +37,7 @@ export const RegionSelect = () => {
setLoading(true);
try {
const response = await api.get(
"https://postamates.spatiality.website/api/ao_and_rayons"
"https://postnet-dev.selftech.ru/api/ao_and_rayons"
);
setData(response.data);
} catch (err) {

@ -8,8 +8,8 @@ export default defineConfig({
plugins: [svgr(), react()],
server: {
proxy: {
"/account": "https://property.spatiality.website/",
"/api": "https://property.spatiality.website/",
"/account": "https://postnet-dev.selftech.ru/",
"/api": "https://postnet-dev.selftech.ru/",
},
},
css: {

Loading…
Cancel
Save