From 78c1d8e8442a053a2fea1ff83e3635b06e9a8cb6 Mon Sep 17 00:00:00 2001 From: Franzz Date: Fri, 4 Sep 2026 11:09:34 +0200 Subject: [PATCH] Change design --- composer.dev.json | 6 +- composer.json | 6 +- config/apache-localhost.conf | 6 +- config/settings-sample.php | 2 +- lib/Controller.php | 24 ++-- lib/{MyThoughts.php => Daydream.php} | 6 +- lib/Journal.php | 56 ++++----- lib/User.php | 42 +++---- package-lock.json | 4 +- package.json | 4 +- public/index.php | 2 +- resources/lang/en.json | 4 +- resources/lang/fr.json | 4 +- resources/masks/index.html | 6 +- src/App.vue | 8 +- src/app.js | 2 +- src/components/AuthPanel.vue | 4 +- src/components/BookmarkRail.vue | 33 ++++- src/images/icons/apple-touch-icon.png | Bin 0 -> 16561 bytes src/images/icons/apple-touch-icon.svg | 23 ---- src/images/icons/favicon.png | Bin 0 -> 12372 bytes src/images/icons/favicon.svg | 17 --- src/images/icons/site.webmanifest | 22 ++-- src/images/logo-full.png | Bin 0 -> 1251882 bytes src/images/logo.png | Bin 56228 -> 305194 bytes src/scripts/hands.js | 2 +- src/styles/_app.scss | 64 ++++++---- src/styles/_book.scss | 18 ++- src/styles/_calendar.scss | 6 +- src/styles/_color.scss | 117 ++++++++++++------ src/styles/_common.scss | 55 ++++---- src/styles/_mobile.scss | 15 ++- src/styles/_panel.scss | 26 ++-- src/styles/_rail.scss | 30 +++-- src/styles/{mythoughts.scss => daydream.scss} | 0 vite.config.mjs | 4 +- 36 files changed, 355 insertions(+), 263 deletions(-) rename lib/{MyThoughts.php => Daydream.php} (98%) create mode 100644 src/images/icons/apple-touch-icon.png delete mode 100644 src/images/icons/apple-touch-icon.svg create mode 100644 src/images/icons/favicon.png delete mode 100644 src/images/icons/favicon.svg create mode 100644 src/images/logo-full.png mode change 100755 => 100644 src/images/logo.png rename src/styles/{mythoughts.scss => daydream.scss} (100%) diff --git a/composer.dev.json b/composer.dev.json index eaa2f0b..566660f 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -1,6 +1,6 @@ { - "name": "franzz/mythoughts", - "description": "MyThoughts", + "name": "franzz/daydream", + "description": "Daydream", "type": "project", "license": "GPL-3.0-or-later", "repositories": [ @@ -21,7 +21,7 @@ }, "autoload": { "psr-4": { - "Franzz\\MyThoughts\\": "lib/", + "Franzz\\Daydream\\": "lib/", "Franzz\\Objects\\": "../objects/inc/" }, "files": [ diff --git a/composer.json b/composer.json index 429d761..7a74ccc 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { - "name": "franzz/mythoughts", - "description": "MyThoughts", + "name": "franzz/daydream", + "description": "Daydream", "type": "project", "license": "GPL-3.0-or-later", "repositories": [ @@ -18,7 +18,7 @@ }, "autoload": { "psr-4": { - "Franzz\\MyThoughts\\": "lib/" + "Franzz\\Daydream\\": "lib/" }, "files": [ "config/settings.php" diff --git a/config/apache-localhost.conf b/config/apache-localhost.conf index 5de1995..557a51e 100644 --- a/config/apache-localhost.conf +++ b/config/apache-localhost.conf @@ -1,12 +1,12 @@ -# Serve https://localhost/mythoughts/ from the public web root. +# Serve https://localhost/daydream/ from the public web root. # # Include this from the site VirtualHost (or paste the Alias/Directory block # into the existing one). Everything outside public/ - lib/, config/, vendor/, # node_modules/ - stays off the document root and is never web-reachable. -Alias /mythoughts /var/www/html/mythoughts/public +Alias /daydream /var/www/html/daydream/public - + Options FollowSymLinks AllowOverride None Require all granted diff --git a/config/settings-sample.php b/config/settings-sample.php index bec0a6c..d91fee1 100644 --- a/config/settings-sample.php +++ b/config/settings-sample.php @@ -4,7 +4,7 @@ class Settings { public const DB_SERVER = 'localhost'; public const DB_LOGIN = ''; public const DB_PASS = ''; - public const DB_NAME = 'mythoughts'; + public const DB_NAME = 'daydream'; public const DB_ENC = 'utf8mb4'; public const TEXT_ENC = 'UTF-8'; public const TIMEZONE = 'Europe/Zurich'; diff --git a/lib/Controller.php b/lib/Controller.php index 28221a8..9f2fa53 100644 --- a/lib/Controller.php +++ b/lib/Controller.php @@ -1,6 +1,6 @@ initCsrfToken(); - $this->oMyThoughts = new MyThoughts($sProcessPage, $this->asReq['t']); + $this->oDaydream = new Daydream($sProcessPage, $this->asReq['t']); //Validate CSRF, then release the session lock before long-running work. $bValidMutationRequest = $this->validateMutationRequest($sAction); if(!$bValidMutationRequest || !in_array($sAction, self::SESSION_WRITING_ACTIONS, true)) $this->closeSession(); - if(!$bValidMutationRequest) $sResult = MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); - else $sResult = ($sAction == '') ? $this->oMyThoughts->getAppMainPage($this->getCsrfToken()) : $this->dispatch($sAction); + if(!$bValidMutationRequest) $sResult = Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); + else $sResult = ($sAction == '') ? $this->oDaydream->getAppMainPage($this->getCsrfToken()) : $this->dispatch($sAction); //Clean errors $sDebug = ob_get_clean(); - if($sDebug != '') $this->oMyThoughts->addUncaughtError($sDebug); + if($sDebug != '') $this->oDaydream->addUncaughtError($sDebug); $this->closeSession(); return $sResult; } private function dispatch(string $sAction): string { - $oJournal = $this->oMyThoughts->getJournal(); + $oJournal = $this->oDaydream->getJournal(); return match($sAction) { /* Account */ - 'signup' => $this->oMyThoughts->signup($this->asReq['name'], $this->asReq['email'], $this->asReq['password'], $this->asReq['t']), - 'login' => $this->oMyThoughts->login($this->asReq['email'], $this->asReq['password'], $this->asReq['t'], $this->asReq['remember']), - 'logout' => $this->oMyThoughts->logout(), - 'account' => $this->oMyThoughts->updateAccount($this->asReq['field'], $this->asReq['value']), + 'signup' => $this->oDaydream->signup($this->asReq['name'], $this->asReq['email'], $this->asReq['password'], $this->asReq['t']), + 'login' => $this->oDaydream->login($this->asReq['email'], $this->asReq['password'], $this->asReq['t'], $this->asReq['remember']), + 'logout' => $this->oDaydream->logout(), + 'account' => $this->oDaydream->updateAccount($this->asReq['field'], $this->asReq['value']), /* Reading the book */ 'book' => $oJournal->getBook(), @@ -102,7 +102,7 @@ class Controller extends PhpObject { 'close_entry' => $oJournal->closeEntry($this->asReq['id'], $this->asReq['content'], $this->asReq['has_content']), 'delete_entry' => $oJournal->deleteEntry($this->asReq['id']), - default => MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND) + default => Daydream::getJsonResult(false, Daydream::NOT_FOUND) }; } diff --git a/lib/MyThoughts.php b/lib/Daydream.php similarity index 98% rename from lib/MyThoughts.php rename to lib/Daydream.php index 92ecf42..2b8858f 100644 --- a/lib/MyThoughts.php +++ b/lib/Daydream.php @@ -1,6 +1,6 @@ oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); + if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); $this->sealStaleEntries(); $asEntries = $this->getEntryWindow(); - return MyThoughts::getJsonResult(true, '', [ + return Daydream::getJsonResult(true, '', [ 'entries' => $asEntries, 'bookmarks' => $this->getBookmarks(), 'has_older' => $this->hasOlderThan($asEntries[0]['id'] ?? 0), @@ -62,7 +62,7 @@ class Journal extends PhpObject { } public function getEntries(string $sDirection, int $iCursorId): string { - if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); + if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); $asEntries = match($sDirection) { 'before' => $this->getEntryWindow($iCursorId, 'before'), @@ -71,9 +71,9 @@ class Journal extends PhpObject { default => null }; - if($asEntries === null) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND); + if($asEntries === null) return Daydream::getJsonResult(false, Daydream::NOT_FOUND); - return MyThoughts::getJsonResult(true, '', [ + return Daydream::getJsonResult(true, '', [ 'entries' => $asEntries, 'has_older' => $this->hasOlderThan($asEntries[0]['id'] ?? 0), 'has_newer' => $this->hasNewerThan(end($asEntries)['id'] ?? 0) @@ -86,18 +86,18 @@ class Journal extends PhpObject { * everything after it is blank. */ public function getEntryIdAtDate(string $sDate): string { - if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); + if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); $oDate = \DateTime::createFromFormat('Y-m-d', $sDate); - if(!$oDate) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND); + if(!$oDate) return Daydream::getJsonResult(false, Daydream::NOT_FOUND); $sDate = $oDate->format('Y-m-d'); $sMidnight = $sDate.' 00:00:00'; $iEntryId = $this->selectFirstId(['started_on' => $sMidnight], ['started_on' => ' >= '], 'ASC'); if(!$iEntryId) $iEntryId = $this->selectFirstId(['started_on' => $sMidnight], ['started_on' => ' < '], 'DESC'); - if(!$iEntryId) return MyThoughts::getJsonResult(false, 'book.no_entry_yet'); + if(!$iEntryId) return Daydream::getJsonResult(false, 'book.no_entry_yet'); - return MyThoughts::getJsonResult(true, '', ['id' => (int) $iEntryId]); + return Daydream::getJsonResult(true, '', ['id' => (int) $iEntryId]); } /* Writing */ @@ -107,7 +107,7 @@ class Journal extends PhpObject { * open from a reload a minute ago, or a fresh one stamped with now. */ public function openEntry(): string { - if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); + if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); $this->sealStaleEntries(); @@ -119,27 +119,27 @@ class Journal extends PhpObject { 'content' => '', 'status' => self::STATUS_OPEN, 'started_on' => date(Db::TIMESTAMP_FORMAT), - 'closed_on' => MyThoughts::ZERO_TIMESTAMP, + 'closed_on' => Daydream::ZERO_TIMESTAMP, 'timezone' => date_default_timezone_get() ]); - if($iEntryId <= 0) return MyThoughts::getJsonResult(false, 'error.commit_db'); + if($iEntryId <= 0) return Daydream::getJsonResult(false, 'error.commit_db'); } - return MyThoughts::getJsonResult(true, '', ['entry' => $this->getEntryById($iEntryId)]); + return Daydream::getJsonResult(true, '', ['entry' => $this->getEntryById($iEntryId)]); } public function saveEntry(int $iEntryId, string $sContent): string { - if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); - if(!$this->ownsEntry($iEntryId)) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND); + if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); + if(!$this->ownsEntry($iEntryId)) return Daydream::getJsonResult(false, Daydream::NOT_FOUND); $sContent = self::normaliseContent($sContent); if($this->oDb->updateRow(self::ENTRY_TABLE, $iEntryId, ['content' => $sContent]) === false) { - return MyThoughts::getJsonResult(false, 'error.commit_db'); + return Daydream::getJsonResult(false, 'error.commit_db'); } - return MyThoughts::getJsonResult(true, '', ['id' => $iEntryId, 'saved_at' => time()]); + return Daydream::getJsonResult(true, '', ['id' => $iEntryId, 'saved_at' => time()]); } /** @@ -147,11 +147,11 @@ class Journal extends PhpObject { * nobody actually wrote in is dropped rather than left as a blank page. */ public function closeEntry(int $iEntryId, string $sContent = '', bool $bHasContent = false): string { - if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); - if(!$this->ownsEntry($iEntryId)) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND); + if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); + if(!$this->ownsEntry($iEntryId)) return Daydream::getJsonResult(false, Daydream::NOT_FOUND); $asResult = $this->sealEntry($iEntryId, $bHasContent ? $sContent : null); - return MyThoughts::getJsonResult($asResult['result'], $asResult['desc_lang_id'], $asResult['data']); + return Daydream::getJsonResult($asResult['result'], $asResult['desc_lang_id'], $asResult['data']); } /** @@ -169,23 +169,23 @@ class Journal extends PhpObject { if(trim($sStored) === '') { $this->oDb->deleteRow(self::ENTRY_TABLE, $iEntryId); - return MyThoughts::getResult(true, '', ['id' => $iEntryId, 'discarded' => true]); + return Daydream::getResult(true, '', ['id' => $iEntryId, 'discarded' => true]); } if($this->oDb->updateRow(self::ENTRY_TABLE, $iEntryId, $asData) === false) { - return MyThoughts::getResult(false, 'error.commit_db'); + return Daydream::getResult(false, 'error.commit_db'); } - return MyThoughts::getResult(true, '', ['entry' => $this->getEntryById($iEntryId), 'discarded' => false]); + return Daydream::getResult(true, '', ['entry' => $this->getEntryById($iEntryId), 'discarded' => false]); } public function deleteEntry(int $iEntryId): string { - if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED); - if(!$this->ownsEntry($iEntryId)) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND); + if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED); + if(!$this->ownsEntry($iEntryId)) return Daydream::getJsonResult(false, Daydream::NOT_FOUND); - if(!$this->oDb->deleteRow(self::ENTRY_TABLE, $iEntryId)) return MyThoughts::getJsonResult(false, 'error.commit_db'); + if(!$this->oDb->deleteRow(self::ENTRY_TABLE, $iEntryId)) return Daydream::getJsonResult(false, 'error.commit_db'); - return MyThoughts::getJsonResult(true, 'book.entry_deleted', ['id' => $iEntryId]); + return Daydream::getJsonResult(true, 'book.entry_deleted', ['id' => $iEntryId]); } /* Internals */ diff --git a/lib/User.php b/lib/User.php index 0b543c8..a361b42 100644 --- a/lib/User.php +++ b/lib/User.php @@ -1,6 +1,6 @@ '', 'language' => '', 'timezone' => '', - 'hand' => MyThoughts::DEFAULT_HAND, + 'hand' => Daydream::DEFAULT_HAND, 'clearance' => self::CLEARANCE_USER ]; //Session & Cookie private const SESSION_ID_USER = 'id_user'; - private const COOKIE_TOKEN = 'mythoughts'; + private const COOKIE_TOKEN = 'daydream'; private const COOKIE_DURATION = 60 * 60 * 24 * 90; //3 months private Db $oDb; @@ -101,14 +101,14 @@ class User extends PhpObject { $sEmail = mb_strtolower(trim($sEmail)); $sName = mb_substr(trim($sName), 0, self::MAX_NAME_LENGTH); - if($sName === '') return MyThoughts::getResult(false, 'account.name_required'); - if(!filter_var($sEmail, FILTER_VALIDATE_EMAIL)) return MyThoughts::getResult(false, 'account.invalid_email'); - if(mb_strlen($sPassword) < self::MIN_PASSWORD_LENGTH) return MyThoughts::getResult(false, 'account.password_too_short', [], [self::MIN_PASSWORD_LENGTH]); + if($sName === '') return Daydream::getResult(false, 'account.name_required'); + if(!filter_var($sEmail, FILTER_VALIDATE_EMAIL)) return Daydream::getResult(false, 'account.invalid_email'); + if(mb_strlen($sPassword) < self::MIN_PASSWORD_LENGTH) return Daydream::getResult(false, 'account.password_too_short', [], [self::MIN_PASSWORD_LENGTH]); //Taken emails must not be distinguishable from a wrong password, so the //message stays the same one login gives - no account enumeration here. if($this->oDb->selectId(self::USER_TABLE, ['email' => $sEmail]) > 0) { - return MyThoughts::getResult(false, 'account.invalid_credentials'); + return Daydream::getResult(false, 'account.invalid_credentials'); } $iUserId = $this->oDb->insertRow(self::USER_TABLE, [ @@ -117,14 +117,14 @@ class User extends PhpObject { 'password' => password_hash($sPassword, PASSWORD_DEFAULT), 'language' => $sLang, 'timezone' => $sTimezone, - 'hand' => MyThoughts::DEFAULT_HAND, + 'hand' => Daydream::DEFAULT_HAND, 'clearance' => self::CLEARANCE_USER ]); - if($iUserId <= 0) return MyThoughts::getResult(false, 'error.commit_db'); + if($iUserId <= 0) return Daydream::getResult(false, 'error.commit_db'); $this->openSessionFor($iUserId, true); - return MyThoughts::getResult(true, 'account.welcome', ['user' => $this->getUserInfo()]); + return Daydream::getResult(true, 'account.welcome', ['user' => $this->getUserInfo()]); } public function login(string $sEmail, string $sPassword, string $sTimezone, bool $bRemember): array { @@ -142,14 +142,14 @@ class User extends PhpObject { $sHash = $asDbUser['password'] ?? ''; $bValid = ($sHash !== '') ? password_verify($sPassword, $sHash) : password_verify($sPassword, '$2y$10$'.str_repeat('.', 53)); - if($iUserId <= 0 || !$bValid) return MyThoughts::getResult(false, 'account.invalid_credentials'); + if($iUserId <= 0 || !$bValid) return Daydream::getResult(false, 'account.invalid_credentials'); if($sTimezone !== '' && $sTimezone !== ($asDbUser['timezone'] ?? '')) { $this->oDb->updateRow(self::USER_TABLE, $iUserId, ['timezone' => $sTimezone]); } $this->openSessionFor($iUserId, $bRemember); - return MyThoughts::getResult(true, 'account.logged_in', ['user' => $this->getUserInfo()]); + return Daydream::getResult(true, 'account.logged_in', ['user' => $this->getUserInfo()]); } public function logout(): array { @@ -159,24 +159,24 @@ class User extends PhpObject { if(session_status() === PHP_SESSION_ACTIVE) session_regenerate_id(true); $this->setUserId(0); - return MyThoughts::getResult(true, 'account.logged_out'); + return Daydream::getResult(true, 'account.logged_out'); } public function updateSettings(string $sField, string $sValue): array { - if(!$this->isLoggedIn()) return MyThoughts::getResult(false, MyThoughts::UNAUTHORIZED); - if(!in_array($sField, ['name', 'language', 'timezone', 'hand'], true)) return MyThoughts::getResult(false, MyThoughts::NOT_FOUND); + if(!$this->isLoggedIn()) return Daydream::getResult(false, Daydream::UNAUTHORIZED); + if(!in_array($sField, ['name', 'language', 'timezone', 'hand'], true)) return Daydream::getResult(false, Daydream::NOT_FOUND); $sValue = mb_substr(trim($sValue), 0, self::MAX_NAME_LENGTH); - if($sField === 'name' && $sValue === '') return MyThoughts::getResult(false, 'account.name_required'); - if($sField === 'timezone' && !in_array($sValue, \DateTimeZone::listIdentifiers(), true)) return MyThoughts::getResult(false, MyThoughts::NOT_FOUND); - if($sField === 'hand' && !in_array($sValue, MyThoughts::getHandIds(), true)) return MyThoughts::getResult(false, MyThoughts::NOT_FOUND); + if($sField === 'name' && $sValue === '') return Daydream::getResult(false, 'account.name_required'); + if($sField === 'timezone' && !in_array($sValue, \DateTimeZone::listIdentifiers(), true)) return Daydream::getResult(false, Daydream::NOT_FOUND); + if($sField === 'hand' && !in_array($sValue, Daydream::getHandIds(), true)) return Daydream::getResult(false, Daydream::NOT_FOUND); if(!$this->oDb->updateRow(self::USER_TABLE, $this->iUserId, [$sField => $sValue])) { - return MyThoughts::getResult(false, 'error.commit_db'); + return Daydream::getResult(false, 'error.commit_db'); } $this->setUserId($this->iUserId); - return MyThoughts::getResult(true, 'account.saved', ['user' => $this->getUserInfo()]); + return Daydream::getResult(true, 'account.saved', ['user' => $this->getUserInfo()]); } /* Session plumbing */ @@ -255,7 +255,7 @@ class User extends PhpObject { private function clearTokenCookie(): void { if($this->isLoggedIn()) { - $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, ['token' => '', 'token_exp' => MyThoughts::ZERO_TIMESTAMP]); + $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, ['token' => '', 'token_exp' => Daydream::ZERO_TIMESTAMP]); } $this->writeCookie('', time() - 3600); diff --git a/package-lock.json b/package-lock.json index da7031e..9e97bb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "mythoughts", + "name": "daydream", "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "mythoughts", + "name": "daydream", "version": "2.0.0", "dependencies": { "@fontsource-variable/caveat": "^5.3.0", diff --git a/package.json b/package.json index 4d38e28..33b3804 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "mythoughts", - "description": "A journal that behaves like an open book: write the left page, then the right, then turn.", + "name": "daydream", + "description": "a place for wandering thoughts.", "version": "2.0.0", "private": true, "type": "module", diff --git a/public/index.php b/public/index.php index afaaa4b..61e2d57 100644 --- a/public/index.php +++ b/public/index.php @@ -2,6 +2,6 @@ require __DIR__.'/../vendor/autoload.php'; -use Franzz\MyThoughts\Controller; +use Franzz\Daydream\Controller; echo (new Controller())->handle(__FILE__, $argv ?? []); diff --git a/resources/lang/en.json b/resources/lang/en.json index f753007..223daa9 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -36,8 +36,8 @@ "hand_sample": "The morning came" }, "book": { - "title": "MyThoughts", - "tagline": "Your thoughts, on paper.", + "title": "Daydream", + "tagline": "a place for wandering thoughts.", "write_here": "Write here…", "first_page": "This is the first page of your book.", "no_entry_yet": "Nothing was written around that date.", diff --git a/resources/lang/fr.json b/resources/lang/fr.json index e8e4b97..7c605aa 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -36,8 +36,8 @@ "hand_sample": "Le matin est venu" }, "book": { - "title": "MyThoughts", - "tagline": "Vos pensées, sur le papier.", + "title": "Daydream", + "tagline": "Où l'esprit vagabonde.", "write_here": "Écrivez ici…", "first_page": "C'est la première page de votre carnet.", "no_entry_yet": "Rien n'a été écrit autour de cette date.", diff --git a/resources/masks/index.html b/resources/masks/index.html index 0a9a35c..1affd2b 100644 --- a/resources/masks/index.html +++ b/resources/masks/index.html @@ -6,10 +6,10 @@ - + - - + + [#]title[#] diff --git a/src/App.vue b/src/App.vue index d2f48d9..96828eb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -184,8 +184,12 @@ export default {

- - {{ lang.get('book.tagline') }} + + + + {{ consts.title }} + {{ lang.get('book.tagline') }} +

diff --git a/src/app.js b/src/app.js index 31c1514..fcfd7b4 100644 --- a/src/app.js +++ b/src/app.js @@ -11,7 +11,7 @@ import { createApp, reactive } from 'vue'; import App from './App.vue'; //Style -import '@styles/mythoughts.scss'; +import '@styles/daydream.scss'; //App Configuration from PHP const appConfig = JSON.parse(document.getElementById('app-config').textContent); diff --git a/src/components/AuthPanel.vue b/src/components/AuthPanel.vue index 5e30791..71cfe92 100644 --- a/src/components/AuthPanel.vue +++ b/src/components/AuthPanel.vue @@ -84,8 +84,8 @@ export default {
- - + +

{{ bNewBook ? lang.get('account.sign_up') : lang.get('account.sign_in') }}

diff --git a/src/components/BookmarkRail.vue b/src/components/BookmarkRail.vue index 1de43c8..7f73285 100644 --- a/src/components/BookmarkRail.vue +++ b/src/components/BookmarkRail.vue @@ -1,6 +1,33 @@