Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Angular_Full_Project_GULP/Model/state.js

This file was deleted.

4 changes: 2 additions & 2 deletions Angular_Full_Project_GULP/Model/user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose=require('mongoose');
var Schema=mongoose.Schema;
var UserSchema=new Schema({
var User2Schema=new Schema({
name:String,
password:String,
email:String,
Expand All @@ -11,5 +11,5 @@ var UserSchema=new Schema({
Gender:String,
IsDeleted:Boolean
});
module.exports=mongoose.model('user',UserSchema);
module.exports=mongoose.model('User2',User2Schema);

89 changes: 89 additions & 0 deletions Angular_Full_Project_GULP/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
var mongoose= require('mongoose');
var express=require('express');
var bodyParser=require('body-parser');
var app=express();
var connection=require('./core/db');
var user2=require('./Model/user');
var jwt= require('jsonwebtoken');
var urlencodedParser=bodyParser.urlencoded({extended:true});
var router=express.Router();
var user=new user2();
//var server = require('http').Server(app);
var id;
app.use(urlencodedParser);
app.use(bodyParser.json());
/*app.use(function(req,res,next){
//validations
});*/
//console.log("Hi");
router.get('/user',function(req,res){
console.log("Hi");
});
/*router.get('/user',function(req,res){
res.render('add.html');
});*/

router.put('/user',function(req,res){
// console.log("Hi");
// if(validator.isNumeric(req.body.updatedpriority)) {
User.findById(id,function(err,user) {
console.log(id);
if (err) {
res.send(err);
}
user.name=req.body.updatedname;
// user.password=req.body.password;
user.email=req.body.updatedemail;
user.state=req.body.updatedstate;
user.city= req.body.updatedcity;
//user.File=req.body.
//user.Dob=req.body.daterange
user.Gender=req.body.updatedgender;
user.IsDeleted=req.body.updatedactive;
user.save(function(err,user2){
if(!err)
{console.log(err);}
})
}
);
});
router.get('/',function(req,res){

res.json({message:'my scratch'});
});
router.delete('',function(req,res){
id=req.params.id;
Task.findByIdAndRemove(req.params.id,function(err,tasks){console.log(tasks);});
});

router.post('/user',function(req,res)
{
console.log("Hi");
//var user=new User();
user.name=req.body.name;
user.password=req.body.password;
user.email=req.body.email;
user.state=req.body.state;
user.city= req.body.city;
user.File=req.body.File;
user.Dob=req.body.daterange
user.Gender=req.body.gender;
user.IsDeleted=req.body.active;
user.save(function(err){
if(err)
{
console.log(err);
}
else{
res.json("done");
}
})
});
app.use('/api',router);

app.use(function(req,res,next)
{
res.redirect('/user')
});
app.listen(8001);

4 changes: 2 additions & 2 deletions Angular_Full_Project_GULP/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
},
"private": true,
"resolutions": {
"jquery": "~2.1.4",
"angular": "~1.4.x",
"jquery": "^3.1.0",
"angular": "1.6.1",
"bootstrap": "4.0.0-alpha.5"
}
}
4 changes: 3 additions & 1 deletion Angular_Full_Project_GULP/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ angular
'ncy-angular-breadcrumb',
'angular-loading-bar',
'ngSanitize',
'ngAnimate'
'ngAnimate'//,
//'daterangepicker'
])
.config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) {
cfpLoadingBarProvider.includeSpinner = false;
Expand All @@ -32,3 +33,4 @@ angular
$rootScope.$state = $state;
return $rootScope.$stateParams = $stateParams;
}]);

67 changes: 66 additions & 1 deletion Angular_Full_Project_GULP/js/controllers.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,39 @@
// controller.js
angular
.module('app')
.controller('languageCtrl', languageCtrl);
.controller('languageCtrl', languageCtrl)
.controller('addController', addController)
//.controller('dateRangeCtrl', dateRangeCtrl);

dateRangeCtrl.$inject = ['$scope'];
function dateRangeCtrl($scope) {
$scope.date = {
startDate: moment().subtract(5, 'days'),
endDate: moment()
};
$scope.opts = {
drops: 'up',
opens: 'left',
ranges: {
'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1,'days'), moment().subtract(1,'days')],
'Last 7 days': [moment().subtract(7,'days'), moment()],
'Last 30 days': [moment().subtract(30,'days'), moment()],
'This month': [moment().startOf('month'), moment().endOf('month')]
}
};

//Watch for date changes
$scope.$watch('date', function(newDate) {
//console.log('New date set: ', newDate);
}, false);
}





addController.$inject=['$http','$scope'];
languageCtrl.$inject = ['$translate', '$scope'];
function languageCtrl($translate, $scope) {
function checkLanguage(languages, langKey) {
Expand Down Expand Up @@ -42,3 +73,37 @@ function languageCtrl($translate, $scope) {
checkLanguage(languages, langKey)
};
}

function addController($http,$scope,$filter, moment, uiCalendarConfig) {
this.array1=[]
$scope.displayForm = false;
this.array = ['Gujarat', 'Maharashtra', 'Uttarakhand'];
this.Myobject = {
Gujarat: ["Valsad", "Surat", "Baroda", "Rajkot", "Ahmedabad", "Gandhinagar"],
Maharashtra: ["Mumbai", "pune", "Aurangabad"],
Uttarakhand: ["Haridwar", "Hrishikesh", "Mussorie"]
};
this.getUser=function(){
var API="http://localhost:8001/api/user";
$http.get(API)
.then(function(response){
this.array1=response.data;
})

};
this.data={
call1:function(){
return{'name':$scope.name,'email':$scope.email,'state':$scope.state,'city':$scope.city,'gender':$scope.gender,'daterange':$scope.date,'active':$scope.active}
}
};
$scope.editItem = function (data) {
$scope.employee = data;
$scope.displayForm = true;
}
this.addUser = function () {
var API = "http://localhost:8001/api/user";
$http.post(API,this.data.call1);
};
};


8 changes: 8 additions & 0 deletions Angular_Full_Project_GULP/js/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ angular
}],
}
})
.state('app.add', {
url: '/user',
templateUrl: 'views/add.html',
ncyBreadcrumb: {
label: 'Home'
}
})
.state('app.main', {
url: '/dashboard',
templateUrl: 'views/main.html',
Expand Down Expand Up @@ -140,6 +147,7 @@ angular
templateUrl: 'views/pages/500.html'
})


//UI Kits
.state('app.uikits', {
abstract: true,
Expand Down
9 changes: 8 additions & 1 deletion Angular_Full_Project_GULP/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@
"main": "index.html",
"dependencies": {
"del": "^2.2.2",
"gulp": "^3.9.1"
"gulp": "^3.9.1",
"mongoose":"4.8.1",
"express":"2.5.1",
"body-parser":"1.16.0",
"bluebird":"3.4.7",
"jsonwebtoken":"7.2.1",
"multer":"1.3.0",
"validator":"6.2.1"
},
"devDependencies": {
"browser-sync": "^2.16.0",
Expand Down
40 changes: 0 additions & 40 deletions Angular_Full_Project_GULP/server.js

This file was deleted.

Loading