diff --git a/package.json b/package.json index 5a371714..8b7edc5d 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,3 @@ - { "name": "cirdlesweb", "version": "0.1.0", @@ -20,7 +19,7 @@ "@babel/polyfill": "^7.12.1", "@material-ui/core": "^4.11.4", "@material-ui/icons": "^4.11.2", - "axios": "^0.24.0", + "axios": "^0.25.0", "babel-core": "^6.26.3", "bootstrap": "^4.5.0", "classnames": "^2.2.6", @@ -109,4 +108,3 @@ "worker-loader": "^2.0.0" } } - diff --git a/src/constants/api.js b/src/constants/api.js index 20cf2286..e20000c2 100644 --- a/src/constants/api.js +++ b/src/constants/api.js @@ -4,7 +4,7 @@ export const AMBAPO_ENDPOINT = BASE_URL + "/ambapo"; export const SQUID_ENDPOINT = BASE_URL + "/prawn"; export const TOPSOIL_ENDPOINT = BASE_URL + "/topsoil"; export const MARS_ENDPOINT = BASE_URL + "/mars"; -export const SQUIDINK_ENDPOINT = "https://cirdles.cs.cofc.edu/sservlet"; +export const SQUIDINK_ENDPOINT = "http://localhost:8080/squid_servlet-1.0.0"; export const PORTEDSQUID_ENDPOINT = BASE_URL + "/portedsquid"; // Sesar APIs @@ -14,10 +14,10 @@ export const PORTEDSQUID_ENDPOINT = BASE_URL + "/portedsquid"; export const SESAR_BASE_URL = "https://app.geosamples.org"; export const SESAR_LOGIN = - SESAR_BASE_URL + "/webservices/credentials_service_v2.php"; + SESAR_BASE_URL + "/webservices/credentials_service_v2.php"; export const SESAR_SAMPLE_PROFILE = - SESAR_BASE_URL + "/webservices/display.php?igsn="; + SESAR_BASE_URL + "/webservices/display.php?igsn="; // added oct 2020 to show sample profile with bar code export const SESAR_SAMPLE_DISPLAY = SESAR_BASE_URL + "/sample/igsn/"; export const SESAR_USER_SAMPLES = SESAR_BASE_URL + "/samples/user_code/"; @@ -28,6 +28,6 @@ export const POST_HEADERS = { }; // Filebrowser -export const FILEBROWSER_URL = "https://cirdles.cs.cofc.edu/filebrowser" +export const FILEBROWSER_URL = "http://localhost:8081" -export const SQUIDINK_ENABLED = false; +export const SQUIDINK_ENABLED = false; \ No newline at end of file diff --git a/src/scenes/Squidink/components/ContextMenu.js b/src/scenes/Squidink/components/ContextMenu.js index c7e75bd8..00780cf8 100644 --- a/src/scenes/Squidink/components/ContextMenu.js +++ b/src/scenes/Squidink/components/ContextMenu.js @@ -22,7 +22,7 @@ export default class DropdownCustom extends React.Component { <> { this.props.menuActive ? -