Merge pull request #1 from eqxmedianl/dev

Dev
eqxmedianl · Apr 13, 2021 · c934650 · c934650
2 parents 1173610 + 75fda27
commit c934650
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 28 deletions.
diff --git a/Website/ClientApp/src/components/Footer.js b/Website/ClientApp/src/components/Footer.js
@@ -20,7 +20,8 @@ export class Footer extends Component {
         return (
             <footer class="footer border-top w-100 p-2">
                 <div class="container text-center">
-                    <span class="text-muted">&copy; 2021 <a href="https://www.eqx-media.nl/" target="_blank">EQX Media B.V.</a> All rights reserved.</span>
+                    <span class="text-muted">&copy; 2021 <a href="https://www.eqx-media.nl/" target="_blank">EQX Media B.V.</a> All rights reserved.</span> - <span>
+                        View the proprietary source <a href="https://github.com/eqxmedianl/TxFileSystem.Website" target="_blank">on GitHub.</a></span>
                 </div>
             </footer>
         );

diff --git a/Website/ClientApp/src/components/Home.js b/Website/ClientApp/src/components/Home.js
@@ -11,43 +11,19 @@
  */
 import React, { Component } from 'react';
 import { Helmet } from "react-helmet";
-import ReactMarkdown from 'react-markdown'
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'
-import { dark } from 'react-syntax-highlighter/dist/esm/styles/prism'
-
-const renderers = {
-    code: ({ language, value }) => {
-        return <SyntaxHighlighter style={dark} language={language} children={value} />
-    }
-}
+import { Readme } from "./Readme";
 
 export class Home extends Component {
     static displayName = Home.name;
 
     constructor(props) {
         super(props)
-
-        this.state = { terms: null }
     }
 
-    componentWillMount() {
-        fetch("https://raw.githubusercontent.com/eqxmedianl/EQXMedia.TxFileSystem/main/Readme.md")
-            .then((response) => response.text()).then((text) => {
-                this.setState({ terms: text })
-            })
-    }
-
-
     render () {
         return (
             <div>
-                <Helmet>
-                    <title>TxFileSystem - OpenSource .NET library</title>
-                    <meta name="description" content="TxFileSystem is a transactional filesystem wrapper using the .NET filesystem abstraction from System.IO.Abstractions" />
-                </Helmet>
-                <section class="readme-md">
-                    <ReactMarkdown renderers={renderers} source={this.state.terms} />
-                </section>
+                <Readme markDownUrl="https://raw.githubusercontent.com/eqxmedianl/EQXMedia.TxFileSystem/main/Readme.md" />
             </div>
         );
     }

diff --git a/Website/ClientApp/src/components/Readme.css b/Website/ClientApp/src/components/Readme.css
@@ -0,0 +1,15 @@
+.readme-md h1 {
+    margin-bottom: 1.5rem;
+}
+
+.readme-md h2 {
+    margin: 1.25rem 0;
+}
+
+.readme-md h3 {
+    margin-bottom: 1rem;
+}
+
+.readme-md h4 {
+    margin: 1.5rem 0 0.75rem 0;
+}
diff --git a/Website/ClientApp/src/components/Readme.js b/Website/ClientApp/src/components/Readme.js
@@ -0,0 +1,46 @@
+/**
+ *
+ * The code is this file is subject to EQX Proprietary License. Therefor it is copyrighted and restricted
+ * from being copied, reproduced or redistributed by any party or indiviual other than the original
+ * copyright holder mentioned below.
+ *
+ * It's also not allowed to copy or redistribute the compiled binaries without explicit consent.
+ *
+ * (c) 2021 EQX Media B.V. - All rights are stricly reserved.
+ *
+ */
+import React, { Component } from 'react';
+import ReactMarkdown from 'react-markdown'
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'
+import { vs } from 'react-syntax-highlighter/dist/esm/styles/prism'
+
+import './Readme.css';
+
+const renderers = {
+    code: ({ language, value }) => {
+        return <SyntaxHighlighter style={vs} language={language} children={value} />
+    }
+}
+
+export class Readme extends Component {
+    constructor(props) {
+        super(props);
+
+        this.state = { contents: null }
+    }
+
+    componentWillMount() {
+        fetch(this.props.markDownUrl)
+            .then((response) => response.text()).then((text) => {
+                this.setState({ contents: text })
+            })
+    }
+
+    render() {
+        return (
+            <section class="readme-md">
+                <ReactMarkdown renderers={renderers} source={this.state.contents} />
+            </section>
+        );
+    }
+}
diff --git a/Website/TxFileSystem.Website.csproj b/Website/TxFileSystem.Website.csproj
@@ -11,10 +11,12 @@
     <AssemblyName>TxFileSystem.Website</AssemblyName>
     <Company>EQX Media B.V.</Company>
     <Authors>Jarno Kamminga</Authors>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Copyright>(c) 2021 EQX Media B.V.</Copyright>
     <PackageProjectUrl>https://txfilesystem.io</PackageProjectUrl>
     <PackageLicenseFile>License.md</PackageLicenseFile>
+    <RepositoryUrl>https://github.com/eqxmedianl/TxFileSystem.Website/</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,6 +32,8 @@
     <Content Remove="$(SpaRoot)**" />
     <None Remove="$(SpaRoot)**" />
     <None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
+    <None Remove="ClientApp\src\components\Readme.css" />
+    <None Remove="ClientApp\src\components\Readme.js" />
     <None Include="..\License.md">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
@@ -38,6 +42,8 @@
 
   <ItemGroup>
     <Content Include="ClientApp\src\components\Footer.js" />
+    <Content Include="ClientApp\src\components\Readme.css" />
+    <Content Include="ClientApp\src\components\Readme.js" />
   </ItemGroup>
 
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">