From 0e4988e7dd11e299bd13df72ca235ed95dca9abc Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:19:40 +0530
Subject: [PATCH 01/48] Update content.js

---
 ide/static/js/content.js | 52 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/ide/static/js/content.js b/ide/static/js/content.js
index 9a0c92d4c..fbb68a2d0 100644
--- a/ide/static/js/content.js
+++ b/ide/static/js/content.js
@@ -85,6 +85,7 @@ class Content extends React.Component {
     this.openModal = this.openModal.bind(this);
     this.closeModal = this.closeModal.bind(this);
     this.saveDb = this.saveDb.bind(this);
+    this.saveModel = this.saveModel.bind(this);
     this.loadDb = this.loadDb.bind(this);
     this.infoModal = this.infoModal.bind(this);
     this.faqModal = this.faqModal.bind(this);
@@ -979,6 +980,35 @@ class Content extends React.Component {
     layer.info.phase = 0;
     this.setState({ net });
   }
+  saveModel(){
+  let netData1 = this.state.net;
+  console.log(netData1);
+  this.setState({ load: true });
+    $.ajax({
+      url: '/saveModel',
+      dataType: 'json',
+      type: 'POST',
+      data: {
+        net: JSON.stringify(netData1),
+        net_name: this.state.net_name,
+        user_id: this.getUserId(),
+        nextLayerId: this.state.nextLayerId
+      },
+      success : function (response) {
+        if (response.result == 'success') {
+          this.modalContent = "Successfully Saved!";
+          this.openModal();
+        }
+        else if (response.result == 'error') {
+          this.addError(response.error);
+        }
+        this.setState({ load: false });
+      }.bind(this),
+      error() {
+        this.setState({ load: false });
+      }
+    });
+  }
   saveDb(){
     let netData = this.state.net;
     this.setState({ load: true });
@@ -1019,6 +1049,7 @@ class Content extends React.Component {
     new RegExp("([^?=&]+)(=([^&]*))?", "g"),
     function($0, $1, $2, $3) {
       urlParams[$1] = $3;
+      console.log(urlParams);
       }
     );
 
@@ -1055,7 +1086,7 @@ class Content extends React.Component {
     // Note: this needs to be improved when handling conflict resolution to avoid
     // inconsistent states of model
     let nextLayerId = this.state.nextLayerId;
-
+    var shareBool = false;
     this.setState({ load: true });
 
     this.dismissAllErrors();
@@ -1072,6 +1103,13 @@ class Content extends React.Component {
           // while loading a model ensure paramete intialisation
           // for UI show/hide is not executed, it leads to inconsistent
           // data which cannot be used further
+          if (response.public_sharing == false) {
+            shareBool = false;
+          }
+          else {
+            shareBool = true;
+          }
+          console.log(response);
           nextLayerId = response.next_layer_id;
           this.initialiseImportedNet(response.net,response.net_name);
           if (Object.keys(response.net).length){
@@ -1083,8 +1121,10 @@ class Content extends React.Component {
         }
         this.setState({
           load: false,
-          isShared: true,
+          isShared: shareBool,
           nextLayerId: parseInt(nextLayerId)
+        }, function() {
+          console.log("Shared value: " + this.state.isShared);
         });
       }.bind(this),
       error() {
@@ -1092,6 +1132,7 @@ class Content extends React.Component {
       }
     });
   }
+
   infoModal() {
     this.modalHeader = "About"
     this.modalContent = `Fabrik is an online collaborative platform to build and visualize deep\
@@ -1113,7 +1154,7 @@ class Content extends React.Component {
       <a target="_blank" href="https://github.com/Cloud-CV/Fabrik/blob/master/docs/source/tested_models.md"> here</a>.
       <br />
       <b>Q:</b> What do the Train/Test buttons mean?<br />
-      <b>A:</b> They are two different modes of your model: 
+      <b>A:</b> They are two different modes of your model:
       Train and Test - respectively for training your model with data and testing how and if it works.<br />
       <b>Q:</b> What does the import fuction do?<br />
       <b>A:</b> It allows you to import your previously created models in Caffe (.protoxt files),
@@ -1127,7 +1168,7 @@ class Content extends React.Component {
       <b>A:</b> Please see the instructions listed
       <a target="_blank" href="https://github.com/Cloud-CV/Fabrik/blob/master/README.md"> here</a>
       <br /><br />
-                         
+
       <b>If you have anymore questions, please visit Fabrik's Github page available
        <a target="_blank" href="https://github.com/Cloud-CV/Fabrik"> here</a> for more information.</b>
       </p>);
@@ -1282,6 +1323,7 @@ class Content extends React.Component {
       this.addNewLayer(layer);
     }
   }
+
   render() {
     let loader = null;
     if (this.state.load) {
@@ -1299,9 +1341,11 @@ class Content extends React.Component {
           <div id="sidebar-scroll" className="col-md-12">
              <h5 className="sidebar-heading">ACTIONS</h5>
              <TopBar
+              isPublic_Sharing={this.state.isShared}
               exportNet={this.exportNet}
               importNet={this.importNet}
               saveDb={this.saveDb}
+              saveModel={this.saveModel}
               zooModal={this.zooModal}
               textboxModal={this.textboxModal}
               urlModal={this.urlModal}

From ebac6b1b4e3dfc19a76b803f8eb14924c8810458 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:20:52 +0530
Subject: [PATCH 02/48] Update views.py

---
 ide/views.py | 176 +++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 148 insertions(+), 28 deletions(-)

diff --git a/ide/views.py b/ide/views.py
index 9cd03ea87..cf4e0a5d6 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -2,9 +2,10 @@
 import sys
 import yaml
 import json
+import urlparse
 
 from caffe_app.models import Network, NetworkVersion, NetworkUpdates
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from django.http import JsonResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.models import User
@@ -82,6 +83,78 @@ def calculate_parameter(request):
         return JsonResponse({'result': 'success', 'net': net})
 
 
+@csrf_exempt
+def deleteModel_from_db(request):
+    if request.method == 'POST':
+        if 'userID' in request.POST:
+            userID = request.POST.get('userID')
+            model_id = request.POST.get('modelid')
+            model = Network.objects.get(id=model_id)
+            if model.author_id == int(userID):
+                model.delete()
+                return JsonResponse({'result': 'success', 'data': 'Model successfully deleted!'})
+            else:
+                return JsonResponse({'result': 'error', 'error': "This model doesn't belong to you!"})
+
+
+@csrf_exempt
+def saveModel_to_db(request):
+    if request.method == 'POST':
+        net = request.POST.get('net')
+        net_name = request.POST.get('net_name')
+        user_id = request.POST.get('user_id')
+        next_layer_id = request.POST.get('nextLayerId')
+        public_sharing = False
+        user = None
+        if net_name == '':
+            net_name = 'Net'
+
+        if Network.objects.filter(name=net_name).exists():
+            # Update the exising json field
+            try:
+                if user_id:
+                    user_id = int(user_id)
+                    user = User.objects.get(id=user_id)
+
+                # load the model with the net name
+                model = Network.objects.get(name=net_name)
+                model_id = model.id
+                # update the model with network id same as model id
+                existing_model = NetworkVersion.objects.get(network_id=model_id)
+                existing_model.network_def = net
+                existing_model.save()
+                # create initial update for nextLayerId
+                model_update = NetworkUpdates(network_version=existing_model,
+                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                              tag='ModelNotShared')
+                model_update.save()
+
+                return JsonResponse({'result': 'success', 'id': model.id})
+            except:
+                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
+
+        else:
+            try:
+                if user_id:
+                    user_id = int(user_id)
+                    user = User.objects.get(id=user_id)
+
+                # create a new model on save event
+                model = Network(name=net_name, public_sharing=public_sharing, author=user)
+                model.save()
+                # create first version of model
+                model_version = NetworkVersion(network=model, network_def=net)
+                model_version.save()
+                # create initial update for nextLayerId
+                model_update = NetworkUpdates(network_version=model_version,
+                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                              tag='ModelNotShared')
+                model_update.save()
+
+                return JsonResponse({'result': 'success', 'id': model.id})
+            except:
+                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
+
 @csrf_exempt
 def save_to_db(request):
     if request.method == 'POST':
@@ -93,29 +166,59 @@ def save_to_db(request):
         user = None
         if net_name == '':
             net_name = 'Net'
-        try:
-            # making model sharing public by default for now
-            # TODO: Prvilege on Sharing
-            if user_id:
-                user_id = int(user_id)
-                user = User.objects.get(id=user_id)
-
-            # create a new model on share event
-            model = Network(name=net_name, public_sharing=public_sharing, author=user)
-            model.save()
-            # create first version of model
-            model_version = NetworkVersion(network=model, network_def=net)
-            model_version.save()
-            # create initial update for nextLayerId
-            model_update = NetworkUpdates(network_version=model_version,
-                                          updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                          tag='ModelShared')
-            model_update.save()
-
-            return JsonResponse({'result': 'success', 'id': model.id})
-        except:
-            return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
 
+        if Network.objects.filter(name=net_name).exists():
+            # Update the exising json field
+            try:
+                # making model sharing public by default for now
+                # TODO: Prvilege on Sharing
+                if user_id:
+                    user_id = int(user_id)
+                    user = User.objects.get(id=user_id)
+
+                # load the model with the net name
+                model = Network.objects.get(name=net_name)
+                model_id = model.id
+                # enable public sharing
+                model.public_sharing = True
+                model.save()
+                # update the model with network id same as model id
+                existing_model = NetworkVersion.objects.get(network_id=model_id)
+                existing_model.network_def = net
+                existing_model.save()
+                # create initial update for nextLayerId
+                model_update = NetworkUpdates(network_version=existing_model,
+                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                              tag='ModelShared')
+                model_update.save()
+
+                return JsonResponse({'result': 'success', 'id': model.id})
+            except:
+                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
+
+        else:
+            try:
+                # making model sharing public by default for now
+                # TODO: Prvilege on Sharing
+                if user_id:
+                    user_id = int(user_id)
+                    user = User.objects.get(id=user_id)
+
+                # create a new model on save event
+                model = Network(name=net_name, public_sharing=public_sharing, author=user)
+                model.save()
+                # create first version of model
+                model_version = NetworkVersion(network=model, network_def=net)
+                model_version.save()
+                # create initial update for nextLayerId
+                model_update = NetworkUpdates(network_version=model_version,
+                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                              tag='ModelShared')
+                model_update.save()
+
+                return JsonResponse({'result': 'success', 'id': model.id})
+            except:
+                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
 
 def create_network_version(network_def, updates_batch):
     network_def = yaml.safe_load(network_def)
@@ -216,20 +319,37 @@ def load_from_db(request):
                 net = data['network']
                 next_layer_id = data['next_layer_id']
 
-                # authorizing the user for access to model
-                if not model.public_sharing:
-                    return JsonResponse({'result': 'error',
-                                         'error': 'Permission denied for access to model'})
             except Exception:
                 return JsonResponse({'result': 'error',
                                      'error': 'No network file found'})
             return JsonResponse({'result': 'success', 'net': net, 'net_name': model.name,
-                                 'next_layer_id': next_layer_id})
+                                 'next_layer_id': next_layer_id, 'public_sharing': model.public_sharing})
 
     if request.method == 'GET':
         return index(request)
 
 
+@csrf_exempt
+def loadModel_from_db(request):
+    if request.method == 'POST':
+        if 'userID' in request.POST:
+            userID = request.POST.get('userID')
+            if Network.objects.filter(author=userID).exists():
+                data={}
+                models = Network.objects.filter(author=userID)
+                modlen = len(models)
+                i=1
+                for mod in models:
+                    data_index1 = "Model%d_Name" % i
+                    data_index2 = "Model%d_ID" % i
+                    data[data_index1]=mod.name
+                    data[data_index2]=mod.id
+                    i+=1
+                return JsonResponse({'result':'success','data':data})
+            else:
+                return JsonResponse({'result':'error','error':'No models found'})
+
+
 @csrf_exempt
 def fetch_model_history(request):
     if request.method == 'POST':

From d10486c9cad99a91779a96d8f9705088542b1272 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:21:22 +0530
Subject: [PATCH 03/48] Update urls.py

---
 ide/urls.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ide/urls.py b/ide/urls.py
index 7798fdc97..d376d17fa 100644
--- a/ide/urls.py
+++ b/ide/urls.py
@@ -3,7 +3,7 @@
 from django.conf.urls.static import static
 from django.conf import settings
 from views import index, calculate_parameter, fetch_layer_shape
-from views import load_from_db, save_to_db, fetch_model_history
+from views import load_from_db, loadModel_from_db, deleteModel_from_db, save_to_db, saveModel_to_db, fetch_model_history
 
 urlpatterns = [
     url(r'^$', index),
@@ -14,7 +14,10 @@
     url(r'^keras/', include('keras_app.urls')),
     url(r'^tensorflow/', include('tensorflow_app.urls')),
     url(r'^save$', save_to_db, name='saveDB'),
+    url(r'^saveModel$', saveModel_to_db, name='saveModel'),
     url(r'^load*', load_from_db, name='loadDB'),
+    url(r'^deleteModel$', deleteModel_from_db, name='deleteModel'),
+    url(r'^getModel$', loadModel_from_db, name='getModelData'),
     url(r'^model_history', fetch_model_history, name='model-history'),
     url(r'^model_parameter/', calculate_parameter, name='calculate-parameter'),
     url(r'^layer_parameter/', fetch_layer_shape, name='fetch-layer-shape')

From 5ffc512321c604091ae28a8c0df18696c6ebf65f Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:22:18 +0530
Subject: [PATCH 04/48] Create dashboard.js

---
 ide/static/js/dashboard.js | 238 +++++++++++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100644 ide/static/js/dashboard.js

diff --git a/ide/static/js/dashboard.js b/ide/static/js/dashboard.js
new file mode 100644
index 000000000..4eae82d39
--- /dev/null
+++ b/ide/static/js/dashboard.js
@@ -0,0 +1,238 @@
+import React from 'react';
+import '../css/dash_style.css';
+import Modal from 'react-modal';
+
+class Card extends React.Component {
+  render() {
+    return(
+            <div style={{display: 'inline-block'}}>
+              <div className="card" style={{
+                background: '#fff', 
+                height: 290, 
+                width: 240, 
+                borderRadius: 30, 
+                display: 'inline-block', 
+                margin: 20, 
+                boxShadow: '0 2px 6px rgba(112,112,112,0.2)'
+              }}>
+              <img style={{marginTop: '4.5em'}} src="static/img/thumb.png" height="60%;" />
+              </div>
+              <div className="overlay">
+                <br />
+                <div className="social" style={{marginTop: '5em'}}>
+                  <div style={{
+                    margin: 10, 
+                    display: 'inline-block', 
+                    color: '#fff', 
+                    fontFamily: '"Proxima Nova",sans-serif', 
+                    width: 10, 
+                    height: 10, 
+                    border: '3px solid #fff', 
+                    padding: 20, 
+                    borderRadius: '50%'
+                  }}>
+                  <a href={"/load?id=" + this.props.ModelID} style={{textDecoration: 'none', color: '#fff'}}>
+                  <p style={{marginTop: '-8px', marginLeft: '-6px'}}>
+                  <span className="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+                  </p>
+                  </a>
+                  </div>
+                  <div style={{margin: 10, 
+                    display: 'inline-block', 
+                    color: '#fff', 
+                    fontFamily: '"Proxima Nova",sans-serif', 
+                    width: 10, 
+                    height: 10, 
+                    border: '3px solid #fff', 
+                    padding: 20, 
+                    borderRadius: '50%'
+                  }}>
+                  <a onClick={
+                    () => this.props.ModelFunction(this.props.ModelID)
+                  } style={{
+                    textDecoration: 'none', 
+                    color: '#fff', 
+                    cursor: 'pointer'
+                  }}>
+                  <p style={{
+                    marginTop: '-8px', 
+                    marginLeft: '-7px'
+                  }}>
+                  <span className="glyphicon glyphicon-trash" aria-hidden="true"></span>
+                  </p>
+                  </a>
+                  </div>
+                </div>
+              </div>
+              <h3 style={{marginTop: '-12em'}}>{this.props.ModelName}</h3>
+            </div>
+      );
+  }
+}
+
+Card.propTypes = {
+  ModelName: React.PropTypes.string,
+  ModelID: React.PropTypes.number,
+  ModelFunction: React.PropTypes.func
+};
+
+const infoStyle = {
+  content : {
+    top                   : '50%',
+    left                  : '55%',
+    right                 : '60%',
+    bottom                : 'auto',
+    marginRight           : '-50%',
+    transform             : 'translate(-50%, -50%)',
+    borderRadius          : '8px'
+  },
+  overlay: {
+    zIndex                : 100
+  }
+};
+
+class Dashboard extends React.Component{
+  constructor(props) {
+    super(props);
+    this.state = {modalIsOpen: false}
+    this.getModelData = this.getModelData.bind(this);
+    this.deleteModel = this.deleteModel.bind(this);
+    this.openModal = this.openModal.bind(this);
+    this.closeModal = this.closeModal.bind(this);
+    this.modalContent = null;
+    this.modalHeader = null;
+  }
+
+  getModelData(){
+    var userid = localStorage.getItem("userID");
+    console.log(userid);
+        $.ajax({
+          url: '/getModel',
+          dataType: 'json',
+          type: 'POST',
+          data: {userID: userid},
+          success : function (response) {
+            if (response.result == 'success') {
+              console.log("success");
+              console.log(response.data);
+              var obj = JSON.stringify(response.data);
+              localStorage.setItem("obj",obj);
+              return obj;
+            }
+            else if (response.result == 'error') {
+              console.log(response.error);
+              if (localStorage.hasOwnProperty('obj')) {
+                console.log("Object set in Local Storage");
+                localStorage.removeItem("obj");
+              }
+            }
+            return response.data;
+          }.bind(this),
+          error() {
+            console.log("error");
+          }
+        });
+  }
+
+  deleteModel(model_id){
+    console.log("model id: "+model_id);
+    var userid = localStorage.getItem("userID");
+    console.log(userid);
+        $.ajax({
+          url: '/deleteModel',
+          type: 'POST',
+          dataType: 'json',
+          data: {userID: userid, modelid: model_id},
+          success : function (response) {
+            console.log(response);
+
+            if (response.result == 'success') {
+              console.log("success2");
+              console.log(response.data);
+              this.modalContent = response.data;
+              this.openModal();
+            }
+            else if (response.result == 'error') {
+              console.log(response.error);
+            }
+          }.bind(this),
+          error() {
+            console.log("error");
+          }
+        });
+  }
+
+  openModal() {
+    this.setState({ modalIsOpen: true });
+  }
+
+  closeModal() {
+    this.setState({ modalIsOpen: false });
+    location.reload(true);
+  }
+
+  componentDidMount() {
+    this.getModelData();
+  }
+
+  render() {
+      if (localStorage.hasOwnProperty('userID')) {
+      if (!localStorage.hasOwnProperty('obj')) {
+        console.log("No objects found");
+        elements=<div><p style={{fontStyle: 'italic', marginTop: '2em'}}>No models found</p></div>;
+      }
+      else {
+      var data_array = JSON.parse(localStorage.getItem("obj"));
+      console.log(data_array);
+      var len = Object.keys(data_array).length/2;
+      console.log("length"+len);
+      var elements=[];
+      for (var i = 1; i < len+1; i++) {
+        elements.push(<Card ModelFunction={ this.deleteModel } ModelName={ data_array["Model"+i+"_Name"] } ModelID={ data_array["Model"+i+"_ID"] } />)
+      }
+      }
+      return (
+      <center>
+        <div className="cont" style={{width: '80%', marginTop: '2em', display: 'inline-block'}}>
+          <h1 style={{color: '#455062', fontSize: '2em', textAlign: 'left', fontWeight: 'bolder'}}>DASHBOARD</h1>
+          <br />
+          <p style={{textAlign: 'left'}}>
+          <a href="#" style={{
+            textDecoration: 'none', 
+            color: '#fff', 
+            fontWeight: 'bold', 
+            background: '#222f3e', 
+            fontSize: '0.7em', 
+            padding: 15, 
+            paddingRight: 20, 
+            paddingLeft: 20, 
+            borderRadius: 200
+          }}>
+          <span className="glyphicon glyphicon-plus" aria-hidden="true"></span> &nbsp;CREATE NEW MODEL</a>
+          </p>
+          <br />
+          <div className="all-cards" style={{marginLeft: '-2.6em', display: 'inline-block'}}>
+          {elements}
+          </div>
+        </div>
+        <Modal
+          isOpen={this.state.modalIsOpen}
+          onRequestClose={this.closeModal}
+          style={infoStyle}
+          contentLabel="Modal">
+          <button type="button" style={{padding: 5+'px'}} className="close" onClick={this.closeModal}>&times;</button>
+          <h4>{ this.modalHeader }</h4>
+          { this.modalContent }
+        </Modal>
+      </center>
+      );
+      }
+      else {
+        console.log("not logged in");
+        window.open("#","_self");
+        return null;
+      }
+  }
+}
+
+export default Dashboard;

From 2cd218c354fce2b774d6ce144b6b8db120772525 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:22:46 +0530
Subject: [PATCH 05/48] Create dash_style.css

---
 ide/static/css/dash_style.css | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ide/static/css/dash_style.css

diff --git a/ide/static/css/dash_style.css b/ide/static/css/dash_style.css
new file mode 100644
index 000000000..3b4571a6c
--- /dev/null
+++ b/ide/static/css/dash_style.css
@@ -0,0 +1,21 @@
+.overlay {
+	opacity: 0;
+	z-index: -2;
+	height: 290px;
+	width: 240px;
+	background: rgb(34,47,62,0.9);
+	border-radius: 30px; 
+	position: relative;
+	top: -310px;
+	transition: all .4s ease;
+}
+
+.card {
+	transition: all .4s ease;
+}
+
+.card:hover + .overlay, .overlay:hover {
+	opacity: 1;
+	z-index: 1;
+	transition: all .4s ease;
+}

From c7dfbcedab78c11834262dc45b56aaae898731c6 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:23:21 +0530
Subject: [PATCH 06/48] Update index.html

---
 ide/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/templates/index.html b/ide/templates/index.html
index 49010dc0e..b98d1b60a 100644
--- a/ide/templates/index.html
+++ b/ide/templates/index.html
@@ -26,7 +26,7 @@
   </script>
 
 </head>
-<body>
+<body style="background: #F3F5F7;">
   <div id="app"></div>
   <a href="#" id="download" style="display:none;"> Download </a>
 </body>

From 288a67cfe382418afa48272df06069cec1985b45 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:24:02 +0530
Subject: [PATCH 07/48] Update login.js

---
 ide/static/js/login.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ide/static/js/login.js b/ide/static/js/login.js
index a31214afa..45ab904ef 100644
--- a/ide/static/js/login.js
+++ b/ide/static/js/login.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import DashButton from './dashbutton';
 
 class Login extends React.Component {
   constructor(props) {
@@ -23,6 +24,7 @@ class Login extends React.Component {
       contentType: false,
       success: function (response) {
         if (response) {
+          localStorage.removeItem("userID");
           this.setState({ loginState: false });
           this.props.setUserId(null);
           this.props.setUserName(null);
@@ -67,6 +69,7 @@ class Login extends React.Component {
         if (response.result) {
           this.setState({ loginState: response.result });
           this.props.setUserId(response.user_id);
+          localStorage.setItem("userID",response.user_id);
           this.props.setUserName(response.username);
 
           if (showNotification) {
@@ -181,6 +184,7 @@ class Login extends React.Component {
     if(this.state.loginState) {
       return (
         <div>
+          <DashButton />
           <h5 className="sidebar-heading" id="sidebar-login-button" onClick={
             () => {
               this.logoutUser();

From feaa07bdedf244586e62dd1ca439b45f547a174e Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:24:36 +0530
Subject: [PATCH 08/48] Update topBar.js

---
 ide/static/js/topBar.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/ide/static/js/topBar.js b/ide/static/js/topBar.js
index b3a02e437..bd256bc6d 100644
--- a/ide/static/js/topBar.js
+++ b/ide/static/js/topBar.js
@@ -4,20 +4,14 @@ import ReactTooltip from 'react-tooltip';
 class TopBar extends React.Component {
   constructor(props) {
     super(props);
-    this.checkURL = this.checkURL.bind(this);
+    this.state = {isPublic_Sharing: false};
   }
-  checkURL() {
-    let url = window.location.href;
-    let urlParams = url.indexOf("load");
-
-    if(urlParams != -1) {
-      return true;
-    }
-    return false;
+  componentWillReceiveProps(newProps){
+    this.setState({isPublic_Sharing: newProps.isPublic_Sharing});
   }
   render() {
     let content = null;
-    if (this.checkURL()) {
+    if (this.state.isPublic_Sharing == true) {
       content = (<div className="topbar-col">
                     <div className="form-group">
                       <button id="topbar-icon" className="btn btn-default dropdown-toggle form-control" data-toggle="dropdown"
@@ -105,6 +99,16 @@ class TopBar extends React.Component {
               </div>
             </div>
             {content}
+            <div className="topbar-col">
+              <div className="form-group">
+                  <div className="dropdown">
+                    <button id="topbar-icon" className="btn btn-default dropdown-toggle form-control" data-toggle="dropdown"
+                    onClick={() => this.props.saveModel()} data-tip="Save Model">
+                      <span className="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>
+                    </button>
+                  </div>
+              </div>
+            </div>
         </div>
       <ReactTooltip type="dark" multiline={true}/>
       </div>
@@ -116,11 +120,13 @@ TopBar.propTypes = {
   exportNet: React.PropTypes.func,
   importNet: React.PropTypes.func,
   saveDb: React.PropTypes.func,
+  saveModel: React.PropTypes.func,
   loadDb: React.PropTypes.func,
   zooModal: React.PropTypes.func,
   textboxModal: React.PropTypes.func,
   urlModal: React.PropTypes.func,
-  updateHistoryModal: React.PropTypes.func
+  updateHistoryModal: React.PropTypes.func,
+  isPublic_Sharing: React.PropTypes.bool
 };
 
 export default TopBar;

From 27f382311d53b5569a3f60e5623e5a03707943e1 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:25:05 +0530
Subject: [PATCH 09/48] Create dashbutton.js

---
 ide/static/js/dashbutton.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ide/static/js/dashbutton.js

diff --git a/ide/static/js/dashbutton.js b/ide/static/js/dashbutton.js
new file mode 100644
index 000000000..a1559e1d5
--- /dev/null
+++ b/ide/static/js/dashbutton.js
@@ -0,0 +1,22 @@
+import React from 'react';
+
+class DashButton extends React.Component {
+	constructor(props) {
+		super(props);
+		this.openDash = this.openDash.bind(this);
+	}
+	openDash(){
+		window.location.href = "/#/dashboard";
+	}
+	render(){
+		return(
+			<div>
+			<h5 style={{marginBottom: '0.6em'}} className="sidebar-heading" id="sidebar-login-button" onClick={() => {this.openDash()}}>
+			<div>DASHBOARD</div>
+			</h5>
+			</div>
+			);
+	}
+}
+
+export default DashButton;

From 0bf3a0cccbd4f979fd9cda0d11d08d123bdc9c12 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:25:45 +0530
Subject: [PATCH 10/48] Update index.js

---
 ide/static/js/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ide/static/js/index.js b/ide/static/js/index.js
index d387a3637..1448af664 100644
--- a/ide/static/js/index.js
+++ b/ide/static/js/index.js
@@ -1,12 +1,13 @@
-
 import React from 'react';
 import { render } from 'react-dom';
 import { Router, Route, hashHistory } from 'react-router';
 import App from './app.js';
+import Dashboard from './dashboard.js';
 import '../css/style.css';
 
 render(
   <Router history={hashHistory}>
     <Route path="/" component={App} />
+    <Route path="/dashboard" component={Dashboard} />
   </Router>, document.getElementById('app')
 );

From c48605f89461c87ff7586298867cf12d7b8b6093 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:27:05 +0530
Subject: [PATCH 11/48] Update test_db.py

---
 tests/unit/caffe_app/test_db.py | 78 +++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/tests/unit/caffe_app/test_db.py b/tests/unit/caffe_app/test_db.py
index ca0fa4a88..487757a3b 100644
--- a/tests/unit/caffe_app/test_db.py
+++ b/tests/unit/caffe_app/test_db.py
@@ -51,3 +51,81 @@ def test_load_nofile(self):
         response = json.loads(response.content)
         self.assertEqual(response['result'], 'error')
         self.assertEqual(response['error'], 'No network file found')
+
+class SaveModelToDBTest(unittest.TestCase):
+
+    def setUp(self):
+        self.client = Client()
+
+    def test_save_json1(self):
+        tests = open(os.path.join(settings.BASE_DIR, 'tests', 'unit', 'ide',
+                                  'caffe_export_test.json'), 'r')
+        net = json.load(tests)['net']
+        response = self.client.post(
+            reverse('saveModel'),
+            {'net': net, 'net_name': 'netname'})
+        response = json.loads(response.content)
+        self.assertEqual(response['result'], 'success')
+
+    def test_load1(self):
+        u_3 = User(id=3, username='user_3')
+        u_3.save()
+        u_4 = User(id=4, username='user_4')
+        u_4.save()
+        model = Network(name='net')
+        model.save()
+        model_version = NetworkVersion(network=model, network_def={})
+        model_version.save()
+
+        response = self.client.post(
+            reverse('saveModel'),
+            {'net': '{"net": "testnet"}', 'net_name': 'name'})
+        response = json.loads(response.content)
+        self.assertEqual(response['result'], 'success')
+        self.assertTrue('id' in response)
+        proto_id = response['id']
+        response = self.client.post(reverse('loadDB'), {'proto_id': proto_id})
+        response = json.loads(response.content)
+        self.assertEqual(response['result'], 'success')
+        self.assertEqual(response['net_name'], 'name')
+
+    def test_load_nofile1(self):
+        response = self.client.post(reverse('loadDB'),
+                                    {'proto_id': 'inexistent'})
+        response = json.loads(response.content)
+        self.assertEqual(response['result'], 'error')
+        self.assertEqual(response['error'], 'No network file found')
+
+class LoadModelFromDB(unittest.TestCase):
+
+    def setUp(self):
+        self.client = Client()
+
+    def test_load_model(self):
+        u_5 = User(id=5, username='user_5')
+        u_5.save()
+        model = Network(id=9,name='test_net',author_id='5')
+        model.save()
+        response = self.client.post(
+            reverse('getModelData'),{'userID':'5'})
+        response = json.loads(response.content)
+        self.assertEqual(response['result'],'success')
+        self.assertEqual(response['data']['Model1_Name'],'test_net')
+        self.assertEqual(response['data']['Model1_ID'],9)
+
+class DeleteModelFromDB(unittest.TestCase):
+
+    def setUp(self):
+        self.client = Client()
+
+    def test_delete_model(self):
+        u_6 = User(id=6, username='user_6')
+        u_6.save()
+        model = Network(id=10,name='test_net2',author_id='6')
+        model.save()
+        response = self.client.post(
+            reverse('deleteModel'),{'userID':'6','modelid':'10'})
+        response = json.loads(response.content)
+        self.assertEqual(response['result'],'success')
+        self.assertEqual(Network.objects.filter(id=10).exists(),False)
+

From 80194bcd89e664bd55fd8407ccf07dfce0ea4699 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:29:07 +0530
Subject: [PATCH 12/48] Update test.py

---
 settings/test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/test.py b/settings/test.py
index 540f7a344..0646701c2 100644
--- a/settings/test.py
+++ b/settings/test.py
@@ -8,10 +8,10 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'fabrik',
-        'USER': 'admin',
-        'PASSWORD': 'fabrik',
-        'HOST': 'localhost',
+        'NAME': 'postgres',
+        'USER': 'postgres',
+        'PASSWORD': 'postgres',
+        'HOST': 'db',
         'PORT': 5432,
     }
 }

From 63d934d2faa278a3d7105eabbd2d90ff6288e48c Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:37:22 +0530
Subject: [PATCH 13/48] Update test.py

---
 settings/test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/test.py b/settings/test.py
index 0646701c2..540f7a344 100644
--- a/settings/test.py
+++ b/settings/test.py
@@ -8,10 +8,10 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'postgres',
-        'USER': 'postgres',
-        'PASSWORD': 'postgres',
-        'HOST': 'db',
+        'NAME': 'fabrik',
+        'USER': 'admin',
+        'PASSWORD': 'fabrik',
+        'HOST': 'localhost',
         'PORT': 5432,
     }
 }

From f8499c1a24d18f18e567b1d4c3d17fc104578784 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 01:54:35 +0530
Subject: [PATCH 14/48] Update test.py

---
 settings/test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/test.py b/settings/test.py
index 540f7a344..a6cda3dd6 100644
--- a/settings/test.py
+++ b/settings/test.py
@@ -8,10 +8,10 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'fabrik',
-        'USER': 'admin',
-        'PASSWORD': 'fabrik',
-        'HOST': 'localhost',
+        'NAME': 'fabrik', # Change this to 'postgres' if you're using docker
+        'USER': 'admin', # Change this to 'postgres' if you're using docker
+        'PASSWORD': 'fabrik', # Change this to 'postgres' if you're using docker
+        'HOST': 'localhost', # Change this to 'db' if you're using docker
         'PORT': 5432,
     }
 }

From 37df28ca2cbfd45d2fc7366b62d3cca2c205b41d Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 03:01:59 +0530
Subject: [PATCH 15/48] Update test.py

---
 settings/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/test.py b/settings/test.py
index a6cda3dd6..64921989c 100644
--- a/settings/test.py
+++ b/settings/test.py
@@ -1,4 +1,4 @@
-from .common import * # noqa: ignore=F405
+from .common import * # flake8: noqa
 
 # Database
 # https://docs.djangoproject.com/en/1.9/ref/settings/#databases

From 8706c6ca7a5a8c231cec35faad76e2c725f27dda Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 03:02:45 +0530
Subject: [PATCH 16/48] Update urls.py

---
 ide/urls.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ide/urls.py b/ide/urls.py
index d376d17fa..30b80f3b7 100644
--- a/ide/urls.py
+++ b/ide/urls.py
@@ -1,3 +1,4 @@
+# flake8: noqa
 from django.conf.urls import url, include
 from django.contrib import admin
 from django.conf.urls.static import static

From 6c28f76f24c41d408e6c7dbd19cdf3354f897011 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 03:03:52 +0530
Subject: [PATCH 17/48] Update views.py

---
 ide/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/views.py b/ide/views.py
index cf4e0a5d6..310014a03 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -1,8 +1,8 @@
+# flake8: noqa
 import copy
 import sys
 import yaml
 import json
-import urlparse
 
 from caffe_app.models import Network, NetworkVersion, NetworkUpdates
 from django.shortcuts import render, redirect

From c81f450c18fdbdd9801370976b8fe7304a4233e6 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 03:04:21 +0530
Subject: [PATCH 18/48] Update views.py

---
 ide/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/views.py b/ide/views.py
index 310014a03..4d2e4efea 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -5,7 +5,7 @@
 import json
 
 from caffe_app.models import Network, NetworkVersion, NetworkUpdates
-from django.shortcuts import render, redirect
+from django.shortcuts import render
 from django.http import JsonResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.models import User

From 41c6afdbb80bd9f6dc342159f16e538eaac0ee8a Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 03:04:43 +0530
Subject: [PATCH 19/48] Update test_db.py

---
 tests/unit/caffe_app/test_db.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/caffe_app/test_db.py b/tests/unit/caffe_app/test_db.py
index 487757a3b..0b39b7533 100644
--- a/tests/unit/caffe_app/test_db.py
+++ b/tests/unit/caffe_app/test_db.py
@@ -1,3 +1,4 @@
+# flake8: noqa
 import json
 import os
 import unittest

From 0a5a94e95a0e83c169974b87a260264744c836af Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 14:47:58 +0530
Subject: [PATCH 20/48] Update content.js

---
 ide/static/js/content.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ide/static/js/content.js b/ide/static/js/content.js
index fbb68a2d0..2865949c9 100644
--- a/ide/static/js/content.js
+++ b/ide/static/js/content.js
@@ -981,15 +981,14 @@ class Content extends React.Component {
     this.setState({ net });
   }
   saveModel(){
-  let netData1 = this.state.net;
-  console.log(netData1);
+  let modelData = this.state.net;
   this.setState({ load: true });
     $.ajax({
       url: '/saveModel',
       dataType: 'json',
       type: 'POST',
       data: {
-        net: JSON.stringify(netData1),
+        net: JSON.stringify(modelData),
         net_name: this.state.net_name,
         user_id: this.getUserId(),
         nextLayerId: this.state.nextLayerId
@@ -1086,7 +1085,7 @@ class Content extends React.Component {
     // Note: this needs to be improved when handling conflict resolution to avoid
     // inconsistent states of model
     let nextLayerId = this.state.nextLayerId;
-    var shareBool = false;
+    let is_shared = false;
     this.setState({ load: true });
 
     this.dismissAllErrors();
@@ -1104,10 +1103,10 @@ class Content extends React.Component {
           // for UI show/hide is not executed, it leads to inconsistent
           // data which cannot be used further
           if (response.public_sharing == false) {
-            shareBool = false;
+            is_shared = false;
           }
           else {
-            shareBool = true;
+            is_shared = true;
           }
           console.log(response);
           nextLayerId = response.next_layer_id;
@@ -1121,7 +1120,7 @@ class Content extends React.Component {
         }
         this.setState({
           load: false,
-          isShared: shareBool,
+          isShared: is_shared,
           nextLayerId: parseInt(nextLayerId)
         }, function() {
           console.log("Shared value: " + this.state.isShared);
@@ -1341,7 +1340,7 @@ class Content extends React.Component {
           <div id="sidebar-scroll" className="col-md-12">
              <h5 className="sidebar-heading">ACTIONS</h5>
              <TopBar
-              isPublic_Sharing={this.state.isShared}
+              isPublicSharing={this.state.isShared}
               exportNet={this.exportNet}
               importNet={this.importNet}
               saveDb={this.saveDb}

From 216807a40e9265d366c29e0de44da92f72bb6835 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 14:50:01 +0530
Subject: [PATCH 21/48] Update content.js

---
 ide/static/js/content.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ide/static/js/content.js b/ide/static/js/content.js
index 2865949c9..fa3c2cdd5 100644
--- a/ide/static/js/content.js
+++ b/ide/static/js/content.js
@@ -1048,7 +1048,6 @@ class Content extends React.Component {
     new RegExp("([^?=&]+)(=([^&]*))?", "g"),
     function($0, $1, $2, $3) {
       urlParams[$1] = $3;
-      console.log(urlParams);
       }
     );
 
@@ -1108,7 +1107,7 @@ class Content extends React.Component {
           else {
             is_shared = true;
           }
-          console.log(response);
+          //console.log(response);
           nextLayerId = response.next_layer_id;
           this.initialiseImportedNet(response.net,response.net_name);
           if (Object.keys(response.net).length){
@@ -1123,7 +1122,7 @@ class Content extends React.Component {
           isShared: is_shared,
           nextLayerId: parseInt(nextLayerId)
         }, function() {
-          console.log("Shared value: " + this.state.isShared);
+          //console.log("Shared value: " + this.state.isShared);
         });
       }.bind(this),
       error() {

From 46b1e09ed39c1e40a36df25c4939ec544fbb04cc Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 14:52:09 +0530
Subject: [PATCH 22/48] Update topBar.js

---
 ide/static/js/topBar.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ide/static/js/topBar.js b/ide/static/js/topBar.js
index bd256bc6d..8d4d24ac7 100644
--- a/ide/static/js/topBar.js
+++ b/ide/static/js/topBar.js
@@ -4,14 +4,14 @@ import ReactTooltip from 'react-tooltip';
 class TopBar extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {isPublic_Sharing: false};
+    this.state = {isPublicSharing: false};
   }
   componentWillReceiveProps(newProps){
-    this.setState({isPublic_Sharing: newProps.isPublic_Sharing});
+    this.setState({isPublicSharing: newProps.isPublicSharing});
   }
   render() {
     let content = null;
-    if (this.state.isPublic_Sharing == true) {
+    if (this.state.isPublicSharing == true) {
       content = (<div className="topbar-col">
                     <div className="form-group">
                       <button id="topbar-icon" className="btn btn-default dropdown-toggle form-control" data-toggle="dropdown"
@@ -126,7 +126,7 @@ TopBar.propTypes = {
   textboxModal: React.PropTypes.func,
   urlModal: React.PropTypes.func,
   updateHistoryModal: React.PropTypes.func,
-  isPublic_Sharing: React.PropTypes.bool
+  isPublicSharing: React.PropTypes.bool
 };
 
 export default TopBar;

From 422e886b011cfa36d1239fe2182bcee58ebe3eca Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 14:53:12 +0530
Subject: [PATCH 23/48] Create card.js

---
 ide/static/js/card.js | 79 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 ide/static/js/card.js

diff --git a/ide/static/js/card.js b/ide/static/js/card.js
new file mode 100644
index 000000000..72b382ff8
--- /dev/null
+++ b/ide/static/js/card.js
@@ -0,0 +1,79 @@
+import React from 'react';
+import '../css/dash_style.css';
+
+class Card extends React.Component {
+  render() {
+    return(
+            <div style={{display: 'inline-block'}}>
+              <div className="card" style={{
+                background: '#fff', 
+                height: 290, 
+                width: 240, 
+                borderRadius: 30, 
+                display: 'inline-block', 
+                margin: 20, 
+                boxShadow: '0 2px 6px rgba(112,112,112,0.2)'
+              }}>
+              <img style={{marginTop: '4.5em'}} src="static/img/thumb.png" height="60%;" />
+              </div>
+              <div className="overlay">
+                <br />
+                <div className="social" style={{marginTop: '5em'}}>
+                  <div style={{
+                    margin: 10, 
+                    display: 'inline-block', 
+                    color: '#fff', 
+                    fontFamily: '"Proxima Nova",sans-serif', 
+                    width: 10, 
+                    height: 10, 
+                    border: '3px solid #fff', 
+                    padding: 20, 
+                    borderRadius: '50%'
+                  }}>
+                  <a href={"/load?id=" + this.props.ModelID} style={{textDecoration: 'none', color: '#fff'}}>
+                  <p style={{marginTop: '-8px', marginLeft: '-6px'}}>
+                  <span className="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+                  </p>
+                  </a>
+                  </div>
+                  <div style={{margin: 10, 
+                    display: 'inline-block', 
+                    color: '#fff', 
+                    fontFamily: '"Proxima Nova",sans-serif', 
+                    width: 10, 
+                    height: 10, 
+                    border: '3px solid #fff', 
+                    padding: 20, 
+                    borderRadius: '50%'
+                  }}>
+                  <a onClick={
+                    () => this.props.ModelFunction(this.props.ModelID)
+                  } style={{
+                    textDecoration: 'none', 
+                    color: '#fff', 
+                    cursor: 'pointer'
+                  }}>
+                  <p style={{
+                    marginTop: '-8px', 
+                    marginLeft: '-7px'
+                  }}>
+                  <span className="glyphicon glyphicon-trash" aria-hidden="true"></span>
+                  </p>
+                  </a>
+                  </div>
+                </div>
+              </div>
+              <h3 style={{marginTop: '-12em'}}>{this.props.ModelName}</h3>
+            </div>
+      );
+  }
+}
+
+Card.propTypes = {
+  ModelName: React.PropTypes.string,
+  ModelID: React.PropTypes.number,
+  ModelFunction: React.PropTypes.func
+};
+
+
+export default Card;

From 5b9405ac1b43ba346f61099982bb34b190355172 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 14:53:38 +0530
Subject: [PATCH 24/48] Update dashboard.js

---
 ide/static/js/dashboard.js | 93 +-------------------------------------
 1 file changed, 1 insertion(+), 92 deletions(-)

diff --git a/ide/static/js/dashboard.js b/ide/static/js/dashboard.js
index 4eae82d39..718ae21c6 100644
--- a/ide/static/js/dashboard.js
+++ b/ide/static/js/dashboard.js
@@ -1,80 +1,6 @@
 import React from 'react';
-import '../css/dash_style.css';
 import Modal from 'react-modal';
-
-class Card extends React.Component {
-  render() {
-    return(
-            <div style={{display: 'inline-block'}}>
-              <div className="card" style={{
-                background: '#fff', 
-                height: 290, 
-                width: 240, 
-                borderRadius: 30, 
-                display: 'inline-block', 
-                margin: 20, 
-                boxShadow: '0 2px 6px rgba(112,112,112,0.2)'
-              }}>
-              <img style={{marginTop: '4.5em'}} src="static/img/thumb.png" height="60%;" />
-              </div>
-              <div className="overlay">
-                <br />
-                <div className="social" style={{marginTop: '5em'}}>
-                  <div style={{
-                    margin: 10, 
-                    display: 'inline-block', 
-                    color: '#fff', 
-                    fontFamily: '"Proxima Nova",sans-serif', 
-                    width: 10, 
-                    height: 10, 
-                    border: '3px solid #fff', 
-                    padding: 20, 
-                    borderRadius: '50%'
-                  }}>
-                  <a href={"/load?id=" + this.props.ModelID} style={{textDecoration: 'none', color: '#fff'}}>
-                  <p style={{marginTop: '-8px', marginLeft: '-6px'}}>
-                  <span className="glyphicon glyphicon-pencil" aria-hidden="true"></span>
-                  </p>
-                  </a>
-                  </div>
-                  <div style={{margin: 10, 
-                    display: 'inline-block', 
-                    color: '#fff', 
-                    fontFamily: '"Proxima Nova",sans-serif', 
-                    width: 10, 
-                    height: 10, 
-                    border: '3px solid #fff', 
-                    padding: 20, 
-                    borderRadius: '50%'
-                  }}>
-                  <a onClick={
-                    () => this.props.ModelFunction(this.props.ModelID)
-                  } style={{
-                    textDecoration: 'none', 
-                    color: '#fff', 
-                    cursor: 'pointer'
-                  }}>
-                  <p style={{
-                    marginTop: '-8px', 
-                    marginLeft: '-7px'
-                  }}>
-                  <span className="glyphicon glyphicon-trash" aria-hidden="true"></span>
-                  </p>
-                  </a>
-                  </div>
-                </div>
-              </div>
-              <h3 style={{marginTop: '-12em'}}>{this.props.ModelName}</h3>
-            </div>
-      );
-  }
-}
-
-Card.propTypes = {
-  ModelName: React.PropTypes.string,
-  ModelID: React.PropTypes.number,
-  ModelFunction: React.PropTypes.func
-};
+import Card from './card';
 
 const infoStyle = {
   content : {
@@ -105,7 +31,6 @@ class Dashboard extends React.Component{
 
   getModelData(){
     var userid = localStorage.getItem("userID");
-    console.log(userid);
         $.ajax({
           url: '/getModel',
           dataType: 'json',
@@ -113,51 +38,39 @@ class Dashboard extends React.Component{
           data: {userID: userid},
           success : function (response) {
             if (response.result == 'success') {
-              console.log("success");
-              console.log(response.data);
               var obj = JSON.stringify(response.data);
               localStorage.setItem("obj",obj);
               return obj;
             }
             else if (response.result == 'error') {
-              console.log(response.error);
               if (localStorage.hasOwnProperty('obj')) {
-                console.log("Object set in Local Storage");
                 localStorage.removeItem("obj");
               }
             }
             return response.data;
           }.bind(this),
           error() {
-            console.log("error");
           }
         });
   }
 
   deleteModel(model_id){
-    console.log("model id: "+model_id);
     var userid = localStorage.getItem("userID");
-    console.log(userid);
         $.ajax({
           url: '/deleteModel',
           type: 'POST',
           dataType: 'json',
           data: {userID: userid, modelid: model_id},
           success : function (response) {
-            console.log(response);
 
             if (response.result == 'success') {
-              console.log("success2");
-              console.log(response.data);
               this.modalContent = response.data;
               this.openModal();
             }
             else if (response.result == 'error') {
-              console.log(response.error);
             }
           }.bind(this),
           error() {
-            console.log("error");
           }
         });
   }
@@ -178,14 +91,11 @@ class Dashboard extends React.Component{
   render() {
       if (localStorage.hasOwnProperty('userID')) {
       if (!localStorage.hasOwnProperty('obj')) {
-        console.log("No objects found");
         elements=<div><p style={{fontStyle: 'italic', marginTop: '2em'}}>No models found</p></div>;
       }
       else {
       var data_array = JSON.parse(localStorage.getItem("obj"));
-      console.log(data_array);
       var len = Object.keys(data_array).length/2;
-      console.log("length"+len);
       var elements=[];
       for (var i = 1; i < len+1; i++) {
         elements.push(<Card ModelFunction={ this.deleteModel } ModelName={ data_array["Model"+i+"_Name"] } ModelID={ data_array["Model"+i+"_ID"] } />)
@@ -228,7 +138,6 @@ class Dashboard extends React.Component{
       );
       }
       else {
-        console.log("not logged in");
         window.open("#","_self");
         return null;
       }

From 28e6c665a4c433c64c95d8ece24c7e7bfe126174 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 14:56:48 +0530
Subject: [PATCH 25/48] Update views.py

---
 ide/views.py | 333 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 226 insertions(+), 107 deletions(-)

diff --git a/ide/views.py b/ide/views.py
index 4d2e4efea..cd06cc634 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -9,7 +9,8 @@
 from django.http import JsonResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.models import User
-from utils.shapes import get_shapes, get_layer_shape, handle_concat_layer
+from utils.shapes import get_shapes, get_layer_shape, \
+    handle_concat_layer
 
 
 def index(request):
@@ -25,38 +26,67 @@ def fetch_layer_shape(request):
             net[layerId]['shape'] = {}
             net[layerId]['shape']['input'] = None
             net[layerId]['shape']['output'] = None
-            dataLayers = ['ImageData', 'Data', 'HDF5Data', 'Input', 'WindowData', 'MemoryData', 'DummyData']
+            dataLayers = [
+                'ImageData',
+                'Data',
+                'HDF5Data',
+                'Input',
+                'WindowData',
+                'MemoryData',
+                'DummyData',
+                ]
 
             # Obtain input shape of new layer
-            if (net[layerId]['info']['type'] == "Concat"):
-                for parentLayerId in net[layerId]['connection']['input']:
+
+            if net[layerId]['info']['type'] == 'Concat':
+                for parentLayerId in net[layerId]['connection']['input'
+                        ]:
+
                     # Check if parent layer have shapes
-                    if (net[parentLayerId]['shape']['output']):
-                        net[layerId]['shape']['input'] = handle_concat_layer(net[layerId], net[parentLayerId])
-            elif (not (net[layerId]['info']['type'] in dataLayers)):
-                if (len(net[layerId]['connection']['input']) > 0):
-                    parentLayerId = net[layerId]['connection']['input'][0]
+
+                    if net[parentLayerId]['shape']['output']:
+                        net[layerId]['shape']['input'] = \
+                            handle_concat_layer(net[layerId],
+                                net[parentLayerId])
+            elif not net[layerId]['info']['type'] in dataLayers:
+                if len(net[layerId]['connection']['input']) > 0:
+                    parentLayerId = net[layerId]['connection']['input'
+                            ][0]
+
                     # Check if parent layer have shapes
-                    if (net[parentLayerId]['shape']['output']):
-                        net[layerId]['shape']['input'] = net[parentLayerId]['shape']['output'][:]
+
+                    if net[parentLayerId]['shape']['output']:
+                        net[layerId]['shape']['input'] = \
+                            (net[parentLayerId]['shape']['output'])[:]
 
             # Obtain output shape of new layer
-            if (net[layerId]['info']['type'] in dataLayers):
+
+            if net[layerId]['info']['type'] in dataLayers:
+
                 # handling Data Layers separately
-                if ('dim' in net[layerId]['params'] and len(net[layerId]['params']['dim'])):
+
+                if 'dim' in net[layerId]['params'] \
+                    and len(net[layerId]['params']['dim']):
+
                     # layers with empty dim parameter can't be passed
-                    net[layerId]['shape']['input'], net[layerId]['shape']['output'] =\
-                            get_layer_shape(net[layerId])
-                elif ('dim' not in net[layerId]['params']):
+
+                    (net[layerId]['shape']['input'],
+                     net[layerId]['shape']['output']) = \
+                        get_layer_shape(net[layerId])
+                elif 'dim' not in net[layerId]['params']:
+
                     # shape calculation for layers with no dim param
-                    net[layerId]['shape']['input'], net[layerId]['shape']['output'] =\
-                            get_layer_shape(net[layerId])
+
+                    (net[layerId]['shape']['input'],
+                     net[layerId]['shape']['output']) = \
+                        get_layer_shape(net[layerId])
             else:
-                if (net[layerId]['shape']['input']):
-                    net[layerId]['shape']['output'] = get_layer_shape(net[layerId])
+                if net[layerId]['shape']['input']:
+                    net[layerId]['shape']['output'] = \
+                        get_layer_shape(net[layerId])
         except BaseException:
-            return JsonResponse({
-                'result': 'error', 'error': str(sys.exc_info()[1])})
+            return JsonResponse({'result': 'error',
+                                'error': str(sys.exc_info()[1])})
         return JsonResponse({'result': 'success', 'net': net})
 
 
@@ -65,26 +95,33 @@ def calculate_parameter(request):
     if request.method == 'POST':
         net = yaml.safe_load(request.POST.get('net'))
         try:
+
             # While calling get_shapes we need to remove the flag
             # added in frontend to show the parameter on pane
+
             netObj = copy.deepcopy(net)
             for layerId in netObj:
                 for param in netObj[layerId]['params']:
-                    netObj[layerId]['params'][param] = netObj[layerId]['params'][param][0]
+                    netObj[layerId]['params'][param] = \
+                        netObj[layerId]['params'][param][0]
+
             # use get_shapes method to obtain shapes of each layer
+
             netObj = get_shapes(netObj)
             for layerId in net:
                 net[layerId]['shape'] = {}
-                net[layerId]['shape']['input'] = netObj[layerId]['shape']['input']
-                net[layerId]['shape']['output'] = netObj[layerId]['shape']['output']
+                net[layerId]['shape']['input'] = netObj[layerId]['shape'
+                        ]['input']
+                net[layerId]['shape']['output'] = \
+                    netObj[layerId]['shape']['output']
         except BaseException:
-            return JsonResponse({
-                'result': 'error', 'error': str(sys.exc_info()[1])})
+            return JsonResponse({'result': 'error',
+                                'error': str(sys.exc_info()[1])})
         return JsonResponse({'result': 'success', 'net': net})
 
 
 @csrf_exempt
-def deleteModel_from_db(request):
+def delete_model_from_db(request):
     if request.method == 'POST':
         if 'userID' in request.POST:
             userID = request.POST.get('userID')
@@ -92,13 +129,17 @@ def deleteModel_from_db(request):
             model = Network.objects.get(id=model_id)
             if model.author_id == int(userID):
                 model.delete()
-                return JsonResponse({'result': 'success', 'data': 'Model successfully deleted!'})
+                return JsonResponse({'result': 'success',
+                                    'data': 'Model successfully deleted!'
+                                    })
             else:
-                return JsonResponse({'result': 'error', 'error': "This model doesn't belong to you!"})
+                return JsonResponse({'result': 'error',
+                                    'error': "This model doesn't belong to you!"
+                                    })
 
 
 @csrf_exempt
-def saveModel_to_db(request):
+def save_model_to_db(request):
     if request.method == 'POST':
         net = request.POST.get('net')
         net_name = request.POST.get('net_name')
@@ -110,50 +151,73 @@ def saveModel_to_db(request):
             net_name = 'Net'
 
         if Network.objects.filter(name=net_name).exists():
+
             # Update the exising json field
+
             try:
                 if user_id:
                     user_id = int(user_id)
                     user = User.objects.get(id=user_id)
 
                 # load the model with the net name
+
                 model = Network.objects.get(name=net_name)
                 model_id = model.id
+
                 # update the model with network id same as model id
-                existing_model = NetworkVersion.objects.get(network_id=model_id)
+
+                existing_model = \
+                    NetworkVersion.objects.get(network_id=model_id)
                 existing_model.network_def = net
                 existing_model.save()
+
                 # create initial update for nextLayerId
-                model_update = NetworkUpdates(network_version=existing_model,
-                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                              tag='ModelNotShared')
+
+                model_update = \
+                    NetworkUpdates(network_version=existing_model,
+                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                   tag='ModelNotShared')
                 model_update.save()
 
-                return JsonResponse({'result': 'success', 'id': model.id})
+                return JsonResponse({'result': 'success',
+                                    'id': model.id})
             except:
-                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
-
+                return JsonResponse({'result': 'error',
+                                    'error': str(sys.exc_info()[1])})
         else:
+
             try:
                 if user_id:
                     user_id = int(user_id)
                     user = User.objects.get(id=user_id)
 
                 # create a new model on save event
-                model = Network(name=net_name, public_sharing=public_sharing, author=user)
+
+                model = Network(name=net_name,
+                                public_sharing=public_sharing,
+                                author=user)
                 model.save()
+
                 # create first version of model
-                model_version = NetworkVersion(network=model, network_def=net)
+
+                model_version = NetworkVersion(network=model,
+                        network_def=net)
                 model_version.save()
+
                 # create initial update for nextLayerId
-                model_update = NetworkUpdates(network_version=model_version,
-                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                              tag='ModelNotShared')
+
+                model_update = \
+                    NetworkUpdates(network_version=model_version,
+                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                   tag='ModelNotShared')
                 model_update.save()
 
-                return JsonResponse({'result': 'success', 'id': model.id})
+                return JsonResponse({'result': 'success',
+                                    'id': model.id})
             except:
-                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
+                return JsonResponse({'result': 'error',
+                                    'error': str(sys.exc_info()[1])})
+
 
 @csrf_exempt
 def save_to_db(request):
@@ -168,57 +232,86 @@ def save_to_db(request):
             net_name = 'Net'
 
         if Network.objects.filter(name=net_name).exists():
+
             # Update the exising json field
+
             try:
+
                 # making model sharing public by default for now
                 # TODO: Prvilege on Sharing
+
                 if user_id:
                     user_id = int(user_id)
                     user = User.objects.get(id=user_id)
 
                 # load the model with the net name
+
                 model = Network.objects.get(name=net_name)
                 model_id = model.id
+
                 # enable public sharing
+
                 model.public_sharing = True
                 model.save()
+
                 # update the model with network id same as model id
-                existing_model = NetworkVersion.objects.get(network_id=model_id)
+
+                existing_model = \
+                    NetworkVersion.objects.get(network_id=model_id)
                 existing_model.network_def = net
                 existing_model.save()
+
                 # create initial update for nextLayerId
-                model_update = NetworkUpdates(network_version=existing_model,
-                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                              tag='ModelShared')
+
+                model_update = \
+                    NetworkUpdates(network_version=existing_model,
+                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                   tag='ModelShared')
                 model_update.save()
 
-                return JsonResponse({'result': 'success', 'id': model.id})
+                return JsonResponse({'result': 'success',
+                                    'id': model.id})
             except:
-                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
-
+                return JsonResponse({'result': 'error',
+                                    'error': str(sys.exc_info()[1])})
         else:
+
             try:
+
                 # making model sharing public by default for now
                 # TODO: Prvilege on Sharing
+
                 if user_id:
                     user_id = int(user_id)
                     user = User.objects.get(id=user_id)
 
                 # create a new model on save event
-                model = Network(name=net_name, public_sharing=public_sharing, author=user)
+
+                model = Network(name=net_name,
+                                public_sharing=public_sharing,
+                                author=user)
                 model.save()
+
                 # create first version of model
-                model_version = NetworkVersion(network=model, network_def=net)
+
+                model_version = NetworkVersion(network=model,
+                        network_def=net)
                 model_version.save()
+
                 # create initial update for nextLayerId
-                model_update = NetworkUpdates(network_version=model_version,
-                                              updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                              tag='ModelShared')
+
+                model_update = \
+                    NetworkUpdates(network_version=model_version,
+                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
+                                   tag='ModelShared')
                 model_update.save()
 
-                return JsonResponse({'result': 'success', 'id': model.id})
+                return JsonResponse({'result': 'success',
+                                    'id': model.id})
             except:
-                return JsonResponse({'result': 'error', 'error': str(sys.exc_info()[1])})
+                return JsonResponse({'result': 'error',
+                                    'error': str(sys.exc_info()[1])})
+
 
 def create_network_version(network_def, updates_batch):
     network_def = yaml.safe_load(network_def)
@@ -232,7 +325,9 @@ def create_network_version(network_def, updates_batch):
             next_layer_id = updated_data['nextLayerId']
 
         if tag == 'UpdateParam':
+
             # Update Param UI event handling
+
             param = updated_data['param']
             layer_id = updated_data['layerId']
             value = updated_data['value']
@@ -241,62 +336,73 @@ def create_network_version(network_def, updates_batch):
                 network_def[layer_id]['props'][param] = value
             else:
                 network_def[layer_id]['params'][param][0] = value
-
         elif tag == 'DeleteLayer':
+
             # Delete layer UI event handling
+
             layer_id = updated_data['layerId']
-            input_layer_ids = network_def[layer_id]['connection']['input']
-            output_layer_ids = network_def[layer_id]['connection']['output']
+            input_layer_ids = network_def[layer_id]['connection'
+                    ]['input']
+            output_layer_ids = network_def[layer_id]['connection'
+                    ]['output']
 
             for input_layer_id in input_layer_ids:
-                network_def[input_layer_id]['connection']['output'].remove(layer_id)
+                network_def[input_layer_id]['connection']['output'
+                        ].remove(layer_id)
 
             for output_layer_id in output_layer_ids:
-                network_def[output_layer_id]['connection']['input'].remove(layer_id)
+                network_def[output_layer_id]['connection']['input'
+                        ].remove(layer_id)
 
             del network_def[layer_id]
-
         elif tag == 'AddLayer':
+
             # Add layer UI event handling
+
             prev_layer_id = updated_data['prevLayerId']
             new_layer_id = updated_data['layerId']
 
             if isinstance(prev_layer_id, list):
                 for layer_id in prev_layer_id:
-                    network_def[layer_id]['connection']['output'].append(new_layer_id)
+                    network_def[layer_id]['connection']['output'
+                            ].append(new_layer_id)
             else:
-                network_def[prev_layer_id]['connection']['output'].append(new_layer_id)
+                network_def[prev_layer_id]['connection']['output'
+                        ].append(new_layer_id)
             network_def[new_layer_id] = updated_data['layer']
-
         elif tag == 'AddComment':
+
             layer_id = updated_data['layerId']
             comment = updated_data['comment']
 
-            if ('comments' not in network_def[layer_id]):
+            if 'comments' not in network_def[layer_id]:
                 network_def[layer_id]['comments'] = []
             network_def[layer_id]['comments'].append(comment)
 
-    return {
-        'network': network_def,
-        'next_layer_id': next_layer_id
-    }
+    return {'network': network_def, 'next_layer_id': next_layer_id}
 
 
 def get_network_version(netObj):
-    network_version = NetworkVersion.objects.filter(network=netObj).order_by('-created_on')[0]
-    updates_batch = NetworkUpdates.objects.filter(network_version=network_version).order_by('created_on')
+    network_version = \
+        NetworkVersion.objects.filter(network=netObj).order_by('-created_on'
+            )[0]
+    updates_batch = \
+        NetworkUpdates.objects.filter(network_version=network_version).order_by('created_on'
+            )
 
-    return create_network_version(network_version.network_def, updates_batch)
+    return create_network_version(network_version.network_def,
+                                  updates_batch)
 
 
 def get_checkpoint_version(netObj, checkpoint_id):
     network_update = NetworkUpdates.objects.get(id=checkpoint_id)
     network_version = network_update.network_version
 
-    updates_batch = NetworkUpdates.objects.filter(network_version=network_version)\
-                                          .filter(created_on__lte=network_update.created_on)\
-                                          .order_by('created_on')
-    return create_network_version(network_version.network_def, updates_batch)
+    updates_batch = \
+        NetworkUpdates.objects.filter(network_version=network_version).filter(created_on__lte=network_update.created_on).order_by('created_on'
+            )
+    return create_network_version(network_version.network_def,
+                                  updates_batch)
 
 
 @csrf_exempt
@@ -304,50 +410,63 @@ def load_from_db(request):
     if request.method == 'POST':
         if 'proto_id' in request.POST:
             try:
-                model = Network.objects.get(id=int(request.POST['proto_id']))
+                model = \
+                    Network.objects.get(id=int(request.POST['proto_id'
+                        ]))
                 version_id = None
                 data = {}
 
-                if 'version_id' in request.POST and request.POST['version_id'] != '':
+                if 'version_id' in request.POST \
+                    and request.POST['version_id'] != '':
+
                     # added for loading any previous version of model
+
                     version_id = int(request.POST['version_id'])
                     data = get_checkpoint_version(model, version_id)
                 else:
+
                     # fetch the required version of model
+
                     data = get_network_version(model)
 
                 net = data['network']
                 next_layer_id = data['next_layer_id']
-
             except Exception:
+
                 return JsonResponse({'result': 'error',
-                                     'error': 'No network file found'})
-            return JsonResponse({'result': 'success', 'net': net, 'net_name': model.name,
-                                 'next_layer_id': next_layer_id, 'public_sharing': model.public_sharing})
+                                    'error': 'No network file found'})
+            return JsonResponse({
+                'result': 'success',
+                'net': net,
+                'net_name': model.name,
+                'next_layer_id': next_layer_id,
+                'public_sharing': model.public_sharing,
+                })
 
     if request.method == 'GET':
         return index(request)
 
 
 @csrf_exempt
-def loadModel_from_db(request):
+def load_model_from_db(request):
     if request.method == 'POST':
         if 'userID' in request.POST:
             userID = request.POST.get('userID')
             if Network.objects.filter(author=userID).exists():
-                data={}
+                data = {}
                 models = Network.objects.filter(author=userID)
                 modlen = len(models)
-                i=1
+                i = 1
                 for mod in models:
-                    data_index1 = "Model%d_Name" % i
-                    data_index2 = "Model%d_ID" % i
-                    data[data_index1]=mod.name
-                    data[data_index2]=mod.id
-                    i+=1
-                return JsonResponse({'result':'success','data':data})
+                    data_index1 = 'Model%d_Name' % i
+                    data_index2 = 'Model%d_ID' % i
+                    data[data_index1] = mod.name
+                    data[data_index2] = mod.id
+                    i += 1
+                return JsonResponse({'result': 'success', 'data': data})
             else:
-                return JsonResponse({'result':'error','error':'No models found'})
+                return JsonResponse({'result': 'error',
+                                    'error': 'No models found'})
 
 
 @csrf_exempt
@@ -356,21 +475,21 @@ def fetch_model_history(request):
         try:
             network_id = int(request.POST['net_id'])
             network = Network.objects.get(id=network_id)
-            network_versions = NetworkVersion.objects.filter(network=network).order_by('created_on')
+            network_versions = \
+                NetworkVersion.objects.filter(network=network).order_by('created_on'
+                    )
 
             modelHistory = {}
             for version in network_versions:
-                network_updates = NetworkUpdates.objects.filter(network_version=version)\
-                                                        .order_by('created_on')
+                network_updates = \
+                    NetworkUpdates.objects.filter(network_version=version).order_by('created_on'
+                        )
                 for update in network_updates:
                     modelHistory[update.id] = update.tag
 
-            return JsonResponse({
-                'result': 'success',
-                'data': modelHistory
-            })
+            return JsonResponse({'result': 'success',
+                                'data': modelHistory})
         except Exception:
-            return JsonResponse({
-                'result': 'error',
-                'error': 'Unable to load model history'
-            })
+            return JsonResponse({'result': 'error',
+                                'error': 'Unable to load model history'
+                                })

From 08b409024616cc840b3760aa44e9d8753f1f6ba7 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 14:58:06 +0530
Subject: [PATCH 26/48] Update urls.py

---
 ide/urls.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/ide/urls.py b/ide/urls.py
index 30b80f3b7..87c45a7e3 100644
--- a/ide/urls.py
+++ b/ide/urls.py
@@ -4,7 +4,9 @@
 from django.conf.urls.static import static
 from django.conf import settings
 from views import index, calculate_parameter, fetch_layer_shape
-from views import load_from_db, loadModel_from_db, deleteModel_from_db, save_to_db, saveModel_to_db, fetch_model_history
+from views import load_from_db, load_model_from_db, \
+    delete_model_from_db, save_to_db, save_model_to_db, \
+    fetch_model_history
 
 urlpatterns = [
     url(r'^$', index),
@@ -15,12 +17,15 @@
     url(r'^keras/', include('keras_app.urls')),
     url(r'^tensorflow/', include('tensorflow_app.urls')),
     url(r'^save$', save_to_db, name='saveDB'),
-    url(r'^saveModel$', saveModel_to_db, name='saveModel'),
+    url(r'^saveModel$', save_model_to_db, name='saveModel'),
     url(r'^load*', load_from_db, name='loadDB'),
-    url(r'^deleteModel$', deleteModel_from_db, name='deleteModel'),
-    url(r'^getModel$', loadModel_from_db, name='getModelData'),
+    url(r'^deleteModel$', delete_model_from_db, name='deleteModel'),
+    url(r'^getModel$', load_model_from_db, name='getModelData'),
     url(r'^model_history', fetch_model_history, name='model-history'),
-    url(r'^model_parameter/', calculate_parameter, name='calculate-parameter'),
-    url(r'^layer_parameter/', fetch_layer_shape, name='fetch-layer-shape')
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + \
-    static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+    url(r'^model_parameter/', calculate_parameter,
+        name='calculate-parameter'),
+    url(r'^layer_parameter/', fetch_layer_shape,
+        name='fetch-layer-shape'),
+    ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \
+        + static(settings.STATIC_URL,
+                 document_root=settings.STATIC_ROOT)

From 640a9d31723d5820749300cd2d5760983dd4ba89 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 15:06:18 +0530
Subject: [PATCH 27/48] Update views.py

---
 ide/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ide/views.py b/ide/views.py
index cd06cc634..e461912c5 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 import copy
 import sys
 import yaml

From 10d1bfa30466a0602c0a766ac8576ec3be978797 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sat, 24 Nov 2018 15:17:16 +0530
Subject: [PATCH 28/48] Update views.py

---
 ide/views.py | 105 +++++++++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 54 deletions(-)

diff --git a/ide/views.py b/ide/views.py
index e461912c5..beff796e0 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -1,3 +1,4 @@
+# flake8: noqa
 import copy
 import sys
 import yaml
@@ -33,24 +34,24 @@ def fetch_layer_shape(request):
                 'WindowData',
                 'MemoryData',
                 'DummyData',
-                ]
+            ]
 
             # Obtain input shape of new layer
 
             if net[layerId]['info']['type'] == 'Concat':
                 for parentLayerId in net[layerId]['connection']['input'
-                        ]:
+                                                                ]:
 
                     # Check if parent layer have shapes
 
                     if net[parentLayerId]['shape']['output']:
                         net[layerId]['shape']['input'] = \
                             handle_concat_layer(net[layerId],
-                                net[parentLayerId])
+                                                net[parentLayerId])
             elif not net[layerId]['info']['type'] in dataLayers:
                 if len(net[layerId]['connection']['input']) > 0:
                     parentLayerId = net[layerId]['connection']['input'
-                            ][0]
+                                                               ][0]
 
                     # Check if parent layer have shapes
 
@@ -65,7 +66,7 @@ def fetch_layer_shape(request):
                 # handling Data Layers separately
 
                 if 'dim' in net[layerId]['params'] \
-                    and len(net[layerId]['params']['dim']):
+                        and len(net[layerId]['params']['dim']):
 
                     # layers with empty dim parameter can't be passed
 
@@ -85,7 +86,7 @@ def fetch_layer_shape(request):
                         get_layer_shape(net[layerId])
         except BaseException:
             return JsonResponse({'result': 'error',
-                                'error': str(sys.exc_info()[1])})
+                                 'error': str(sys.exc_info()[1])})
         return JsonResponse({'result': 'success', 'net': net})
 
 
@@ -110,12 +111,12 @@ def calculate_parameter(request):
             for layerId in net:
                 net[layerId]['shape'] = {}
                 net[layerId]['shape']['input'] = netObj[layerId]['shape'
-                        ]['input']
+                                                                 ]['input']
                 net[layerId]['shape']['output'] = \
                     netObj[layerId]['shape']['output']
         except BaseException:
             return JsonResponse({'result': 'error',
-                                'error': str(sys.exc_info()[1])})
+                                 'error': str(sys.exc_info()[1])})
         return JsonResponse({'result': 'success', 'net': net})
 
 
@@ -129,12 +130,12 @@ def delete_model_from_db(request):
             if model.author_id == int(userID):
                 model.delete()
                 return JsonResponse({'result': 'success',
-                                    'data': 'Model successfully deleted!'
-                                    })
+                                     'data': 'Model successfully deleted!'
+                                     })
             else:
                 return JsonResponse({'result': 'error',
-                                    'error': "This model doesn't belong to you!"
-                                    })
+                                     'error': "This model doesn't belong to you!"
+                                     })
 
 
 @csrf_exempt
@@ -179,10 +180,10 @@ def save_model_to_db(request):
                 model_update.save()
 
                 return JsonResponse({'result': 'success',
-                                    'id': model.id})
-            except:
+                                     'id': model.id})
+            except BaseException:
                 return JsonResponse({'result': 'error',
-                                    'error': str(sys.exc_info()[1])})
+                                     'error': str(sys.exc_info()[1])})
         else:
 
             try:
@@ -200,7 +201,7 @@ def save_model_to_db(request):
                 # create first version of model
 
                 model_version = NetworkVersion(network=model,
-                        network_def=net)
+                                               network_def=net)
                 model_version.save()
 
                 # create initial update for nextLayerId
@@ -212,10 +213,10 @@ def save_model_to_db(request):
                 model_update.save()
 
                 return JsonResponse({'result': 'success',
-                                    'id': model.id})
-            except:
+                                     'id': model.id})
+            except BaseException:
                 return JsonResponse({'result': 'error',
-                                    'error': str(sys.exc_info()[1])})
+                                     'error': str(sys.exc_info()[1])})
 
 
 @csrf_exempt
@@ -269,10 +270,10 @@ def save_to_db(request):
                 model_update.save()
 
                 return JsonResponse({'result': 'success',
-                                    'id': model.id})
-            except:
+                                     'id': model.id})
+            except BaseException:
                 return JsonResponse({'result': 'error',
-                                    'error': str(sys.exc_info()[1])})
+                                     'error': str(sys.exc_info()[1])})
         else:
 
             try:
@@ -294,7 +295,7 @@ def save_to_db(request):
                 # create first version of model
 
                 model_version = NetworkVersion(network=model,
-                        network_def=net)
+                                               network_def=net)
                 model_version.save()
 
                 # create initial update for nextLayerId
@@ -306,10 +307,10 @@ def save_to_db(request):
                 model_update.save()
 
                 return JsonResponse({'result': 'success',
-                                    'id': model.id})
-            except:
+                                     'id': model.id})
+            except BaseException:
                 return JsonResponse({'result': 'error',
-                                    'error': str(sys.exc_info()[1])})
+                                     'error': str(sys.exc_info()[1])})
 
 
 def create_network_version(network_def, updates_batch):
@@ -341,17 +342,17 @@ def create_network_version(network_def, updates_batch):
 
             layer_id = updated_data['layerId']
             input_layer_ids = network_def[layer_id]['connection'
-                    ]['input']
+                                                    ]['input']
             output_layer_ids = network_def[layer_id]['connection'
-                    ]['output']
+                                                     ]['output']
 
             for input_layer_id in input_layer_ids:
                 network_def[input_layer_id]['connection']['output'
-                        ].remove(layer_id)
+                                                          ].remove(layer_id)
 
             for output_layer_id in output_layer_ids:
                 network_def[output_layer_id]['connection']['input'
-                        ].remove(layer_id)
+                                                           ].remove(layer_id)
 
             del network_def[layer_id]
         elif tag == 'AddLayer':
@@ -364,10 +365,10 @@ def create_network_version(network_def, updates_batch):
             if isinstance(prev_layer_id, list):
                 for layer_id in prev_layer_id:
                     network_def[layer_id]['connection']['output'
-                            ].append(new_layer_id)
+                                                        ].append(new_layer_id)
             else:
                 network_def[prev_layer_id]['connection']['output'
-                        ].append(new_layer_id)
+                                                         ].append(new_layer_id)
             network_def[new_layer_id] = updated_data['layer']
         elif tag == 'AddComment':
 
@@ -384,10 +385,9 @@ def create_network_version(network_def, updates_batch):
 def get_network_version(netObj):
     network_version = \
         NetworkVersion.objects.filter(network=netObj).order_by('-created_on'
-            )[0]
-    updates_batch = \
-        NetworkUpdates.objects.filter(network_version=network_version).order_by('created_on'
-            )
+                                                               )[0]
+    updates_batch = NetworkUpdates.objects.filter(
+        network_version=network_version).order_by('created_on')
 
     return create_network_version(network_version.network_def,
                                   updates_batch)
@@ -397,9 +397,9 @@ def get_checkpoint_version(netObj, checkpoint_id):
     network_update = NetworkUpdates.objects.get(id=checkpoint_id)
     network_version = network_update.network_version
 
-    updates_batch = \
-        NetworkUpdates.objects.filter(network_version=network_version).filter(created_on__lte=network_update.created_on).order_by('created_on'
-            )
+    updates_batch = NetworkUpdates.objects.filter(
+        network_version=network_version).filter(
+        created_on__lte=network_update.created_on).order_by('created_on')
     return create_network_version(network_version.network_def,
                                   updates_batch)
 
@@ -411,12 +411,12 @@ def load_from_db(request):
             try:
                 model = \
                     Network.objects.get(id=int(request.POST['proto_id'
-                        ]))
+                                                            ]))
                 version_id = None
                 data = {}
 
                 if 'version_id' in request.POST \
-                    and request.POST['version_id'] != '':
+                        and request.POST['version_id'] != '':
 
                     # added for loading any previous version of model
 
@@ -433,14 +433,14 @@ def load_from_db(request):
             except Exception:
 
                 return JsonResponse({'result': 'error',
-                                    'error': 'No network file found'})
+                                     'error': 'No network file found'})
             return JsonResponse({
                 'result': 'success',
                 'net': net,
                 'net_name': model.name,
                 'next_layer_id': next_layer_id,
                 'public_sharing': model.public_sharing,
-                })
+            })
 
     if request.method == 'GET':
         return index(request)
@@ -454,7 +454,6 @@ def load_model_from_db(request):
             if Network.objects.filter(author=userID).exists():
                 data = {}
                 models = Network.objects.filter(author=userID)
-                modlen = len(models)
                 i = 1
                 for mod in models:
                     data_index1 = 'Model%d_Name' % i
@@ -465,7 +464,7 @@ def load_model_from_db(request):
                 return JsonResponse({'result': 'success', 'data': data})
             else:
                 return JsonResponse({'result': 'error',
-                                    'error': 'No models found'})
+                                     'error': 'No models found'})
 
 
 @csrf_exempt
@@ -474,21 +473,19 @@ def fetch_model_history(request):
         try:
             network_id = int(request.POST['net_id'])
             network = Network.objects.get(id=network_id)
-            network_versions = \
-                NetworkVersion.objects.filter(network=network).order_by('created_on'
-                    )
+            network_versions = NetworkVersion.objects.filter(
+                network=network).order_by('created_on')
 
             modelHistory = {}
             for version in network_versions:
-                network_updates = \
-                    NetworkUpdates.objects.filter(network_version=version).order_by('created_on'
-                        )
+                network_updates = NetworkUpdates.objects.filter(
+                    network_version=version).order_by('created_on')
                 for update in network_updates:
                     modelHistory[update.id] = update.tag
 
             return JsonResponse({'result': 'success',
-                                'data': modelHistory})
+                                 'data': modelHistory})
         except Exception:
             return JsonResponse({'result': 'error',
-                                'error': 'Unable to load model history'
-                                })
+                                 'error': 'Unable to load model history'
+                                 })

From 7a88df13fcedbf3587eebfc2c0c0714573f233a7 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sun, 25 Nov 2018 02:25:42 +0530
Subject: [PATCH 29/48] Update index.html

---
 ide/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/templates/index.html b/ide/templates/index.html
index b98d1b60a..49010dc0e 100644
--- a/ide/templates/index.html
+++ b/ide/templates/index.html
@@ -26,7 +26,7 @@
   </script>
 
 </head>
-<body style="background: #F3F5F7;">
+<body>
   <div id="app"></div>
   <a href="#" id="download" style="display:none;"> Download </a>
 </body>

From 8aaeda71805d772375b91dd1ce303587a7b803fd Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sun, 25 Nov 2018 02:26:12 +0530
Subject: [PATCH 30/48] Update searchbar_style.css

---
 ide/static/css/searchbar_style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ide/static/css/searchbar_style.css b/ide/static/css/searchbar_style.css
index d7e3c537a..02e86a05d 100644
--- a/ide/static/css/searchbar_style.css
+++ b/ide/static/css/searchbar_style.css
@@ -1,3 +1,7 @@
+body {
+	background: #F3F5F7;
+}
+
 .insert-layer-title {
 	position: relative;
 }

From b2390629473873ed24424816cd8af4bb05ca93b7 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Sun, 25 Nov 2018 17:23:07 +0530
Subject: [PATCH 31/48] Update content.js

---
 ide/static/js/content.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ide/static/js/content.js b/ide/static/js/content.js
index fa3c2cdd5..ce9dc0bab 100644
--- a/ide/static/js/content.js
+++ b/ide/static/js/content.js
@@ -1101,10 +1101,7 @@ class Content extends React.Component {
           // while loading a model ensure paramete intialisation
           // for UI show/hide is not executed, it leads to inconsistent
           // data which cannot be used further
-          if (response.public_sharing == false) {
-            is_shared = false;
-          }
-          else {
+          if (response.public_sharing == true) {
             is_shared = true;
           }
           //console.log(response);

From 815402ad6630e85df42364bb1551cb29aec20750 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:17:49 +0530
Subject: [PATCH 32/48] Update views.py

---
 ide/views.py | 113 ++++++++-------------------------------------------
 1 file changed, 18 insertions(+), 95 deletions(-)

diff --git a/ide/views.py b/ide/views.py
index beff796e0..88c1d0ebd 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -139,14 +139,17 @@ def delete_model_from_db(request):
 
 
 @csrf_exempt
-def save_model_to_db(request):
+def save(request, public_sharing):
     if request.method == 'POST':
         net = request.POST.get('net')
         net_name = request.POST.get('net_name')
         user_id = request.POST.get('user_id')
         next_layer_id = request.POST.get('nextLayerId')
-        public_sharing = False
         user = None
+        if public_sharing is True:
+            tag = "ModelShared"
+        else:
+            tag = "ModelNotShared"
         if net_name == '':
             net_name = 'Net'
 
@@ -175,8 +178,9 @@ def save_model_to_db(request):
 
                 model_update = \
                     NetworkUpdates(network_version=existing_model,
-                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                   tag='ModelNotShared')
+                                   updated_data=json.dumps(
+                                       {'nextLayerId': next_layer_id}),
+                                   tag=tag)
                 model_update.save()
 
                 return JsonResponse({'result': 'success',
@@ -208,8 +212,9 @@ def save_model_to_db(request):
 
                 model_update = \
                     NetworkUpdates(network_version=model_version,
-                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                   tag='ModelNotShared')
+                                   updated_data=json.dumps(
+                                       {'nextLayerId': next_layer_id}),
+                                   tag=tag)
                 model_update.save()
 
                 return JsonResponse({'result': 'success',
@@ -220,97 +225,15 @@ def save_model_to_db(request):
 
 
 @csrf_exempt
-def save_to_db(request):
-    if request.method == 'POST':
-        net = request.POST.get('net')
-        net_name = request.POST.get('net_name')
-        user_id = request.POST.get('user_id')
-        next_layer_id = request.POST.get('nextLayerId')
-        public_sharing = True
-        user = None
-        if net_name == '':
-            net_name = 'Net'
-
-        if Network.objects.filter(name=net_name).exists():
-
-            # Update the exising json field
-
-            try:
-
-                # making model sharing public by default for now
-                # TODO: Prvilege on Sharing
-
-                if user_id:
-                    user_id = int(user_id)
-                    user = User.objects.get(id=user_id)
-
-                # load the model with the net name
-
-                model = Network.objects.get(name=net_name)
-                model_id = model.id
-
-                # enable public sharing
-
-                model.public_sharing = True
-                model.save()
-
-                # update the model with network id same as model id
-
-                existing_model = \
-                    NetworkVersion.objects.get(network_id=model_id)
-                existing_model.network_def = net
-                existing_model.save()
-
-                # create initial update for nextLayerId
-
-                model_update = \
-                    NetworkUpdates(network_version=existing_model,
-                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                   tag='ModelShared')
-                model_update.save()
-
-                return JsonResponse({'result': 'success',
-                                     'id': model.id})
-            except BaseException:
-                return JsonResponse({'result': 'error',
-                                     'error': str(sys.exc_info()[1])})
-        else:
-
-            try:
-
-                # making model sharing public by default for now
-                # TODO: Prvilege on Sharing
-
-                if user_id:
-                    user_id = int(user_id)
-                    user = User.objects.get(id=user_id)
-
-                # create a new model on save event
-
-                model = Network(name=net_name,
-                                public_sharing=public_sharing,
-                                author=user)
-                model.save()
-
-                # create first version of model
-
-                model_version = NetworkVersion(network=model,
-                                               network_def=net)
-                model_version.save()
-
-                # create initial update for nextLayerId
+def save_model_to_db(request):
+    response = save(request, False)
+    return response
 
-                model_update = \
-                    NetworkUpdates(network_version=model_version,
-                                   updated_data=json.dumps({'nextLayerId': next_layer_id}),
-                                   tag='ModelShared')
-                model_update.save()
 
-                return JsonResponse({'result': 'success',
-                                     'id': model.id})
-            except BaseException:
-                return JsonResponse({'result': 'error',
-                                     'error': str(sys.exc_info()[1])})
+@csrf_exempt
+def save_to_db(request):
+    response = save(request, True)
+    return response
 
 
 def create_network_version(network_def, updates_batch):

From ef409243b95edd2a1a9e3e8a43d8e5a6b1243328 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:18:20 +0530
Subject: [PATCH 33/48] Update content.js

---
 ide/static/js/content.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ide/static/js/content.js b/ide/static/js/content.js
index ce9dc0bab..ba151f864 100644
--- a/ide/static/js/content.js
+++ b/ide/static/js/content.js
@@ -1101,10 +1101,13 @@ class Content extends React.Component {
           // while loading a model ensure paramete intialisation
           // for UI show/hide is not executed, it leads to inconsistent
           // data which cannot be used further
-          if (response.public_sharing == true) {
+          if (response.public_sharing == false) {
+            is_shared = false;
+          }
+          else {
             is_shared = true;
           }
-          //console.log(response);
+          console.log(response);
           nextLayerId = response.next_layer_id;
           this.initialiseImportedNet(response.net,response.net_name);
           if (Object.keys(response.net).length){
@@ -1119,7 +1122,7 @@ class Content extends React.Component {
           isShared: is_shared,
           nextLayerId: parseInt(nextLayerId)
         }, function() {
-          //console.log("Shared value: " + this.state.isShared);
+          console.log("Shared value: " + this.state.isShared);
         });
       }.bind(this),
       error() {
@@ -1336,7 +1339,7 @@ class Content extends React.Component {
           <div id="sidebar-scroll" className="col-md-12">
              <h5 className="sidebar-heading">ACTIONS</h5>
              <TopBar
-              isPublicSharing={this.state.isShared}
+              isShared={this.state.isShared}
               exportNet={this.exportNet}
               importNet={this.importNet}
               saveDb={this.saveDb}

From dc03332b2d32e68ad4e784e4ee20019bbb4db65e Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:18:50 +0530
Subject: [PATCH 34/48] Update topBar.js

---
 ide/static/js/topBar.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ide/static/js/topBar.js b/ide/static/js/topBar.js
index 8d4d24ac7..b95712e3f 100644
--- a/ide/static/js/topBar.js
+++ b/ide/static/js/topBar.js
@@ -4,14 +4,14 @@ import ReactTooltip from 'react-tooltip';
 class TopBar extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {isPublicSharing: false};
+    this.state = {isShared: false};
   }
   componentWillReceiveProps(newProps){
-    this.setState({isPublicSharing: newProps.isPublicSharing});
+    this.setState({isShared: newProps.isShared});
   }
   render() {
     let content = null;
-    if (this.state.isPublicSharing == true) {
+    if (this.state.isShared == true) {
       content = (<div className="topbar-col">
                     <div className="form-group">
                       <button id="topbar-icon" className="btn btn-default dropdown-toggle form-control" data-toggle="dropdown"
@@ -126,7 +126,7 @@ TopBar.propTypes = {
   textboxModal: React.PropTypes.func,
   urlModal: React.PropTypes.func,
   updateHistoryModal: React.PropTypes.func,
-  isPublicSharing: React.PropTypes.bool
+  isShared: React.PropTypes.bool
 };
 
 export default TopBar;

From 2da10bbbe111c92b12fc9e8cd2a156d51a82cc7a Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:19:17 +0530
Subject: [PATCH 35/48] Update card.js

---
 ide/static/js/card.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/static/js/card.js b/ide/static/js/card.js
index 72b382ff8..c57152847 100644
--- a/ide/static/js/card.js
+++ b/ide/static/js/card.js
@@ -9,7 +9,7 @@ class Card extends React.Component {
                 background: '#fff', 
                 height: 290, 
                 width: 240, 
-                borderRadius: 30, 
+                borderRadius: 20, 
                 display: 'inline-block', 
                 margin: 20, 
                 boxShadow: '0 2px 6px rgba(112,112,112,0.2)'

From 74d8b3a22e66552da249875cc550d789604a22d6 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:19:50 +0530
Subject: [PATCH 36/48] Update dash_style.css

---
 ide/static/css/dash_style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/static/css/dash_style.css b/ide/static/css/dash_style.css
index 3b4571a6c..fe720deb5 100644
--- a/ide/static/css/dash_style.css
+++ b/ide/static/css/dash_style.css
@@ -4,7 +4,7 @@
 	height: 290px;
 	width: 240px;
 	background: rgb(34,47,62,0.9);
-	border-radius: 30px; 
+	border-radius: 20px; 
 	position: relative;
 	top: -310px;
 	transition: all .4s ease;

From 03872669ae3dcf44319a1a0ce7712fc7d556fbf9 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:20:31 +0530
Subject: [PATCH 37/48] Update login_style.css

---
 ide/static/css/login_style.css | 39 +++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/ide/static/css/login_style.css b/ide/static/css/login_style.css
index b4228b7f1..bf3c37ea9 100644
--- a/ide/static/css/login_style.css
+++ b/ide/static/css/login_style.css
@@ -15,6 +15,36 @@
 	cursor: pointer;
 }
 
+#sidebar-logout-button {
+    background: rgb(205, 207, 210);
+    color: rgb(69, 80, 97);
+    text-align: center;
+    border-radius: 5px;
+    width: 110px;
+    margin: 0.2em;
+    transition: 0.2s;
+    position: relative;
+}
+
+#sidebar-logout-button:hover {
+	cursor: pointer;
+}
+
+#sidebar-dash-button {
+    background: rgb(205, 207, 210);
+    color: rgb(69, 80, 97);
+    text-align: center;
+    border-radius: 5px;
+    width: 130px;
+    margin: 0.2em;
+    transition: 0.2s;
+    position: relative;
+}
+
+#sidebar-dash-button:hover {
+	cursor: pointer;
+}
+
 #sidebar-login-button span {
 	position: absolute;
 	left: 9px;
@@ -67,6 +97,13 @@
 	}
 }
 
+.long-buttons {
+	display: flex;
+	flex: 1;
+	flex-direction: row;
+	margin-top: -0.5em;
+}
+
 .login-panel {
 	position: relative;
 	width: 350px;
@@ -265,4 +302,4 @@
 	position: absolute;
 	top: 0px;
 	right: 10px;
-}
\ No newline at end of file
+}

From 3de7f304f0064a3ba8a4fab4ff37badfac63db54 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:21:11 +0530
Subject: [PATCH 38/48] Update login.js

---
 ide/static/js/login.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ide/static/js/login.js b/ide/static/js/login.js
index 45ab904ef..7165f4dae 100644
--- a/ide/static/js/login.js
+++ b/ide/static/js/login.js
@@ -184,13 +184,15 @@ class Login extends React.Component {
     if(this.state.loginState) {
       return (
         <div>
+        <div className="long-buttons">
           <DashButton />
-          <h5 className="sidebar-heading" id="sidebar-login-button" onClick={
+          <h5 className="sidebar-heading" id="sidebar-logout-button" onClick={
             () => {
               this.logoutUser();
           }}>
           <div>LOGOUT</div>
           </h5>
+          </div>
           <div id="successful-login-notification">
             <i className="material-icons">done</i>
             <div id="successful-login-notification-message"></div>

From 9df8d9d4e9735c09c569a96aeb43fb9ce381990e Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Tue, 27 Nov 2018 03:21:41 +0530
Subject: [PATCH 39/48] Update dashbutton.js

---
 ide/static/js/dashbutton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/static/js/dashbutton.js b/ide/static/js/dashbutton.js
index a1559e1d5..3a45a0a41 100644
--- a/ide/static/js/dashbutton.js
+++ b/ide/static/js/dashbutton.js
@@ -11,7 +11,7 @@ class DashButton extends React.Component {
 	render(){
 		return(
 			<div>
-			<h5 style={{marginBottom: '0.6em'}} className="sidebar-heading" id="sidebar-login-button" onClick={() => {this.openDash()}}>
+			<h5 className="sidebar-heading" id="sidebar-dash-button" onClick={() => {this.openDash()}}>
 			<div>DASHBOARD</div>
 			</h5>
 			</div>

From b7eea2d1d7d8a2a7aba092239375d1822f559d06 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 01:44:54 +0530
Subject: [PATCH 40/48] Update urls.py

---
 ide/urls.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ide/urls.py b/ide/urls.py
index 87c45a7e3..140087b11 100644
--- a/ide/urls.py
+++ b/ide/urls.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 from django.conf.urls import url, include
 from django.contrib import admin
 from django.conf.urls.static import static

From 1c904d0e3016bea95f9c31e76ea93a736d62968d Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 01:45:46 +0530
Subject: [PATCH 41/48] Update test_db.py

---
 tests/unit/caffe_app/test_db.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/caffe_app/test_db.py b/tests/unit/caffe_app/test_db.py
index 0b39b7533..487757a3b 100644
--- a/tests/unit/caffe_app/test_db.py
+++ b/tests/unit/caffe_app/test_db.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 import json
 import os
 import unittest

From 86409fcc6d36149c7f604b1a4a586c8c91315439 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 01:47:40 +0530
Subject: [PATCH 42/48] Update views.py

---
 ide/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ide/views.py b/ide/views.py
index 88c1d0ebd..ef749c4e6 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -1,4 +1,3 @@
-# flake8: noqa
 import copy
 import sys
 import yaml

From feb8591af5f97695f53897f8ca0be63fc7c5e4cc Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 01:54:34 +0530
Subject: [PATCH 43/48] Update views.py

---
 ide/views.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/ide/views.py b/ide/views.py
index ef749c4e6..e0e340494 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -172,16 +172,7 @@ def save(request, public_sharing):
                     NetworkVersion.objects.get(network_id=model_id)
                 existing_model.network_def = net
                 existing_model.save()
-
-                # create initial update for nextLayerId
-
-                model_update = \
-                    NetworkUpdates(network_version=existing_model,
-                                   updated_data=json.dumps(
-                                       {'nextLayerId': next_layer_id}),
-                                   tag=tag)
-                model_update.save()
-
+                
                 return JsonResponse({'result': 'success',
                                      'id': model.id})
             except BaseException:

From 1c17d4bb98730fecfeb40cea0b1d91408636b978 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 01:59:22 +0530
Subject: [PATCH 44/48] Update test_db.py

---
 tests/unit/caffe_app/test_db.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/unit/caffe_app/test_db.py b/tests/unit/caffe_app/test_db.py
index 487757a3b..5556c2187 100644
--- a/tests/unit/caffe_app/test_db.py
+++ b/tests/unit/caffe_app/test_db.py
@@ -52,6 +52,7 @@ def test_load_nofile(self):
         self.assertEqual(response['result'], 'error')
         self.assertEqual(response['error'], 'No network file found')
 
+
 class SaveModelToDBTest(unittest.TestCase):
 
     def setUp(self):
@@ -96,6 +97,7 @@ def test_load_nofile1(self):
         self.assertEqual(response['result'], 'error')
         self.assertEqual(response['error'], 'No network file found')
 
+
 class LoadModelFromDB(unittest.TestCase):
 
     def setUp(self):
@@ -104,14 +106,15 @@ def setUp(self):
     def test_load_model(self):
         u_5 = User(id=5, username='user_5')
         u_5.save()
-        model = Network(id=9,name='test_net',author_id='5')
+        model = Network(id=9, name='test_net', author_id='5')
         model.save()
         response = self.client.post(
-            reverse('getModelData'),{'userID':'5'})
+            reverse('getModelData'), {'userID': '5'})
         response = json.loads(response.content)
-        self.assertEqual(response['result'],'success')
-        self.assertEqual(response['data']['Model1_Name'],'test_net')
-        self.assertEqual(response['data']['Model1_ID'],9)
+        self.assertEqual(response['result'], 'success')
+        self.assertEqual(response['data']['Model1_Name'], 'test_net')
+        self.assertEqual(response['data']['Model1_ID'], 9)
+
 
 class DeleteModelFromDB(unittest.TestCase):
 
@@ -121,11 +124,11 @@ def setUp(self):
     def test_delete_model(self):
         u_6 = User(id=6, username='user_6')
         u_6.save()
-        model = Network(id=10,name='test_net2',author_id='6')
+        model = Network(id=10, name='test_net2', author_id='6')
         model.save()
         response = self.client.post(
-            reverse('deleteModel'),{'userID':'6','modelid':'10'})
+            reverse('deleteModel'), {'userID': '6','modelid': '10'})
         response = json.loads(response.content)
-        self.assertEqual(response['result'],'success')
-        self.assertEqual(Network.objects.filter(id=10).exists(),False)
+        self.assertEqual(response['result'], 'success')
+        self.assertEqual(Network.objects.filter(id=10).exists(), False)
 

From 91790c3fe0ebf01660056a8f28d784137f2fb67a Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 02:01:33 +0530
Subject: [PATCH 45/48] Update dashboard.js

---
 ide/static/js/dashboard.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ide/static/js/dashboard.js b/ide/static/js/dashboard.js
index 718ae21c6..b67fe0170 100644
--- a/ide/static/js/dashboard.js
+++ b/ide/static/js/dashboard.js
@@ -62,13 +62,10 @@ class Dashboard extends React.Component{
           dataType: 'json',
           data: {userID: userid, modelid: model_id},
           success : function (response) {
-
             if (response.result == 'success') {
               this.modalContent = response.data;
               this.openModal();
             }
-            else if (response.result == 'error') {
-            }
           }.bind(this),
           error() {
           }

From 3f4c6f4d9474dbd97aacc057126e5b92f6dfea71 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 02:08:45 +0530
Subject: [PATCH 46/48] Update test_db.py

---
 tests/unit/caffe_app/test_db.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/caffe_app/test_db.py b/tests/unit/caffe_app/test_db.py
index 5556c2187..7dfeac6a5 100644
--- a/tests/unit/caffe_app/test_db.py
+++ b/tests/unit/caffe_app/test_db.py
@@ -131,4 +131,3 @@ def test_delete_model(self):
         response = json.loads(response.content)
         self.assertEqual(response['result'], 'success')
         self.assertEqual(Network.objects.filter(id=10).exists(), False)
-

From 6a61d2e7e9b10061f28c3255806608da891aa77e Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 02:16:48 +0530
Subject: [PATCH 47/48] Update views.py

---
 ide/views.py | 49 ++++++++++++-------------------------------------
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/ide/views.py b/ide/views.py
index e0e340494..4cc94b8b4 100644
--- a/ide/views.py
+++ b/ide/views.py
@@ -38,8 +38,7 @@ def fetch_layer_shape(request):
             # Obtain input shape of new layer
 
             if net[layerId]['info']['type'] == 'Concat':
-                for parentLayerId in net[layerId]['connection']['input'
-                                                                ]:
+                for parentLayerId in net[layerId]['connection']['input']:
 
                     # Check if parent layer have shapes
 
@@ -49,8 +48,7 @@ def fetch_layer_shape(request):
                                                 net[parentLayerId])
             elif not net[layerId]['info']['type'] in dataLayers:
                 if len(net[layerId]['connection']['input']) > 0:
-                    parentLayerId = net[layerId]['connection']['input'
-                                                               ][0]
+                    parentLayerId = net[layerId]['connection']['input'][0]
 
                     # Check if parent layer have shapes
 
@@ -109,8 +107,7 @@ def calculate_parameter(request):
             netObj = get_shapes(netObj)
             for layerId in net:
                 net[layerId]['shape'] = {}
-                net[layerId]['shape']['input'] = netObj[layerId]['shape'
-                                                                 ]['input']
+                net[layerId]['shape']['input'] = netObj[layerId]['shape']['input']
                 net[layerId]['shape']['output'] = \
                     netObj[layerId]['shape']['output']
         except BaseException:
@@ -129,12 +126,10 @@ def delete_model_from_db(request):
             if model.author_id == int(userID):
                 model.delete()
                 return JsonResponse({'result': 'success',
-                                     'data': 'Model successfully deleted!'
-                                     })
+                                     'data': 'Model successfully deleted!'})
             else:
                 return JsonResponse({'result': 'error',
-                                     'error': "This model doesn't belong to you!"
-                                     })
+                                     'error': "This model doesn't belong to you!"})
 
 
 @csrf_exempt
@@ -153,63 +148,48 @@ def save(request, public_sharing):
             net_name = 'Net'
 
         if Network.objects.filter(name=net_name).exists():
-
             # Update the exising json field
-
             try:
                 if user_id:
                     user_id = int(user_id)
                     user = User.objects.get(id=user_id)
-
                 # load the model with the net name
-
                 model = Network.objects.get(name=net_name)
                 model_id = model.id
-
                 # update the model with network id same as model id
-
                 existing_model = \
                     NetworkVersion.objects.get(network_id=model_id)
                 existing_model.network_def = net
                 existing_model.save()
-                
                 return JsonResponse({'result': 'success',
                                      'id': model.id})
-            except BaseException:
+            except:
                 return JsonResponse({'result': 'error',
                                      'error': str(sys.exc_info()[1])})
         else:
-
             try:
                 if user_id:
                     user_id = int(user_id)
                     user = User.objects.get(id=user_id)
-
                 # create a new model on save event
-
                 model = Network(name=net_name,
                                 public_sharing=public_sharing,
                                 author=user)
                 model.save()
-
                 # create first version of model
-
                 model_version = NetworkVersion(network=model,
                                                network_def=net)
                 model_version.save()
-
                 # create initial update for nextLayerId
-
                 model_update = \
                     NetworkUpdates(network_version=model_version,
                                    updated_data=json.dumps(
                                        {'nextLayerId': next_layer_id}),
                                    tag=tag)
                 model_update.save()
-
                 return JsonResponse({'result': 'success',
                                      'id': model.id})
-            except BaseException:
+            except:
                 return JsonResponse({'result': 'error',
                                      'error': str(sys.exc_info()[1])})
 
@@ -254,18 +234,14 @@ def create_network_version(network_def, updates_batch):
             # Delete layer UI event handling
 
             layer_id = updated_data['layerId']
-            input_layer_ids = network_def[layer_id]['connection'
-                                                    ]['input']
-            output_layer_ids = network_def[layer_id]['connection'
-                                                     ]['output']
+            input_layer_ids = network_def[layer_id]['connection']['input']
+            output_layer_ids = network_def[layer_id]['connection']['output']
 
             for input_layer_id in input_layer_ids:
-                network_def[input_layer_id]['connection']['output'
-                                                          ].remove(layer_id)
+                network_def[input_layer_id]['connection']['output'].remove(layer_id)
 
             for output_layer_id in output_layer_ids:
-                network_def[output_layer_id]['connection']['input'
-                                                           ].remove(layer_id)
+                network_def[output_layer_id]['connection']['input'].remove(layer_id)
 
             del network_def[layer_id]
         elif tag == 'AddLayer':
@@ -400,5 +376,4 @@ def fetch_model_history(request):
                                  'data': modelHistory})
         except Exception:
             return JsonResponse({'result': 'error',
-                                 'error': 'Unable to load model history'
-                                 })
+                                 'error': 'Unable to load model history'})

From e12392977797b297264b3032db49658f444e7615 Mon Sep 17 00:00:00 2001
From: Sayam Kanwar <sayamkanwar616@gmail.com>
Date: Thu, 13 Dec 2018 02:18:31 +0530
Subject: [PATCH 48/48] Update test_db.py

---
 tests/unit/caffe_app/test_db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/caffe_app/test_db.py b/tests/unit/caffe_app/test_db.py
index 7dfeac6a5..8dea0a934 100644
--- a/tests/unit/caffe_app/test_db.py
+++ b/tests/unit/caffe_app/test_db.py
@@ -127,7 +127,7 @@ def test_delete_model(self):
         model = Network(id=10, name='test_net2', author_id='6')
         model.save()
         response = self.client.post(
-            reverse('deleteModel'), {'userID': '6','modelid': '10'})
+            reverse('deleteModel'), {'userID': '6', 'modelid': '10'})
         response = json.loads(response.content)
         self.assertEqual(response['result'], 'success')
         self.assertEqual(Network.objects.filter(id=10).exists(), False)