pavel/pinkmine
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into feature/design-wishlist

Browse source
This commit is contained in:
Pavel Gnedov 2023-07-03 08:08:37 +07:00
commit b46bb91a2a
8 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/.env.development Normal file
View file

@ -0,0 +1 @@
REACT_APP_BACKEND=http://localhost:3001/

1
frontend/.env.production Normal file
View file

@ -0,0 +1 @@
REACT_APP_BACKEND=/

2
frontend/src/issues-list-board/store.ts
View file

@ -61,7 +61,7 @@ export const PageStore = types.model({
}); });
export async function PageStoreLoadData(store: IPageStore): Promise<void> { export async function PageStoreLoadData(store: IPageStore): Promise<void> {
const url = `/simple-kanban-board/${store.type}/${store.name}/raw`; const url = `${process.env.REACT_APP_BACKEND}simple-kanban-board/${store.type}/${store.name}/raw`;
const resp = await axios.get(url); const resp = await axios.get(url);
if (!(resp?.data)) return; if (!(resp?.data)) return;

2
frontend/src/kanban-board/kanban-boards.tsx
View file

@ -34,7 +34,7 @@ export const KanbanBoards = observer((props: Props) => {
const onTreeRefreshClick = (e: React.MouseEvent) => { const onTreeRefreshClick = (e: React.MouseEvent) => {
if (e.target !== e.currentTarget) return; if (e.target !== e.currentTarget) return;
e.stopPropagation(); e.stopPropagation();
axios.get(`/simple-kanban-board/tree/${props.store.name}/refresh`); axios.get(`${process.env.REACT_APP_BACKEND}simple-kanban-board/tree/${props.store.name}/refresh`);
} }
treeRefreshMenuItem = <button onClick={onTreeRefreshClick}>Force tree refresh</button>; treeRefreshMenuItem = <button onClick={onTreeRefreshClick}>Force tree refresh</button>;
} }

2
frontend/src/kanban-board/store.ts
View file

@ -86,7 +86,7 @@ export const PageStore = types.model({
}); });
export async function PageStoreLoadData(store: IPageStore): Promise<void> { export async function PageStoreLoadData(store: IPageStore): Promise<void> {
const url = `/simple-kanban-board/${store.type}/${store.name}/raw`; const url = `${process.env.REACT_APP_BACKEND}simple-kanban-board/${store.type}/${store.name}/raw`;
const resp = await axios.get(url); const resp = await axios.get(url);
if (!(resp?.data)) return; if (!(resp?.data)) return;
store.setData(resp.data); store.setData(resp.data);

2
frontend/src/misc-components/issue-details-dialog.tsx
View file

@ -43,7 +43,7 @@ export type Props = {
export const IssueDetailsDialog = observer((props: Props): JSX.Element => { export const IssueDetailsDialog = observer((props: Props): JSX.Element => {
const onUpdateClick = (e: React.MouseEvent) => { const onUpdateClick = (e: React.MouseEvent) => {
const url = `/redmine-event-emitter/append-issues`; const url = `${process.env.REACT_APP_BACKEND}redmine-event-emitter/append-issues`;
axios.post(url, [props.store.issue.id]); axios.post(url, [props.store.issue.id]);
}; };
const onCloseClick = (e: React.MouseEvent) => { const onCloseClick = (e: React.MouseEvent) => {

2
frontend/src/utils/service-actions.ts
View file

@ -14,7 +14,7 @@ export const onIssuesRefreshClick = (e: React.MouseEvent) => {
export const onGetIssuesQueueSizeClick = async (e: React.MouseEvent): Promise<void> => { export const onGetIssuesQueueSizeClick = async (e: React.MouseEvent): Promise<void> => {
if (e.target !== e.currentTarget) return; if (e.target !== e.currentTarget) return;
e.stopPropagation(); e.stopPropagation();
const resp = await axios.get(`/redmine-event-emitter/get-issues-queue-size`); const resp = await axios.get(`${process.env.REACT_APP_BACKEND}redmine-event-emitter/get-issues-queue-size`);
console.debug(`resp -`, resp); // DEBUG console.debug(`resp -`, resp); // DEBUG
if (!resp || typeof resp.data !== 'number') return; if (!resp || typeof resp.data !== 'number') return;
alert(`Issues queue size - ${resp.data}`); alert(`Issues queue size - ${resp.data}`);

2
src/main.ts
View file

@ -12,6 +12,8 @@ async function bootstrap() {
logger: ['debug', 'error', 'warn', 'log', 'verbose'], logger: ['debug', 'error', 'warn', 'log', 'verbose'],
}); });
app.enableCors();
app.setBaseViewsDir(join(__dirname, '..', 'views')); app.setBaseViewsDir(join(__dirname, '..', 'views'));
app.setViewEngine('hbs'); app.setViewEngine('hbs');