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.

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

Dev wave 18 #9

Open
wants to merge 858 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
858 commits
Select commit Hold shift + click to select a range
9170083
test case correction in community
psharneja Jul 16, 2017
9d4a46e
added footer and progress spinner on graph
psharneja Jul 16, 2017
d27687e
integration for ui
SandhiyaViswanathan Jul 16, 2017
3c4245e
footer added and routes corrected
psharneja Jul 16, 2017
e899e3e
Merge conflicts removed
SandhiyaViswanathan Jul 16, 2017
17aab5d
refactoring of angular components according to angularCLI guidelines
psharneja Jul 16, 2017
5550641
conflicts removed
SandhiyaViswanathan Jul 16, 2017
d914ad0
conflicts removed
SandhiyaViswanathan Jul 16, 2017
3e962ba
changes in theme
psharneja Jul 16, 2017
c9fbb45
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 16, 2017
d3ad11e
removed merge conflicts
psharneja Jul 16, 2017
d3399be
dependency issue with angular, resolved, app working now
psharneja Jul 16, 2017
5baa3c4
added theme toggle to admin panel of communities
psharneja Jul 16, 2017
1e9c20f
correction in theme toggler working
psharneja Jul 16, 2017
8f8068f
footer position corrected for admin panel
psharneja Jul 16, 2017
4c16e7f
express code lint errors
psharneja Jul 16, 2017
9df6225
changes in templates and communities
Aravindh-r Jul 17, 2017
537452a
removed console log
Jul 17, 2017
3fce8f9
added db to gitignore list
psharneja Jul 17, 2017
333addc
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 17, 2017
0e1477e
db creation script for toolsink
psharneja Jul 17, 2017
1824e2a
Update docker-compose.yml
psharneja Jul 17, 2017
cdaeabc
counter controller correction
psharneja Jul 17, 2017
85d0288
eventmapping module added
JananiVenkat Jul 17, 2017
734eec2
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 17, 2017
fb7e3a7
added router to the eventmapping
JananiVenkat Jul 17, 2017
2761f55
changes related to get counter for community
psharneja Jul 17, 2017
def0fb9
tool integration api
JananiVenkat Jul 17, 2017
14c93ba
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 17, 2017
d4a71bb
tabs removed
prakharsrivastava25 Jul 17, 2017
d3079de
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
prakharsrivastava25 Jul 17, 2017
f44943b
UI design changed for template
SandhiyaViswanathan Jul 17, 2017
b0b2c21
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
SandhiyaViswanathan Jul 17, 2017
8889756
eventmapping api routes added
psharneja Jul 17, 2017
875c671
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 17, 2017
6f05d0e
added ui for tools
Jul 17, 2017
229fe76
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Jul 17, 2017
5df16e0
Added tools to UI and inserted data
Aravindh-r Jul 17, 2017
ca537bc
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Aravindh-r Jul 17, 2017
d2c1511
added moment
prakharsrivastava25 Jul 17, 2017
186fa0f
merge conflict cleared
prakharsrivastava25 Jul 17, 2017
224156f
webhook api added and verified the token
JananiVenkat Jul 17, 2017
8f31b31
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 17, 2017
4c3b4f3
added domains length for the tool
Jul 17, 2017
cc1b74a
added domains length for the tool
Jul 17, 2017
947d79a
Changes made in UI
Aravindh-r Jul 17, 2017
0419c6a
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Aravindh-r Jul 17, 2017
83874ae
event mapping API
psharneja Jul 17, 2017
b966980
merge conflicts removed
psharneja Jul 17, 2017
4f58d20
removed config file and added content in appconfig
JananiVenkat Jul 17, 2017
082c6dd
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 17, 2017
8e1bc5e
APIs for tool integration
psharneja Jul 17, 2017
9f2bcd1
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 17, 2017
8f14e4f
post method for webhook
JananiVenkat Jul 17, 2017
6937be3
correction in community controller for get request
psharneja Jul 17, 2017
2887dc9
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 17, 2017
c349bbc
db creation script
psharneja Jul 17, 2017
fda1a10
removed lint errors
JananiVenkat Jul 17, 2017
19558a9
removed lint errors
JananiVenkat Jul 17, 2017
4d400c9
UI for templates
SandhiyaViswanathan Jul 17, 2017
b2952c3
merge conflicts cleared
SandhiyaViswanathan Jul 17, 2017
0bb1f75
cleared lint errors and changed the kafka topics and restructured dat…
Jul 17, 2017
f91b1d9
cleared lint errors and changed the kafka topics and restructured dat…
Jul 17, 2017
a9490c3
cleared lint errors and changed the kafka topics and restructured dat…
Jul 17, 2017
2f0025f
jwt token generation for every tool integrated
psharneja Jul 17, 2017
7414ec2
merge conflict resolved
psharneja Jul 17, 2017
abb3966
pulling new code
Jul 18, 2017
5b3cb34
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Jul 18, 2017
26a5b31
pulling new code
Jul 18, 2017
61ff7e1
communitieslist component removed
SandhiyaViswanathan Jul 18, 2017
d31e8fa
webhook controller modified
JananiVenkat Jul 18, 2017
cefd865
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 18, 2017
b0d3925
conflicts removed
SandhiyaViswanathan Jul 18, 2017
dd85c13
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
SandhiyaViswanathan Jul 18, 2017
a82a6ff
change in tools controller as per datamodel change
psharneja Jul 18, 2017
86117d9
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 18, 2017
e24d43d
removed merge conflict
JananiVenkat Jul 18, 2017
6c6d332
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 18, 2017
6d0c1f6
changes made in community tools services
sandhyasrini Jul 18, 2017
e3e4a32
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 18, 2017
b8d8b39
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 18, 2017
f51c458
redirection from communities to particular community corrected
psharneja Jul 18, 2017
5346472
changed routes for UI
psharneja Jul 18, 2017
7132abe
checking the counter
JananiVenkat Jul 18, 2017
9d35e3f
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 18, 2017
59733d5
changes made in tools services
sandhyasrini Jul 18, 2017
26259a4
modified ui
SandhiyaViswanathan Jul 18, 2017
8d07953
router part for ui
SandhiyaViswanathan Jul 18, 2017
56b5d86
routing changes for communities
psharneja Jul 18, 2017
6067d08
error removed
psharneja Jul 18, 2017
da2db91
removed unused angular components
psharneja Jul 18, 2017
1251c92
graph click function added
psharneja Jul 18, 2017
9034094
added module for community activity events
JananiVenkat Jul 18, 2017
b0b3e68
filtering of communities
Aravindh-r Jul 18, 2017
bcacab9
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Aravindh-r Jul 18, 2017
d149255
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 18, 2017
6915283
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 18, 2017
d2a7b24
added actor and object in the activity types and also added test case…
Jul 18, 2017
13237e4
event for delete tool added
sandhyasrini Jul 18, 2017
cee0c7e
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 18, 2017
3968533
added a service to listen from tool events and publish to Community a…
sandhyasrini Jul 18, 2017
9bd0083
UI modified
Aravindh-r Jul 18, 2017
c8e6662
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Aravindh-r Jul 18, 2017
5c2514b
added a service to listen from tool events and publish to Community a…
sandhyasrini Jul 18, 2017
229b176
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 18, 2017
064d5f7
tools mapping and community tool's POST request integrated
psharneja Jul 18, 2017
e55fb97
changed get API for tools
psharneja Jul 18, 2017
0bcd016
merge conflicts resolved
psharneja Jul 18, 2017
6a63018
get, post request changes in tools
psharneja Jul 18, 2017
d71af51
communitylife cycle event checked for member
JananiVenkat Jul 18, 2017
8683921
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 18, 2017
30717fe
patch requestof tools, added events in jwt token
psharneja Jul 18, 2017
92d8018
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 18, 2017
989279c
made chnages in topic
Aravindh-r Jul 18, 2017
69e72e4
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Aravindh-r Jul 18, 2017
190deac
lint errors
Aravindh-r Jul 18, 2017
d553e57
tool events changes in templates
psharneja Jul 18, 2017
c075ca9
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 18, 2017
7b11a92
tool sink code modified
sandhyasrini Jul 19, 2017
db30535
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 19, 2017
af38f45
client socket complted
SandhiyaViswanathan Jul 19, 2017
4fefe8b
conflicts cleared
SandhiyaViswanathan Jul 19, 2017
c6c9935
added socketserver
prakharsrivastava25 Jul 19, 2017
5d86941
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
prakharsrivastava25 Jul 19, 2017
06237f1
modified memberrequests consumer service
SandhiyaViswanathan Jul 19, 2017
1307215
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
SandhiyaViswanathan Jul 19, 2017
8d81fc1
changes made in tool sink
sandhyasrini Jul 19, 2017
13bb352
socket error resolved
prakharsrivastava25 Jul 19, 2017
8fde2fe
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
prakharsrivastava25 Jul 19, 2017
5da06f0
Bug fixes on behalf of Prakhar
Jul 19, 2017
206b7ef
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Jul 19, 2017
a86cab2
Restored docker script to wait for service before containers coming up
Jul 19, 2017
2dd9878
correction in community creation workflow
psharneja Jul 19, 2017
fd978a9
changes in patch request of toolmapping
psharneja Jul 19, 2017
f1cd33e
merge conflict resolved
psharneja Jul 19, 2017
5aaab2b
removed console logs
psharneja Jul 19, 2017
90232f4
removed lint errors
psharneja Jul 19, 2017
983569e
testcases for tools
sandhyasrini Jul 19, 2017
a4f3b3a
testcase for tools
sandhyasrini Jul 19, 2017
7d18020
removed git merge lines
sandhyasrini Jul 19, 2017
24ea6fb
removed unnecessary console log in counter
psharneja Jul 19, 2017
0548436
changes in docker compose
psharneja Jul 19, 2017
5e89c4e
webhook code
JananiVenkat Jul 19, 2017
103dbd3
test cases file for webhook
JananiVenkat Jul 19, 2017
2f1c090
merge conflicts removed
JananiVenkat Jul 19, 2017
75da0d2
Update webhook.controller.js
psharneja Jul 19, 2017
84065a5
Update webhook.controller.js
psharneja Jul 19, 2017
d9a99f6
toolsink service added in dockercompose
psharneja Jul 19, 2017
df92a61
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 19, 2017
d0c0003
added test cases
JananiVenkat Jul 19, 2017
9a49609
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 19, 2017
faae453
test cases modfied
sandhyasrini Jul 19, 2017
c68d1ea
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 19, 2017
8a16fe4
correction in patch request of tool
psharneja Jul 19, 2017
ae55eb4
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 19, 2017
e9dcbe5
changes in toolsink topic
psharneja Jul 19, 2017
9257b33
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 19, 2017
88f47a4
test cases modfied
sandhyasrini Jul 19, 2017
7261ec9
membership get method verified
JananiVenkat Jul 19, 2017
99b5d3e
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 19, 2017
da643e4
component routing is working and verified
Aravindh-r Jul 19, 2017
c1442fc
correction in community-page componen'st service
psharneja Jul 19, 2017
10dab20
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 19, 2017
948bfcb
modified membership get method and verified
JananiVenkat Jul 19, 2017
b75be79
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 19, 2017
6a100ea
tools service changes for event for toolRL
psharneja Jul 19, 2017
509279b
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 19, 2017
5c9fd15
removed concurrently from package.json
psharneja Jul 19, 2017
d0499dd
added angular built
psharneja Jul 19, 2017
071365f
correction in tools counter event
psharneja Jul 19, 2017
e5bf4cd
changed gitignore to ignore dist
psharneja Jul 19, 2017
a4d28e1
redis integrated
SandhiyaViswanathan Jul 19, 2017
4168e54
redis added
SandhiyaViswanathan Jul 19, 2017
9f7b418
checked for counter services of increment and decrement functions
Jul 19, 2017
a2a081b
checked for counter services of increment and decrement functions
Jul 19, 2017
464aa26
checked for counter services of increment and decrement functions
Jul 19, 2017
c3dcafb
changes for community creation event
psharneja Jul 19, 2017
1932481
merge conflicts
psharneja Jul 19, 2017
b65e291
test cases modfied
sandhyasrini Jul 20, 2017
9fb4564
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
sandhyasrini Jul 20, 2017
f2d52e2
added testcases to webhook api
JananiVenkat Jul 20, 2017
c29d73d
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
JananiVenkat Jul 20, 2017
2341bce
removed console .log from counter.controller
Jul 20, 2017
45beb1f
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Jul 20, 2017
3e2cb51
config added for redis
SandhiyaViswanathan Jul 20, 2017
a6933d7
merge conflicts removed
SandhiyaViswanathan Jul 20, 2017
4e3ce51
added services to docker
psharneja Jul 20, 2017
a8518fc
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 20, 2017
f1f559a
notification service added for docker-compose
psharneja Jul 20, 2017
ef6ce43
template ui modified
SandhiyaViswanathan Jul 20, 2017
58d9363
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 20, 2017
bb0bd53
removed localhost from URL
psharneja Jul 20, 2017
65da2bf
corrected dependencies in docker-compose
psharneja Jul 20, 2017
bf95ecb
added toolurl
psharneja Jul 20, 2017
0896034
event name added
SandhiyaViswanathan Jul 20, 2017
8b49d94
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
SandhiyaViswanathan Jul 20, 2017
188e29a
memreq notification
Aravindh-r Jul 20, 2017
10309d7
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
Aravindh-r Jul 20, 2017
b217fdb
tool's avatar added in community component
psharneja Jul 20, 2017
a9fc30b
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
psharneja Jul 20, 2017
2caf157
change in result for tools
psharneja Jul 20, 2017
6cb5017
community creation data refactoring
psharneja Jul 20, 2017
2ed6246
UI for notifications modified
SandhiyaViswanathan Jul 20, 2017
e5ebc56
Merge branch 'dev-wave-18' of https://github.com/stackroute/calvin-co…
SandhiyaViswanathan Jul 20, 2017
4970d95
notification scrollable
psharneja Jul 20, 2017
cfffdac
changes in docker for kafka
psharneja Jul 20, 2017
48a4495
changes in new community and new member data publishing for events
psharneja Jul 20, 2017
11f2bb2
corrections in publisher for webhook
psharneja Jul 20, 2017
eb77dc5
correction in membersadded event
psharneja Jul 20, 2017
2256304
correction in notification ui
psharneja Jul 20, 2017
37bb70a
webhook short circuiting
psharneja Jul 20, 2017
2f5befe
webhook short circuiting
psharneja Jul 20, 2017
132fadd
correction injson
psharneja Jul 21, 2017
ae3e9cf
change
psharneja Jul 21, 2017
7142fdf
change
psharneja Jul 21, 2017
a8cf990
Update README.md
psharneja Sep 21, 2017
9b2d533
Update README.md
psharneja Sep 21, 2017
20e0fde
Update README.md
psharneja Sep 21, 2017
33f1ca2
Update README.md
psharneja Sep 21, 2017
4f537c1
Update README.md
rajiff Sep 22, 2017
3df6869
Update docker-compose.yml
rajiff Sep 22, 2017
ee3d9e8
added custom material module as official aggregator module for materi…
psharneja Sep 25, 2017
e495a7a
Merge branch 'dev-wave-18' of https://www.github.com/stackroute/calvi…
psharneja Sep 25, 2017
523bb05
event refactoring for add member & add tools with counters
psharneja Oct 2, 2017
2423798
codeacy errors removed
psharneja Oct 2, 2017
a5df777
codacy corrections
psharneja Oct 9, 2017
78e8b98
codacy sol
psharneja Oct 9, 2017
b4b859f
codacy n lint removed, object destructuring
psharneja Oct 14, 2017
8b2948a
codace
psharneja Oct 14, 2017
2915f84
removed pending codacy errors
psharneja Oct 14, 2017
5a9fc6d
new codacy errors
psharneja Oct 14, 2017
31c6325
reappeared codacy error
psharneja Oct 14, 2017
992be44
Enabling Tool sink
rajiff Nov 22, 2017
1a7db67
isolating containers and giving a dedicated data folder
rajiff Nov 22, 2017
c64f6b1
linkages were added
rajiff Nov 22, 2017
a879196
Update docker-compose.yml
rajiff Nov 22, 2017
225aeea
Update docker-compose.yml
rajiff Nov 22, 2017
cadd206
Update docker-compose.yml
rajiff Nov 22, 2017
3b1f4f4
makign changes to host it all 3 calvin platforms together on AWS
rajiff Nov 23, 2017
4aa8219
Changes to use common resource servers intead of hosting one
Nov 23, 2017
4815041
Changes to use common resource servers intead of hosting one
Nov 23, 2017
75976d0
Changes to use common resource servers intead of hosting one
Nov 23, 2017
238443f
Changes to use common resource servers intead of hosting one
Nov 23, 2017
67bd687
Changes to use common resource servers intead of hosting one
Nov 23, 2017
8b49b1c
Changes to use common resource servers intead of hosting one
Nov 23, 2017
642c535
Pushing UI build as dist folder for deployment purpose
Nov 23, 2017
12c9a3f
Resolved material component related issue for material v2-rc
Nov 23, 2017
9fea346
fixes to community cration
Nov 23, 2017
d0436e4
fixes to community cration
Nov 23, 2017
93eeb5e
fixes to community cration
Nov 23, 2017
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
12 changes: 9 additions & 3 deletions .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@
"testTsconfig": "tsconfig.spec.json",
"prefix": "calvin",
"styles": [
"styles.css"
"styles.css",
"styles.scss"
],
"stylePreprocessorOptions": {
"includePaths": ["./", "./themes"]
},
"scripts": [
"../node_modules/hammerjs/hammer.min.js"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
Expand Down Expand Up @@ -54,4 +60,4 @@
"styleExt": "css",
"component": {}
}
}
}
10 changes: 10 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.git
.gitignore
.editorconfig
node_modules
logs/*
*.log
Dockerfile*
docker-compose.yml
*.md
*.yml
8 changes: 5 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
module.exports = {
"extends": "airbnb-base",
"installedESLint": true,
"plugins": [
"import"
]
};
],
"env": {
"mocha": true
}
};
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# dependencies
/node_modules

/database
# IDEs and editors
/.idea
.project
Expand All @@ -32,6 +32,7 @@
npm-debug.log
testem.log
/typings
package-lock.json

# e2e
/e2e/*.js
Expand Down
23 changes: 23 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM mhart/alpine-node:8

MAINTAINER https://hub.docker.com/u/mhart/

RUN apk update && \
apk add git && \
apk add --no-cache python build-base

#RUN apk add --no-cache python build-base

RUN mkdir -p /usr/src/

WORKDIR /usr/src/

COPY package.json .

RUN npm install --production

COPY . .

EXPOSE 3000

CMD ["npm", "start"]
104 changes: 85 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,101 @@
# CalvinCommunities
# Calvin- Communities

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.3.

## Development server
## Overview

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
Calvin- Communities repository has all the backend APIs for 'Calvin- Practitioners Platform' along with Angular based Front-End for Admin Panel.

## Code scaffolding
The Backend API code & Front-End UI code is in [server] & [webapp] directories respectively.

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.
also, most of the tasks are implemented as micro-services.
for which you need a certain level of infrastructure to run, which are viz;

## Build
## Prerequisites

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
### Git
- You can find documentation and download git [here][git-home].
- After Downloading, clone this repository with 'git clone https://github.com/stackroute/calvin-communities'.
- after cloning, move to branch [dev-wave-18] with 'git checkout -b dev-wave-18'
- pull the latest commit code from this branch by using 'git pull origin dev-wave-18'

## Running unit tests
### Node.js and Tools

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
- Get Node v8 or above from here [Node.js][node].
- Install the tool dependencies: `npm install`

## Running end-to-end tests
### Angular CLI
- Install Angular CLI, follow instructuions at https://cli.angular.io

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Before running the tests make sure you are serving the app via `ng serve`.
### Docker
- You can download required docker & docker-compose versions from [here](https://www.docker.com), according to your host system OS.

## Further help
# Deploying or Running the App

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
You can run the app locally or as a fully dockerized set of containers, below explained how to deploy as a Dockerized set of containers.

## Command used to generate this project
Project is originally generated usign Angular CLI, and was added the express part manually
# Steps to Dockerize this app

Below is the command used to generate the code
`ng new --directory calvinCommunities --source-dir webapp --prefix calvin --routing true --skip-install true calvinCommunities`
Clone the project locally, ensure all pre-requisites are installed

## step-0 Building angular code

- Before Dockerizing the App, we need to build the angular code on the local or host machine
- Angular code provide Admin panel UI
- To build the angualr code, please run command `npm run build`
- once the build is complete, verify if `dist` folder is created, which will have built code and gets baked into docker images in the next steps.

## step-1 dockerize the app

- Need to build the docker image for the app
- To build the image, use command `docker-compose build` (prefix `sudo`, if required)
- Once the build is completed successfully, run the command `docker images` and see if the new image names you can see as per the image names given in the `docker-compose.yml` file

## step-2 run the dockerized app
- Ensure, ports [`3000`, `9042`, `2181`, `9092`, `6379`] are free on your Host Machine OR change the ports for the services in `docker-compose.yml` as per your need before running the app
- Use command `docker-compose up` to run the app in foreground and command `docker-compose up -d` to run in background
- Assuming now the services are up, you can view the logs using command `docker-compose logs -f --tail=1` to see the running log
- Please refer docker-compose reference to check other useful commands on viewing the logs in more advanced way

Above steps should ensure the app is running and now you should be able to access th UI from http://localhost:3000 and API from http://localhost:3000/api/v1/

Refer the API documentation from [here](https://github.com/stackroute/calvin-communities/wiki)

# Running services locally

## Prerequisites for running all Micro Services individually and locally

- Get Cassandra DB from [here](http://cassandra.apache.org/download/) .
- Get Apache Zookeeper from [here](https://zookeeper.apache.org/) .
- Get Apache Kafka from [here](https://kafka.apache.org/downloads) .
- Get Redis from [here](https://redis.io/download) .

Get all the above running on above mentioned ports respectively.

### Starting Node app

- Run this command to start the node app `npm run serve`.
- This will build & host the Angular Code, Backend APIs along with creating the required Database for our app, (yes DB is automatically created if not exists already)

### Start required services using these commands

- **Counter Service** `npm run svc.counter`
- **Reverse Lookup Service** `npm run svc.tool`
- **Member Reverse Lookup Service** `npm run svc.member`
- **Member Requests Service** `npm run svc.memberrequests`
- **Toolsink Service** `npm run svc.toolsink`
- **Notifications Service** `npm run svc.notifications`

### Other commands available, if needed

`npm run installdb` --> Create Keyspaces, Tables etc in Cassandra DB.
`npm run truncatedb` --> Truncate all the data from the database.
`npm run coverage` --> To check the code coverage by your testcaes with help of Istanbul.
`npm run testcases` --> Run all mocha testcases written for the app. BEST OF LUCK...!
`npm run lint` --> To check all the Lint Errors in your code.
`npm run test` --> To check all the Lint Errors as well as test cases.
`npm start` --> Run only backend API code, junk UI :-)

## For detailed information on APIs, please visit our wiki page [here](https://github.com/stackroute/calvin-communities/wiki)

[git-home]: https://git-scm.com/
[node]: https://nodejs.org/
79 changes: 42 additions & 37 deletions bin/www
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

// Create instance of express based web app
let app = require('../server/app');
let socketServer = require('../server/socketserver.js');
let debug = require('debug')('dataDisplayApp:server');
let http = require('http');

Expand All @@ -24,67 +25,71 @@ let server = http.createServer(app);
* Listen on provided port, on all network interfaces.
*/

