fix staging server

pull/37/head
maxime.batista 1 year ago
parent 208d835a1f
commit 4c684e27a8

@ -1 +1,2 @@
VITE_API_ENDPOINT=/api VITE_API_ENDPOINT=/api
VITE_BASE=

@ -36,6 +36,7 @@ steps:
- chmod +x /tmp/moshell_setup.sh - chmod +x /tmp/moshell_setup.sh
- echo n | /tmp/moshell_setup.sh - echo n | /tmp/moshell_setup.sh
- echo "VITE_API_ENDPOINT=/IQBall/$DRONE_BRANCH/public/api" >> .env.PROD - echo "VITE_API_ENDPOINT=/IQBall/$DRONE_BRANCH/public/api" >> .env.PROD
- echo "VITE_BASE=/IQBall/$DRONE_BRANCH/public" >> .env.PROD
- -
- /root/.local/bin/moshell ci/build_react.msh - /root/.local/bin/moshell ci/build_react.msh

@ -9,8 +9,6 @@ val drone_branch = std::env("DRONE_BRANCH").unwrap()
val base = "/IQBall/$drone_branch/public" val base = "/IQBall/$drone_branch/public"
npm run build -- --base=$base --mode PROD npm run build -- --base=$base --mode PROD
npm run build -- --base=/IQBall/public --mode PROD
// Read generated mappings from build // Read generated mappings from build
val result = $(jq -r 'to_entries|map(.key + " " +.value.file)|.[]' dist/manifest.json) val result = $(jq -r 'to_entries|map(.key + " " +.value.file)|.[]' dist/manifest.json)
val mappings = $result.split('\n') val mappings = $result.split('\n')

@ -2,3 +2,8 @@
* This constant defines the API endpoint. * This constant defines the API endpoint.
*/ */
export const API = import.meta.env.VITE_API_ENDPOINT export const API = import.meta.env.VITE_API_ENDPOINT
/**
* This constant defines the base app's endpoint.
*/
export const BASE = import.meta.env.VITE_BASE

@ -37,14 +37,14 @@ export interface EditorViewProps {
tactic: Tactic tactic: Tactic
onContentChange: (tactic: TacticContent) => Promise<SaveState> onContentChange: (tactic: TacticContent) => Promise<SaveState>
onNameChange: (name: string) => Promise<boolean> onNameChange: (name: string) => Promise<boolean>
courtType: string courtType: "PLAIN" | "HALF"
} }
export interface EditorProps { export interface EditorProps {
id: number id: number
name: string name: string
content: string content: string
courtType: string courtType: "PLAIN" | "HALF"
} }
/** /**

@ -3,6 +3,7 @@ import "../style/new_tactic_panel.css"
import plainCourt from "../assets/court/court.svg" import plainCourt from "../assets/court/court.svg"
import halfCourt from "../assets/court/half_court.svg" import halfCourt from "../assets/court/half_court.svg"
import {BASE} from "../Constants";
export default function NewTacticPanel() { export default function NewTacticPanel() {
return ( return (
@ -44,14 +45,14 @@ function CourtKindButton({
return ( return (
<div <div
className="court-kind-button" className="court-kind-button"
onClick={() => (location.href = redirect)}> onClick={() => location.href = BASE + redirect}>
<div className="court-kind-button-details">{details}</div> <div className="court-kind-button-details">{details}</div>
<div className="court-kind-button-top"> <div className="court-kind-button-top">
<div className="court-kind-button-image-div"> <div className="court-kind-button-image-div">
<img <img
src={image} src={image}
alt={name} alt={name}
className="court-kind-button-image"></img> className="court-kind-button-image"/>
</div> </div>
</div> </div>
<div className="court-kind-button-bottom"> <div className="court-kind-button-bottom">

Loading…
Cancel
Save