From 5cb09bc4c6dd4b2fcb8fe5de30e89857be2e0e50 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 13 Aug 2022 18:00:07 +0200
Subject: [PATCH] show information about demo account if enabled

---
 commafeed-client/src/app/types.ts                             | 1 +
 commafeed-client/src/locales/en/messages.po                   | 4 ++++
 commafeed-client/src/locales/fr/messages.po                   | 4 ++++
 commafeed-client/src/pages/auth/LoginPage.tsx                 | 1 +
 commafeed-server/config.dev.yml                               | 2 +-
 .../main/java/com/commafeed/frontend/model/ServerInfo.java    | 3 +++
 .../main/java/com/commafeed/frontend/resource/ServerREST.java | 1 +
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/commafeed-client/src/app/types.ts b/commafeed-client/src/app/types.ts
index ae2cbecd..17dcc5c0 100644
--- a/commafeed-client/src/app/types.ts
+++ b/commafeed-client/src/app/types.ts
@@ -160,6 +160,7 @@ export interface ServerInfo {
     allowRegistrations: boolean
     googleAnalyticsCode?: string
     smtpEnabled: boolean
+    demoAccountEnabled: boolean
 }
 
 export interface Settings {
diff --git a/commafeed-client/src/locales/en/messages.po b/commafeed-client/src/locales/en/messages.po
index 5e856b21..6fd5657f 100644
--- a/commafeed-client/src/locales/en/messages.po
+++ b/commafeed-client/src/locales/en/messages.po
@@ -468,6 +468,10 @@ msgstr "The URL for the feed you want to subscribe to. You can also use the webs
 msgid "Theme"
 msgstr "Theme"
 
+#: src/pages/auth/LoginPage.tsx
+msgid "Try out CommaFeed with the demo account: demo/demo"
+msgstr "Try out CommaFeed with the demo account: demo/demo"
+
 #: src/components/header/Header.tsx
 msgid "Unread"
 msgstr "Unread"
diff --git a/commafeed-client/src/locales/fr/messages.po b/commafeed-client/src/locales/fr/messages.po
index dcbdaddb..4f0f6789 100644
--- a/commafeed-client/src/locales/fr/messages.po
+++ b/commafeed-client/src/locales/fr/messages.po
@@ -468,6 +468,10 @@ msgstr "L'URL du flux auquel vous souhaitez vous abonner. Vous pouvez aussi util
 msgid "Theme"
 msgstr "Thème"
 
+#: src/pages/auth/LoginPage.tsx
+msgid "Try out CommaFeed with the demo account: demo/demo"
+msgstr "Essayez CommaFeed avec le compte de démonstration : demo/demo"
+
 #: src/components/header/Header.tsx
 msgid "Unread"
 msgstr "Non lu"
diff --git a/commafeed-client/src/pages/auth/LoginPage.tsx b/commafeed-client/src/pages/auth/LoginPage.tsx
index 766c65a8..c3d00449 100644
--- a/commafeed-client/src/pages/auth/LoginPage.tsx
+++ b/commafeed-client/src/pages/auth/LoginPage.tsx
@@ -51,6 +51,7 @@ export function LoginPage() {
                             label={t`User Name or E-mail`}
                             placeholder={t`User Name or E-mail`}
                             {...form.getInputProps("name")}
+                            description={serverInfos?.demoAccountEnabled ? t`Try out CommaFeed with the demo account: demo/demo` : ""}
                             size="md"
                             required
                         />
diff --git a/commafeed-server/config.dev.yml b/commafeed-server/config.dev.yml
index b8893b9b..e98bdb7a 100644
--- a/commafeed-server/config.dev.yml
+++ b/commafeed-server/config.dev.yml
@@ -8,7 +8,7 @@ app:
   allowRegistrations: true
   
   # create a demo account the first time the app starts
-  createDemoAccount: false
+  createDemoAccount: true
   
   # put your google analytics tracking code here
   googleAnalyticsTrackingCode:
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java
index c10fc069..b305c97c 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/ServerInfo.java
@@ -29,4 +29,7 @@ public class ServerInfo implements Serializable {
 	@ApiModelProperty(required = true)
 	private boolean smtpEnabled;
 
+	@ApiModelProperty(required = true)
+	private boolean demoAccountEnabled;
+
 }
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java
index 199cbc2f..41c1b7fe 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/ServerREST.java
@@ -52,6 +52,7 @@ public class ServerREST {
 		infos.setAllowRegistrations(config.getApplicationSettings().getAllowRegistrations());
 		infos.setGoogleAnalyticsCode(config.getApplicationSettings().getGoogleAnalyticsTrackingCode());
 		infos.setSmtpEnabled(StringUtils.isNotBlank(config.getApplicationSettings().getSmtpHost()));
+		infos.setDemoAccountEnabled(config.getApplicationSettings().getCreateDemoAccount());
 		return Response.ok(infos).build();
 	}