diff --git a/src/UI/Settings/UITabAbout.js b/src/UI/Settings/UITabAbout.js index f53a587b..3d49b75f 100644 --- a/src/UI/Settings/UITabAbout.js +++ b/src/UI/Settings/UITabAbout.js @@ -17,8 +17,6 @@ * along with this program. If not, see . */ -import { fetchServerInfo } from '../../services/VersionService.js'; - // About export default { id: 'about', @@ -95,9 +93,9 @@ export default { }, init: ($el_window) => { // server and version infomration - fetchServerInfo(api_origin, auth_token) + puter.os.version() .then(res => { - const deployed_date = new Date(res.deployTimestamp).toLocaleString(); + const deployed_date = new Date(res.deploy_timestamp).toLocaleString(); $el_window.find('.version').html(`Version: ${res.version} • Server: ${res.location} • Deployed: ${deployed_date}`); }) .catch(error => { diff --git a/src/UI/UIWindowLogin.js b/src/UI/UIWindowLogin.js index ea3b1e60..98920a17 100644 --- a/src/UI/UIWindowLogin.js +++ b/src/UI/UIWindowLogin.js @@ -20,7 +20,6 @@ import UIWindow from './UIWindow.js' import UIWindowSignup from './UIWindowSignup.js' import UIWindowRecoverPassword from './UIWindowRecoverPassword.js' -import { fetchServerInfo } from '../services/VersionService.js'; async function UIWindowLogin(options){ options = options ?? {}; @@ -73,9 +72,9 @@ async function UIWindowLogin(options){ h += ``; // server and version infomration - fetchServerInfo(api_origin, auth_token) + puter.os.version() .then(res => { - const deployed_date = new Date(res.deployTimestamp).toLocaleString(); + const deployed_date = new Date(res.deploy_timestamp).toLocaleString(); $("#version-placeholder").html(`Version: ${res.version} • Server: ${res.location} • Deployed: ${deployed_date}`); }) .catch(() => { diff --git a/src/services/VersionService.js b/src/services/VersionService.js deleted file mode 100644 index 2aadf3bc..00000000 --- a/src/services/VersionService.js +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (C) 2024 Puter Technologies Inc. - * - * This file is part of Puter. - * - * Puter is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -let server_info = null; - -export async function fetchServerInfo(api_origin, auth_token) { - if (server_info) return server_info; - - try { - const res = await $.ajax({ - url: api_origin + "/version", - type: 'GET', - contentType: "application/json", - headers: { - "Authorization": "Bearer " + auth_token - }, - statusCode: { - 401: function () { - logout(); - } - } - }); - server_info = { - version: res.version, - location: res.location, - deployTimestamp: res.deploy_timestamp - }; - return server_info; - } catch (error) { - console.error('Failed to fetch server info:', error); - throw error; - } -}