Skip to content

Commit

Permalink
JS designer component and major site refactor (microsoft#2247)
Browse files Browse the repository at this point in the history
  • Loading branch information
matthidinger authored Jan 4, 2019
1 parent cb41da8 commit 56d5ab0
Show file tree
Hide file tree
Showing 326 changed files with 65,448 additions and 36,546 deletions.
32 changes: 12 additions & 20 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,17 @@
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceRoot}/source/dotnet/Test/AdaptiveCards.Html.Test/bin/Debug/netcoreapp1.1/AdaptiveCards.Html.Test.dll",
"args": [],
"cwd": "${workspaceRoot}/source/dotnet/Test/AdaptiveCards.Html.Test",
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
"console": "internalConsole",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
{
"type": "chrome",
"request": "launch",
"name": "Debug Designer",
"url": "http://localhost:8001",
"webRoot": "${workspaceFolder}/source/nodejs/adaptivecards-designer"
},{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
]
}
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# Announcing Adaptive Cards 1.1!
# Adaptive Cards

Adaptive Cards 1.1 is here! Thank you to all the contributors for filing issues and helping us get the right set of new schema entries and bug fixes into this release. We hope some of the additions like media element and image buttons can help fulfil some of your top requests and make your lives easier. For a full list of what's in 1.1, check the [wiki](https://github.com/Microsoft/AdaptiveCards/wiki/1.1-Feature-List).
![logo](assets/adaptive-card-200.png)

