Skip to content

Смена URL-адреса сервера #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Смена URL-адреса сервера #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/components/ToolButtonList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ interface State {
show: boolean;
}

// Default server URL (mostly useful while development)
let serverUrl: string = "http://gl-backend.svtz.ru:5000";
if ("REACT_APP_SERVER_PROTOCOL" in process.env && "REACT_APP_SERVER_HOST" in process.env && "REACT_APP_SERVER_PORT" in process.env) {
serverUrl = process.env.REACT_APP_SERVER_PROTOCOL + '://' + process.env.REACT_APP_SERVER_HOST + ':' + process.env.REACT_APP_SERVER_PORT;
}

export class ToolButtonList extends Component<{}, State> {

public toolButtons?: {
Expand Down Expand Up @@ -58,9 +64,9 @@ export class ToolButtonList extends Component<{}, State> {
});
}

private setGraphCreationList() {
private setGraphCreationList() {
const setImg = (title: string): string =>
`http://gl-backend.svtz.ru:5000/odata/downloadImage(name='${title}.png')`;
`${serverUrl}/odata/downloadImage(name='${title}.png')`;
let list: { [index: string]: () => void } = {};
list[setImg('add_vertex')] = () => {
console.log(adapter);
Expand All @@ -80,7 +86,7 @@ export class ToolButtonList extends Component<{}, State> {

private setDefaultButtonList() {
const setImg = (title: string): string =>
`http://gl-backend.svtz.ru:5000/odata/downloadImage(name='${title}.png')`;
`${serverUrl}/odata/downloadImage(name='${title}.png')`;
let list: { [index: string]: () => void } = {};
list[setImg('Help')] = () => {
this.dispatch({
Expand Down
12 changes: 9 additions & 3 deletions src/redux/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ import { composeWithDevTools } from 'redux-devtools-extension';
import rootReducer, { RootState } from './rootReducer';
import { init } from 'graphlabs.core.notifier';

// '!': https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-0.html#non-null-assertion-operator
// http://gl-backend.svtz.ru:5000 is default server URL (mostly useful while development)
let serverProtocol: string = 'REACT_APP_SERVER_PROTOCOL' in process.env ? process.env.REACT_APP_SERVER_PROTOCOL! : 'http';
let serverHost: string = 'REACT_APP_SERVER_HOST' in process.env ? process.env.REACT_APP_SERVER_HOST! : 'gl-backend.svtz.ru';
let serverPort: number = 'REACT_APP_SERVER_PORT' in process.env ? parseInt(process.env.REACT_APP_SERVER_PORT!) : 5000;

init({
protocol: 'http',
host: 'gl-backend.svtz.ru',
port: 5000,
protocol: serverProtocol,
host: serverHost,
port: serverPort,
path: 'odata/taskVariantLogs'
});

Expand Down