Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history 
merging upstream changes in order to catch up with the upstream
  • Loading branch information
@Dolganoff
Dolganoff committed Dec 21, 2017
2 parents 7095e37 + 09e8c0b commit 42d0e31
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 76 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<a href="https://ilyas-it83.github.io/CloudComparer/">
<img src="https://github.com/ilyas-it83/CloudComparer/blob/master/img/Logo2.png" alt="Compare Cloud" title="Compare Cloud" align="right" height="180" />
</a>
# Cloud Comparer

This is the second version of my Cloud Comparison Slide deck which i prepared a year back(can be downloaded here: http://www.slideshare.net/ilyas_it83/microsoft-azure-vs-amazon-web-services-aws-services-feature-mapping). The version 1 recieved more than 22K views and 400+ download at the time of working on this project. This gave me the idea of creating a robust and dependable comparison/mapping between the various services offered by the major cloud providers in a lively and updatable format.
Expand Down
70 changes: 53 additions & 17 deletions data/Services.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
{
"name": "Amazon Elastic Container Service for Kubernetes",
"name": "Amazon Elastic Container Service for Kubernetes(EKS)",
"ref": "https://aws.amazon.com/eks/",
"icon": "Compute_AmazonECS.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}
],
"azure": [
{
"name": "Azure Container Service",
"name": "Azure Container Service(AKS)",
"ref": "https://azure.microsoft.com/en-in/services/container-service/",
"icon": "Azure Container Service.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
Expand Down Expand Up @@ -933,7 +933,7 @@
},
{
"name": "Cloud Spanner",
"ref": "https://cloud.google.com/spaner/",
"ref": "https://cloud.google.com/spanner/",
"icon": "Cloud-Spanner.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}
Expand Down Expand Up @@ -1016,6 +1016,12 @@
"ref": "https://aws.amazon.com/dynamodb/dax/",
"icon": "Database_AmazonDynamoDB.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
{
"name": "Amazon Neptune (Preview)",
"ref": "https://aws.amazon.com/neptune/",
"icon": "aws.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}
],
"azure": [
Expand Down Expand Up @@ -1980,7 +1986,12 @@
"ref": "",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
"aws": [
"aws": [{
"name": "AWS Cloud9",
"ref": "https://aws.amazon.com/cloud9/",
"icon": "aws.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
{
"name": "AWS Code Star",
"ref": "https://aws.amazon.com/codestar/",
Expand Down Expand Up @@ -3426,9 +3437,9 @@
],
"azure": [
{
"name": "",
"ref": "",
"icon": "none.png",
"name": "Azure DDoS Protection (Preview)",
"ref": "https://azure.microsoft.com/en-in/services/ddos-protection/",
"icon": "Microsoft Azure.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}
],
Expand Down Expand Up @@ -3611,9 +3622,9 @@
],
"google": [
{
"name": "",
"ref": "",
"icon": "none.png",
"name": "Big Query",
"ref": "https://cloud.google.com/bigquery/",
"icon": "BigQuery.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}
],
Expand Down Expand Up @@ -4042,7 +4053,14 @@
"ref": "https://aws.amazon.com/lex/",
"icon": "aws.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
{
"name": "Amazon Comprehend",
"ref": "https://aws.amazon.com/comprehend/",
"icon": "aws.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}

],
"azure": [
{
Expand Down Expand Up @@ -4149,6 +4167,18 @@
"ref": "",
"icon": "aws.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
{
"name": "Amazon Transcribe",
"ref": "https://aws.amazon.com/transcribe/",
"icon": "aws.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
{
"name": "Amazon Translate",
"ref": "https://aws.amazon.com/translate/",
"icon": "aws.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}
],
"azure": [
Expand Down Expand Up @@ -4297,6 +4327,12 @@
"ref": "",
"icon": "Analytics_AmazonMachineLearning.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
},
{
"name": "Amazon Sage​Maker",
"ref": "https://aws.amazon.com/sagemaker/",
"icon": "Analytics_AmazonMachineLearning.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
}
],
"azure": [
Expand Down Expand Up @@ -5254,9 +5290,9 @@
],
"alibaba": [
{
"name": "Blockchain",
"ref": "https://console.ng.bluemix.net/catalog/services/blockchain/",
"icon": "alibaba.png",
"name": "",
"ref": "https://#",
"icon": "none.png",
"Properties": [ "Yes", "To be added", "To be added", "To be added", "To be added" ]
}
]
Expand Down Expand Up @@ -5314,10 +5350,10 @@
],
"alibaba": [
{
"name": "",
"ref": "",
"icon": "none.png",
"Properties": [ "To be added", "To be added", "To be added", "To be added", "To be added" ]
"name": "Blockchain",
"ref": "https://console.ng.bluemix.net/catalog/services/blockchain/",
"icon": "alibaba.png",
"Properties": [ "Yes", "To be added", "To be added", "To be added", "To be added" ]
}
]
},
Expand Down
Binary file added img/Logo1.png
View file
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 img/Logo2.png
View file
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 img/Logo_Design.pdn
View file
Binary file not shown.
Binary file added img/Logo_Design.png
View file
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 img/cloudproviders/alibaba/none.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 20 additions & 59 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,23 @@ <h2>Last Updated on : 11-Nov-2017</h2>
<th width="15%"><img class="img-responsive" src='img/logo/alibaba.png' height="112" alt='icon' /></th>
</tr>
</thead>

</table>
<table class="blueshine table">
<tr>
<td width="16%" colspan="2">Latest Updates</th>
<td width="15%">
<!-- start feedwind code --> <script type="text/javascript" src="https://feed.mikle.com/js/fw-loader.js" data-fw-param="57947/"></script> <!-- end feedwind code -->
</td>
<td width="15%">
<!-- start feedwind code --> <script type="text/javascript" src="https://feed.mikle.com/js/fw-loader.js" data-fw-param="57946/"></script> <!-- end feedwind code --></td>
<td width="15%">
<script type="text/javascript" src="https://feed.mikle.com/js/fw-loader.js" data-fw-param="57941/"></script> <!-- end feedwind code --></td>
<td width="15%"><!-- start feedwind code --> <script type="text/javascript" src="https://feed.mikle.com/js/fw-loader.js" data-fw-param="57948/"></script> <!-- end feedwind code --></td>
<td width="15%"><!-- start feedwind code --> <script type="text/javascript" src="https://feed.mikle.com/js/fw-loader.js" data-fw-param="57950/"></script> <!-- end feedwind code --></td>
<td width="15%">To be updated</td>
</tr>
</table>
<div class="row">
<div class="col-xs-02" id="rss-aws"></div>
<div class="col-xs-02" id="rss-azure"></div>
<div class="col-xs-02" id="rss-gcp"></div>
<div class="col-xs-02" id="rss-ibm"></div>
<div class="col-xs-02" id="rss-oracle"></div>
<div class="col-xs-02" id="rss-alibaba"></div>
</div>
</div>
</div>
<!-- /.col-lg-10 -->
Expand Down Expand Up @@ -202,56 +210,19 @@ <h4><strong>The Ultimate Cloud Comparison by <a href="https://github.com/ilyas-i
<script src="js/jquery.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.min.js"></script>
<script src="js/jquery.rss.min.js"></script>

<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.lazy/1.7.4/jquery.lazy.min.js"></script>
<!-- Bootstrap Core JavaScript -->
<script src="js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/floatthead/1.4.5/jquery.floatThead-slim.js"></script>

<script>
jQuery(function($) {
$("#rss-aws").rss("https://aws.amazon.com/new/feed/",
{
limit: 05,
effect: 'slideFastSynced',
entryTemplate:'<li><a href="{url}">[{author}@{date}] {title}</a><br/>{teaserImage}{shortBodyPlain}</li>'
})

$("#rss-azure").rss("https://azure.microsoft.com/en-in/blog/topics/announcements/feed/",
{
entryTemplate:'<li><a href="{url}">[{author}@{date}] {title}</a><br/>{teaserImage}{shortBodyPlain}</li>'
})

$("#rss-gcp").rss("http://googlecloudplatform.blogspot.com/atom.xml",
{
entryTemplate:'<li><a href="{url}">[{author}@{date}] {title}</a><br/>{teaserImage}{shortBodyPlain}</li>'
})

$("#rss-ibm").rss("https://www.ibm.com/blogs/cloud-announcements/feed/",
{
entryTemplate:'<li><a href="{url}">[{author}@{date}] {title}</a><br/>{teaserImage}{shortBodyPlain}</li>'
})

$("#rss-aws").rss("https://blogs.oracle.com/rss",
{
entryTemplate:'<li><a href="{url}">[{author}@{date}] {title}</a><br/>{teaserImage}{shortBodyPlain}</li>'
})
})
</script>

<!-- Custom Theme JavaScript -->
<script>



// Table Rendering
$(document).ready(function(){
var trHTML = '';

$.getJSON('data/Services.json', function (Json) {

//$.getJSON('https://raw.githubusercontent.com/BlueCodersDev/CloudComparer/master/data/Services.json', function (Json) {
//$.getJSON('data/Services.json', function (Json) {
$.getJSON('https://raw.githubusercontent.com/BlueCodersDev/CloudComparer/master/data/Services.json', function (Json) {
//$.getJSON('Data/Services.json', function (Json) {

$.each(Json, function (key, value) {
trHTML += '<tr><td><b>' + value.category.name + '</b></td>';
trHTML += '<td><b>' + value.service.name + '</b> <a href="' + value.service.ref + '" class="glyphicon glyphicon-link" target="_blank"></a></td>';
Expand Down Expand Up @@ -343,22 +314,12 @@ <h4><strong>The Ultimate Cloud Comparison by <a href="https://github.com/ilyas-i
$("a[href='']").remove()
}





function imgError(image) {
image.onerror = "";
image.src = "https://ilyas-it83.github.io/CloudComparer/img/cloudproviders/gcp/none.png";
return true;
}

jQuery(function($) {
$("#rss-feeds").rss("http://feeds.feedburner.com/premiumpixels",
{
entryTemplate:'<li><a href="{url}">[{author}@{date}] {title}</a><br/>{teaserImage}{shortBodyPlain}</li>'
})
})

// Closes the sidebar menu
$("#menu-close").click(function (e) {
e.preventDefault();
Expand Down

0 comments on commit 42d0e31

Please sign in to comment.