Showing the frontend and backend version in the settings panel.

Bumped the version to 7.6.0

brewman/__version__.py

@@ -0,0 +1 @@
+__version__ = "7.6.0"

brewman/routers/login.py

@@ -14,6 +14,7 @@ from fastapi.responses import JSONResponse
 from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.orm import Session
 
+from .. import __version__
 from ..core.config import settings
 from ..core.security import (
     Token,
@@ -85,6 +86,7 @@ async def login_for_access_token(
             ),
             "userId": str(user.id),
             "lockedOut": user.locked_out,
+            "ver": __version__.__version__,
         },
         expires_delta=access_token_expires,
     )
@@ -100,6 +102,7 @@ async def refresh_token(user: UserToken = Security(get_current_active_user)):
             "scopes": user.permissions,
             "userId": str(user.id_),
             "lockedOut": user.locked_out,
+            "ver": __version__.__version__,
         },
         expires_delta=access_token_expires,
     )

overlord/package.json

@@ -1,6 +1,6 @@
 {
   "name": "overlord",
-  "version": "7.5.0",
+  "version": "7.6.0",
   "scripts": {
     "ng": "ng",
     "prettier": "prettier",

overlord/src/app/auth/auth.service.ts

@@ -91,6 +91,7 @@ export class AuthService {
       perms: decoded.scopes,
       access_token: token,
       exp: decoded.exp,
+      ver: decoded.ver
     });
   }
 

overlord/src/app/core/user.ts

@@ -8,6 +8,7 @@ export class User {
   isAuthenticated: boolean;
   access_token?: string;
   exp?: number;
+  ver: string;
 
   public constructor(init?: Partial<User>) {
     Object.assign(this, init);

overlord/src/app/settings/settings.component.html

@@ -218,3 +218,8 @@
     </mat-card>
   </mat-tab>
 </mat-tab-group>
+   <footer class="footer">
+      <p>
+        Backend: v{{ auth.user.ver }} / Frontend: v{{ version }}
+      </p>
+    </footer>

overlord/src/app/settings/settings.component.ts

@@ -12,6 +12,7 @@ import { Product } from '../core/product';
 import { debounceTime, distinctUntilChanged, map, startWith, switchMap } from 'rxjs/operators';
 import { Observable, of as observableOf } from 'rxjs';
 import { ProductService } from '../product/product.service';
+import {environment} from '../../environments/environment';
 
 @Component({
   selector: 'app-settings',
@@ -30,6 +31,8 @@ export class SettingsComponent implements OnInit {
 
   maintenance: any;
 
+  version: string;
+
   constructor(
     private route: ActivatedRoute,
     private router: Router,
@@ -51,6 +54,7 @@ export class SettingsComponent implements OnInit {
     this.listenToProductChanges();
 
     this.maintenance = { enabled: false, user: '' };
+    this.version = environment.version;
   }
 
   ngOnInit() {

overlord/src/environments/environment.prod.ts

@@ -1,4 +1,5 @@
 export const environment = {
   production: true,
   ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
+  version: '7.6.0',
 };

overlord/src/environments/environment.ts

@@ -5,6 +5,7 @@
 export const environment = {
   production: false,
   ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
+  version: '7.6.0',
 };
 
 /*

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "brewman"
-version = "7.5.0"
+version = "7.6.0"
 description = "Accounting plus inventory management for a restaurant."
 authors = ["tanshu <git@tanshu.com>"]