Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
y2kenny authored May 20, 2020
2 parents 169e0c7 + aa6d1d2 commit fd4a690
Show file tree
Hide file tree
Showing 62 changed files with 9,759 additions and 199 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@ node_modules
main.py

# trash
.DS_Store
.DS_Store

# Website uses yarn; ignore npm package-lock.json
website/package-lock.json

# Ignore .swp files
.swp
18 changes: 16 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contribution Guide

You shouldn't edit the node class files (all files under `diagram` directory) by
You shouldn't edit the node class files (all files under `diagrams/` directory) by
yourself.

## Resources
Expand All @@ -27,7 +27,7 @@ ffmpeg -i my_big_image.jpg -vf scale=w=256:h=256:force_original_aspect_ratio=dec
Then just run the `./autogen.sh` to generate the added or updated node classes.

> IMPORTANT NOTE: To run `autogen.sh`, you need [round][round] and
> [inkscape][inkscape] command lines that are used for clearning the image
> [inkscape][inkscape] command lines that are used for cleaning the image
> resource filenames.
>
> macOS users can download the inkscape via Homebrew.
Expand Down Expand Up @@ -55,3 +55,17 @@ Then just run the `./autogen.sh` to generate the added or updated aliases.
```shell
python -m unittest tests/*.py -v
```

## Testing changes to the website

The [Docusaurus](https://docusaurus.io/)-based documentation website can be run by installing dependencies, then simply running `npm run start`.

```bash
cd website/
npm i
npm run start
```

The website will be available on [http://localhost:3000](http://localhost:3000).

Edit files in `website/` and `docs/` respectively to edit documentation.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
![kubernetes provider](https://img.shields.io/badge/provider-Kubernetes-orange?logo=kubernetes&color=326ce5)
![alibaba cloud provider](https://img.shields.io/badge/provider-AlibabaCloud-orange)
![oracle cloud provider](https://img.shields.io/badge/provider-OracleCloud-orange?logo=oracle&color=f80000)
![programming provider](https://img.shields.io/badge/provider-Programming-orange?color=5f87bf)

**Diagram as Code**.

Expand Down
4 changes: 3 additions & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/bash
set -e

app_root_dir="diagrams"

# NOTE: azure icon set is not latest version
providers=("onprem" "aws" "azure" "gcp" "k8s" "alibabacloud" "oci")
providers=("onprem" "aws" "azure" "gcp" "k8s" "alibabacloud" "oci" "programming")

if ! [ -x "$(command -v round)" ]; then
echo 'round is not installed'
Expand Down
13 changes: 11 additions & 2 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
DIR_RESOURCE = "resources"
DIR_TEMPLATE = "templates"

PROVIDERS = ("base", "onprem", "aws", "azure", "gcp", "k8s", "alibabacloud", "oci")
PROVIDERS = ("base", "onprem", "aws", "azure", "gcp", "k8s", "alibabacloud", "oci", "programming")

#########################
# Resource Processing #
Expand All @@ -32,6 +32,7 @@
"k8s": (),
"alibabacloud": (),
"oci": ("OCI-",),
"programming": (),
}

#########################
Expand Down Expand Up @@ -330,5 +331,13 @@
"Databaseservice": "DBService",
"DatabaseserviceGrey": "DBServiceGrey",
}
}
},
"programming": {
"language": {
"Javascript": "JavaScript",
"Nodejs": "NodeJS",
"Php": "PHP",
"Typescript": "TypeScript"
},
},
}
55 changes: 55 additions & 0 deletions diagrams/aws/media.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# This module is automatically generated by autogen.sh. DO NOT EDIT.

from . import _AWS


class _Media(_AWS):
_type = "media"
_icon_dir = "resources/aws/media"


class ElasticTranscoder(_Media):
_icon = "elastic-transcoder.png"


class ElementalConductor(_Media):
_icon = "elemental-conductor.png"


class ElementalDelta(_Media):
_icon = "elemental-delta.png"


class ElementalLive(_Media):
_icon = "elemental-live.png"


class ElementalMediaconnect(_Media):
_icon = "elemental-mediaconnect.png"


class ElementalMediaconvert(_Media):
_icon = "elemental-mediaconvert.png"


class ElementalMedialive(_Media):
_icon = "elemental-medialive.png"


class ElementalMediapackage(_Media):
_icon = "elemental-mediapackage.png"


class ElementalMediastore(_Media):
_icon = "elemental-mediastore.png"


class ElementalMediatailor(_Media):
_icon = "elemental-mediatailor.png"


class ElementalServer(_Media):
_icon = "elemental-server.png"


# Aliases
8 changes: 8 additions & 0 deletions diagrams/onprem/analytics.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class Hive(_Analytics):
_icon = "hive.png"


class Metabase(_Analytics):
_icon = "metabase.png"


class Norikra(_Analytics):
_icon = "norikra.png"

Expand All @@ -36,4 +40,8 @@ class Storm(_Analytics):
_icon = "storm.png"


class Tableau(_Analytics):
_icon = "tableau.png"


# Aliases
12 changes: 12 additions & 0 deletions diagrams/programming/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"""
Programming provides a set of programming languages and frameworks.
"""

from diagrams import Node


class _Programming(Node):
_provider = "programming"
_icon_dir = "resources/programming"

fontcolor = "#ffffff"
55 changes: 55 additions & 0 deletions diagrams/programming/framework.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# This module is automatically generated by autogen.sh. DO NOT EDIT.

from . import _Programming


class _Framework(_Programming):
_type = "framework"
_icon_dir = "resources/programming/framework"


class Angular(_Framework):
_icon = "angular.png"


class Backbone(_Framework):
_icon = "backbone.png"


class Django(_Framework):
_icon = "django.png"


class Ember(_Framework):
_icon = "ember.png"


class Flask(_Framework):
_icon = "flask.png"


class Flutter(_Framework):
_icon = "flutter.png"


class Laravel(_Framework):
_icon = "laravel.png"


class Rails(_Framework):
_icon = "rails.png"


class React(_Framework):
_icon = "react.png"


class Spring(_Framework):
_icon = "spring.png"


class Vue(_Framework):
_icon = "vue.png"


# Aliases
84 changes: 84 additions & 0 deletions diagrams/programming/language.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# This module is automatically generated by autogen.sh. DO NOT EDIT.

from . import _Programming


class _Language(_Programming):
_type = "language"
_icon_dir = "resources/programming/language"


class Bash(_Language):
_icon = "bash.png"


class C(_Language):
_icon = "c.png"


class Cpp(_Language):
_icon = "cpp.png"


class Csharp(_Language):
_icon = "csharp.png"


class Dart(_Language):
_icon = "dart.png"


class Go(_Language):
_icon = "go.png"


class Java(_Language):
_icon = "java.png"


class Javascript(_Language):
_icon = "javascript.png"


class Kotlin(_Language):
_icon = "kotlin.png"


class Matlab(_Language):
_icon = "matlab.png"


class Nodejs(_Language):
_icon = "nodejs.png"


class Php(_Language):
_icon = "php.png"


class Python(_Language):
_icon = "python.png"


class R(_Language):
_icon = "r.png"


class Ruby(_Language):
_icon = "ruby.png"


class Swift(_Language):
_icon = "swift.png"


class Typescript(_Language):
_icon = "typescript.png"


# Aliases

JavaScript = Javascript
NodeJS = Nodejs
PHP = Php
TypeScript = Typescript
Loading

0 comments on commit fd4a690

Please sign in to comment.