mirror of
https://github.com/HeyPuter/puter.git
synced 2026-10-07 12:21:56 +00:00
* feat: make the dashboard the default interface at root The dashboard now loads at / (with /dashboard kept as an alias), and the desktop moves to a new /desktop route. An "Open Desktop" button pinned at the bottom of the dashboard sidebar switches to the desktop. Root URLs that carry a desktop-only flow keep booting the desktop: auth popups (?embedded_in_popup=), app deep links (?app=), direct downloads (?download=), fullpage mode (?puter.fullpage=), and iframe embeds. Desktop-context redirects are retargeted so desktop users stay on the desktop: logout, the QR "continue on phone" link, the auth cover-page logo click, and window close/hide URL resets now use /desktop. OIDC login/signup gains a strictly whitelisted return_to param (/desktop or /dashboard) so social login returns to the interface it started from. Also: the dashboard strips ?ref= like the desktop does, ?auth_token= cleanup preserves the path and tab hash, the logged-out session list gets the wallpaper back, ?download= also works at /desktop, and the GUI dev server serves /desktop and /dashboard. * Add Open Desktop bento card and CSS Replace the previous desktop-switch UI with a full-width "Open Desktop" bento card that links to /desktop. Removes the pinned sidebar Open Desktop button and the old desktop-switch button/handler, and adds new CSS variables and styles for the desktop card (icon background, shadow, surface/header colors), hover shadow and arrow transition, and layout/padding adjustments. Changed files: TabHome.js (removed old switch, added anchor card), UIDashboard.js (removed sidebar button), dashboard.css (new desktop color vars and styles; removed legacy desktop-switch/button styles). * Remove box-shadow from myapps search input Delete the box-shadow declarations from input.myapps-search::placeholder in dashboard.css. This simplifies the placeholder styling (removes subtle and light shadow layers), likely to reduce visual noise or fix rendering inconsistency. * Show index_url hostname for opaque app IDs Only replace an app's title with the hostname from index_url when the app appears to use an opaque id. Add a check for names starting with 'app-' so the hostname is used only if title, name and uuid are identical and the name looks like an opaque app id. This avoids overwriting meaningful user-facing names that may coincidentally match the uuid and clarifies the intent in the comment. * Update dashboard.css
77 lines
2.8 KiB
JavaScript
77 lines
2.8 KiB
JavaScript
/*
|
|
* Copyright (C) 2024-present 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
import express from 'express';
|
|
import { generateDevHtml, build } from './utils.js';
|
|
import { argv } from 'node:process';
|
|
import chalk from 'chalk';
|
|
import dotenv from 'dotenv';
|
|
dotenv.config();
|
|
|
|
const app = express();
|
|
let port = process.env.PORT ?? 4000; // Starting port
|
|
const maxAttempts = 10; // Maximum number of ports to try
|
|
const env = argv[2] ?? 'dev';
|
|
|
|
const startServer = (attempt, useAnyFreePort = false) => {
|
|
if ( attempt > maxAttempts ) {
|
|
useAnyFreePort = true; // Use any port that is free
|
|
}
|
|
|
|
const server = app.listen(useAnyFreePort ? 0 : port, () => {
|
|
console.log('\n-----------------------------------------------------------\n');
|
|
console.log('Puter is now live at: ', chalk.underline.blue(`http://localhost:${server.address().port}`));
|
|
console.log('\n-----------------------------------------------------------\n');
|
|
}).on('error', (err) => {
|
|
if ( err.code === 'EADDRINUSE' ) { // Check if the error is because the port is already in use
|
|
console.error(chalk.red(`ERROR: Port ${port} is already in use. Trying next port...`));
|
|
port++; // Increment the port number
|
|
startServer(attempt + 1); // Try the next port
|
|
}
|
|
});
|
|
};
|
|
|
|
// Start the server with the first attempt
|
|
startServer(1);
|
|
|
|
// build the GUI
|
|
build();
|
|
|
|
app.get(['/', '/app/*', '/action/*', '/desktop', '/dashboard'], (req, res) => {
|
|
res.send(generateDevHtml({
|
|
env: env,
|
|
api_origin: 'https://api.puter.com',
|
|
title: 'Puter',
|
|
max_item_name_length: 150,
|
|
require_email_verification_to_publish_website: false,
|
|
short_description: 'Puter is a privacy-first personal cloud that houses all your files, apps, and games in one private and secure place, accessible from anywhere at any time.',
|
|
}));
|
|
});
|
|
app.use(express.static('./'));
|
|
|
|
if ( env === 'prod' ) {
|
|
// make sure to serve the ./dist/ folder maps to the root of the website
|
|
app.use(express.static('./dist/'));
|
|
}
|
|
|
|
if ( env === 'dev' ) {
|
|
app.use(express.static('./src/'));
|
|
}
|
|
|
|
export { app };
|