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

Merge branch 'develop'

Browse Source
This commit is contained in:
Barry Low committed 2019-01-17 12:20:46 -08:00
2 parents 7f95b49f55 cb4822bf8b
commit b142a950e1
10 files changed
+98 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CONTRIBUTING.md
+12 -2
View File
@@ -1,6 +1,6 @@
# Contributing
We are thrilled you are interested in contributing to this repository. Your help may be essential to the project's success and we want you in!
We are thrilled you are interested in contributing to this repository. Your help may be essential to the project's success and we want you in!
Superalgos is a collective project, currently at a very early stage. Although this repository is not open source software yet, we do welcome contributions from the community.
@@ -26,9 +26,15 @@ Cool? Then, by submitting your first Pull Request, and as a condition of your co
"Project IP" includes concepts, designs, developments, discoveries, ideas, improvements, inventions, trade secrets, trademarks, and works of authorship.
<<<<<<< HEAD
2. **What the Project doesn't own.** If you create IP that doesn't fit into one of the categories listed above, the Project doesn't own it. In other words, the Project doesn't own concepts, designs, developments, discoveries, ideas, improvements, inventions, trade secrets, trademarks, or works of authorship that you develop, invent, or create that do not meet any of the conditions in Section 1.
3. **Contribution of your IP to Project projects.** If you include your own IP – such as IP you created prior to working for the Project – into a Project product or service, it's still yours, of course, but you grant the Project a non-exclusive, irrevocable, fully paid-up, royalty-free, perpetual, sublicensable, transferable, worldwide license to use it without restriction in any way or implementation, in modified form, or as is, by itself, or incorporated into another product or service ("License"). If you include your name in any project over which the Project would have rights under this Agreement, such as in a copyright notice or a comment in code or documentation, then the License covers the rights associated with that use of your name as well.
=======
2. **What the Project doesn't own.** If you create IP that doesn't fit into one of the categories listed above, the Project doesn't own it. In other words, the Project doesn't own concepts, designs, developments, discoveries, ideas, improvements, inventions, trade secrets, trademarks, or works of authorship that you develop, invent, or create that do not meet any of the conditions in Section 1.
3. **Contribution of your IP to Project projects.** If you include your own IP � such as IP you created prior to working for the Project � into a Project product or service, it's still yours, of course, but you grant the Project a non-exclusive, irrevocable, fully paid-up, royalty-free, perpetual, sub-licensable, transferable, worldwide license to use it without restriction in any way or implementation, in modified form, or as is, by itself, or incorporated into another product or service ("License"). If you include your name in any project over which the Project would have rights under this Agreement, such as in a copyright notice or a comment in code or documentation, then the License covers the rights associated with that use of your name as well.
>>>>>>> develop
4. **Your contributions to non-Project projects.** The Project recognizes that you may be engaged in work that requires you to submit IP to entities other than the Project, such as open source projects used by the Project. Please make sure that Legal is aware of what you're working on so that Legal can help with any licensing issues. If any project asks you to sign a contribution agreement, you should check with Legal before doing so. These agreements may be legally binding on the Project and so should be run through Legal first.
@@ -42,4 +48,8 @@ Cool? Then, by submitting your first Pull Request, and as a condition of your co
"Confidential Information" includes non-public technical details about our products or services, financial information, business strategies and forecasts, customer data, or any other information, data or know-how that is valuable to the Project because it is not publicly known.
The Project's Confidential Information is sensitive and we expect that you'll treat it as such. You agree to only use the Project's Confidential Information for the purpose of performing your contribution and for the benefit of the Project. You will do your best to keep Confidential Information secret. If you are not sure if something is Confidential Information, you should assume that it is, until you can confirm otherwise.
<<<<<<< HEAD
The Project's Confidential Information is sensitive and we expect that you'll treat it as such. You agree to only use the Project's Confidential Information for the purpose of performing your contribution and for the benefit of the Project. You will do your best to keep Confidential Information secret. If you are not sure if something is Confidential Information, you should assume that it is, until you can confirm otherwise.
=======
The Project's Confidential Information is sensitive and we expect that you'll treat it as such. You agree to only use the Project's Confidential Information for the purpose of performing your contribution and for the benefit of the Project. You will do your best to keep Confidential Information secret. If you are not sure if something is Confidential Information, you should assume that it is, until you can confirm otherwise.
>>>>>>> develop
LICENSE
+31 -4
View File
@@ -1,25 +1,43 @@
COPYRIGHT NOTICE
COPYRIGHT NOTICE
<<<<<<< HEAD
© Copyright 2018 Superalgos.org
=======
© Copyright 2019 Superalgos.org
>>>>>>> develop
LICENSE NOTICE
<<<<<<< HEAD
Superalgos is a collaborative project currently at a very early stage. Because certain aspects of
the project are still not clearly defined, we have chosen to --temporarily-- grant a restrictive
license for the use of this repository, until those aspects are clarified and a proper open source
license can be granted.
Superalgos.org is publishing the code of this software for several reasons. However, it shall not be considered free software yet. Superalgos is a collaborative project in the crypto space and this
=======
Superalgos is a collaborative project currently at a very early stage. Because certain aspects of
the project are still not clearly defined, we have chosen to --temporarily-- grant a restrictive
license for the use of this repository, until those aspects are clarified and a proper open source
license can be granted.
Superalgos.org is publishing the code of this software for several reasons. However, it shall not be considered free software yet. Superalgos is a collaborative project in the crypto space and this
>>>>>>> develop
software is still proprietary software.
The reasons for opening up the code of this software at this stage are the following:
<<<<<<< HEAD
* We believe that transparency is paramount to achieving our goals, so we want everyone to
be able to understand what this software does and how. Opening up the code of this software
=======
* We believe that transparency is paramount to achieving our goals, so we want everyone to
be able to understand what this software does and how. Opening up the code of this software
>>>>>>> develop
allows anyone to take a close look.
* We welcome contributions from the community. Contributions are regarded as voluntary work.
* We welcome contributions from the community. Contributions are regarded as voluntary work.
There may be incentives in place for certain kinds of contributions. Contact us to learn more.
Contributors agree to provide an express grant of patent rights for their contributions.
@@ -28,12 +46,21 @@ LICENSE WORDING
Superalgos.org grants a limited license for the following uses:
1. CODE REVIEW AND AUDITS. You are granted permission to clone this repository to analyze,
1. CODE REVIEW AND AUDITS. You are granted permission to clone this repository to analyze,
review or audit the code.
<<<<<<< HEAD
2. COLLABORATING WITH Superalgos.org. You are granted permission to fork this repository
with the sole purpose of correcting bugs and developing functionality in agreement with
Superalgos.org. By contributing to this repository you explicitely agree to the terms
detailed in CONTRIBUTING.MD.
PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY.
PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY.
=======
2. COLLABORATING WITH Superalgos.org. You are granted permission to fork this repository
with the sole purpose of correcting bugs and developing functionality in agreement with
Superalgos.org. By contributing to this repository you explicitly agree to the terms
detailed in CONTRIBUTING.MD.
PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY.
>>>>>>> develop
README.md
+2 -2
View File
@@ -1,8 +1,8 @@
# Advanced Algos Notifications Module
# Superlgos Notifications Module
## Introduction
The general purpose of the notifications module is providing notification services to other AA Platform modules.
The general purpose of the notifications module is providing notification services to other Superalgos Platform modules.
## Quick Start
docs/README.md
+1 -1
View File
@@ -1,4 +1,4 @@
# AA Notifications Module Documentation
# Superalgos Notifications Module Documentation
## Architecture
Currently, this module is only a GraphQL server providing notification services to other platform modules. For example, it wraps the SendGrid API and allows other modules to send transactional emails or provides signup methods to campaign newsletter list.
package.json
+5 -5
View File
@@ -1,21 +1,21 @@
{
"name": "NotificationsModule",
"version": "0.0.1",
"description": "Advanced Algos Notifications Module",
"description": "Superalgos Notifications Module",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/AdvancedAlgos/NotificationsModule.git"
"url": "git+https://github.com/Superalgos/NotificationsModule.git"
},
"keywords": [
"Advanced Algos"
"Superalgos"
],
"author": "Barry Low <bearcanru@gmail.com>",
"license": "SEE LICENSE IN LICENSE.MD",
"bugs": {
"url": "https://github.com/AdvancedAlgos/NotificationsModule.git/issues"
"url": "https://github.com/Superalgos/NotificationsModule.git/issues"
},
"homepage": "https://github.com/AdvancedAlgos/NotificationsModule.git#readme"
"homepage": "https://github.com/Superalgos/NotificationsModule.git#readme"
}
server/LICENSE
+17 -20
View File
@@ -1,42 +1,39 @@
COPYRIGHT NOTICE
COPYRIGHT NOTICE
© Copyright 2018 Advanced Algos LTD.
© Copyright 2019 Superalgos.org
LICENSE NOTICE
Advanced Algos LTD. is a startup, currently at a very early stage. Because certain aspects of
the business are still not clearly defined, we have chosen to --temporarily-- grant a
restrictive license for the use of this repository, until those business aspects are clarified
and a proper open source license can be granted.
Superalgos is a collaborative project currently at a very early stage. Because certain aspects of
the project are still not clearly defined, we have chosen to --temporarily-- grant a restrictive
license for the use of this repository, until those aspects are clarified and a proper open source
license can be granted.
Advanced Algos LTD. is publishing the code of this software for several reasons. However,
it shall not be considered free software yet. Advanced Algos LTD. is a for-profit company
in the crypto space and this module is still proprietary software.
Superalgos.org is publishing the code of this software for several reasons. However, it shall not be considered free software yet. Superalgos is a collaborative project in the crypto space and this
software is still proprietary software.
The reasons for opening up the code of this module at this stage are the following:
The reasons for opening up the code of this software at this stage are the following:
* We believe that transparency is paramount to achieving our goals, so we want everyone
to be able to understand what this module does and how. Opening up the code of this module
* We believe that transparency is paramount to achieving our goals, so we want everyone to
be able to understand what this software does and how. Opening up the code of this software
allows anyone to take a close look.
* We welcome contributions from the community. Contributions are regarded as voluntary work.
* We welcome contributions from the community. Contributions are regarded as voluntary work.
There may be incentives in place for certain kinds of contributions. Contact us to learn more.
Contributors agree to provide an express grant of patent rights for their contributions.
LICENSE WORDING
Advanced Algos LTD. grants a limited license for the following uses:
Superalgos.org grants a limited license for the following uses:
1. CODE REVIEW AND AUDITS. You are granted permission to clone this repository to analyze,
1. CODE REVIEW AND AUDITS. You are granted permission to clone this repository to analyze,
review or audit the code.
2. COLLABORATING WITH ADVANCED ALGOS LTD. You are granted permission to fork this repository
with the sole purpose of correcting bugs and developing functionality in agreement with
Advanced Algos LTD. By contributing to this repository you explicitely agree to the terms
2. COLLABORATING WITH Superalgos.org. You are granted permission to fork this repository
with the sole purpose of correcting bugs and developing functionality in agreement with
Superalgos.org. By contributing to this repository you explicitly agree to the terms
detailed in CONTRIBUTING.MD.
PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY.
server/README.md
+3 -8
View File
@@ -1,10 +1,8 @@
# Advance Algos Team GraphQL API Server
# Superalgos Notifications 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 Notifications Module server-side GraphQL API server. We use Docker to develop locally and for our production 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 module currently has no client-side component.
## Getting Started
@@ -51,9 +49,6 @@ 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.
server/src/graphql/resolvers/Mutation/sendgrid/corporate.js
+10 -10
View File
@@ -27,14 +27,14 @@ export default {
],
dynamic_template_data: {
"aaverifylink": origin + params + token,
"subject": 'VERIFY YOUR INTEREST in Advanced Algos'
"subject": 'VERIFY YOUR INTEREST in the Superalgos project'
},
"subject": 'VERIFY YOUR INTEREST in Advanced Algos'
"subject": 'VERIFY YOUR INTEREST in the Superalgos project'
}
],
"from": {
"email": "feedback@advancedalgos.net",
"name": "Advanced Algos Team"
"email": "feedback@superalgos.org",
"name": "Superalgos Project Team"
},
"template_id": process.env.SG_CORPORATE_SIGNUP_EMAILID
})
@@ -152,7 +152,7 @@ export default {
"aacontactemail": email,
"aacontactbody": message
},
"subject": `AA Corporate Site Contact - Message from ${name}`
"subject": `Superalgos Project Site Contact - Message from ${name}`
}
],
"from": {
@@ -186,17 +186,17 @@ export default {
logger.info('Sendgrid Contact response: ')
logger.info(response)
if (response.status >= 200 && response.status < 300) {
return `Corporate Contact email sent`
return `Superalgos Project Contact email sent`
} else {
throw response.data.errors[0].message
}
})
.catch(function (error) {
logger.error(`sendgrid Error: ${JSON.stringify(error)}`)
throw `Corporate Contact email send error: ${error.response.data.errors[0].message}`
throw `Superalgos Project Contact email send error: ${error.response.data.errors[0].message}`
})
}else{
logger.info('Corporate Contact recaptcha error')
logger.info('Superalgos Project Contact recaptcha error')
logger.info(response.data)
throw { response: { data: JSON.stringify(response.data) } }
}
@@ -205,9 +205,9 @@ export default {
return response
})
.catch(function (error) {
logger.error('Sendgrid Corporate Contact RECAPTCHA Error:')
logger.error('Sendgrid Superalgos Project Contact RECAPTCHA Error:')
logger.error(error)
throw new ApolloError(`Sendgrid Corporate Contact RECAPTCHA Error: ${error.response.data}`, 404)
throw new ApolloError(`Sendgrid Superalgos Project Contact RECAPTCHA Error: ${error.response.data}`, 404)
})
return checkCaptcha
server/src/graphql/resolvers/Mutation/sendgrid/master.js
+8 -8
View File
@@ -27,18 +27,18 @@ export default {
],
dynamic_template_data: {
"aaverifylink": origin + params + token,
"subject": 'VERIFY YOUR INTEREST in Advanced Algos'
"subject": 'VERIFY YOUR INTEREST in the Superalgos Project'
},
"subject": 'VERIFY YOUR INTEREST in Advanced Algos'
"subject": 'VERIFY YOUR INTEREST in the Superalgos Project'
}
],
"from": {
"email": "feedback@advancedalgos.net",
"name": "Advanced Algos Team"
"email": "feedback@superalgos.org",
"name": "Superalgos Project Team"
},
"reply_to": {
"email": "feedback@advancedalgos.net",
"name": "Advanced Algos Team"
"email": "feedback@superalgos.org",
"name": "Superalgos Project Team"
},
"template_id": process.env.SG_MASTER_SIGNUP_EMAILID
})
@@ -139,7 +139,7 @@ export default {
return subscribe
},
async Master_Feedback(parent, { email, subject, message, recaptcha }, ctx, info) {
const toEmail = 'feedback@advancedalgos.net'
const toEmail = 'feedback@superalgos.org'
const data = JSON.stringify({
"personalizations": [
@@ -154,7 +154,7 @@ export default {
"aacontactemail": email,
"aacontactbody": message
},
"subject": `AA Platform App Feedback - Message from ${name}`
"subject": `Superalgos Platform App Feedback - Message from ${name}`
}
],
"from": {
server/src/graphql/resolvers/Mutation/sendgrid/teams.js
+9 -9
View File
@@ -34,12 +34,12 @@ export default {
}
],
"from": {
"email": "noreply@advancedalgos.net",
"name": "Advanced Algos Teams"
"email": "noreply@superalgos.org",
"name": "Superalgos Project Teams"
},
"reply_to": {
"email": "feedback@advancedalgos.net",
"name": "Advanced Algos Teams"
"email": "feedback@superalgos.org",
"name": "Superalgos Project Teams"
},
"template_id": process.env.SG_TEAMS_MEMBER_INVITE_EMAILID
})
@@ -91,7 +91,7 @@ export default {
}
],
dynamic_template_data: {
"aadeveloplink": "https://develop.advancedalgos.net/index.html",
"aadeveloplink": "https://platform.superalgos.org/index.html",
"aateamname": teamName,
"aabotname": botName,
"subject": "Team " + teamName + " has been created!"
@@ -100,12 +100,12 @@ export default {
}
],
"from": {
"email": "noreply@advancedalgos.net",
"name": "Advanced Algos Teams"
"email": "noreply@superalgos.org",
"name": "Superalgos Project Teams"
},
"reply_to": {
"email": "feedback@advancedalgos.net",
"name": "Advanced Algos Teams"
"email": "feedback@superalgos.org",
"name": "Superalgos Project Teams"
},
"template_id": process.env.SG_TEAMS_TEAMCREATE_EMAILID
})