submission ready again

nishavaitywebdev · Nov 30, 2016 · b143194 · b143194
1 parent 92e455d
commit b143194
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/assignment/services/user.service.server.js b/assignment/services/user.service.server.js
@@ -10,6 +10,7 @@ module.exports = function(app,model){
         {_id: "456", email:"[email protected]", username: "jannunzi", password: "jannunzi", firstName: "Jose",   lastName: "Annunzi" }
     ];
 
+
     //console.log("Inside user service server js");
     app.get('/api/user', findUser);
     // app.get('/api/user?username=username&password=password',findUserByCredentials);

diff --git a/package.json b/package.json
@@ -6,7 +6,9 @@
   "dependencies": {
     "body-parser": "^1.15.1",
     "express": "^4.13.4",
-    "mongoose": "^4.4.15"
+    "mongoose": "^4.4.15",
+    "passport": "^0.3.2",
+    "passport-local": "^1.0.0"
   },
   "devDependencies": {},
   "scripts": {

diff --git a/public/assignment/views/widget/widget-html-edit.view.client.html b/public/assignment/views/widget/widget-html-edit.view.client.html
@@ -3,26 +3,26 @@
         <form>
             <div class="form-group">
                 <label for="name">Name</label>
-                <input ng-model="model.widget.widgetType"
+                <input ng-model="model.widget.name"
                        type="text"
                        class="form-control"
                        id="name"
                        placeholder="Widget name"/>
             </div>
             <div class="form-group">
                 <label for="text">Text</label>
-                <input ng-model="model.widget.text"
-                       type="text"
-                       class="form-control"
-                       id="text"/>
-                <div text-angular ta-toolbar="[['h1','h2','h3'],['bold','italics','underline','strikeThrough'],
+                <!--<input ng-model="model.widget.text"-->
+                       <!--type="text"-->
+                       <!--class="form-control"-->
+                       <!--id="text"/>-->
+                <div id="text" ng-model="model.widget.text" text-angular ta-toolbar="[['h1','h2','h3'],['bold','italics','underline','strikeThrough'],
                                     ['ul','ol'],['justifyLeft','justifyCenter','justifyRight','justifyFull'],
                                     ['indent','outdent'],['html']]"></div>
-                <input
-                       placeholder="{{widget.placeholder}}" class="form-control" value="{{widget.text}}"/>
-                <textarea ng-if="!widget.formatted && (widget.rows > 1)"
-                          rows="{{widget.rows}}" placeholder="{{widget.placeholder}}"
-                          class="form-control">{{widget.text}}</textarea>
+                <!--<label for="placeholder">Placeholder</label>-->
+                <!--<input id="placeholder"-->
+                       <!--placeholder="{{widget.placeholder}}" class="form-control" value="{{widget.text}}"/>-->
+                <!--<textarea -->
+                          <!--class="form-control">{{widget.text}}</textarea>-->
             </div>
             <a ng-click="model.deleteWidget(model.widget._id)" class="btn btn-danger btn-block">Delete</a>
         </form>

diff --git a/public/assignment/views/widget/widget-list.view.client.html b/public/assignment/views/widget/widget-list.view.client.html
@@ -51,7 +51,7 @@ <h6 ng-switch-when="6">{{widget.text}}</h6>
             <div ng-switch-when="TEXT">
                 <div ng-if="widget.formatted" text-angular ta-toolbar="[['h1','h2','h3'],['bold','italics','underline','strikeThrough'],
                                     ['ul','ol'],['justifyLeft','justifyCenter','justifyRight','justifyFull'],
-                                    ['indent','outdent'],['html']]"></div>
+                                    ['indent','outdent'],['html']]" ng-model="widget.text"></div>
                 <input ng-if="!widget.formatted && (!widget.rows || widget.rows===1)"
                        placeholder="{{widget.placeholder}}" class="form-control" value="{{widget.text}}"/>
                 <textarea ng-if="!widget.formatted && (widget.rows > 1)"