fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2018-11-19 07:22:01 +01:00
2 parents d42cc16306 52f96b8172
commit 331acf9ffb
5 files changed
+167 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/html/index.html
+1 -1
View File
@@ -13,7 +13,7 @@
<link rel="shortcut icon" type="image/png/ico" href="/favicon.ico" />
<script src="https://unpkg.com/apollo-client-browser@1.7.0"></script>
<script type="text/javascript" src="https://charts-dev.advancedalgos.net/Scripts/Require.js"></script>
<script type="text/javascript" src="https://charts-dev.advancedalgos.net/Scripts/require.js"></script>
<script type="text/javascript" src="https://charts-dev.advancedalgos.net/Scripts/AppPreLoader.js"></script>
<script type="text/javascript">
client/package-lock.json
Generated
+145 -58
View File
@@ -26,9 +26,9 @@
}
},
"@advancedalgos/key-vault-client": {
"version": "0.0.21",
"resolved": "https://registry.npmjs.org/@advancedalgos/key-vault-client/-/key-vault-client-0.0.21.tgz",
"integrity": "sha512-qLuWI/mcHO8UuebUtHQM4U0uTWOcpIpmo7nhNzue6/al0hHH0NYziqmPET5N0dKjtImX9pTr3uj802GyMfAI0A==",
"version": "0.0.24",
"resolved": "https://registry.npmjs.org/@advancedalgos/key-vault-client/-/key-vault-client-0.0.24.tgz",
"integrity": "sha512-yLQGx5pohKCkzFD+hiRmrGVN8xzIRi2V/OAErKLa1aRWIdSNZVpiQe7GAnB1zpHYUmjxh5YKH9WfurRNAIovLQ==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.2",
@@ -46,12 +46,12 @@
}
},
"@advancedalgos/teams-client": {
"version": "0.0.27",
"resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.27.tgz",
"integrity": "sha512-TBawzPu+zn/VSf3CGG+5zh1KPwxfetKIwKaXZsU/kgmLllArXDUXEdVbznD6oYlkOUp0naenxA/SLu+XuuaGeg==",
"version": "0.0.29",
"resolved": "https://registry.npmjs.org/@advancedalgos/teams-client/-/teams-client-0.0.29.tgz",
"integrity": "sha512-jObBNPVG2udT/36zzs6LfDwT1/KCT7NddFsnZc79irzNXXKDUIIoAxaFS08Z/Kis24cD24FFgjxjSLKEPMxBCA==",
"dev": true,
"requires": {
"@advancedalgos/web-components": "0.0.13",
"@advancedalgos/web-components": "0.0.15",
"@azure/storage-blob": "^10.0.0-preview",
"apollo-cache-inmemory": "^1.3.5",
"apollo-client": "^2.4.2",
@@ -78,12 +78,139 @@
"react-router-dom": "^4.3.1",
"recompose": "^0.30.0",
"subscriptions-transport-ws": "^0.9.15"
},
"dependencies": {
"@advancedalgos/web-components": {
"version": "0.0.15",
"resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.15.tgz",
"integrity": "sha512-Z9QyMqgpR/Al+0EYuLtSK3/9BJ/anB0zulBG7QMac9xCgNGSSbon9GndtSIFN3HwyirDCsIH3CZdPi6tJL3KnA==",
"dev": true,
"requires": {
"@azure/storage-blob": "^10.1.0-preview",
"@material-ui/core": "^3.2.2",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.5",
"blob-util": "^2.0.2",
"browser-image-resizer": "^1.2.0",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"prop-types": "^15.6.2",
"react": "^16.6.1",
"react-apollo": "^2.3.1",
"react-dom": "^16.6.1",
"react-dropzone": "^5.1.0",
"react-image-cropper": "^1.3.0"
},
"dependencies": {
"@azure/storage-blob": {
"version": "10.1.0-preview",
"resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.1.0-preview.tgz",
"integrity": "sha512-vKY4dF8VCRCOOQ03Z1ResyjZbWg4jPOnQtRtlSEKE6a7WwFE3EuIbhE7OQfEihuNYyE+XWLkTjrHxeHDFx1hFg==",
"dev": true,
"requires": {
"events": "3.0.0",
"ms-rest-js": "0.22.425",
"tslib": "^1.9.3"
}
},
"apollo-client": {
"version": "2.4.6",
"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.6.tgz",
"integrity": "sha512-RsZVMYone7mu3Wj4sr7ehctN8pdaHsP4X1Sv6Ly4gZ/YDetCCVnhbmnk5q7kvDtfoo0jhhHblxgFyA3FLLImtA==",
"dev": true,
"requires": {
"@types/async": "2.0.50",
"@types/zen-observable": "^0.8.0",
"apollo-cache": "1.1.20",
"apollo-link": "^1.0.0",
"apollo-link-dedup": "^1.0.0",
"apollo-utilities": "1.0.25",
"symbol-observable": "^1.0.2",
"zen-observable": "^0.8.0"
}
},
"apollo-utilities": {
"version": "1.0.25",
"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.25.tgz",
"integrity": "sha512-AXvqkhni3Ir1ffm4SA1QzXn8k8I5BBl4PVKEyak734i4jFdp+xgfUyi2VCqF64TJlFTA/B73TRDUvO2D+tKtZg==",
"dev": true,
"requires": {
"fast-json-stable-stringify": "^2.0.0"
}
},
"react-apollo": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.1.tgz",
"integrity": "sha512-xPteQmCzMJT8wE4v0zq38E6JWLhrNcJENl66fP117lwzU2lZA+qoUDcizqKl0z2OY5b+KklmqnPPD+wcWAdy7w==",
"dev": true,
"requires": {
"fbjs": "^1.0.0",
"hoist-non-react-statics": "^3.0.0",
"invariant": "^2.2.2",
"lodash.flowright": "^3.5.0",
"lodash.isequal": "^4.5.0",
"prop-types": "^15.6.0"
}
}
}
},
"apollo-cache": {
"version": "1.1.20",
"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.20.tgz",
"integrity": "sha512-+Du0/4kUSuf5PjPx0+pvgMGV12ezbHA8/hubYuqRQoy/4AWb4faa61CgJNI6cKz2mhDd9m94VTNKTX11NntwkQ==",
"dev": true,
"requires": {
"apollo-utilities": "^1.0.25"
},
"dependencies": {
"apollo-utilities": {
"version": "1.0.25",
"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.25.tgz",
"integrity": "sha512-AXvqkhni3Ir1ffm4SA1QzXn8k8I5BBl4PVKEyak734i4jFdp+xgfUyi2VCqF64TJlFTA/B73TRDUvO2D+tKtZg==",
"dev": true,
"requires": {
"fast-json-stable-stringify": "^2.0.0"
}
}
}
},
"core-js": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
"integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
"dev": true
},
"fbjs": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz",
"integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==",
"dev": true,
"requires": {
"core-js": "^2.4.1",
"fbjs-css-vars": "^1.0.0",
"isomorphic-fetch": "^2.1.1",
"loose-envify": "^1.0.0",
"object-assign": "^4.1.0",
"promise": "^7.1.1",
"setimmediate": "^1.0.5",
"ua-parser-js": "^0.7.18"
}
},
"hoist-non-react-statics": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.1.0.tgz",
"integrity": "sha512-MYcYuROh7SBM69xHGqXEwQqDux34s9tz+sCnxJmN18kgWh6JFdTw/5YdZtqsOdZJXddE/wUpCzfEdDrJj8p0Iw==",
"dev": true,
"requires": {
"react-is": "^16.3.2"
}
}
}
},
"@advancedalgos/users-client": {
"version": "0.0.22",
"resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.22.tgz",
"integrity": "sha512-kjLBUdpnh9jYwesfsOBwAe5jPydKF0pt1ts9QBk3KKjcv4FATnCQ8uHsWtltg1gSAE781ozJaUSB0jjNrYVICg==",
"version": "0.0.24",
"resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.24.tgz",
"integrity": "sha512-Ab5crZqo3CGlUVnwNFO/Ym3KYGUHg3XwoGCOHspBrsdijQ4IiKHo8Kp/IMd1kfJ/JvQloiuFH5Nc1UqcgBl6hQ==",
"dev": true,
"requires": {
"@material-ui/core": "^3.2.0",
@@ -144,40 +271,6 @@
}
}
},
"@advancedalgos/web-components": {
"version": "0.0.13",
"resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.13.tgz",
"integrity": "sha512-jXz2w/r08GX8uqB4UTDaow27T3juvR7Bk/80TWmDORVPNCPK152MEUBgxF161hAyOj1jdB+K4M1Fy5GkEpDhmw==",
"dev": true,
"requires": {
"@azure/storage-blob": "^10.1.0-preview",
"@material-ui/core": "^3.2.2",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.2",
"blob-util": "^2.0.2",
"browser-image-resizer": "^1.2.0",
"graphql": "^14.0.2",
"graphql-tag": "^2.9.2",
"prop-types": "^15.6.2",
"react-apollo": "^2.1.11",
"react-dropzone": "^5.1.0",
"react-image-crop": "^5.0.0",
"react-image-cropper": "^1.3.0"
},
"dependencies": {
"@azure/storage-blob": {
"version": "10.1.0-preview",
"resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.1.0-preview.tgz",
"integrity": "sha512-vKY4dF8VCRCOOQ03Z1ResyjZbWg4jPOnQtRtlSEKE6a7WwFE3EuIbhE7OQfEihuNYyE+XWLkTjrHxeHDFx1hFg==",
"dev": true,
"requires": {
"events": "3.0.0",
"ms-rest-js": "0.22.425",
"tslib": "^1.9.3"
}
}
}
},
"@azure/storage-blob": {
"version": "10.0.0-preview",
"resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.0.0-preview.tgz",
@@ -6648,9 +6741,9 @@
}
},
"flatmap-stream": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz",
"integrity": "sha512-lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==",
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.2.tgz",
"integrity": "sha512-ucyr6WkLXjyMuHPtOUq4l+nSAxgWi7v4QO508eQ9resnGj+lSup26oIsUI5aH8k4Qfpjsxa8dDf9UCKkS2KHzQ==",
"dev": true
},
"flatten": {
@@ -16659,7 +16752,7 @@
},
"globby": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
"resolved": "http://registry.npmjs.org/globby/-/globby-8.0.1.tgz",
"integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==",
"dev": true,
"requires": {
@@ -16750,12 +16843,6 @@
"shallowequal": "^1.0.2"
}
},
"react-image-crop": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/react-image-crop/-/react-image-crop-5.0.0.tgz",
"integrity": "sha512-MBT18tcHeEpmrhbSS6hx00MmfNgrnlhZuwY96cGRPhUmNeabxM7UBCcoU+oJCZXB0iGZk38zy/YGoZ4ELVp/LQ==",
"dev": true
},
"react-image-cropper": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/react-image-cropper/-/react-image-cropper-1.3.0.tgz",
@@ -17311,7 +17398,7 @@
},
"globby": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true,
"requires": {
@@ -19978,9 +20065,9 @@
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
},
"stack-utils": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.1.tgz",
"integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=",
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
"integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
"dev": true
},
"static-extend": {
client/package.json
+3 -3
View File
@@ -22,10 +22,10 @@
"homepage": "https://github.com/Algoteers/MasterApp#readme",
"devDependencies": {
"@advancedalgos/events-client": "0.0.4",
"@advancedalgos/key-vault-client": "0.0.23",
"@advancedalgos/teams-client": "0.0.27",
"@advancedalgos/key-vault-client": "0.0.24",
"@advancedalgos/teams-client": "0.0.29",
"@advancedalgos/users-client": "0.0.24",
"@advancedalgos/web-components": "0.0.13",
"@advancedalgos/web-components": "0.0.15",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
client/src/views/layout/header/imports.js
-1
View File
@@ -33,7 +33,6 @@ const teamsMenus = {
{ title: 'Directory', to: '/teams/explore', icon: ImportContacts },
{ title: 'Your teams', to: '/teams/manage-teams', icon: Group, authenticated: true },
{ title: 'Team members', to: '/teams/team-members', icon: People, authenticated: true },
{ title: 'Financial beings', to: '/teams/financial-beings', icon: Adb, authenticated: true },
{ title: 'Report a Bug', to: 'https://github.com/AdvancedAlgos/TeamsModule/issues/new', icon: BugReport, externalLink: true }
]
}
server/src/index.js
+18 -12
View File
@@ -43,22 +43,27 @@ async function getUserId (authId) {
}
async function run () {
const transformedTeamsSchema = await createTransformedRemoteSchema(
'teams_',
process.env.TEAMS_API_URL,
process.env.TEAMS_API_PRESHARED)
const transformedUsersSchema = await createTransformedRemoteSchema(
'users_',
process.env.USERS_API_URL,
process.env.USERS_API_PRESHARED)
const transformedEventsSchema = await createTransformedRemoteSchema(
'events_',
process.env.EVENTS_API_URL,
process.env.EVENTS_API_PRESHARED)
logger.info('About to create schemas')
const transformedKeyVaultSchema = await createTransformedRemoteSchema(
'keyVault_',
process.env.KEYVAULT_API_URL,
process.env.KEYVAULT_API_PRESHARED)
logger.info('KeyVault schema created')
const transformedTeamsSchema = await createTransformedRemoteSchema(
'teams_',
process.env.TEAMS_API_URL,
process.env.TEAMS_API_PRESHARED)
logger.info('Teams schema created')
const transformedUsersSchema = await createTransformedRemoteSchema(
'users_',
process.env.USERS_API_URL,
process.env.USERS_API_PRESHARED)
logger.info('Users schema created')
const transformedEventsSchema = await createTransformedRemoteSchema(
'events_',
process.env.EVENTS_API_URL,
process.env.EVENTS_API_PRESHARED)
logger.info('Events schema created')
var schemas = [masterSchema]
var resolvers = {}
@@ -171,6 +176,7 @@ async function run () {
}
try {
logger.info('About to run main run method')
run()
} catch (e) {
logger.error(`An general error occured while running the app: ${e}, details: ${e.message}, stack: ${e.stack}`)