diff --git a/src/main/java/com/commafeed/frontend/model/RegistrationRequest.java b/src/main/java/com/commafeed/frontend/model/RegistrationRequest.java index 799c27ac..4c95057c 100644 --- a/src/main/java/com/commafeed/frontend/model/RegistrationRequest.java +++ b/src/main/java/com/commafeed/frontend/model/RegistrationRequest.java @@ -8,6 +8,7 @@ public class RegistrationRequest implements Serializable { private String name; private String password; private String email; + private boolean googleImport = true; public String getName() { return name; @@ -33,4 +34,12 @@ public class RegistrationRequest implements Serializable { this.email = email; } + public boolean isGoogleImport() { + return googleImport; + } + + public void setGoogleImport(boolean googleImport) { + this.googleImport = googleImport; + } + } diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.css b/src/main/java/com/commafeed/frontend/pages/WelcomePage.css new file mode 100644 index 00000000..b576700f --- /dev/null +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.css @@ -0,0 +1,3 @@ +.header { + margin: 20px 0 40px 0; +} \ No newline at end of file diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html index 3d180549..474f736f 100644 --- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html @@ -1,13 +1,13 @@ - - CommaFeed - + +CommaFeed +
-
+

CommaFeed

Bloat-free feed reader. @@ -15,14 +15,24 @@
-

Login

- +
+

Login

+ +
-

Register

- +
+

Register

+ +
+ +
+
+ © CommaFeed - 2013 +
+
diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.java b/src/main/java/com/commafeed/frontend/pages/WelcomePage.java index dc922cef..7258db7b 100644 --- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.java +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.java @@ -2,9 +2,12 @@ package com.commafeed.frontend.pages; import javax.inject.Inject; +import org.apache.wicket.markup.head.IHeaderResponse; + import com.commafeed.backend.dao.ApplicationSettingsService; import com.commafeed.frontend.pages.components.LoginPanel; import com.commafeed.frontend.pages.components.RegisterPanel; +import com.commafeed.frontend.utils.WicketUtils; @SuppressWarnings("serial") public class WelcomePage extends BasePage { @@ -23,4 +26,11 @@ public class WelcomePage extends BasePage { } }); } + + @Override + public void renderHead(IHeaderResponse response) { + super.renderHead(response); + WicketUtils.loadJS(response, WelcomePage.class); + WicketUtils.loadCSS(response, WelcomePage.class); + } } diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.js b/src/main/java/com/commafeed/frontend/pages/WelcomePage.js new file mode 100644 index 00000000..71dc2b23 --- /dev/null +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.js @@ -0,0 +1,7 @@ +$(function() { + var reg = $('#register-panel'); + if (!reg) { + return; + } + $('#login-panel').height(reg.height()); +}); \ No newline at end of file diff --git a/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html b/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html index 4636faf2..e890f4ff 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html +++ b/src/main/java/com/commafeed/frontend/pages/components/LoginPanel.html @@ -7,13 +7,13 @@
- +
- +

diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html index b67e04de..c9d16d74 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html +++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html @@ -7,21 +7,28 @@

- +
- +
- +
+

+ + You'll be able to import later if you want. +

diff --git a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java index db927a25..158b1d5e 100644 --- a/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java +++ b/src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java @@ -6,6 +6,7 @@ import javax.inject.Inject; import org.apache.wicket.authentication.IAuthenticationStrategy; import org.apache.wicket.feedback.ContainerFeedbackMessageFilter; +import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.EmailTextField; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.PasswordTextField; @@ -23,7 +24,9 @@ import com.commafeed.backend.dao.ApplicationSettingsService; import com.commafeed.backend.dao.UserService; import com.commafeed.backend.model.User; import com.commafeed.backend.model.UserRole.Role; +import com.commafeed.frontend.CommaFeedSession; import com.commafeed.frontend.model.RegistrationRequest; +import com.commafeed.frontend.pages.GoogleImportRedirectPage; import com.commafeed.frontend.utils.ModelFactory.MF; @SuppressWarnings("serial") @@ -51,8 +54,17 @@ public class RegisterPanel extends Panel { IAuthenticationStrategy strategy = getApplication() .getSecuritySettings().getAuthenticationStrategy(); strategy.save(req.getName(), req.getPassword()); + CommaFeedSession.get().signIn(req.getName(), + req.getPassword()); + + if (req.isGoogleImport()) { + setResponsePage(GoogleImportRedirectPage.class); + } else { + setResponsePage(getApplication().getHomePage()); + } + } else { + setResponsePage(getApplication().getHomePage()); } - setResponsePage(getApplication().getHomePage()); } }; add(form); @@ -77,6 +89,7 @@ public class RegisterPanel extends Panel { form.add(new PasswordTextField("password", MF.m(model, p.getPassword())) .setResetPassword(false).add(StringValidator.minimumLength(6))); form.add(new EmailTextField("email", MF.m(model, p.getEmail()))); + form.add(new CheckBox("import", MF.m(model, p.isGoogleImport()))); } }