mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-11-22 12:21:13 +00:00
* Add UI version to UI via docker. Fixes #263 * Adding git fetch tags to CI.
This commit is contained in:
parent
440d0c9b77
commit
7f348fd074
6 changed files with 19 additions and 3 deletions
|
@ -14,6 +14,7 @@ steps:
|
||||||
- apk add git
|
- apk add git
|
||||||
- git submodule init
|
- git submodule init
|
||||||
- git submodule update --recursive --remote
|
- git submodule update --recursive --remote
|
||||||
|
- git fetch --tags
|
||||||
|
|
||||||
- name: yarn
|
- name: yarn
|
||||||
image: node:14-alpine
|
image: node:14-alpine
|
||||||
|
@ -110,6 +111,7 @@ steps:
|
||||||
- apk add git
|
- apk add git
|
||||||
- git submodule init
|
- git submodule init
|
||||||
- git submodule update --recursive --remote
|
- git submodule update --recursive --remote
|
||||||
|
- git fetch --tags
|
||||||
when:
|
when:
|
||||||
ref:
|
ref:
|
||||||
- refs/heads/main
|
- refs/heads/main
|
||||||
|
|
|
@ -16,6 +16,10 @@ COPY generate_translations.js \
|
||||||
|
|
||||||
COPY lemmy-translations lemmy-translations
|
COPY lemmy-translations lemmy-translations
|
||||||
COPY src src
|
COPY src src
|
||||||
|
COPY .git .git
|
||||||
|
|
||||||
|
# Set UI version
|
||||||
|
RUN echo "export const VERSION = '$(git describe --tag)';" > "src/shared/version.ts"
|
||||||
|
|
||||||
RUN yarn
|
RUN yarn
|
||||||
RUN yarn build:prod
|
RUN yarn build:prod
|
||||||
|
|
|
@ -3,6 +3,7 @@ import { Link } from "inferno-router";
|
||||||
import { i18n } from "../i18next";
|
import { i18n } from "../i18next";
|
||||||
import { repoUrl, joinLemmyUrl, docsUrl } from "../utils";
|
import { repoUrl, joinLemmyUrl, docsUrl } from "../utils";
|
||||||
import { GetSiteResponse } from "lemmy-js-client";
|
import { GetSiteResponse } from "lemmy-js-client";
|
||||||
|
import { VERSION } from "../version";
|
||||||
|
|
||||||
interface FooterProps {
|
interface FooterProps {
|
||||||
site: GetSiteResponse;
|
site: GetSiteResponse;
|
||||||
|
@ -19,7 +20,10 @@ export class Footer extends Component<FooterProps, any> {
|
||||||
<div className="navbar-collapse">
|
<div className="navbar-collapse">
|
||||||
<ul class="navbar-nav ml-auto">
|
<ul class="navbar-nav ml-auto">
|
||||||
<li class="nav-item">
|
<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>
|
||||||
<li className="nav-item">
|
<li className="nav-item">
|
||||||
<Link className="nav-link" to="/modlog">
|
<Link className="nav-link" to="/modlog">
|
||||||
|
|
|
@ -263,7 +263,9 @@ export class Main extends Component<any, MainState> {
|
||||||
get documentTitle(): string {
|
get documentTitle(): string {
|
||||||
return `${
|
return `${
|
||||||
this.state.siteRes.site_view
|
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"
|
: "Lemmy"
|
||||||
}`;
|
}`;
|
||||||
}
|
}
|
||||||
|
|
|
@ -181,7 +181,10 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
|
||||||
<div class="container">
|
<div class="container">
|
||||||
{this.props.site_res.site_view && (
|
{this.props.site_res.site_view && (
|
||||||
<Link
|
<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"
|
className="d-flex align-items-center navbar-brand mr-md-3"
|
||||||
to="/"
|
to="/"
|
||||||
>
|
>
|
||||||
|
|
1
src/shared/version.ts
Normal file
1
src/shared/version.ts
Normal file
|
@ -0,0 +1 @@
|
||||||
|
export const VERSION = "unknown version";
|
Loading…
Reference in a new issue