/* Socket starts*/
socketServer.attach(server);

/* Socket ends */

server.listen(port);
server.on('error', onError);
server.on('listening', onListening);


/**
* Normalize a port into a number, string, or false.
*/

function normalizePort(val) {
let port = parseInt(val, 10);
let port = parseInt(val, 10);

if (isNaN(port)) {
// named pipe
return val;
}
if (isNaN(port)) {
// named pipe
return val;
}

if (port >= 0) {
// port number
return port;
}
if (port >= 0) {
// port number
return port;
}

return false;
return false;
}

/**
* Event listener for HTTP server "error" event.
*/

function onError(error) {
if (error.syscall !== 'listen') {
throw error;
}

let bind = typeof port === 'string' ?
'Pipe ' + port :
'Port ' + port;

// handle specific listen errors with friendly messages
switch (error.code) {
case 'EACCES':
// console.error(bind + ' requires elevated privileges');
process.exit(1);
break;
case 'EADDRINUSE':
// console.error(bind + ' is already in use');
process.exit(1);
break;
default:
throw error;
}
if (error.syscall !== 'listen') {
throw error;
}

let bind = typeof port === 'string' ?
'Pipe ' + port :
'Port ' + port;

// handle specific listen errors with friendly messages
switch (error.code) {
case 'EACCES':
// console.error(bind + ' requires elevated privileges');
process.exit(1);
break;
case 'EADDRINUSE':
// console.error(bind + ' is already in use');
process.exit(1);
break;
default:
throw error;
}
}

