Merge pull request #70 from kadoshita/add-version-text

Add version text
kadoshita · Apr 3, 2020 · 9053d18 · 9053d18
2 parents da4aa15 + d662b8d
commit 9053d18
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/build-and-deploy-to-azure.yml b/.github/workflows/build-and-deploy-to-azure.yml
@@ -21,6 +21,8 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 3.1.100
+    - name: Replace latest version tag
+      run: sed -i -e s/LATEST_RELEASE_VERSION_TAG/$(git describe --abbrev=0 --tags)/ ./ClientApp/src/components/NavMenu.js
     - name: Publish with dotnet
       run: dotnet publish -c Release -o ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
     - name: Deploy to Azure WebApp

diff --git a/ClientApp/src/components/NavMenu.css b/ClientApp/src/components/NavMenu.css
@@ -7,6 +7,7 @@
 html {
   font-size: 14px;
 }
+
 @media (min-width: 768px) {
   html {
     font-size: 16px;
@@ -16,3 +17,7 @@ html {
 .box-shadow {
   box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
 }
+
+.version-text {
+  color: rgba(0, 0, 0, 0.6);
+}
diff --git a/ClientApp/src/components/NavMenu.js b/ClientApp/src/components/NavMenu.js
@@ -27,6 +27,7 @@ export class NavMenu extends Component {
         <Navbar className="navbar-expand-sm navbar-toggleable-sm ng-white border-bottom box-shadow mb-3" light>
           <Container>
             <NavbarBrand tag={Link} to="/">Live Share Editor</NavbarBrand>
+            <p className='version-text'>LATEST_RELEASE_VERSION_TAG</p>
             <NavbarToggler onClick={this.toggleNavbar} className="mr-2" />
             <Collapse className="d-sm-inline-flex flex-sm-row-reverse" isOpen={!this.state.collapsed} navbar>
               <ul className="navbar-nav flex-grow">