Skip to content

Commit

Permalink
Bug fix for non localhost:3000 installs
Browse files Browse the repository at this point in the history
  • Loading branch information
klavins committed Feb 14, 2019
1 parent fa9e0a8 commit c7f8aeb
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ Installation
- Enter in your server URL, your username, and your password.
- Then click on the **Aq** icon. You may need to click the Download button next to where it says "PACKAGE EXPLORER: AQUARIUM" to refresh the extension.

Upgrading
===

As of this writing, to upgrade to a new version of Nemo, you need to uninstall the old version. To do so, first uninstall it vai VS Code, then remove the installation directory. On a Mac, this directory would be at ~/.vscode/extensions/klavins-lab.nemo-*

Usage
===

Expand Down Expand Up @@ -67,3 +72,8 @@ To start VS Code in development mode:
function code () { VSCODE_CWD="$PWD" open -n -b "com.microsoft.VSCode" --args $*; }
code .
```

To build the package:
```bash
vsce package
```
2 changes: 1 addition & 1 deletion aquarium.js
Original file line number Diff line number Diff line change
Expand Up @@ -6973,7 +6973,7 @@ AQ.login = function(username, password) {
resolve(body);
} else {
console.log("AQ: COULD NOT LOG IN");
reject("Could not log in to Aquarium server. Check Nemo's settings.")
reject("Could not log in to Aquarium server at " + AQ.config.aquarium_url + ". Check Nemo's settings.")
}
})
})
Expand Down
2 changes: 2 additions & 0 deletions extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ function activate(context) {

let config = vscode.workspace.getConfiguration('nemo');

AQ.config.aquarium_url = config.localAquariumServerUrl;

function connect() {
let operations_types = [];
let libraries = [];
Expand Down
Binary file renamed nemo-0.0.1.vsix → nemo-0.0.2.vsix
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"displayName": "Nemo",
"description": "Pull, edit, test, and push Aquarium protocols.",
"repository": "https://github.com/klavinslab/nemo",
"version": "0.0.1",
"version": "0.0.2",
"engines": {
"vscode": "^1.30.0"
},
Expand Down

0 comments on commit c7f8aeb

Please sign in to comment.