Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding liveshare diceroller to sample gallery #8174

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -389,4 +389,6 @@ mochawesome-report
# metrics
.metrics

package-lock.json
package-lock.json

.DS_Store
12 changes: 11 additions & 1 deletion packages/fx-core/src/common/samples-config-v3.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,16 @@
"time": "10min to run",
"configuration": "Manual configurations required",
"suggested": false
}
},
{
"id": "live-share-diceroller-sample",
"title": "Get started with a diceroll sample introducing Live Share",
"shortDescription": "This sample introduces Microsoft Live Share and Azure Fluid Relay to enable a shared experience between multiple users.",
"fullDescription": "Microsoft Live Share is a collaboration tool that enables you to share your experience with others in real time. Azure Fluid Relay is a part of this service. The diceroller example is a simple app that allows multiple users to roll a dice and see the results. This sample is a great way to get started with Live Share and Fluid.",
"tags": ["Live Share", "JS", "ReactJS", "Teams-JS 2.0"],
"time": "5 min to run",
"configuration": "Manual configuration required",
"suggested": false
}
]
}
10 changes: 10 additions & 0 deletions packages/fx-core/src/common/samples-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,16 @@
"time": "7min to run",
"configuration": "Ready for debug",
"suggested": false
},
{
"id": "live-share-dice-roller-sample",
"title": "Get started with a dice-roller sample introducing Live Share",
"shortDescription": "This sample introduces Microsoft Live Share and Azure Fluid Relay to enable a shared experience between multiple users.",
"fullDescription": "Microsoft Live Share is a collaboration tool that enables you to share your experience with others in real time. Azure Fluid Relay is a part of this service. The dice-roller example is a simple app that allows multiple users to roll a dice and see the results. This sample is a great way to get started with Live Share and Fluid.",
"tags": ["Live Share", "JS", "ReactJS", "Teams-JS 2.0"],
"time": "5 min to run",
"configuration": "Manual configuration required",
"suggested": false
}
]
}
2 changes: 2 additions & 0 deletions packages/vscode-extension/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package.json
package-lock.json
10 changes: 9 additions & 1 deletion packages/vscode-extension/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
module.exports = {
extends: ["../eslint-plugin-teamsfx/config/shared.js"],
extends: ["../eslint-config"],
rules: {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "off",
"import/no-unresolved": "off",
"import/no-cycle": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"no-secrets/no-secrets": "off",
},
};
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions packages/vscode-extension/src/controls/SampleGallery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import DeepLinking from "../../img/webview/sample/deeplink-without-sso.gif";
import DashboardTab from "../../img/webview/sample/team-central-dashboard.gif";
import TeamsTabAndOutlookAddin from "../../img/webview/sample/hello-world-teams-tab-and-outlook-add-in.png";
import DevAssistDashboard from "../../img/webview/sample/dev-assist-dashboard.png";
import LiveShareDiceRoller from "../../img/webview/sample/live-share-dice-roller.gif"
import {
TelemetryEvent,
TelemetryProperty,
Expand Down Expand Up @@ -61,6 +62,7 @@ const imageMapping: { [p: string]: any } = {
"team-central-dashboard": DashboardTab,
"hello-world-teams-tab-and-outlook-add-in": TeamsTabAndOutlookAddin,
"dev-assist-dashboard": DevAssistDashboard,
"live-share-dice-roller":LiveShareDiceRoller,
};

export default class SampleGallery extends React.Component<any, any> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@ import { environmentManager } from "@microsoft/teamsfx-core/build/core/environme

import VsCodeLogInstance from "../commonlib/log";
import M365TokenInstance from "../commonlib/m365Login";
import { getSystemInputs, showError } from "../handlers";
import { getSystemInputs, showError, core } from "../handlers";
import { TelemetryEvent, TelemetryProperty } from "../telemetry/extTelemetryEvents";
import * as commonUtils from "./commonUtils";
import { Host, Hub, sideloadingDisplayMessages } from "./constants";
import { localTelemetryReporter, sendDebugAllEvent } from "./localTelemetryReporter";
import { getTeamsAppInternalId, showInstallAppInTeamsMessage } from "./teamsAppInstallation";
import { terminateAllRunningTeamsfxTasks } from "./teamsfxTaskHandler";
import { core } from "../handlers";
import { ExtensionSource } from "../error";
import { UserError } from "@microsoft/teamsfx-api";

export interface TeamsfxDebugConfiguration extends vscode.DebugConfiguration {
teamsfxIsRemote?: boolean;
Expand Down