Add UI version to UI via docker. Fixes #263 (#278)

* Add UI version to UI via docker. Fixes #263

* Adding git fetch tags to CI.

diff --git a/.drone.yml b/.drone.yml
index 7c4cea8a846f636552b1c4512a591237d2661192..bfb6ab7a94f4a0b6fbdefe595b308c9c261f5f52 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,6 +14,7 @@ steps:
       - apk add git
       - git submodule init
       - git submodule update --recursive --remote
+      - git fetch --tags
 
   - name: yarn
     image: node:14-alpine
@@ -110,6 +111,7 @@ steps:
       - apk add git
       - git submodule init
       - git submodule update --recursive --remote
+      - git fetch --tags
     when:
       ref:
         - refs/heads/main

diff --git a/Dockerfile b/Dockerfile
index c03cdc6d0e06e4b817e479101ad7775400015397..a56a391b96b67836bd8be7337acd97273865aea1 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,10 @@ COPY generate_translations.js \
 \r
 COPY lemmy-translations lemmy-translations\r
 COPY src src\r
+COPY .git .git\r
+\r
+# Set UI version \r
+RUN echo "export const VERSION = '$(git describe --tag)';" > "src/shared/version.ts"\r
 \r
 RUN yarn\r
 RUN yarn build:prod\r

diff --git a/src/shared/components/footer.tsx b/src/shared/components/footer.tsx
index 16f5fc76215624620b64cc09ec8521e354193c93..f688bb62c0bc2557a0050af231866a1002cbd727 100644 (file)
--- a/src/shared/components/footer.tsx
+++ b/src/shared/components/footer.tsx
@@ -3,6 +3,7 @@ import { Link } from "inferno-router";
 import { i18n } from "../i18next";
 import { repoUrl, joinLemmyUrl, docsUrl } from "../utils";
 import { GetSiteResponse } from "lemmy-js-client";
+import { VERSION } from "../version";
 
 interface FooterProps {
   site: GetSiteResponse;
@@ -19,7 +20,10 @@ export class Footer extends Component<FooterProps, any> {
         <div className="navbar-collapse">
           <ul class="navbar-nav ml-auto">
             <li class="nav-item">
-              <span class="navbar-text">{this.props.site.version}</span>
+              <span class="nav-link">UI: {VERSION}</span>
+            </li>
+            <li class="nav-item">
+              <span class="nav-link">BE: {this.props.site.version}</span>
             </li>
             <li className="nav-item">
               <Link className="nav-link" to="/modlog">

diff --git a/src/shared/components/main.tsx b/src/shared/components/main.tsx
index 8fafeb103c5fdc42c1ed35491c3368fefb6bf391..94d085a036cc826a77f95f423ce12d35f64e70d3 100644 (file)
--- a/src/shared/components/main.tsx
+++ b/src/shared/components/main.tsx
@@ -263,7 +263,9 @@ export class Main extends Component<any, MainState> {
   get documentTitle(): string {
     return `${
       this.state.siteRes.site_view
-        ? this.state.siteRes.site_view.site.name
+        ? this.state.siteRes.site_view.site.description
+          ? `${this.state.siteRes.site_view.site.name} - ${this.state.siteRes.site_view.site.description}`
+          : this.state.siteRes.site_view.site.name
         : "Lemmy"
     }`;
   }

diff --git a/src/shared/components/navbar.tsx b/src/shared/components/navbar.tsx
index 31f45453707c23cac180682972c1d033b6e60bc2..e212d37603c5378b567842d0bb4027868ffa5aa2 100644 (file)
--- a/src/shared/components/navbar.tsx
+++ b/src/shared/components/navbar.tsx
@@ -181,7 +181,10 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
         <div class="container">
           {this.props.site_res.site_view && (
             <Link
-              title={this.props.site_res.version}
+              title={
+                this.props.site_res.site_view.site.description ||
+                this.props.site_res.site_view.site.name
+              }
               className="d-flex align-items-center navbar-brand mr-md-3"
               to="/"
             >

diff --git a/src/shared/version.ts b/src/shared/version.ts
new file mode 100644 (file)
index 0000000..c1dba35
--- /dev/null
+++ b/src/shared/version.ts
@@ -0,0 +1 @@
+export const VERSION = "unknown version";