diff --git a/README.md b/README.md index e63b81cc5..e90d84ee9 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Advanced Algos Team Module -[![npm client version](https://badge.fury.io/js/%40advancedalgos%2Fteams-client.svg)](https://badge.fury.io/js/%40advancedalgos%2Fteams-client) +# Superalgos Team Module +[![npm client version](https://badge.fury.io/js/%40superalgos%2Fteams-client.svg)](https://badge.fury.io/js/%40superalgos%2Fteams-client) ## Introduction The general purpose of the team module is -This module explores crafting a strategic development pattern that upholds the Advanced Algos principles of rapid-evolution and automation built upon the values of collaboration, permissionless innovation, and accessibility. +This module explores crafting a strategic development pattern that upholds the Superalgos principles of rapid-evolution and automation built upon the values of collaboration, permissionless innovation, and accessibility. #### This is a monorepo containing the Team GraphQL API server, Team Client, and Team Prisma Schema @@ -17,7 +17,7 @@ Requirements: - NPM (comes installed with NodeJS) - [Github authorization via SSH](https://help.github.com/articles/connecting-to-github-with-ssh/): *optional* - removes need to authenticate every push or pull from GitHub especially as this is a private repo. -1. Clone this repository `git clone https://github.com/Algoteers/aa-team-module.git` +1. Clone this repository `git clone https://github.com/Superalgos/TeamsModule.git` 2. `cd aa-team-module` 5. Navigate to desired package in /packages and look at its README.md for further instructions. diff --git a/api/README.md b/api/README.md index 8dfe0fcc6..1059d7ad2 100644 --- a/api/README.md +++ b/api/README.md @@ -1,10 +1,8 @@ -# Advance Algos Team GraphQL API Server +# Superalgos Team GraphQL API Server -This is the Advanced Algos Team Module server-side GraphQL API server. We use Webpack 4 + Docker to develop locally, then build to a distribution bundle that can then be uploaded via FTP, git or used with a continuous integration workflow. +This is the Superalgos Team Module server-side GraphQL API server. We use Webpack 4 + Docker to develop locally, then build to a distribution bundle that can then be uploaded via FTP, git or used with a continuous integration workflow. -This modules client-side component is the [aateam-client package](../aateam-client#README). - -For more information on the general architecture and related technology of this module, please visit this repos [main documenation](../../docs#README). +This modules client-side frontend is in the [client directory](../client#README). ## Getting Started @@ -17,98 +15,31 @@ then npm run dev ``` -### Using Docker - -Get latest Docker and Docker Compose: [https://docs.docker.com/compose/install/](https://docs.docker.com/compose/install/) - -#### Using Docker container for Development - -To run starter kit in development mode with hot code reload execute: - -Run docker container in background: - -``` -docker-compose up -d -``` - -If image issues, try running: -``` -docker-compose up --build -``` -then run -``` -docker-compose up -d -``` - -To view logs -``` -docker-compose logs -f -t -``` -Hit Ctrl + c to exit logs without stopping service - -To stop service -``` -docker-compose down -``` - ## Overview -The development architecture of the Algobots Community site is to allow both rapid initial development and ongoing rapid-evolution. As with any opinionated workflow, there's a learning curve, but the libraries and architecture of this application have been chosen to maximize collaboration, flexibility, and extensibility. +The Superalgos/TeamModule API is a GraphQL server that serves the necessary queries and mutations for Superalgos teams to browser clients and the Superalgos platform. ### Main Libraries -- [*Webpack 4*](https://webpack.js.org/):web application bundler. Allows us to us latest newer JS ECMA features that increase productivity and code clarity. Also allows additional libraries such as modular and programmable CSS via SASS/SCSS/LESS. Provides webserver for local development. -- [*Bulma CSS Framework*](https://bulma.io/documentation/): Bulma is a highly-customizable CSS-only framework allowing us to quickly prototype the layout of a webapp without being complicated by opinionated functionality represented in libraries such as Bootstrap or Material UI. Grants us the flexibility to create a custom look at top speed whilst minimizing baggage. -- [*HyperApp*](https://github.com/hyperapp/hyperapp): Allows a controlled Flux-styled approach to state-management and data-flow through components like React minus the excess boilerplate and learning curve. +- [*Prisma*](https://www.prisma.io/): GraphQL ORM for Postgres. +- [*Graphql*](https://graphql.org/): GraphQL is a query language for APIs and a runtime for fulfilling those queries. +- [*Apollo Server*](https://www.apollographql.com/docs/apollo-server/): Apollo Server is the best way to quickly build a production-ready, self-documenting API for GraphQL clients, using data from any source. - [*Docker*](https://www.docker.com/what-docker) ### File organization ``` . # Top level directory located at your choice +├── database # Database files for local Prisma development ├── src -│ ├── actions # Actions are functions that change the app state -│ ├── assets # images, logos and other static assets -│ ├── state # Schema of state — the single source of truth concerning app state. -│ ├── styles # SASS/SCSS styles -│ ├── utils # Local storage and other utils -│ └── views # Main folder for editing site content -│ ├─ nav # Nav components — header, footer, etc. -│ ├─ pages # Nav components — header, footer, etc. -│ │ ├─ landing # Homepage -│ │ │ ├─ sections # Homepage sections. Collated in its own index.js -│ │ │ └─ index.js # Main homepage component. Pulls in sections -│ │ └─ ... # Other page/component folders -│ └─ index.js # Main view container. Main router -├── html -│ └── index.html # index.html template pulled in by Webpack to attach transpiled bundles -├── index.js # JS entry point to website +│ ├── directives # Directives for role permissions +│ ├── errors # error handling +│ ├── generated # Auto-compile GraphQl schema from Prisma endpoint +│ ├── graphql # GraphQL API schema + resolvers +│ ├── logger # Utils for logging +│ ├── middleware # Server middleware +│ └── storage # Azure storage service +├── ApolloServer.js # Main Apollo Server setup │ -├── tools # utility scripts, mostly for webpack configuration -│ -├── node_modules # created by running `npm install` in this packages root dir -├── dist # created by `npm run develop` - a cache of bundled files served by Webpack for local development -└── build # created by `npm run build` - location of deployable production bundle +└── index.js # Server API entrypoint ``` - -## Deployment - -The simplest deployment is compiling/transpiling the site to a distribution bundle and then uploading the files in the bundle to a web-accessible folder or storage. - -For this application we use Webpack to transpile the application which combines and minimizes all code and assets into an optimized bundle without and of the development code and resources. - -To build, run: -``` - npm run build -``` -Looking in this packages directory, there should be a ./build directory with the final built files that can be uploaded. - -### Create Docker image - -``` - docker build -t aateamapi/prod . -``` - -### Deployment instructions - -Coming soon... diff --git a/client/README.md b/client/README.md index 243701ffd..25d2b170f 100644 --- a/client/README.md +++ b/client/README.md @@ -1,10 +1,8 @@ -# Advance Algos Team Client-side Application +# Superalgos Team Client-side Application -This is the Advanced Algos Team Module client-side web app a.k.a. single-page-application (SPA). We use Webpack 4 + Docker to develop locally, then build to a distribution bundle that can then be uploaded via FTP, git or used with a continuous integration workflow. +This is the Superalgos Team Module client-side web app a.k.a. single-page-application (SPA). We use Webpack 4 + Docker to develop locally, then build to a distribution bundle that can then be uploaded via FTP, git or used with a continuous integration workflow. -This webapp's server-side component is the [aateam-api package](../aateam-api#README). - -For more information on the general architecture and related technology of this module, please visit this repos [main documenation](../../docs#README). +This webapp's server-side component is the [apit directory](../api#README). ## Getting Started @@ -51,58 +49,9 @@ To stop service docker-compose down ``` -## Overview -The development architecture of the Algobots Community site is to allow both rapid initial development and ongoing rapid-evolution. As with any opinionated workflow, there's a learning curve, but the libraries and architecture of this application have been chosen to maximize collaboration, flexibility, and extensibility. - ### Main Libraries - [*Webpack 4*](https://webpack.js.org/):web application bundler. Allows us to us latest newer JS ECMA features that increase productivity and code clarity. Also allows additional libraries such as modular and programmable CSS via SASS/SCSS/LESS. Provides webserver for local development. -- [*Bulma CSS Framework*](https://bulma.io/documentation/): Bulma is a highly-customizable CSS-only framework allowing us to quickly prototype the layout of a webapp without being complicated by opinionated functionality represented in libraries such as Bootstrap or Material UI. Grants us the flexibility to create a custom look at top speed whilst minimizing baggage. -- [*HyperApp*](https://github.com/hyperapp/hyperapp): Allows a controlled Flux-styled approach to state-management and data-flow through components like React minus the excess boilerplate and learning curve. +- [*React*](https://reactjs.org/): A JavaScript library for building user interfaces. +- [*Material UI*](https://material-ui.com/): React components that implement Google's Material Design. - [*Docker*](https://www.docker.com/what-docker) - -### File organization - -``` -. # Top level directory located at your choice -├── src -│ ├── actions # Actions are functions that change the app state -│ ├── assets # images, logos and other static assets -│ ├── state # Schema of state — the single source of truth concerning app state. -│ ├── styles # SASS/SCSS styles -│ ├── utils # Local storage and other utils -│ └── views # Main folder for editing site content -│ ├─ nav # Nav components — header, footer, etc. -│ ├─ pages # Nav components — header, footer, etc. -│ │ ├─ landing # Homepage -│ │ │ ├─ sections # Homepage sections. Collated in its own index.js -│ │ │ └─ index.js # Main homepage component. Pulls in sections -│ │ └─ ... # Other page/component folders -│ └─ index.js # Main view container. Main router -├── html -│ └── index.html # index.html template pulled in by Webpack to attach transpiled bundles -├── index.js # JS entry point to website -│ -├── tools # utility scripts, mostly for webpack configuration -│ -├── node_modules # created by running `npm install` in this packages root dir -├── dist # created by `npm run develop` - a cache of bundled files served by Webpack for local development -└── build # created by `npm run build` - location of deployable production bundle - -``` - -## Deployment - -The simplest deployment is compiling/transpiling the site to a distribution bundle and then uploading the files in the bundle to a web-accessible folder or storage. - -For this application we use Webpack to transpile the application which combines and minimizes all code and assets into an optimized bundle without and of the development code and resources. - -To build, run: -``` - npm run build -``` -Looking in this packages directory, there should be a ./build directory with the final built files that can be uploaded. - -### Deployment instructions - -Coming soon... diff --git a/client/package-lock.json b/client/package-lock.json index 6bf4fc7cb..33443500f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,152 +1,27 @@ { "name": "@advancedalgos/teams-client", - "version": "0.0.31", + "version": "0.0.32", "lockfileVersion": 1, "requires": true, "dependencies": { - "@advancedalgos/web-components": { - "version": "0.0.17", - "resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.17.tgz", - "integrity": "sha512-xD+0E4XBltgIxH/9TkzMS6a6iz7973YjxOzEr2O/D93lGIeHaYJQTDwykOLtSocuSaSSYRzxFlf82pVh22wLIA==", + "@azure/ms-rest-js": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.2.3.tgz", + "integrity": "sha512-eROQ034b+9v0Hd3wETKi/EwF5pqS3VRAk1Lm8iKVPOP8v30f6Zfzsi420MRfBMsbNCx/mE2N0L65Px7tvcGfVg==", "requires": { - "@azure/storage-blob": "^10.1.0-preview", - "@bearcanrun/react-image-cropper": "^1.3.6", - "@material-ui/core": "^3.6.1", - "@material-ui/icons": "^3.0.1", - "apollo-client": "^2.4.7", - "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.2", - "react-dom": "^16.6.1", - "react-dropzone": "^5.1.0", - "react-helmet": "^5.2.0", - "react-router-dom": "^4.3.1" + "axios": "^0.18.0", + "form-data": "^2.3.2", + "tough-cookie": "^2.4.3", + "tslib": "^1.9.2", + "uuid": "^3.2.1", + "xml2js": "^0.4.19" }, "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==", - "requires": { - "events": "3.0.0", - "ms-rest-js": "0.22.425", - "tslib": "^1.9.3" - } - }, - "@types/async": { - "version": "2.0.50", - "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz", - "integrity": "sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==", - "optional": true - }, - "@types/node": { - "version": "9.6.40", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.40.tgz", - "integrity": "sha512-M3HHoXXndsho/sTbQML2BJr7/uwNhMg8P0D4lb+UsM65JQZx268faiz9hKpY4FpocWqpwlLwa8vevw8hLtKjOw==" - }, - "apollo-cache": { - "version": "1.1.21", - "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz", - "integrity": "sha512-5ErNb78KHtrJNimkDBTEigcvHkIqUmS7QJIk4lpZZ+XLVVgvk2fD+GhD1PLP+s8vHfAKVbO6vdbRxCCjGGrh5w==", - "requires": { - "apollo-utilities": "^1.0.26" - } - }, - "apollo-client": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.7.tgz", - "integrity": "sha512-6aAm+16AFBYZhJF8eKxrup6AbYni01InDiwTfZhMMTP2xaXQWjsQnfaHbI2oE+hd3+AZFy1drkse8RZKghR/WQ==", - "requires": { - "@types/async": "2.0.50", - "@types/zen-observable": "^0.8.0", - "apollo-cache": "1.1.21", - "apollo-link": "^1.0.0", - "apollo-link-dedup": "^1.0.0", - "apollo-utilities": "1.0.26", - "symbol-observable": "^1.0.2", - "zen-observable": "^0.8.0" - } - }, - "apollo-utilities": { - "version": "1.0.26", - "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz", - "integrity": "sha512-URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==", - "requires": { - "fast-json-stable-stringify": "^2.0.0" - } - }, - "events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", - "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==" - }, - "fbjs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", - "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", - "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.2.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", - "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", - "requires": { - "react-is": "^16.3.2" - } - }, - "ms-rest-js": { - "version": "0.22.425", - "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-0.22.425.tgz", - "integrity": "sha512-PM9l0Si+T3kFxce8hwB/LlCxPJSHwSlFUSpjdJHzPvF+2w8lw7huE/FCPnRfdaUm7IikQESkJhydnbqX6g2OuQ==", - "requires": { - "@types/express": "^4.11.1", - "@types/form-data": "^2.2.1", - "@types/node": "^9.4.6", - "@types/uuid": "^3.4.3", - "axios": "^0.18.0", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, - "react-apollo": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.2.tgz", - "integrity": "sha512-3lU9iqmj4KMIZvlWWSuLihxMGLEAL6oNmnSTWrb3/mRP36Zy0zJD4rdaonDx4WzqFYQAnUPaOiFnHGp0UQUTwA==", - "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" - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", @@ -2165,58 +2040,6 @@ } } }, - "@material-ui/core": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.6.1.tgz", - "integrity": "sha512-jmDtLQVXYHzvv6TljspaoHazGXkgmgnLUosFateBdB3Vva6WVJZ7WY5LaAGOqtuTEUW6KUKDumaGoOQs4xuJWA==", - "requires": { - "@babel/runtime": "7.1.2", - "@material-ui/utils": "^3.0.0-alpha.0", - "@types/jss": "^9.5.6", - "@types/react-transition-group": "^2.0.8", - "brcast": "^3.0.1", - "classnames": "^2.2.5", - "csstype": "^2.5.2", - "debounce": "^1.1.0", - "deepmerge": "^2.0.1", - "dom-helpers": "^3.2.1", - "hoist-non-react-statics": "^3.0.0", - "is-plain-object": "^2.0.4", - "jss": "^9.3.3", - "jss-camel-case": "^6.0.0", - "jss-default-unit": "^8.0.2", - "jss-global": "^3.0.0", - "jss-nested": "^6.0.1", - "jss-props-sort": "^6.0.0", - "jss-vendor-prefixer": "^7.0.0", - "keycode": "^2.1.9", - "normalize-scroll-left": "^0.1.2", - "popper.js": "^1.14.1", - "prop-types": "^15.6.0", - "react-event-listener": "^0.6.2", - "react-transition-group": "^2.2.1", - "recompose": "0.28.0 - 0.30.0", - "warning": "^4.0.1" - }, - "dependencies": { - "@babel/runtime": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz", - "integrity": "sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==", - "requires": { - "regenerator-runtime": "^0.12.0" - } - }, - "hoist-non-react-statics": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", - "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", - "requires": { - "react-is": "^16.3.2" - } - } - } - }, "@material-ui/icons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-3.0.1.tgz", @@ -2265,12 +2088,15 @@ } } }, - "@material-ui/utils": { - "version": "3.0.0-alpha.0", - "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.0.tgz", - "integrity": "sha512-HwC/pBcPG81UP4Jh0BaH2i4wAY9aDOrvL5+B/7J6cyFlG/Wip5Li+qI+GDlk9MR3kpG8v0sxfpWA0IlQYcHK6g==", + "@material-ui/system": { + "version": "3.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-3.0.0-alpha.1.tgz", + "integrity": "sha512-5EihYa6Ct5mA/shfFSjWO8e/whV+otbXAduYfiL34GH+Mh4vZs+wjcy0P80XA/cDIwSgkQ7vTvvY1x04AgIz4w==", "requires": { - "@babel/runtime": "7.1.2" + "@babel/runtime": "7.1.2", + "deepmerge": "^2.0.1", + "prop-types": "^15.6.0", + "warning": "^4.0.1" }, "dependencies": { "@babel/runtime": { @@ -2333,6 +2159,187 @@ } } }, + "@superalgos/web-components": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@superalgos/web-components/-/web-components-0.0.18.tgz", + "integrity": "sha512-siLammrkkntvYShqy8DjO6Zt6ZxHyZMHjb0jUhGUjIN3Ca4GiBbrSnCz3F3/1xx82mK6HK8lnGZyjQwWs4rJ8A==", + "requires": { + "@azure/storage-blob": "^10.1.0-preview", + "@bearcanrun/react-image-cropper": "^1.3.6", + "@material-ui/core": "^3.6.2", + "@material-ui/icons": "^3.0.1", + "apollo-client": "^2.4.7", + "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.2", + "react-dom": "^16.6.1", + "react-dropzone": "^5.1.0", + "react-helmet": "^5.2.0", + "react-router-dom": "^4.3.1" + }, + "dependencies": { + "@azure/storage-blob": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.3.0.tgz", + "integrity": "sha512-KZbJ3q8RpAdeIB5Em1lgXkiq7Mll9bSHHbHavOFMepkkF7HQa3Sez9FdkAVIkVVWK5YoBlshBGZ+mtiSQiS9Fw==", + "requires": { + "@azure/ms-rest-js": "1.2.3", + "events": "3.0.0", + "tslib": "^1.9.3" + } + }, + "@babel/runtime": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz", + "integrity": "sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==", + "requires": { + "regenerator-runtime": "^0.12.0" + } + }, + "@material-ui/core": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.8.3.tgz", + "integrity": "sha512-jgWx5uwpo+mCj+Y6JdygFRji8ZHDYZdbylqCXvpK42c2n6m/jsr4Y5Y7RnlgllkIqftKFGNnik/rd1gTLaF+Ig==", + "requires": { + "@babel/runtime": "^7.2.0", + "@material-ui/system": "^3.0.0-alpha.0", + "@material-ui/utils": "^3.0.0-alpha.2", + "@types/jss": "^9.5.6", + "@types/react-transition-group": "^2.0.8", + "brcast": "^3.0.1", + "classnames": "^2.2.5", + "csstype": "^2.5.2", + "debounce": "^1.1.0", + "deepmerge": "^3.0.0", + "dom-helpers": "^3.2.1", + "hoist-non-react-statics": "^3.2.1", + "is-plain-object": "^2.0.4", + "jss": "^9.8.7", + "jss-camel-case": "^6.0.0", + "jss-default-unit": "^8.0.2", + "jss-global": "^3.0.0", + "jss-nested": "^6.0.1", + "jss-props-sort": "^6.0.0", + "jss-vendor-prefixer": "^7.0.0", + "keycode": "^2.1.9", + "normalize-scroll-left": "^0.1.2", + "popper.js": "^1.14.1", + "prop-types": "^15.6.0", + "react-event-listener": "^0.6.2", + "react-transition-group": "^2.2.1", + "recompose": "0.28.0 - 0.30.0", + "warning": "^4.0.1" + } + }, + "@material-ui/utils": { + "version": "3.0.0-alpha.3", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.3.tgz", + "integrity": "sha512-rwMdMZptX0DivkqBuC+Jdq7BYTXwqKai5G5ejPpuEDKpWzi1Oxp+LygGw329FrKpuKeiqpcymlqJTjmy+quWng==", + "requires": { + "@babel/runtime": "^7.2.0", + "prop-types": "^15.6.0", + "react-is": "^16.6.3" + } + }, + "@types/async": { + "version": "2.0.50", + "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz", + "integrity": "sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==", + "optional": true + }, + "apollo-cache": { + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.22.tgz", + "integrity": "sha512-8PoxhQLISj2oHwT7i/r4l+ly4y3RKZls+dtXzAewu3U77P9dNZKhYkRNAhx9iEfsrNoHgXBV8vMp64hb1uYh+g==", + "requires": { + "apollo-utilities": "^1.0.27" + } + }, + "apollo-client": { + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.8.tgz", + "integrity": "sha512-OAFbCTnGPtaIv0j+EZYzY20d+MD2JNbJ/YXZ4s0/oZlSg87bb0gjcIbccw2lnytipymZcZNr5ArFFeh0saGEwA==", + "requires": { + "@types/async": "2.0.50", + "@types/zen-observable": "^0.8.0", + "apollo-cache": "1.1.22", + "apollo-link": "^1.0.0", + "apollo-link-dedup": "^1.0.0", + "apollo-utilities": "1.0.27", + "symbol-observable": "^1.0.2", + "zen-observable": "^0.8.0" + } + }, + "apollo-utilities": { + "version": "1.0.27", + "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.27.tgz", + "integrity": "sha512-nzrMQ89JMpNmYnVGJ4t8zN75gQbql27UDhlxNi+3OModp0Masx5g+fQmQJ5B4w2dpRuYOsdwFLmj3lQbwOKV1Q==", + "requires": { + "fast-json-stable-stringify": "^2.0.0" + } + }, + "deepmerge": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.0.0.tgz", + "integrity": "sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw==" + }, + "events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", + "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==" + }, + "fbjs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", + "integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==", + "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.2.1", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", + "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", + "requires": { + "react-is": "^16.3.2" + } + }, + "react-apollo": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.3.tgz", + "integrity": "sha512-y4CwwmJjp0De/An7vrvEWOJ27lxmS/SXT8z22I8aOEBC2wzdcavDPjKzeLYJKs+hv1MGS3h84PSwFtlU4Em/bA==", + "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" + } + }, + "react-is": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.7.0.tgz", + "integrity": "sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g==" + }, + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + } + } + }, "@types/async": { "version": "2.0.49", "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.49.tgz", diff --git a/client/package.json b/client/package.json index 4624ee655..3862e7f37 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { - "name": "@advancedalgos/teams-client", + "name": "@superalgos/teams-client", "version": "0.0.32", - "description": "Advanced Algos Team client-side web app", + "description": "Superalgos Project Team client-side web app", "main": "src/index.js", "scripts": { "dev": "NODE_ENV=development PORT=3001 webpack-serve --config ./webpack.config.js", @@ -16,7 +16,7 @@ ], "repository": "", "author": "Barry Low ", - "license": "AGPL-3.0", + "license": "READ LICENSE.MD", "devDependencies": { "@babel/cli": "^7.1.2", "@babel/core": "^7.1.2", @@ -69,8 +69,8 @@ "workbox-cli": "^3.6.2" }, "dependencies": { - "@advancedalgos/web-components": "0.0.18", "@azure/storage-blob": "^10.0.0-preview", + "@superalgos/web-components": "0.0.18", "apollo-cache-inmemory": "^1.3.5", "apollo-client": "^2.4.2", "apollo-link": "^1.2.3", diff --git a/client/src/assets/logos/superalgos/Superalgos-logo-horz-dark.svg b/client/src/assets/logos/superalgos/Superalgos-logo-horz-dark.svg new file mode 100644 index 000000000..1fc7d8615 --- /dev/null +++ b/client/src/assets/logos/superalgos/Superalgos-logo-horz-dark.svg @@ -0,0 +1 @@ +Superalgos-logo-horz-dark \ No newline at end of file diff --git a/client/src/assets/logos/superalgos/Superalgos-logo-horz-sm-t.png b/client/src/assets/logos/superalgos/Superalgos-logo-horz-sm-t.png new file mode 100644 index 000000000..995d19538 Binary files /dev/null and b/client/src/assets/logos/superalgos/Superalgos-logo-horz-sm-t.png differ diff --git a/client/src/assets/logos/superalgos/Superalgos-logo-horz.svg b/client/src/assets/logos/superalgos/Superalgos-logo-horz.svg new file mode 100644 index 000000000..a96f0a5ee --- /dev/null +++ b/client/src/assets/logos/superalgos/Superalgos-logo-horz.svg @@ -0,0 +1 @@ +Superalgos-logo-horz \ No newline at end of file diff --git a/client/src/assets/logos/superalgos/Superalgos-logo-vert-dark.svg b/client/src/assets/logos/superalgos/Superalgos-logo-vert-dark.svg new file mode 100644 index 000000000..d6d2619dd --- /dev/null +++ b/client/src/assets/logos/superalgos/Superalgos-logo-vert-dark.svg @@ -0,0 +1 @@ +Superalgos-logo-vert-dark \ No newline at end of file diff --git a/client/src/assets/logos/superalgos/Superalgos-logo-vert.svg b/client/src/assets/logos/superalgos/Superalgos-logo-vert.svg new file mode 100644 index 000000000..603af5ac3 --- /dev/null +++ b/client/src/assets/logos/superalgos/Superalgos-logo-vert.svg @@ -0,0 +1 @@ +Superalgos-logo-vert_1 \ No newline at end of file diff --git a/client/src/views/dashboard/TeamMembers.js b/client/src/views/dashboard/TeamMembers.js index 7c450150f..45aa825cd 100644 --- a/client/src/views/dashboard/TeamMembers.js +++ b/client/src/views/dashboard/TeamMembers.js @@ -5,7 +5,7 @@ import Typography from '@material-ui/core/Typography' import { withStyles } from '@material-ui/core/styles' // import ManageTeamMembersList from './components/ManageTeamMembersList' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' const styles = theme => ({ tableContainer: { diff --git a/client/src/views/dashboard/components/DashTeam.js b/client/src/views/dashboard/components/DashTeam.js index c1650d963..225f41cfa 100644 --- a/client/src/views/dashboard/components/DashTeam.js +++ b/client/src/views/dashboard/components/DashTeam.js @@ -11,7 +11,7 @@ import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' import DashTeamItem from './DashTeamItem' import CreateTeamDialog from './CreateTeamDialog' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import { isDefined, isString } from '../../../utils/js-helpers' import { getItem } from '../../../utils/local-storage' diff --git a/client/src/views/dashboard/components/DrawerLinks.js b/client/src/views/dashboard/components/DrawerLinks.js deleted file mode 100644 index 91f83641a..000000000 --- a/client/src/views/dashboard/components/DrawerLinks.js +++ /dev/null @@ -1,83 +0,0 @@ -import React from 'react' -import { Link } from 'react-router-dom' - -import ListItem from '@material-ui/core/ListItem' -import ListItemIcon from '@material-ui/core/ListItemIcon' -import ListItemText from '@material-ui/core/ListItemText' -import GroupIcon from '@material-ui/icons/Group' -import DashboardIcon from '@material-ui/icons/Dashboard' -import SettingsIcon from '@material-ui/icons/Settings' -import SupervisedUserCircleIcon from '@material-ui/icons/SupervisedUserCircle' -import LibraryBooksIcon from '@material-ui/icons/LibraryBooks' -import SentimentSatisfiedAltIcon from '@material-ui/icons/SentimentSatisfiedAlt' -import AndroidIcon from '@material-ui/icons/Android' - -const DashboardLink = props => -const TeamsLink = props => -const MembersLink = props => -const SettingsLink = props => -const FBLink = props => -const DocumentationLink = props => ( - -) -const SupportLink = props => ( - -) - -export const MainDrawerItems = ( -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-) - -export const SecondaryDrawerItems = ( -
- - - - - - - - - - - - -
-) - -export default MainDrawerItems diff --git a/client/src/views/dashboard/components/ManageFBEdit.js b/client/src/views/dashboard/components/ManageFBEdit.js index 39434562b..cf6d17d6d 100644 --- a/client/src/views/dashboard/components/ManageFBEdit.js +++ b/client/src/views/dashboard/components/ManageFBEdit.js @@ -13,7 +13,7 @@ import DialogContentText from '@material-ui/core/DialogContentText' import DialogTitle from '@material-ui/core/DialogTitle' import Typography from '@material-ui/core/Typography' -import { MessageCard, ImageUpload } from '@advancedalgos/web-components' +import { MessageCard, ImageUpload } from '@superalgos/web-components' import UPDATE_FB from '../../../graphql/teams/UpdateFBMutation' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' diff --git a/client/src/views/dashboard/components/ManageFBList.js b/client/src/views/dashboard/components/ManageFBList.js index 6cabe0949..e3692f81d 100644 --- a/client/src/views/dashboard/components/ManageFBList.js +++ b/client/src/views/dashboard/components/ManageFBList.js @@ -4,7 +4,7 @@ import { Query } from 'react-apollo' import { withStateHandlers, lifecycle, compose } from 'recompose' import Grid from '@material-ui/core/Grid' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import { withStyles } from '@material-ui/core/styles' import { isDefined, isString } from '../../../utils/js-helpers' diff --git a/client/src/views/dashboard/components/ManageMembersItem.js b/client/src/views/dashboard/components/ManageMembersItem.js index a3116f048..268a3f5ec 100644 --- a/client/src/views/dashboard/components/ManageMembersItem.js +++ b/client/src/views/dashboard/components/ManageMembersItem.js @@ -7,7 +7,7 @@ import Typography from '@material-ui/core/Typography' import ManageMemberDelete from './ManageMemberDelete' import ManageMemberRole from './ManageMemberRole' import ManageMemberStatus from './ManageMemberStatus' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import log from '../../../utils/log' diff --git a/client/src/views/dashboard/components/ManageMembersTeamItem.js b/client/src/views/dashboard/components/ManageMembersTeamItem.js index a7a88c384..8738b9108 100644 --- a/client/src/views/dashboard/components/ManageMembersTeamItem.js +++ b/client/src/views/dashboard/components/ManageMembersTeamItem.js @@ -10,7 +10,7 @@ import Typography from '@material-ui/core/Typography' import InviteMemberDialog from './InviteMemberDialog' import ManageMembersItem from './ManageMembersItem' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import log from '../../../utils/log' diff --git a/client/src/views/dashboard/components/ManageTeamEdit.js b/client/src/views/dashboard/components/ManageTeamEdit.js index 9574b700f..23e1411c3 100644 --- a/client/src/views/dashboard/components/ManageTeamEdit.js +++ b/client/src/views/dashboard/components/ManageTeamEdit.js @@ -13,7 +13,7 @@ import DialogContentText from '@material-ui/core/DialogContentText' import DialogTitle from '@material-ui/core/DialogTitle' import Typography from '@material-ui/core/Typography' -import { MessageCard, ImageUpload } from '@advancedalgos/web-components' +import { MessageCard, ImageUpload } from '@superalgos/web-components' import log from '../../../utils/log' diff --git a/client/src/views/dashboard/components/ManageTeamMembersList.js b/client/src/views/dashboard/components/ManageTeamMembersList.js index b6e6e9345..426974926 100644 --- a/client/src/views/dashboard/components/ManageTeamMembersList.js +++ b/client/src/views/dashboard/components/ManageTeamMembersList.js @@ -12,7 +12,7 @@ import { getItem } from '../../../utils/local-storage' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' import ManageMembersTeamItem from './ManageMembersTeamItem' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import log from '../../../utils/log' diff --git a/client/src/views/dashboard/components/ManageTeamsList.js b/client/src/views/dashboard/components/ManageTeamsList.js index 8d4283757..187798cef 100644 --- a/client/src/views/dashboard/components/ManageTeamsList.js +++ b/client/src/views/dashboard/components/ManageTeamsList.js @@ -4,7 +4,7 @@ import { Query } from 'react-apollo' import { withStateHandlers, lifecycle, compose } from 'recompose' import Grid from '@material-ui/core/Grid' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import { withStyles } from '@material-ui/core/styles' import { isDefined, isString } from '../../../utils/js-helpers' diff --git a/client/src/views/dashboard/settings.js b/client/src/views/dashboard/settings.js index 8dc1d315f..339bc486f 100644 --- a/client/src/views/dashboard/settings.js +++ b/client/src/views/dashboard/settings.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types' import Typography from '@material-ui/core/Typography' import { withStyles } from '@material-ui/core/styles' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' const styles = theme => ({ tableContainer: { diff --git a/client/src/views/financial-beings/components/ManageFBEdit.js b/client/src/views/financial-beings/components/ManageFBEdit.js index e8f69bd65..492be0071 100644 --- a/client/src/views/financial-beings/components/ManageFBEdit.js +++ b/client/src/views/financial-beings/components/ManageFBEdit.js @@ -13,7 +13,7 @@ import DialogContentText from '@material-ui/core/DialogContentText' import DialogTitle from '@material-ui/core/DialogTitle' import Typography from '@material-ui/core/Typography' -import { ImageUpload } from '@advancedalgos/web-components' +import { ImageUpload } from '@superalgos/web-components' import UPDATE_FB from '../../../graphql/teams/UpdateFBMutation' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' diff --git a/client/src/views/financial-beings/components/ManageFBList.js b/client/src/views/financial-beings/components/ManageFBList.js index 69ca35323..d17018a25 100644 --- a/client/src/views/financial-beings/components/ManageFBList.js +++ b/client/src/views/financial-beings/components/ManageFBList.js @@ -5,7 +5,7 @@ import { Query } from 'react-apollo' import Grid from '@material-ui/core/Grid' import Paper from '@material-ui/core/Paper' import Typography from '@material-ui/core/Typography' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import { withStyles } from '@material-ui/core/styles' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' diff --git a/client/src/views/financial-beings/index.js b/client/src/views/financial-beings/index.js index a3cf773ad..5cdfde9b5 100644 --- a/client/src/views/financial-beings/index.js +++ b/client/src/views/financial-beings/index.js @@ -14,7 +14,7 @@ const styles = theme => ({ const FinancialBeings = ({ classes }) => (
- +
) diff --git a/client/src/views/landing/index.js b/client/src/views/landing/index.js index 170caadf0..baed9d7ad 100644 --- a/client/src/views/landing/index.js +++ b/client/src/views/landing/index.js @@ -23,7 +23,7 @@ const styles = theme => ({ const Landing = ({ classes, ...props }) => ( - +
Welcome to the Teams Module! @@ -33,7 +33,7 @@ const Landing = ({ classes, ...props }) => (
- One of the core propositions of Advanced Algos revolves around people teaming up to breed financial beings and compete in algorithmic trading competitions. Both developing and competing are team activities. + One of the core propositions of the Superalgos projects revolves around people teaming up to breed financial beings and compete in algorithmic trading competitions. Both developing and competing are team activities. If you are a user of the system but still haven’t joined any teams, the Teams Module is the right place to find one or even create your own. diff --git a/client/src/views/manage-teams/components/ManageTeamEdit.js b/client/src/views/manage-teams/components/ManageTeamEdit.js index 7e575eab0..ca84d1388 100644 --- a/client/src/views/manage-teams/components/ManageTeamEdit.js +++ b/client/src/views/manage-teams/components/ManageTeamEdit.js @@ -13,7 +13,7 @@ import DialogContentText from '@material-ui/core/DialogContentText' import DialogTitle from '@material-ui/core/DialogTitle' import Typography from '@material-ui/core/Typography' -import { ImageUpload } from '@advancedalgos/web-components' +import { ImageUpload } from '@superalgos/web-components' import UPDATE_TEAM_PROFILE from '../../../graphql/teams/UpdateTeamProfileMutation' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' diff --git a/client/src/views/manage-teams/components/ManageTeamMembersList.js b/client/src/views/manage-teams/components/ManageTeamMembersList.js index 4c1916559..7b68b8006 100644 --- a/client/src/views/manage-teams/components/ManageTeamMembersList.js +++ b/client/src/views/manage-teams/components/ManageTeamMembersList.js @@ -12,7 +12,7 @@ import { getItem } from '../../../utils/local-storage' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' import ManageMembersTeamItem from './ManageMembersTeamItem' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import log from '../../../utils/log' diff --git a/client/src/views/manage-teams/components/ManageTeamProfileEdit.js b/client/src/views/manage-teams/components/ManageTeamProfileEdit.js index 027017a76..096e394ab 100644 --- a/client/src/views/manage-teams/components/ManageTeamProfileEdit.js +++ b/client/src/views/manage-teams/components/ManageTeamProfileEdit.js @@ -7,7 +7,7 @@ import Grid from '@material-ui/core/Grid' import TextField from '@material-ui/core/TextField' import Typography from '@material-ui/core/Typography' -import { ImageUpload } from '@advancedalgos/web-components' +import { ImageUpload } from '@superalgos/web-components' import UPDATE_TEAM_PROFILE from '../../../graphql/teams/UpdateTeamProfileMutation' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' diff --git a/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js b/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js index 9362784d2..01bcedc85 100644 --- a/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js +++ b/client/src/views/manage-teams/components/ManageTeamProfileFBEdit.js @@ -10,7 +10,7 @@ import Dialog from '@material-ui/core/Dialog' import DialogContent from '@material-ui/core/DialogContent' import Typography from '@material-ui/core/Typography' -import { ImageUpload } from '@advancedalgos/web-components' +import { ImageUpload } from '@superalgos/web-components' import UPDATE_FB from '../../../graphql/teams/UpdateFBMutation' import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' diff --git a/client/src/views/manage-teams/components/ManageTeamsList.js b/client/src/views/manage-teams/components/ManageTeamsList.js index 264acc851..0e5950467 100644 --- a/client/src/views/manage-teams/components/ManageTeamsList.js +++ b/client/src/views/manage-teams/components/ManageTeamsList.js @@ -5,7 +5,7 @@ import { Query } from 'react-apollo' import Grid from '@material-ui/core/Grid' import Paper from '@material-ui/core/Paper' import Typography from '@material-ui/core/Typography' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import { withStyles } from '@material-ui/core/styles' import { isEmpty } from '../../../utils/js-helpers' diff --git a/client/src/views/manage-teams/index.js b/client/src/views/manage-teams/index.js index 28cb2c10c..3a5fea7ae 100644 --- a/client/src/views/manage-teams/index.js +++ b/client/src/views/manage-teams/index.js @@ -10,8 +10,8 @@ const ManageTeams = ({ match, ...props }) => ( size={match.params.slug !== undefined ? 'small' : 'medium'} title='Your Teams' text='Create and manage your teams here.' - backgroundUrl='https://advancedalgos.net/img/photos/teams.jpg' - /> + backgroundUrl='https://superalgos.net/img/photos/teams.jpg' + />
diff --git a/client/src/views/settings/index.js b/client/src/views/settings/index.js index 4dee030b3..2963580a0 100644 --- a/client/src/views/settings/index.js +++ b/client/src/views/settings/index.js @@ -5,7 +5,7 @@ import Typography from '@material-ui/core/Typography' import { withStyles } from '@material-ui/core/styles' import Grid from '@material-ui/core/Grid' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' const styles = theme => ({ heroContent: { diff --git a/client/src/views/team-members/components/ManageMembersItem.js b/client/src/views/team-members/components/ManageMembersItem.js index a3116f048..268a3f5ec 100644 --- a/client/src/views/team-members/components/ManageMembersItem.js +++ b/client/src/views/team-members/components/ManageMembersItem.js @@ -7,7 +7,7 @@ import Typography from '@material-ui/core/Typography' import ManageMemberDelete from './ManageMemberDelete' import ManageMemberRole from './ManageMemberRole' import ManageMemberStatus from './ManageMemberStatus' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import log from '../../../utils/log' diff --git a/client/src/views/team-members/components/ManageMembersTeamItem.js b/client/src/views/team-members/components/ManageMembersTeamItem.js index a7a88c384..8738b9108 100644 --- a/client/src/views/team-members/components/ManageMembersTeamItem.js +++ b/client/src/views/team-members/components/ManageMembersTeamItem.js @@ -10,7 +10,7 @@ import Typography from '@material-ui/core/Typography' import InviteMemberDialog from './InviteMemberDialog' import ManageMembersItem from './ManageMembersItem' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import log from '../../../utils/log' diff --git a/client/src/views/team-members/index.js b/client/src/views/team-members/index.js index 35349f402..4a97162f9 100644 --- a/client/src/views/team-members/index.js +++ b/client/src/views/team-members/index.js @@ -14,7 +14,7 @@ const styles = theme => ({ const TeamMembers = ({ classes }) => (
- +
) diff --git a/client/src/views/teams/AcceptTeamInvite.js b/client/src/views/teams/AcceptTeamInvite.js index 58fa28efa..7850a46d5 100644 --- a/client/src/views/teams/AcceptTeamInvite.js +++ b/client/src/views/teams/AcceptTeamInvite.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types' import { parse } from '../../utils/js-helpers' import log from '../../utils/log' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' class AcceptTeamInvite extends Component { render () { diff --git a/client/src/views/teams/components/TeamsList.js b/client/src/views/teams/components/TeamsList.js index db813ea27..c8a316dc7 100644 --- a/client/src/views/teams/components/TeamsList.js +++ b/client/src/views/teams/components/TeamsList.js @@ -5,7 +5,7 @@ import { Query } from 'react-apollo' import Typography from '@material-ui/core/Typography' import Grid from '@material-ui/core/Grid' import { withStyles } from '@material-ui/core/styles' -import { MessageCard } from '@advancedalgos/web-components' +import { MessageCard } from '@superalgos/web-components' import GET_ALL_TEAMS_QUERY from '../../../graphql/teams/GetAllTeamsQuery' diff --git a/client/src/views/teams/index.js b/client/src/views/teams/index.js index b928a03be..bec9b1368 100644 --- a/client/src/views/teams/index.js +++ b/client/src/views/teams/index.js @@ -31,7 +31,7 @@ const styles = theme => ({ const Teams = ({ classes, match }) => ( - +