diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 0547ab32894..8f5a4d33e00 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -46,6 +46,7 @@ class MyController < ApplicationController
menu_item :password, only: [:password]
menu_item :access_token, only: [:access_token]
menu_item :notifications, only: [:notifications]
+ menu_item :reminders, only: [:reminders]
def account; end
@@ -81,23 +82,30 @@ class MyController < ApplicationController
# Administer access tokens
def access_token; end
- # Configure user's mail notifications
+ # Configure user's in app notifications
def notifications
render html: '',
layout: 'angular',
locals: { menu_name: :my_menu }
end
+ # Configure user's mail reminders
+ def reminders
+ render html: '',
+ layout: 'angular',
+ locals: { menu_name: :my_menu }
+ end
+
# Create a new feeds key
def generate_rss_key
- if request.post?
- token = Token::RSS.create!(user: current_user)
- flash[:info] = [
- t('my.access_token.notice_reset_token', type: 'RSS').html_safe,
- content_tag(:strong, token.plain_value),
- t('my.access_token.token_value_warning')
- ]
- end
+ token = Token::RSS.create!(user: current_user)
+ flash[:info] = [
+ # rubocop:disable Rails/OutputSafety
+ t('my.access_token.notice_reset_token', type: 'RSS').html_safe,
+ # rubocop:enable Rails/OutputSafety
+ content_tag(:strong, token.plain_value),
+ t('my.access_token.token_value_warning')
+ ]
rescue StandardError => e
Rails.logger.error "Failed to reset user ##{current_user.id} RSS key: #{e}"
flash[:error] = t('my.access_token.failed_to_reset_token', error: e.message)
@@ -107,14 +115,14 @@ class MyController < ApplicationController
# Create a new API key
def generate_api_key
- if request.post?
- token = Token::API.create!(user: current_user)
- flash[:info] = [
- t('my.access_token.notice_reset_token', type: 'API').html_safe,
- content_tag(:strong, token.plain_value),
- t('my.access_token.token_value_warning')
- ]
- end
+ token = Token::API.create!(user: current_user)
+ flash[:info] = [
+ # rubocop:disable Rails/OutputSafety
+ t('my.access_token.notice_reset_token', type: 'API').html_safe,
+ # rubocop:enable Rails/OutputSafety
+ content_tag(:strong, token.plain_value),
+ t('my.access_token.token_value_warning')
+ ]
rescue StandardError => e
Rails.logger.error "Failed to reset user ##{current_user.id} API key: #{e}"
flash[:error] = t('my.access_token.failed_to_reset_token', error: e.message)
diff --git a/config/initializers/menus.rb b/config/initializers/menus.rb
index 46dd2450b18..b5e76a346af 100644
--- a/config/initializers/menus.rb
+++ b/config/initializers/menus.rb
@@ -137,6 +137,10 @@ Redmine::MenuManager.map :my_menu do |menu|
{ controller: '/my', action: 'notifications' },
caption: I18n.t('js.notifications.settings.title'),
icon: 'icon2 icon-bell'
+ menu.push :reminders,
+ { controller: '/my', action: 'reminders' },
+ caption: I18n.t('js.reminders.settings.title'),
+ icon: 'icon2 icon-email-alert'
menu.push :delete_account, :delete_my_account_info_path,
caption: I18n.t('account.delete'),
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index cef93364866..65a9478fa1a 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -627,6 +627,15 @@ en:
autocompleter:
label: 'Project autocompletion'
+ reminders:
+ settings:
+ daily:
+ title: 'Send me daily email reminders for unread notifications'
+ explanation: 'You will receive these reminders only for unread notifications and only at hours you specify.'
+ label: 'Time %{counter}'
+ title: 'Email reminders'
+
+
text_are_you_sure: "Are you sure?"
text_data_lost: "All entered data will be lost."
diff --git a/config/routes.rb b/config/routes.rb
index 42fb85a6fb3..ca4ea7e6a44 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -552,6 +552,7 @@ OpenProject::Application.routes.draw do
get '/my/account', action: 'account'
get '/my/settings', action: 'settings'
get '/my/notifications', action: 'notifications'
+ get '/my/reminders', action: 'reminders'
patch '/my/account', action: 'update_account'
patch '/my/settings', action: 'update_settings'
diff --git a/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.html b/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.html
new file mode 100644
index 00000000000..5cb11bff6ba
--- /dev/null
+++ b/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.html
@@ -0,0 +1,19 @@
+
+
+
+
+ {{text.label(i + 1)}}
+
+
diff --git a/frontend/src/app/features/user-preferences/reminder-settings/reminder-time/reminder-settings-daily-time.component.ts b/frontend/src/app/features/user-preferences/reminder-settings/reminder-time/reminder-settings-daily-time.component.ts
new file mode 100644
index 00000000000..72944ba93d5
--- /dev/null
+++ b/frontend/src/app/features/user-preferences/reminder-settings/reminder-time/reminder-settings-daily-time.component.ts
@@ -0,0 +1,30 @@
+import { Component, Input, OnInit } from "@angular/core";
+import { ChangeDetectionStrategy } from "@angular/core";
+import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { UserPreferencesStore } from 'core-app/features/user-preferences/state/user-preferences.store';
+
+@Component({
+ selector: 'op-reminder-settings-daily-time',
+ templateUrl: './reminder-settings-daily-time.component.html',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ReminderSettingsDailyTimeComponent implements OnInit {
+ public dailyReminderTimes = ["08:00", "12:00", "16:00"]
+
+ text = {
+ label: (counter:number):string => this.I18n.t('js.reminders.settings.daily.label', { counter: counter }),
+ };
+
+ constructor(
+ private I18n:I18nService,
+ private store:UserPreferencesStore,
+ ) {
+ }
+
+ ngOnInit():void {
+
+ }
+
+ public saveChanges():void {
+ }
+}
diff --git a/frontend/src/app/features/user-preferences/user-preferences.lazy-routes.ts b/frontend/src/app/features/user-preferences/user-preferences.lazy-routes.ts
index c5c41633822..51a75249c0f 100644
--- a/frontend/src/app/features/user-preferences/user-preferences.lazy-routes.ts
+++ b/frontend/src/app/features/user-preferences/user-preferences.lazy-routes.ts
@@ -39,4 +39,9 @@ export const MY_ACCOUNT_LAZY_ROUTES:Ng2StateDeclaration[] = [
url: '/users/:userId/edit/notifications',
loadChildren: () => import('./user-preferences.module').then((m) => m.OpenProjectMyAccountModule),
},
+ {
+ name: 'my_reminders.**',
+ url: '/my/reminders',
+ loadChildren: () => import('./user-preferences.module').then((m) => m.OpenProjectMyAccountModule),
+ },
];
diff --git a/frontend/src/app/features/user-preferences/user-preferences.module.ts b/frontend/src/app/features/user-preferences/user-preferences.module.ts
index 3b31d787a96..b65caa0559e 100644
--- a/frontend/src/app/features/user-preferences/user-preferences.module.ts
+++ b/frontend/src/app/features/user-preferences/user-preferences.module.ts
@@ -13,6 +13,8 @@ import { NotificationSettingInlineCreateComponent } from 'core-app/features/user
import { MY_ACCOUNT_ROUTES } from 'core-app/features/user-preferences/user-preferences.routes';
import { NotificationsSettingsToolbarComponent } from './notifications-settings/toolbar/notifications-settings-toolbar.component';
import { NotificationSettingsTableComponent } from './notifications-settings/table/notification-settings-table.component';
+import { ReminderSettingsPageComponent } from './reminder-settings/page/reminder-settings-page.component';
+import { ReminderSettingsDailyTimeComponent } from 'core-app/features/user-preferences/reminder-settings/reminder-time/reminder-settings-daily-time.component';
@NgModule({
providers: [
@@ -26,6 +28,8 @@ import { NotificationSettingsTableComponent } from './notifications-settings/tab
NotificationSettingInlineCreateComponent,
NotificationsSettingsToolbarComponent,
NotificationSettingsTableComponent,
+ ReminderSettingsPageComponent,
+ ReminderSettingsDailyTimeComponent
],
imports: [
CommonModule,
diff --git a/frontend/src/app/features/user-preferences/user-preferences.routes.ts b/frontend/src/app/features/user-preferences/user-preferences.routes.ts
index 19cd25e5776..9b6ec82df99 100644
--- a/frontend/src/app/features/user-preferences/user-preferences.routes.ts
+++ b/frontend/src/app/features/user-preferences/user-preferences.routes.ts
@@ -28,6 +28,7 @@
import { Ng2StateDeclaration } from '@uirouter/angular';
import { NotificationsSettingsPageComponent } from 'core-app/features/user-preferences/notifications-settings/page/notifications-settings-page.component';
+import { ReminderSettingsPageComponent } from './reminder-settings/page/reminder-settings-page.component';
export const MY_ACCOUNT_ROUTES:Ng2StateDeclaration[] = [
{
@@ -40,4 +41,9 @@ export const MY_ACCOUNT_ROUTES:Ng2StateDeclaration[] = [
url: '/users/:userId/edit/notifications',
component: NotificationsSettingsPageComponent,
},
+ {
+ name: 'my_reminders',
+ url: '/my/reminders',
+ component: ReminderSettingsPageComponent,
+ },
];
diff --git a/frontend/src/assets/fonts/openproject_icon/openproject-icon-font.svg b/frontend/src/assets/fonts/openproject_icon/openproject-icon-font.svg
index b21c0578ef4..8336ce11080 100644
--- a/frontend/src/assets/fonts/openproject_icon/openproject-icon-font.svg
+++ b/frontend/src/assets/fonts/openproject_icon/openproject-icon-font.svg
@@ -232,563 +232,566 @@
+