/**
* Event listener for HTTP server "listening" event.
*/

function onListening() {
let addr = server.address();
let bind = typeof addr === 'string' ?
'pipe ' + addr :
'port ' + addr.port;
debug('Listening on ' + bind);
let addr = server.address();
let bind = typeof addr === 'string' ?
'pipe ' + addr :
'port ' + addr.port;
debug('Listening on ' + bind);
}
65 changes: 65 additions & 0 deletions build/config.gypi
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Do not edit. File was generated by node-gyp's "configure" step
{
"target_defaults": {
"cflags": [],
"default_configuration": "Release",
"defines": [],
"include_dirs": [],
"libraries": []
},
"variables": {
"asan": 0,
"coverage": "false",
"debug_devtools": "node",
"force_dynamic_crt": 0,
"gas_version": "2.26",
"host_arch": "x64",
"icu_data_file": "icudt58l.dat",
"icu_data_in": "../../deps/icu-small/source/data/in/icudt58l.dat",
"icu_endianness": "l",
"icu_gyp_path": "tools/icu/icu-generic.gyp",
"icu_locales": "en,root",
"icu_path": "deps/icu-small",
"icu_small": "true",
"icu_ver_major": "58",
"node_byteorder": "little",
"node_enable_d8": "false",
"node_enable_v8_vtunejit": "false",
"node_install_npm": "true",
"node_module_version": 51,
"node_no_browser_globals": "false",
"node_prefix": "/usr",
"node_release_urlbase": "",
"node_shared": "false",
"node_shared_cares": "false",
"node_shared_http_parser": "false",
"node_shared_libuv": "false",
"node_shared_openssl": "false",
"node_shared_zlib": "false",
"node_tag": "",
"node_use_bundled_v8": "true",
"node_use_dtrace": "false",
"node_use_etw": "false",
"node_use_lttng": "false",
"node_use_openssl": "true",
"node_use_perfctr": "false",
"node_use_v8_platform": "true",
"openssl_fips": "",
"openssl_no_asm": 0,
"shlib_suffix": "so.51",
"target_arch": "x64",
"uv_parent_path": "/deps/uv/",
"uv_use_dtrace": "false",
"v8_enable_gdbjit": 0,
"v8_enable_i18n_support": 1,
"v8_inspector": "true",
"v8_no_strict_aliasing": 1,
"v8_optimized_debug": 0,
"v8_random_seed": 0,
"v8_use_snapshot": "true",
"want_separate_host_toolset": 0,
"want_separate_host_toolset_mkpeephole": 0,
"nodedir": "/home/psharneja/.node-gyp/7.10.0",
"standalone_static_library": 1
}
}
Binary file added dist/assets/icons/search_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/logo/logo-fav.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/assets/logo/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/favicon.ico
Binary file not shown.
Loading