Skip to content

solved cors problem and displayed the data #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rupalitomar5 merged 1 commit into from
Feb 3, 2017
Merged

solved cors problem and displayed the data #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 48 additions & 39 deletions Angular_Full_Project_GULP/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,82 @@ var mongoose= require('mongoose');
var express=require('express');
var bodyParser=require('body-parser');
var app=express();
var multer=require('multer');
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 ang=[];
var cors = require('express-cors');
var ObjectId = require('mongodb').ObjectID;

app.use(cors({
allowedOrigins: [
'http://localhost:3000', 'google.com'
]
}));
//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');
//console.log("Hi");
});*/

router.put('/user',function(req,res){
// console.log("Hi");
// if(validator.isNumeric(req.body.updatedpriority)) {
User.findById(id,function(err,user) {
router.get('/user/:id',function(req,res){

id= req.params.id;
user2.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);}
})
res.json(user);
}
);
});
router.get('/',function(req,res){
router.post('/user/:id',function(req,res){
console.log("hi");
user.name=req.body.name;
user.email=req.body.email;
user.state=req.body.state;
user.city= req.body.city;
user.Gender=req.body.gender;
user.IsDeleted=req.body.active;
user.save(function(err,user2){
if(err)
{console.log(err);}
else{
console.log("no err");
}})
res.sendStatus(200);
})
router.get('/user',function(req,res){

res.json({message:'my scratch'});
user2.find({},function(err,users){
if(!err){
console.log(users);
res.json(users)
}
});
});
router.delete('',function(req,res){
id=req.params.id;
Task.findByIdAndRemove(req.params.id,function(err,tasks){console.log(tasks);});
user2.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.Dob=req.body.daterange;
user.Gender=req.body.gender;
user.IsDeleted=req.body.active;
user.save(function(err){
Expand All @@ -75,15 +86,13 @@ router.post('/user',function(req,res)
console.log(err);
}
else{
res.json("done");
console.log("no err");
}
})
});
app.use('/api',router);
});
res.sendStatus(200);
console.log("Its here");

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

7 changes: 7 additions & 0 deletions Angular_Full_Project_GULP/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,17 @@ angular
'ngAnimate'//,
//'daterangepicker'
])

.config(function ($httpProvider) {
$httpProvider.defaults.withCredentials = true;
delete $httpProvider.defaults.headers.common["X-Requested-With"];
})

.config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) {
cfpLoadingBarProvider.includeSpinner = false;
cfpLoadingBarProvider.latencyThreshold = 1;
}])

.run(['$rootScope', '$state', '$stateParams', function($rootScope, $state, $stateParams) {
$rootScope.$on('$stateChangeSuccess',function(){
document.body.scrollTop = document.documentElement.scrollTop = 0;
Expand Down
155 changes: 107 additions & 48 deletions Angular_Full_Project_GULP/js/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,25 @@ angular
.module('app')
.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);
}

.service('fileUpload', ['$http', function ($http) {
this.uploadFileToUrl = function(file, uploadUrl){
var fd = new FormData();
fd.append('file', file);

$http.post(uploadUrl, fd, {
transformRequest: angular.identity,
headers: {'Content-Type': undefined}
})

.success(function(){
})

.error(function(){
});
}
}])

addController.$inject=['$http','$scope'];
addController.$inject=['$http','$scope','fileUpload'];
languageCtrl.$inject = ['$translate', '$scope'];
function languageCtrl($translate, $scope) {
function checkLanguage(languages, langKey) {
Expand Down Expand Up @@ -67,43 +55,114 @@ function languageCtrl($translate, $scope) {
}
]
$scope.languages = languages;
checkLanguage(languages, $translate.use())
checkLanguage(languages, $translate.use());
$scope.changeLanguage = function (langKey) {
$translate.use(langKey);
checkLanguage(languages, langKey)
};
}
function addController($http,$scope,fileUpload) {

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.getUser = function () {
$scope.users = [];
$http.get('http://localhost:8001/api/user').then(function (d) {
console.log(d);
for (i in d.data) {
$scope.users[i] = d.data[i];
}

}, function (err) {
console.log(err);
}
);

};
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;


this.editItem = function (data) {
$scope.user = [];
$http.get('http://localhost:8001/api/user/' + data).then(function (d) {
console.log(d);
$scope.user = d.data;

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

$scope.uploadFile = function () {
var file = $scope.myFile;

console.log('file is ');
console.dir(file);

var uploadUrl = "http://localhost:8001/api/user";
fileUpload.uploadFileToUrl(file, uploadUrl);
}
}
}
/*.directive('fileModel', ['$parse', function ($parse) {
return {
restrict: 'A',
link: function(scope, element, attrs) {
var model = $parse(attrs.fileModel);
var modelSetter = model.assign;

element.bind('change', function(){
scope.$apply(function(){
modelSetter(scope, element[0].files[0]);
});
});
}
};
}])*/




/*this.saveitem=function(data1){
console.log(data1);
$http({
url: 'http://localhost:8001/api/user/'+data1,
method: 'POST',
data: {
'name': $scope.user.name,
'email': $scope.user.email,
'state': $scope.user.state,
'city': $scope.user.city,
'gender': $scope.user.gender,
'daterange': $scope.user.date,
'active': $scope.active
//'dob': $scope.newprofile.dob,
//'stateid': $scope.newprofile.stateid,
//'cityid': $scope.newprofile.cityid,
//'profileimg': $scope.newprofile.profileimg,
//'status': $scope.newprofile.status
}})

}*/

2 changes: 1 addition & 1 deletion Angular_Full_Project_GULP/js/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ angular
url: '/user',
templateUrl: 'views/add.html',
ncyBreadcrumb: {
label: 'Home'
label: 'Add your Profile'
}
})
.state('app.main', {
Expand Down
4 changes: 3 additions & 1 deletion Angular_Full_Project_GULP/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"bluebird":"3.4.7",
"jsonwebtoken":"7.2.1",
"multer":"1.3.0",
"validator":"6.2.1"
"validator":"6.2.1",
"cors":"2.8.1",
"express-cors":"0.0.3"
},
"devDependencies": {
"browser-sync": "^2.16.0",
Expand Down
Loading