git hash in build script (#691)

Co-authored-by: Drew Ansbacher <drew.ansbacher@spiredigital.com>
This commit is contained in:
Drew Ansbacher
2021-10-18 10:55:38 -06:00
committed by Aiden McClelland
parent 9225363392
commit 5eae4ffeb4
4 changed files with 13 additions and 1 deletions

View File

@@ -1,4 +1,5 @@
{ {
"gitHash": "",
"patchDb": { "patchDb": {
"poll": { "poll": {
"cooldown": 10000 "cooldown": 10000

View File

@@ -19,6 +19,13 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item>
<ion-label>
<h2>Git Hash</h2>
<p>{{ config.gitHash }}</p>
</ion-label>
</ion-item>
<ion-item-divider>Addresses</ion-item-divider> <ion-item-divider>Addresses</ion-item-divider>
<ion-item> <ion-item>

View File

@@ -2,6 +2,7 @@ import { Component, ViewChild } from '@angular/core'
import { IonContent, ToastController } from '@ionic/angular' import { IonContent, ToastController } from '@ionic/angular'
import { copyToClipboard } from 'src/app/util/web.util' import { copyToClipboard } from 'src/app/util/web.util'
import { PatchDbService } from 'src/app/services/patch-db/patch-db.service' import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
import { ConfigService } from 'src/app/services/config.service'
@Component({ @Component({
selector: 'server-specs', selector: 'server-specs',
@@ -14,6 +15,7 @@ export class ServerSpecsPage {
constructor ( constructor (
private readonly toastCtrl: ToastController, private readonly toastCtrl: ToastController,
public readonly patch: PatchDbService, public readonly patch: PatchDbService,
public readonly config: ConfigService,
) { } ) { }
ngAfterViewInit () { ngAfterViewInit () {

View File

@@ -1,9 +1,10 @@
import { Injectable } from '@angular/core' import { Injectable } from '@angular/core'
import { InterfaceDef, PackageDataEntry, PackageMainStatus, PackageState } from './patch-db/data-model' import { InterfaceDef, PackageDataEntry, PackageMainStatus, PackageState } from './patch-db/data-model'
const { patchDb, api, mocks } = require('../../../config.json') as UiConfig const { gitHash, patchDb, api, mocks } = require('../../../config.json') as UiConfig
type UiConfig = { type UiConfig = {
gitHash: string
patchDb: { patchDb: {
poll: { poll: {
cooldown: number /* in ms */ cooldown: number /* in ms */
@@ -30,6 +31,7 @@ export class ConfigService {
origin = removePort(removeProtocol(window.origin)) origin = removePort(removeProtocol(window.origin))
version = require('../../../package.json').version version = require('../../../package.json').version
gitHash = gitHash
patchDb = patchDb patchDb = patchDb
api = api api = api
mocks = mocks mocks = mocks