From b8123cc035780276e0365609819353ca142bf482 Mon Sep 17 00:00:00 2001 From: "ACM@UIUC" Date: Wed, 14 Feb 2018 13:02:49 -0600 Subject: [PATCH 1/3] successful application merge --- src/app/App.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 1e2885c..ef8cd9f 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -6,12 +6,12 @@ import './App.css'; class App extends Component { constructor(props) { - super(props); + super(props); this.state = {frameworks: this.props.frameworkImages, - disableAllButton: false}; - + disableAllButton: false}; this.loadingGif = "https://loading.io/spinners/double-ring/lg.double-ring-spinner.gif"; this.click = this.click.bind(this); + this.api = window.location.protocol+"//"+window.location.href.split('/')[2] } click(f) { @@ -22,7 +22,7 @@ class App extends Component { updatedFramework[index].loading = true; this.setState({framework:updatedFramework, disableAllButton:true}) - fetch('http://vault.acm.illinois.edu:5656/create_container', { + fetch(this.api + '/create_container', { method: 'POST', headers: { 'Accept': 'application/json', From 1690ae54f3c3f40e90ce998a685de83c840b2369 Mon Sep 17 00:00:00 2001 From: "ACM@UIUC" Date: Sat, 17 Feb 2018 00:12:34 -0600 Subject: [PATCH 2/3] support other formats --- src/app/App.js | 2 +- src/frameworkImages.js | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index ef8cd9f..bec4c4d 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -30,7 +30,7 @@ class App extends Component { }, body: JSON.stringify(f) }).then((resp) => resp.json()).then(function(res){ - window.location.replace(res['jupyter_url']); + window.location.replace(res['ui_url']); }); console.log(f) } diff --git a/src/frameworkImages.js b/src/frameworkImages.js index c2cf1e2..09bc4f4 100644 --- a/src/frameworkImages.js +++ b/src/frameworkImages.js @@ -3,27 +3,31 @@ var FrameworkImages = name:'TensorFlow', details: "Ubuntu 16.04 - Python 3.5 - Jupyter Notebook", img: "https://upload.wikimedia.org/wikipedia/commons/thumb/2/2d/Tensorflow_logo.svg/115px-Tensorflow_logo.svg.png", - image: "acmuiuc/tensorflow:latest" + image: "acmuiuc/tensorflow:latest", + token_required: true },{ name:'Caffe2', details: "Ubuntu 16.04 - Python 3.5 - Jupyter Notebook", img: "https://caffe2.ai/static/logo.svg", - image: "acmuiuc/caffe2:latest" + image: "acmuiuc/caffe2:latest", + token_required: true },{ name:'PyTorch', - details: "Ubuntu 16.04 - Python 3.5 - Jupyter Notebook", + details: "Ubuntu 16.04 - Python 3.6 - Jupyter Notebook", img: "http://pytorch.org/static/img/pytorch-logo-dark.svg", - image: "acmuiuc/pytorch:latest" + image: "acmuiuc/pytorch:v0.2", + token_required: true },{ name:'Keras', details: "Ubuntu 16.04 - Python 3.5 - Jupyter Notebook", img: "https://upload.wikimedia.org/wikipedia/commons/c/c9/Keras_Logo.jpg", - image: "acmuiuc/keras:latest" + image: "acmuiuc/keras:latest", + token_required: true },{ name:'NVIDIA Digits', details: "Ubuntu 16.04 - In Browser GUI", img: "https://www.scan.co.uk/images/3xs/infopages/nvidia-digits.png", - image: "nvidia/digits" + image: "acmuiuc/digits" },{ name:'Caffe', details: "Ubuntu 16.04 - C++ - SSH", @@ -32,13 +36,15 @@ var FrameworkImages = },{ name:'mxnet', details: "Ubuntu 16.04 - Python 3.5 - Jupyter Notebook", - img: "https://secure.gravatar.com/avatar/04d69822f9bb98f4d8fd1484c7954c3d.jpg?s=512&r=g&d=mm", - image: "acmuiuc/mxnet" + img: "https://pbs.twimg.com/profile_images/921441672684171264/ElXb2HlG_400x400.jpg", + image: "acmuiuc/mxnet", + token_required: true },{ name:'CNTK', details: "Ubuntu 16.04 - Python 3.5 - Jupyter Notebook", img: "https://blog.paperspace.com/content/images/2016/12/cntk.png", - image: "acmuiuc/cntk" + image: "acmuiuc/cntk", + token_required: true },{ name:'Dockerfile', details: null, @@ -46,4 +52,4 @@ var FrameworkImages = image: null }] -module.exports = FrameworkImages; \ No newline at end of file +module.exports = FrameworkImages; From 956b764bba2f266a9c72d0bfe698b77f80984133 Mon Sep 17 00:00:00 2001 From: "ACM@UIUC" Date: Sun, 25 Feb 2018 01:54:03 -0600 Subject: [PATCH 3/3] update latest frameworks --- src/frameworkImages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frameworkImages.js b/src/frameworkImages.js index 09bc4f4..0103ec4 100644 --- a/src/frameworkImages.js +++ b/src/frameworkImages.js @@ -27,7 +27,7 @@ var FrameworkImages = name:'NVIDIA Digits', details: "Ubuntu 16.04 - In Browser GUI", img: "https://www.scan.co.uk/images/3xs/infopages/nvidia-digits.png", - image: "acmuiuc/digits" + image: "acmuiuc/digits:latest" },{ name:'Caffe', details: "Ubuntu 16.04 - C++ - SSH",