Add 'userType' field to Meteor.user Collection, add createAdmin view

malithjkmt · May 3, 2016 · 6f6d4c2 · 6f6d4c2
1 parent 76ae7a0
commit 6f6d4c2
Show file tree

Hide file tree

Showing 14 changed files with 389 additions and 240 deletions.
diff --git a/.idea/GTracker.iml b/.idea/GTracker.iml
diff --git a/.idea/libraries/meteor_packages_auto_import_browser.xml b/.idea/libraries/meteor_packages_auto_import_browser.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/.meteor/packages b/.meteor/packages
@@ -32,3 +32,4 @@ aldeed:autoform
 aldeed:collection2
 yogiben:autoform-map
 momentjs:moment
+sergeyt:typeahead
diff --git a/.meteor/versions b/.meteor/versions
@@ -81,6 +81,7 @@ [email protected]
 [email protected]
 [email protected]
 seba:[email protected]
+sergeyt:[email protected]_8
 [email protected]
 [email protected]
 [email protected]

diff --git a/client/head.html b/client/head.html
@@ -1,3 +1,4 @@
 <head>
     <title>GT2</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
diff --git a/imports/startup/client/autoform.js b/imports/startup/client/autoform.js
@@ -1 +1 @@
-AutoForm.setDefaultTemplate('materialize');
+AutoForm.setDefaultTemplate('materialize');
diff --git a/imports/startup/client/route.js b/imports/startup/client/route.js
@@ -10,6 +10,7 @@ import '../../ui/pages/home/home.js';
 import '../../ui/pages/feedback/feedback.js';
 import '../../ui/pages/feedback/viewFeedback.js';
 import '../../ui/pages/feedback/feedbackThreads.js';
+import '../../ui/pages/admin/createAdmin.js';
 
 import '../../ui/pages/footer.html';
 import '../../ui/pages/master_layout.html';
@@ -47,7 +48,7 @@ Router.route('/', function () {
 
 
 Router.route('/feedback/:townsmanID', function () {
-    var adminID = 'HxGqztWygWCxco4d5';    // admin ID should be accuired from DB ??? only one admin or multiple???????
+    var adminID = '6ekcRhqSWz6tijCKY';    // admin ID should be accuired from DB ??? only one admin or multiple???????
     this.redirect('/feedback/' + this.params.townsmanID+ '/' + adminID);
 });
 
@@ -75,6 +76,13 @@ Router.route('/feedbackThreads', function () {
 
 });
 
+
+Router.route('/createAdmin', function () {
+    this.layout('myLayout');
+    this.render('createAdmin');
+    this.render('nav', {to: 'nav'});
+});
+
 Router.route('/viewDrivers', function () {
     this.layout('myLayout');
     this.render('viewDrivers');

diff --git a/imports/ui/pages/admin/createAdmin.html b/imports/ui/pages/admin/createAdmin.html
@@ -0,0 +1,24 @@
+
+<template name="createAdmin">
+
+    <div class="container">
+        <h3>Create Admin</h3>
+
+
+        <div class="row">
+            <div class="col s8">
+            <input class="form-control typeahead" name="userID" type="text"
+                   placeholder="NIC"
+                   autocomplete="off" spellcheck="off"
+                   data-source="userIDs"/>
+</div>
+            <div class="col s4">
+            <button id="makeAdmin" class="btn waves-effect waves-light" type="submit" name="action">Make Admin
+                <i class="material-icons right">send</i>
+            </button>
+</div>
+        </div>
+
+
+    </div>
+</template>
diff --git a/imports/ui/pages/admin/createAdmin.js b/imports/ui/pages/admin/createAdmin.js
@@ -0,0 +1,23 @@
+import './createAdmin.html';
+
+
+Template.createAdmin.helpers({
+    userIDs: function() {
+
+
+        return Meteor.users.find().fetch().map(function(it){ return it.username; });
+    }
+});
+
+Template.createAdmin.rendered = function() {
+    Meteor.typeahead.inject();
+};
+
+
+Template.createAdmin.events({
+    'click #makeAdmin'(event) {
+        // Prevent default browser form submit
+        console.log("clicked!!");
+        Meteor.call('test',"111111111");
+    }
+});
diff --git a/imports/ui/pages/nav.html b/imports/ui/pages/nav.html
@@ -25,6 +25,7 @@
             <li class="{{isActiveRoute regex='viewDrivers'}}"><a href="{{pathFor 'viewDrivers'}}">Drivers</a></li>
             <li class="{{isActiveRoute regex='viewTrucks'}}"><a href="{{pathFor 'viewTrucks'}}">Trucks</a></li>
             <li class="{{isActiveRoute regex='registerDriver'}}"><a href="{{pathFor 'registerDriver'}}">Register Driver</a></li>
+            <li class="{{isActiveRoute regex='createAdmin'}}"><a href="{{pathFor 'createAdmin'}}">Create Admin</a></li>
             <li class="{{isActiveRoute regex='registerTruck'}}"><a href="{{pathFor 'registerTruck'}}">Register Truck</a></li>
             <li class="{{isActiveRoute regex='registerTownsman'}}"><a href="{{pathFor 'registerTownsman'}}">Register Townsman</a></li>
           <li>{{> atNavButton }}</li>

diff --git a/lib/methods.js b/lib/methods.js
@@ -1,6 +1,15 @@
 Meteor.methods({
-    /*"test":function(userID) {
+    "test":function(nic) {
         //should print the user details if logged in, undefined otherwise.
-        console.log(userID);
-    }*/
+        console.log("test passed!!");
+        var townsman = Meteor.users.findOne({username:nic});
+        console.log(townsman);
+        console.log(townsman._id);
+
+
+
+       Meteor.users.update({_id:townsman._id},
+        {$set: { username: "999999999" }})
+        console.log(Meteor.users.findOne({_id:townsman._id}));
+    }
 });
diff --git a/lib/useraccounts-configuration.js b/lib/useraccounts-configuration.js
@@ -75,6 +75,5 @@ AccountsTemplates.addFields([{
     errStr: 'should be like: e.g: 0777203574',
 }
 
-
 ]);
 AccountsTemplates.addField(pwd);
diff --git a/server/main.js b/server/main.js
@@ -2,6 +2,12 @@ import { Meteor } from 'meteor/meteor';
 
 Meteor.startup(() => {
   // code to run on server at startup
+    Accounts.onCreateUser(function(options, user) {
+        options.profile['userType'] = 'townsman';
+        console.log(options);
+        return user;
+    });
 
+
 
 });
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		AutoForm.setDefaultTemplate('materialize');
		AutoForm.setDefaultTemplate('materialize');
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,6 +75,5 @@ AccountsTemplates.addFields([{ @@
         errStr: 'should be like: e.g: 0777203574',
     }
     ]);
     AccountsTemplates.addField(pwd);