Skip to content
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

Jump to bottom

Authentication for the Angular App #35

Open
wants to merge 73 commits into
base: master
Choose a base branch
from
Open

Authentication for the Angular App #35

wants to merge 73 commits into from

Conversation

xqjibz
Copy link

@xqjibz xqjibz commented Dec 9, 2014

this has passport middleware worked in, so that we're authenticating web requests. See the commit log for a full breakdown of changes made.

Ron Siewert added 30 commits October 7, 2014 17:48
set express to 3.5.1 as 4.1.1 seems to now offload many settings to t…
eee01b6 
…he connect framework, which I didn't want to debug yet. can do that on another branch at some time in the future
added jquery and bootstrap to this seed project
a9dc8dd
removed leading '/' on css refs...(just to be consistent with js file…
e2f2894 
… refs) don't know why this should not change anything but it didn't
initial creation
abf9b7a
added RegistrationCtrl
1205a15
enclosed each angular file's code in anonymous function to hide var n…
211e7d4 
…ames

angular is now returning data from node server
have getaAll, getById, getByNodeId working correctly from the angular…
31ff92b 
… controller
setting default on page load to getAll registrations
ac9363c
setting default on page load to getAll registrations -- added more gr…
027fb35 
…anular view to get status, location(lat/long)
added minified versions of bootstrap and angular
597b376
have local route working but data is not being displayed in the div I…
0d732a8 
… think it should
have watable displayed but not displaying the content yet
0327098
loading data into watable...mock data only.
075730a
loading data into watable...mock data only.
3ea6f62
removed ref to watable object in data mock code
29c6452
Merge branch 'use-watable-for-list-display' of https://github.com/rsi…
fa2d792 
…ewert/Nodes-Talking-Admin into use-watable-for-list-display
have live data displaying in WATable plugin...looks good
1714e38
added some more columns to the table
58b627f
cleaned up the code somewhat
f852583
updating with watable list view
be2500d
Merge branch 'develop'
d5fa9e0 
Conflicts:
	public/js/controllers.js
	routes/api.js
	views/index.jade
	views/layout.jade

Now merged Ok
Merge remote-tracking branch 'origin/master'
0c43950 
Conflicts:
	public/js/controllers.js
	routes/api.js
	views/index.jade
	views/layout.jade
added usage info for Node-Talking-Admin
9acf5e8
added usage info for Node-Talking-Admin
f79118b
added usage info for Node-Talking-Admin
0c9f3c6
added clickRow event...now can obtain json formatted row data and a c…
9105443 
…olumn info if clicked in a column other than nodeId
Merge branch 'develop'
a3a49a4
started using realistic partials: nodes-list.jade and node-detail.jad…
ccdb842 
…e...hence removing the partial1 and partial2 files
fixed a bug...missing the partials/nodes-list path...had only nodes-list
3f714ff
added partials: nodes-list.jade and node-detail.jade
259886a 
now have table loaded on page load and ref'ing nodes-list.jade
xqjibz and others added 30 commits December 9, 2014 13:20
@xqjibz
commit to rebase
117e074
@xqjibz
Added git ignore
fb1b17b
@xqjibz
Added bower components to .gitignore
4778643
@xqjibz
no semis, this will mess up the commit, but it is only once.
77ba69b
@xqjibz
working in the examples from online.
46fe2f0
@xqjibz
redirecting to login, needs work.
d145d35
@xqjibz
small cleanups, still needs more
e77c3e2
@xqjibz
changed type here, no cleartext
8994051
@xqjibz
added in the rest of the required modules
95bcce5
@xqjibz
this is sort of how I see this working, needs breakout of functions, …
5027f94 
…etc.,..
@xqjibz
finished up angular adds, moved some stuff around
32ea6fc
@xqjibz
nope
fb3c260
@xqjibz
commit to rebase
df39b59
@xqjibz
merge master in
6de70a4 
Merge branch 'authentication' of https://github.com/rsiewert/Nodes-Talking-Admin into authentication
@xqjibz
commit to fix my mess up with rebasing off the wrong branch, a-doi
ccec15c
@xqjibz
added todo for API protection
90a100d
@xqjibz
more comments
5b1ed0a
@xqjibz
meh, I'm no css guy. :)
1507143
@xqjibz
mongoskin add-in
d5d0ff2
@xqjibz
adding in bcryptjs, likely never required in the BE
eeca090
@xqjibz
remove console.log and fixup names here so this actually works.
03051ac
@xqjibz
well that's amazing.
375cd22
@xqjibz
fixup names here, they _are_ important
fd1054d
@xqjibz
with db lookup of names, needs ssl
8654449
@xqjibz
finalized working with bcrypt stored passwords, making PR
44c22da
@xqjibz
worked in ssl certs...though it needs worked out.
a981123
@xqjibz
forgot to remove optiosn here, woops
b447103
@xqjibz
cert and key for others, once we get that working.
c1cfcdb
@xqjibz
remove NPM bcrypt, moving to FE
bd845fa
@xqjibz
moved to bcryptjs, maybe the pure JS guys got it right.
c435411
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@xqjibz