You can find updated packages for all the platforms below and our updated website and new visual designer are available as well.
[Adaptive Cards](https://adaptivecards.io) are a new way for developers to exchange content in a common and consistent way. Get started today by putting Adaptive Cards into Microsoft Teams, Outlook Actionable Messages, Cortana Skills, or Windows Timeline -- or render cards inside your own apps by using our SDKs.

## Dive in

## Learn more at https://adaptivecards.io
* [Documentation](https://adaptivecards.io/documentation/)
* [Schema Explorer](https://adaptivecards.io/explorer/)
* [Sample Cards](https://adaptivecards.io/samples/)
* [Interactive visualizer](https://adaptivecards.io/visualizer/)
* [Designer](https://adaptivecards.io/designer/)

# Install and Build
## Install and Build

Adaptive Cards are designed to render anywhere that your users are. The following native platform renderers are under development right now.


|Platform|Install|Build|Docs|Status|
|---|---|---|---|---|
| JavaScript | [![npm install](https://img.shields.io/npm/v/adaptivecards.svg)](https://www.npmjs.com/package/adaptivecards) | [Source](https://github.com/Microsoft/AdaptiveCards/tree/master/source/nodejs)| [Docs](https://docs.microsoft.com/en-us/adaptive-cards/display/libraries/htmlclient) | ![Build Status](https://img.shields.io/vso/build/Microsoft/56cf629e-8f3a-4412-acbc-bf69366c552c/20564.svg) |
Expand Down
43 changes: 43 additions & 0 deletions samples/v1.1/Elements/Media.Sources.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.1",
"body": [
{
"type": "TextBlock",
"text": "Media supports **audio** and **video** content!",
"wrap": true
},
{
"type": "TextBlock",
"text": "Video",
"horizontalAlignment": "center",
"spacing": "medium",
"separator": true,
"size": "large"
},
{
"type": "Media",
"poster": "https://adaptivecards.io/content/poster-video.png",
"sources": [{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}]
},
{
"type": "TextBlock",
"text": "Audio",
"horizontalAlignment": "center",
"separator": true,
"size": "large"
},
{
"type": "Media",
"poster": "https://adaptivecards.io/content/poster-audio.jpg",
"sources": [{
"mimeType": "audio/mpeg",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp3"
}]
}
]
}
46 changes: 14 additions & 32 deletions samples/v1.1/Elements/Media.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,17 @@
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.1",
"body": [
{
"type": "TextBlock",
"text": "This is a media element which specifies a poster:",
"wrap": true
},
{
"type": "Media",
"poster": "http://adaptivecards.io/content/cats/1.png",
"sources": [
{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}
]
},
{
"type": "TextBlock",
"text": "This is a media element which doesn't specify a poster. It will use the poster from the host config if present:",
"wrap": true
},
{
"type": "Media",
"sources": [
{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}
]
}
]
}
"fallbackText": "This card requires Media to be viewed. Ask your platform to update to Adaptive Cards v1.1 for this an more!",
"body": [
{
"type": "Media",
"poster": "https://adaptivecards.io/content/poster-video.png",
"sources": [
{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}
]
}
]
}
40 changes: 0 additions & 40 deletions samples/v1.1/Elements/MediaAudio.json

This file was deleted.

59 changes: 33 additions & 26 deletions samples/v1.1/Elements/MediaSource.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,41 @@
"type": "AdaptiveCard",
"version": "1.1",
"body": [
{
"type": "TextBlock",
"text": "This is a media element which specifies a poster:",
"wrap": true
},
{
"type": "Media",
"poster": "http://adaptivecards.io/content/cats/1.png",
"sources": [
{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}
]
},
{
"type": "TextBlock",
"text": "This is a media element which doesn't specify a poster. It will use the poster from the host config if present:",
"wrap": true
},
{
"type": "Media",
"sources": [
"type": "TextBlock",
"text": "Media supports **audio** and **video** content!",
"wrap": true
},
{
"type": "TextBlock",
"text": "Video",
"horizontalAlignment": "center",
"spacing": "medium",
"separator": true,
"size": "large"
},
{
"type": "Media",
"poster": "https://adaptivecards.io/content/poster-video.png",
"sources": [{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}]
},
{
"type": "TextBlock",
"text": "Audio",
"horizontalAlignment": "center",
"separator": true,
"size": "large"
},
{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
"type": "Media",
"poster": "https://adaptivecards.io/content/poster-audio.jpg",
"sources": [{
"mimeType": "audio/mpeg",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp3"
}]
}
]
}
]
}
36 changes: 0 additions & 36 deletions samples/v1.1/Scenarios/Media.json

This file was deleted.

25 changes: 25 additions & 0 deletions samples/v1.1/Scenarios/ProductVideo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.1",
"fallbackText": "This card requires Media to be viewed. Ask your platform to update to Adaptive Cards v1.1 for this an more!",
"body": [
{
"type": "Media",
"poster": "https://adaptivecards.io/content/poster-video.png",
"sources": [
{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}
]
}
],
"actions": [
{
"type": "Action.OpenUrl",
"title": "Learn more",
"url": "https://adaptivecards.io"
}
]
}
5 changes: 5 additions & 0 deletions schemas/adaptive-card.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
"selectAction": {
"description": "An Action that will be invoked when the card is tapped or selected. `Action.ShowCard` is not supported.",
"type": "object",
"version": "1.1",
"oneOf": [
{ "$ref": "#/definitions/Action.Submit" },
{ "$ref": "#/definitions/Action.OpenUrl" }
Expand Down Expand Up @@ -306,6 +307,7 @@
"selectAction": {
"description": "An Action that will be invoked when the `Column` is tapped or selected. `Action.ShowCard` is not supported.",
"type": "object",
"version": "1.1",
"oneOf": [
{ "$ref": "#/definitions/Action.Submit" },
{ "$ref": "#/definitions/Action.OpenUrl" }
Expand Down Expand Up @@ -358,6 +360,7 @@
"selectAction": {
"description": "An Action that will be invoked when the `ColumnSet` is tapped or selected. `Action.ShowCard` is not supported.",
"type": "object",
"version": "1.1",
"oneOf": [
{ "$ref": "#/definitions/Action.Submit" },
{ "$ref": "#/definitions/Action.OpenUrl" }
Expand Down Expand Up @@ -399,6 +402,7 @@
"selectAction": {
"description": "An Action that will be invoked when the `Container` is tapped or selected. `Action.ShowCard` is not supported.",
"type": "object",
"version": "1.1",
"oneOf": [
{ "$ref": "#/definitions/Action.Submit" },
{ "$ref": "#/definitions/Action.OpenUrl" }
Expand Down Expand Up @@ -574,6 +578,7 @@
"selectAction": {
"description": "An Action that will be invoked when the `Image` is tapped or selected. `Action.ShowCard` is not supported.",
"type": "object",
"version": "1.1",
"oneOf": [
{ "$ref": "#/definitions/Action.Submit" },
{ "$ref": "#/definitions/Action.OpenUrl" }
Expand Down
8 changes: 2 additions & 6 deletions source/nodejs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
**/built/*.js
**/built/*.js.map
**/built/*.d.ts
**/dist/*.js
**/dist/*.js.map
**/dist/*.d.ts
lib/
dist/
Loading

0 comments on commit 56d5ab0

Please sign in to comment.