From fe0b7ca0625ec94362b186c66b57b31644a4246b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 18 Dec 2020 22:30:10 +0100
Subject: [PATCH 1/2] Add setting for sending reminder emails

---
 src/models/userName.js       | 10 -------
 src/models/userSettings.js   | 11 +++++++
 src/services/userName.js     | 10 -------
 src/services/userSettings.js | 10 +++++++
 src/store/modules/auth.js    |  3 +-
 src/views/user/Settings.vue  | 57 ++++++++++++++++++++----------------
 6 files changed, 55 insertions(+), 46 deletions(-)
 delete mode 100644 src/models/userName.js
 create mode 100644 src/models/userSettings.js
 delete mode 100644 src/services/userName.js
 create mode 100644 src/services/userSettings.js

diff --git a/src/models/userName.js b/src/models/userName.js
deleted file mode 100644
index 1e1cc5d4e..000000000
--- a/src/models/userName.js
+++ /dev/null
@@ -1,10 +0,0 @@
-
-import AbstractModel from './abstractModel'
-
-export default class UserNameModel extends AbstractModel {
-	defaults() {
-		return {
-			name: '',
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/models/userSettings.js b/src/models/userSettings.js
new file mode 100644
index 000000000..2a11061f3
--- /dev/null
+++ b/src/models/userSettings.js
@@ -0,0 +1,11 @@
+
+import AbstractModel from './abstractModel'
+
+export default class UserSettingsModel extends AbstractModel {
+	defaults() {
+		return {
+			name: '',
+			emailRemindersEnabled: true,
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/services/userName.js b/src/services/userName.js
deleted file mode 100644
index 83a09cd72..000000000
--- a/src/services/userName.js
+++ /dev/null
@@ -1,10 +0,0 @@
-
-import AbstractService from './abstractService'
-
-export default class UserNameService extends AbstractService {
-	constructor() {
-		super({
-			update: '/user/settings/name',
-		})
-	}
-}
\ No newline at end of file
diff --git a/src/services/userSettings.js b/src/services/userSettings.js
new file mode 100644
index 000000000..eb7aebf2e
--- /dev/null
+++ b/src/services/userSettings.js
@@ -0,0 +1,10 @@
+
+import AbstractService from './abstractService'
+
+export default class UserSettingsService extends AbstractService {
+	constructor() {
+		super({
+			update: '/user/settings/general',
+		})
+	}
+}
\ No newline at end of file
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index b431d53e4..6dd48623c 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -16,8 +16,9 @@ export default {
 			state.info = info
 			state.avatarUrl = info.getAvatarUrl()
 		},
-		setUserName(state, name) {
+		setUserSettings(state, {name, emailRemindersEnabled}) {
 			state.info.name = name
+			state.info.emailRemindersEnabled = emailRemindersEnabled
 		},
 		authenticated(state, authenticated) {
 			state.authenticated = authenticated
diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue
index 5fabdd950..2e552b349 100644
--- a/src/views/user/Settings.vue
+++ b/src/views/user/Settings.vue
@@ -106,30 +106,36 @@
 			</div>
 		</div>
 
-		<!-- Name -->
+		<!-- General -->
 		<div class="card update-name">
 			<header class="card-header">
 				<p class="card-header-title">
-					Update your name
+					General Settings
 				</p>
 			</header>
 			<div class="card-content">
 				<div class="content">
-						<div class="field">
-							<label class="label" for="newName">Name</label>
-							<div class="control">
-								<input
-									@keyup.enter="updateName"
-									class="input"
-									id="newName"
-									placeholder="The new name"
-									type="text"
-									v-model="name"/>
-							</div>
+					<div class="field">
+						<label class="label" for="newName">Name</label>
+						<div class="control">
+							<input
+								@keyup.enter="updateSettings"
+								class="input"
+								id="newName"
+								placeholder="The new name"
+								type="text"
+								v-model="settings.name"/>
 						</div>
+					</div>
+					<div class="field">
+						<label class="checkbox">
+							<input type="checkbox" v-model="settings.emailRemindersEnabled"/>
+							Send me Reminders for tasks via Email
+						</label>
+					</div>
 
 					<div class="bigbuttons">
-						<button :class="{ 'is-loading': userNameService.loading}" @click="updateName()"
+						<button :class="{ 'is-loading': userSettingsService.loading}" @click="updateSettings()"
 								class="button is-primary is-fullwidth">
 							Save
 						</button>
@@ -266,8 +272,8 @@ import EmailUpdateService from '../../services/emailUpdate'
 import EmailUpdateModel from '../../models/emailUpdate'
 import TotpModel from '../../models/totp'
 import TotpService from '../../services/totp'
-import UserNameService from '../../services/userName'
-import UserNameModel from '../../models/userName'
+import UserSettingsService from '../../services/userSettings'
+import UserSettingsModel from '../../models/userSettings'
 
 import {mapState} from 'vuex'
 
@@ -295,8 +301,8 @@ export default {
 
 			caldavUrl: '',
 
-			name: '',
-			userNameService: UserNameService,
+			settings: UserSettingsModel,
+			userSettingsService: UserSettingsService,
 		}
 	},
 	components: {
@@ -312,8 +318,11 @@ export default {
 		this.totpService = new TotpService()
 		this.totp = new TotpModel()
 
-		this.userNameService = new UserNameService()
-		this.name = this.$store.state.auth.info.name
+		this.userSettingsService = new UserSettingsService()
+		this.settings = new UserSettingsModel({
+			name: this.$store.state.auth.info.name,
+			emailRemindersEnabled: this.$store.state.auth.info.emailRemindersEnabled ?? false,
+		})
 
 		this.totpStatus()
 		this.buildCaldavUrl()
@@ -399,12 +408,10 @@ export default {
 				})
 				.catch(e => this.error(e, this))
 		},
-		updateName() {
-			const name = new UserNameModel({name: this.name})
-
-			this.userNameService.update(name)
+		updateSettings() {
+			this.userSettingsService.update(this.settings)
 				.then(() => {
-					this.$store.commit('auth/setUserName', this.name)
+					this.$store.commit('auth/setUserSettings', this.settings)
 					this.success({message: 'The name was successfully changed.'}, this)
 				})
 				.catch(e => this.error(e, this))
-- 
2.40.1


From 4176e433551a45ed4e0f5f49c436943e3c66aada Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 18 Dec 2020 22:33:02 +0100
Subject: [PATCH 2/2] Fix the "Import your data button" in the settings

---
 src/views/user/Settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue
index 2e552b349..aa49f4b40 100644
--- a/src/views/user/Settings.vue
+++ b/src/views/user/Settings.vue
@@ -223,7 +223,7 @@
 			<div class="card-content">
 				<router-link
 					:to="{name: 'migrate.start'}"
-					class="button is-primary is-right noshadow is-outlined"
+					class="button is-primary"
 					v-if="migratorsEnabled"
 				>
 					Import your data into Vikunja
-- 
2.40.1