Merge branch '91-favourite-projects-disappearing-after-log-out-log-in' into 'main'

Persist favorites, bookmarks and settings after logging out

Closes #91

See merge request mvanremmerden/gitdock!96
This commit is contained in:
Marcel van Remmerden 2022-03-27 05:57:58 +00:00
commit 6d5ba447dc
3 changed files with 9 additions and 11 deletions

View File

@ -406,15 +406,8 @@ function logout() {
deleteFromStore('username');
deleteFromStore('access_token');
deleteFromStore('custom_cert_path');
deleteFromStore('favorite-projects');
deleteFromStore('bookmarks');
deleteFromStore('host');
deleteFromStore('plan');
deleteFromStore('keep_visible');
deleteFromStore('show_dock_icon');
deleteFromStore('analytics');
deleteFromStore('analytics_id');
deleteFromStore('shortcuts');
mb.window.webContents.session.clearCache();
mb.window.webContents.session.clearStorageData();
app.quit();
@ -929,7 +922,12 @@ async function saveUser(accessToken, url = store.host, customCertPath = undefine
store.custom_cert_path = customCertPath;
}
getUsersProjects().then(async (projects) => {
if (projects && projects.length > 0) {
if (
store['favorite-projects'] &&
store['favorite-projects'].length === 0 &&
projects &&
projects.length > 0
) {
store['favorite-projects'] = projects;
}
// eslint-disable-next-line no-use-before-define

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "gitdock",
"version": "0.1.21",
"version": "0.1.22",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "gitdock",
"version": "0.1.21",
"version": "0.1.22",
"dependencies": {
"electron-squirrel-startup": "^1.0.0",
"electron-store": "^8.0.0",

View File

@ -1,7 +1,7 @@
{
"name": "gitdock",
"productName": "GitDock",
"version": "0.1.21",
"version": "0.1.22",
"description": "A better way of managing all your work on GitLab.",
"main": "myApp.js",
"scripts": {