Merge branch 'master' into feature/maps-management

This commit is contained in:
MathieuG-P
2022-11-19 15:18:51 +01:00
15 changed files with 3136 additions and 2262 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ const isDebug = process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD
log.transports.file.level = 'info';
log.transports.file.resolvePath = (() => {
const now = new Date();
return path.join(app.getPath("logs"), `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()}.log`);
return path.join(app.getPath("logs"), `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()}-v${app.getVersion()}.log`);
});
log.catchErrors();
+1
View File
@@ -11,6 +11,7 @@ import { ThemeService } from "./services/theme.service";
import { NotificationOverlay } from "./components/notification/notification-overlay.component";
import { PageStateService } from "./services/page-state.service";
import MapsPage from "./pages/maps-page.component";
import "tailwindcss/tailwind.css";
export default function App() {
+4 -1
View File
@@ -30,7 +30,10 @@ export default function Launcher() {
updaterService.isUpdateAvailable().then(available => {
if(!available){ return windowService.openThenCloseAll("index.html"); }
setText("auto-update.downloading");
updaterService.downloadUpdate().then(installed => installed && updaterService.quitAndInstall());
updaterService.downloadUpdate().then(installed => {
if(!installed){ return windowService.openThenCloseAll("index.html"); }
updaterService.quitAndInstall()
});
});
return () => sub.unsubscribe();
@@ -9,7 +9,6 @@ export class ConfigurationService {
private constructor(){
this.observers = new Map<string, BehaviorSubject<any>>();
}
private emitChange(key: string){
if(this.observers.has(key)){
const val = this.get(key);
+1
View File
@@ -22,6 +22,7 @@ export class I18nService {
if(!I18nService.instance){ I18nService.instance = new I18nService(); }
return I18nService.instance;
}
private constructor(){
this.configService = ConfigurationService.getInstance();
this.cache = new Map<string, string>();