Skip to content

Commit

Permalink
About page cleanup (#1472)
Browse files Browse the repository at this point in the history
* Cleans up About page, adds PRIVACY.md

* Change help link to new issue template
  • Loading branch information
cwhitten committed Nov 3, 2019
1 parent 1b3c3f3 commit e61fbf7
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 26 deletions.
1 change: 1 addition & 0 deletions Composer/packages/client/config/env.js
Expand Up @@ -89,6 +89,7 @@ function getClientEnvironment(publicUrl) {
GIT_SHA: getGitSha()
.toString()
.replace('\n', ''),
SDK_PACKAGE_VERSON: '4.6.0-preview2', // TODO: change this when Composer supports custom schema/custom runtime
}
);
// Stringify all values so we can feed into Webpack DefinePlugin
Expand Down
62 changes: 44 additions & 18 deletions Composer/packages/client/src/pages/about/index.js
Expand Up @@ -14,55 +14,81 @@ export const About = () => {
<div css={about.content}>
<div css={about.title}> {formatMessage(`About`)} </div>
<div css={about.body}>
<div css={about.version}>{formatMessage(`Version 0.0.1 - Alpha`)}</div>
<div css={about.version}>{formatMessage(`Release: Preview 1.0`)}</div>
<div css={about.description}>
<p>
{formatMessage(` Bot Framework Composer is an integrated development environment (IDE) for building
{formatMessage(`Bot Framework Composer is an integrated development environment (IDE) for building
bots and other types of conversational software with the Microsoft Bot Framework technology stack.
Inside this web-based tool, you'll find everything you need to build a modern, state-of-the-art conversational experience.`)}
Inside this web-based tool you will find everything you need to build a modern, state-of-the-art conversational experience.`)}
</p>
<p>
{formatMessage(`Bot Framework Composer enables teams working to create bots to build all kinds of conversational experiences that use the
latest features from the Bot Framework SDK without writing code. The Designer app reads and writes from the Adaptive Dialog format,
a JSON specification shared by many tools provided by the Bot Framework. Dialogs, NLU training data and message templates are treated
like normal developer assets - files that can be committed to source control and deployed alongside code updates.`)}
latest components from the Bot Framework: SDK, LG, LU, and declarative file formats, all without writing code.`)}
<Link
href={'https://github.com/microsoft/BotFramework-Composer/blob/stable/toc.md'}
tabIndex={-1}
target={'_blank'}
style={{ marginLeft: '5px' }}
>
{formatMessage(`Learn more`)}
</Link>
</p>
</div>
<div css={about.DiagnosticsInfo}>
<div css={about.DiagnosticsInfoText}>
<div css={about.DiagnosticsInfoTextAlignLeft}>{formatMessage(`Build SHA`)}</div>
<div css={about.DiagnosticsInfoTextAlignLeft}>{formatMessage(`Application SHA`)}</div>
<div css={about.DiagnosticsInfoTextAlignLeft}>
{process.env.GIT_SHA || 'Unable to find Build number'}{' '}
<Link
href={`https://github.com/microsoft/BotFramework-Composer/commit/${process.env.GIT_SHA}`}
tabIndex={-1}
target={'_blank'}
style={{ marginLeft: '5px' }}
>
{process.env.GIT_SHA || 'Unknown'}
</Link>
</div>
</div>
<div css={about.DiagnosticsInfoText}>
<div css={about.DiagnosticsInfoTextAlignLeft}>{formatMessage(`SDK runtime packages`)}</div>
<div css={about.DiagnosticsInfoTextAlignLeft}>
<Link
href={`https://botbuilder.myget.org/feed/botbuilder-v4-dotnet-daily/package/nuget/Microsoft.Bot.Builder.Dialogs.Adaptive/${
process.env.SDK_PACKAGE_VERSON
}`}
tabIndex={-1}
target={'_blank'}
style={{ marginLeft: '5px' }}
>
{process.env.SDK_PACKAGE_VERSON || 'Unknown'}
</Link>
</div>
</div>
</div>
</div>
<div css={about.linkRow}>
<Link
href={'https://github.com/microsoft/BotFramework-Designer/blob/master/help.md'}
href={'https://github.com/microsoft/BotFramework-Composer/issues/new/choose'}
tabIndex={-1}
target={'_blank'}
>
<div css={about.helpLink}>{formatMessage(`Getting Help`)} </div>
</Link>
</div>
<div css={about.linkContainer}>
<div css={about.linkRow}>
<IconButton styles={about.icon} iconProps={{ iconName: 'Info' }} />
<Link href={'/about'} tabIndex={-1} target={'_blank'}>
<div css={about.link}>{formatMessage(`Terms of Use`)} </div>
</Link>
</div>
<div css={about.linkRow}>
<IconButton styles={about.icon} iconProps={{ iconName: 'BlockedSite' }} />
<Link href={'/about'} tabIndex={-1} target={'_blank'}>
<div css={about.link}>{formatMessage(`Third-Party Notices`)} </div>
<Link
href={'https://github.com/microsoft/BotFramework-Composer/blob/stable/LICENSE.md'}
tabIndex={-1}
target={'_blank'}
>
<div css={about.link}>{formatMessage(`Terms of Use`)} </div>
</Link>
</div>
<div css={about.linkRow}>
<IconButton styles={about.icon} iconProps={{ iconName: 'Lock' }} />
<Link
href={'https://github.com/microsoft/BotFramework-Designer/blob/master/Private-Preview-LICENSE.md'}
href={'https://github.com/microsoft/BotFramework-Composer/blob/stable/PRIVACY.md'}
tabIndex={-1}
target={'_blank'}
>
Expand Down
1 change: 0 additions & 1 deletion Composer/packages/client/src/pages/about/styles.js
Expand Up @@ -60,7 +60,6 @@ export const DiagnosticsInfoText = css`
`;

export const DiagnosticsInfoTextAlignLeft = css`
width: 50%;
text-align: left;
`;

Expand Down
1 change: 1 addition & 0 deletions PRIVACY.md
@@ -0,0 +1 @@
Our privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and our privacy statement. Your use of the software operates as your consent to these practices.
7 changes: 0 additions & 7 deletions help.md

This file was deleted.

0 comments on commit e61fbf7

Please sign in to comment.