From a7b5047febbc930c4855257453880eb3a867379e Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Wed, 17 Oct 2018 14:52:12 -0300 Subject: [PATCH 1/2] Changing default config --- server/.env.example | 8 ++++---- server/src/createRemoteSchema.js | 2 +- server/src/index.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/.env.example b/server/.env.example index 1cb345459..a4299b7da 100644 --- a/server/.env.example +++ b/server/.env.example @@ -1,4 +1,4 @@ -GRAPHQL_API_URL='https://dev-app.advancedalgos.net/graphql' -TEAMS_API_URL='https://teams-api.advancedalgos.net/graphql' -USERS_API_URL='https://users-api.advancedalgos.net/graphql' -KEYVAULT_API_URL='https://keyvault-api.advancedalgos.net/graphql' +GRAPHQL_API_URL=https://app-api.advancedalgos.net/graphql +TEAMS_API_URL=https://teams-api.advancedalgos.net/graphql +USERS_API_URL=https://users-api.advancedalgos.net/graphql +KEYVAULT_API_URL=https://keyvault-api.advancedalgos.net/graphql diff --git a/server/src/createRemoteSchema.js b/server/src/createRemoteSchema.js index 5606634d8..3f840c1c1 100644 --- a/server/src/createRemoteSchema.js +++ b/server/src/createRemoteSchema.js @@ -43,7 +43,7 @@ export const createTransformedRemoteSchema = async (prefix, uri) => { try { schema = await createRemoteSchema(uri) } catch (error) { - logger.error(`An error occured while fetching ${prefix} schema. Details: `, error) + logger.error(`An error occured while fetching ${prefix}, ${uri} schema. Details: ${error}`) return false } const transformedSchema = transformSchema(schema, [ diff --git a/server/src/index.js b/server/src/index.js index 3889ddc77..ea5d1502c 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -78,5 +78,5 @@ async function run () { try { run() } catch (e) { - logger.error(e, e.message, e.stack) + logger.error(`An general error occured while running the app: ${e}, details: ${e.message}, stack: ${e.stack}`) } From 85960e51252e1799414c0d3858696525a434474e Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Fri, 19 Oct 2018 12:15:37 -0300 Subject: [PATCH 2/2] Reducing top menu size and adding favico --- client/.env.example | 10 ++++++++-- client/html/favicon.ico | Bin 0 -> 758 bytes client/html/index.html | 29 ++++++++++++++-------------- client/src/App.js | 2 +- client/src/views/header/LoggedIn.js | 2 -- client/src/views/header/index.js | 1 - 6 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 client/html/favicon.ico diff --git a/client/.env.example b/client/.env.example index fa326946a..868777c08 100644 --- a/client/.env.example +++ b/client/.env.example @@ -1,15 +1,21 @@ +#General configuration PORT=3100 NODE_ENV=development +#Graphql API DEV_GRAPHQL=http://localhost:4100/graphql PROD_GRAPHQL=https://app.advancedalgos.net/graphql +#Auth0 Server AUTH0_DOMAIN=advancedalgos.eu.auth0.com AUTH0_AUDIENCE=https://auth-dev.advancedalgos.net AUTH0_ISSUER=https://advancedalgos.eu.auth0.com/ AUTH0_CLIENTID= +#Auth0 Client AUTH0_CALLBACK_URL=http://localhost:3100/callback AUTH0_LOGOUT_URL=http://localhost:3100 -AUTH0_PROD_CALLBACK_URL=https://app.advancedalgos.net/callback -AUTH0_PROD_LOGOUT_URL=https://app.advancedalgos.net + +#Storage account +AZURE_STORAGE_URL_TEAMS= +AZURE_STORAGE_SAS_TEAMS= diff --git a/client/html/favicon.ico b/client/html/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..08c2369b05c014d615766ea699a4a355d454ed25 GIT binary patch literal 758 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaNh0(?STpSW9MBA?7cOhHmb9xo5e1==E8666=m`18dn79M*BrayZh-qaTI zmCkr?yu4|4beYn`w#~+>nYKWut@Cto46!(!8{D~VwE_=IWK-Af(%gUl&F{0ksr?$_ zr+wPT$%wP7&Q0OE$+VDrE7=c)Wysog^s~4=U$OJaqVqlR{CUgoZFtuEhS~9{f=x__ zzg$z!RIZd6$$i0hKboDLCid*mUjdy`^;UrmH|B9nTb6VvT+>^79Y;AZK-eEt`*#*_ z8%4Bi|HPQ_V54Hq&#(4p70!K|soiq_#Uyd3d2jyP9N1xb_Qb~4v)n?GD?$s31&_Rn z?b^m$AimK^^ZZLCmRk(dWhOSvNshGMx%hWXVZq8u8J)<2#QymSN7YX_=B$dll*51U zV?DFAedaZb8O<}^8$L9$Ni5g2G?Mn7lyP*|5do*W!e_IK7HT~U{WA5;CxJ^oSDtH3 zy&gHqVQy#IOvR2Tcb;AH7Mr^+=&5Lz%H-(RS9l)2I_dEC!Tu~Z=jYe|t)KL&Xz7Z2 z+2;Ji;jdSAPq7WYy|?GtquMe*ld0cw3)key-sW56Iz@Y_y%|?LOY5=&S45STif5)3 zE2{|A_$zCj`&tvSa%G)d-%_7mBs%pCTA7B)RSA|5B1SOU$6cpvBW#*(RlvEa^Dr6RvBr`Bn%z6BYhodk| zL*tbH=`)^BgBX~Vx%HB{g_VW9CyOu(E4Vb698O_Y-W;NE`o@(LN6s9PIl_Lr!DE4! a9>Xhf!IDo-rc;4dFnGH9xvX - + + + + - - +
- diff --git a/client/src/App.js b/client/src/App.js index bc7694331..dcb3a0323 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -18,7 +18,7 @@ import KeyVault from '@advancedalgos/key-vault-client' import Users from '@advancedalgos/users-client' export const auth = new Auth( - result => console.log('auth result', result), + result => console.log('Authentication successful.'), client ) diff --git a/client/src/views/header/LoggedIn.js b/client/src/views/header/LoggedIn.js index 80d9c557c..be62994b7 100644 --- a/client/src/views/header/LoggedIn.js +++ b/client/src/views/header/LoggedIn.js @@ -28,9 +28,7 @@ export const LoggedIn = props => { return (
-

-

) } diff --git a/client/src/views/header/index.js b/client/src/views/header/index.js index 7c5179242..07c819807 100644 --- a/client/src/views/header/index.js +++ b/client/src/views/header/index.js @@ -53,7 +53,6 @@ const styles = theme => ({ position: 'relative' }, img: { - margin: 20, display: 'block', maxWidth: 240, maxHeight: 48