This repository has been archived by the owner on Oct 6, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updates development with latest fixes from 3.0.0 (#1153)
* Update "About" information for DNN Platform to be more relevant and current (#1094) * Update to include relevant information and links for DNN Platform * Update local resource file to include new content * Update URLs to be absolute instead of using protocol-relative URLs * Moved UNSAFE_componentWillMount to componentDidMount * Fixed an issue where float where preventing collapsible height calculation * Prevents chrome autofill * Updates Dnn dependencies * DNN-31578 - Not listing deleted children in pages Parent dropdown (#1099) * Build front end projects in parallel using lerna (#1101) * Added lerna config * Sets up lerna to use yarn workspaces * Adds checksum for 9.4.0 Platform * Reran yarn build
- Loading branch information
1 parent
0c751af
commit 2499da4
Showing
26 changed files
with
15,921 additions
and
13,852 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
|
|
||
| yarn install | ||
| yarn workspaces run build | ||
| yarn lerna run build --parallel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 55 additions & 45 deletions
100
...Content/Dnn.PersonaBar.Extensions/WebApps/Licensing.Web/src/components/platform/index.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,101 @@ | ||
| import React, { Component } from "react"; | ||
| import PropTypes from "prop-types"; | ||
| import { connect } from "react-redux"; | ||
| import { | ||
| licensing as LicensingActions | ||
| } from "../../actions"; | ||
| import "./style.less"; | ||
| import resx from "../../resources"; | ||
| import styles from "./style.less"; | ||
|
|
||
| /*eslint-disable quotes*/ | ||
| const starIcon = require(`!raw-loader!./../svg/star_circle.svg`).default; | ||
| const evoqIcon = require(`!raw-loader!./../svg/evoq.svg`).default; | ||
| const infoIcon = require(`!raw-loader!./../svg/info_circle.svg`).default; | ||
| const dnnTechnologyEditorialIcon = require(`!raw-loader!./../svg/dnn_technology_editorial.svg`).default; | ||
| const githubIcon = require(`!raw-loader!./../svg/github.svg`).default; | ||
| const dnnIcon = require(`!raw-loader!./../svg/dnn_logo_primary.svg`).default; | ||
| const docsIcon = require(`!raw-loader!./../svg/dnn_docs_logo.svg`).default; | ||
|
|
||
| class Platform extends Component { | ||
| constructor() { | ||
| super(); | ||
| } | ||
|
|
||
| renderHeader() { | ||
| let tableFields = []; | ||
| tableFields.push({ "name": resx.get("LicenseType.Header"), "id": "LicenseType" }); | ||
| tableFields.push({ "name": resx.get("InvoiceNumber.Header"), "id": "InvoiceNumber" }); | ||
| tableFields.push({ "name": resx.get("WebServer.Header"), "id": "WebServer" }); | ||
| tableFields.push({ "name": resx.get("Activated.Header"), "id": "Activated" }); | ||
| tableFields.push({ "name": resx.get("Expires.Header"), "id": "Expires" }); | ||
|
|
||
| let tableHeaders = tableFields.map((field) => { | ||
| let className = "header-" + field.id; | ||
| return <div className={className} key={"header-" + field.id}> | ||
| <span>{field.name}</span> | ||
| </div>; | ||
| }); | ||
| return <div className="licenses-header-row">{tableHeaders}</div>; | ||
| renderVersion() { | ||
| return <div className="intro-header-row">{this.props.productVersion}</div>; | ||
| } | ||
|
|
||
| onEvoqClick() { | ||
| window.open("http://www.dnnsoftware.com/cms-features", "_blank"); | ||
| onGitHubClick() { | ||
| window.open("https://github.com/dnnsoftware/Dnn.Platform", "_blank"); | ||
| } | ||
|
|
||
| onUpgradeClick() { | ||
| window.open("http://www.dnnsoftware.com/about/contact-dnn", "_blank"); | ||
| onCommunityClick() { | ||
| window.open("https://dnncommunity.org", "_blank"); | ||
| } | ||
|
|
||
| onDocCenterClick() { | ||
| window.open("http://www.dnnsoftware.com/docs/", "_blank"); | ||
| onDocsClick() { | ||
| window.open("https://dnndocs.com", "_blank"); | ||
| } | ||
|
|
||
| /* eslint-disable react/no-danger */ | ||
| renderLinks() { | ||
| return ( | ||
| <div className="links-wrapper"> | ||
| <div className="link-evoq-wrapper"> | ||
| <div className="link-evoq" onClick={this.onEvoqClick.bind(this) }> | ||
| <div className="star-icon" dangerouslySetInnerHTML={{ __html: starIcon }} /> | ||
| <div className="link-evoq-header">{resx.get("CheckOutEvoq.Header") }</div> | ||
| <div className="link-evoq-desc">{resx.get("CheckOutEvoq") }</div> | ||
| <div className="link-docs-wrapper" title={resx.get("Docs.Header")} onClick={this.onDocsClick.bind(this) }> | ||
| <div className="link-docs"> | ||
| <div className="docs-icon" dangerouslySetInnerHTML={{ __html: docsIcon }} /> | ||
| <div className="link-docs-header">{resx.get("Docs.Header") }</div> | ||
| <div className="link-docs-desc">{resx.get("Docs") }</div> | ||
| </div> | ||
| </div> | ||
| <div className="link-upgrade-wrapper"> | ||
| <div className="link-upgrade" onClick={this.onUpgradeClick.bind(this) }> | ||
| <div className="evoq-icon" dangerouslySetInnerHTML={{ __html: evoqIcon }} /> | ||
| <div className="link-upgrade-header">{resx.get("UpgradeToEvoq.Header") }</div> | ||
| <div className="link-upgrade-desc">{resx.get("UpgradeToEvoq") }</div> | ||
| <div className="link-community-wrapper"> | ||
| <div className="link-community" title={resx.get("Community.Header")} onClick={this.onCommunityClick.bind(this) }> | ||
| <div className="dnn-icon" dangerouslySetInnerHTML={{ __html: dnnIcon }} /> | ||
| <div className="link-community-header">{resx.get("Community.Header") }</div> | ||
| <div className="link-community-desc">{resx.get("Community") }</div> | ||
| </div> | ||
| </div> | ||
| <div className="link-doc-wrapper" onClick={this.onDocCenterClick.bind(this) }> | ||
| <div className="link-doc"> | ||
| <div className="info-icon" dangerouslySetInnerHTML={{ __html: infoIcon }} /> | ||
| <div className="link-doc-header">{resx.get("DocumentCenter.Header") }</div> | ||
| <div className="link-doc-desc">{resx.get("DocumentCenter") }</div> | ||
| <div className="link-github-wrapper"> | ||
| <div className="link-github" title={resx.get("GitHub.Header")} onClick={this.onGitHubClick.bind(this)}> | ||
| <div className="github-icon" dangerouslySetInnerHTML={{ __html: githubIcon }} /> | ||
| <div className="link-github-header">{resx.get("GitHub.Header")}</div> | ||
| <div className="link-github-desc">{resx.get("GitHub")}</div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| const {props} = this; | ||
| props.dispatch(LicensingActions.getServerInfo()); | ||
| } | ||
|
|
||
| /*eslint no-mixed-spaces-and-tabs: "error"*/ | ||
| render() { | ||
| return ( | ||
| <div className={styles.licensingPlatform}> | ||
| <div> | ||
| {this.renderHeader() } | ||
| <div className="nolicense"> | ||
| <div className="nolicense-header">{resx.get("NoLicense.Header") }</div> | ||
| <div className="nolicense-body">{resx.get("NoLicense") }</div> | ||
| </div> | ||
| {this.renderVersion()} | ||
| <div className="intro"> | ||
| <div className="dnn-technology-editorial-icon" dangerouslySetInnerHTML={{ __html: dnnTechnologyEditorialIcon }} /> | ||
| <div className="intro-header">{resx.get("Intro.Header") }</div> | ||
| <div className="intro-body">{resx.get("Intro") }</div> | ||
| </div> | ||
| </div> | ||
| {this.renderLinks() } | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default Platform; | ||
| Platform.propTypes = { | ||
| dispatch: PropTypes.func.isRequired, | ||
| productVersion: PropTypes.string | ||
| }; | ||
|
|
||
| function mapStateToProps(state) { | ||
| return { | ||
| productVersion: state.licensing.productVersion | ||
| }; | ||
| } | ||
|
|
||
| export default connect(mapStateToProps)(Platform); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
...ersonaBar.Extensions/WebApps/Licensing.Web/src/components/svg/dnn_docs_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
...onaBar.Extensions/WebApps/Licensing.Web/src/components/svg/dnn_logo_primary.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.