configured email

Author: MathieuGilbert

.idea/workspace.xml

@@ -25,6 +25,12 @@ $nav-button-color: rgb(147, 179, 241);
 
 body {
   font-family: Verdana;
+
+  input[type='text'], textarea {
+    font-family: Verdana;
+    font-size: 1em;
+  }
+
   background-image: url('cross_scratches.png');
   width: $page-width;
   @include center;
@@ -178,9 +184,12 @@ footer {
 
   .contact {
 
-    label {
-
-
+    .error {
+      color: #EF2343;
+      font-weight: bold;
+      font-size: 1.5em;
+      line-height: 20px;
+      text-align: center;
     }
 
     input {

app/assets/stylesheets/pages.css.scss

@@ -16,10 +16,10 @@ def nav_items
   end
 
   def make_contact
-    if @captcha.valid? && ContactMailer.contact_email(@captcha.values[:name], @captcha.values[:email], @captcha.values[:message]).deliver
+    if @captcha.valid? && form_valid && send_message
       redirect_to :root
     else
-      redirect_to :make_contact_pages
+      redirect_to :contact_pages, :flash => { :error => @failure_reason }
     end
   end
 
@@ -31,8 +31,26 @@ def setup_negative_captcha
         :spinner => request.remote_ip,
         :fields => [:name, :email, :message],
         :params => params)
-      pie = 3
     end
 
+    def form_valid
+      email_regex = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+
+      if @captcha.values[:name].blank? || @captcha.values[:email].blank? || @captcha.values[:message].blank?
+        @failure_reason = "All fields are requried!"
+        return false
+      end
+
+      unless @captcha.values[:email] =~ email_regex
+        @failure_reason = "Valid email addresses only!"
+        return false
+      end
+
+      return true
+    end
+
+    def send_message
+      return ContactMailer.contact_email(@captcha.values[:name], @captcha.values[:email], @captcha.values[:message]).deliver
+    end
 
 end

app/controllers/pages_controller.rb

@@ -2,6 +2,8 @@
   Contact
 = form_tag(:pages_make_contact, :class => 'contact') do
   = raw negative_captcha(@captcha)
+  %p.error
+    = flash[:error]
 
   .left-side
     = negative_label_tag(@captcha, :name, 'Name:')

app/views/pages/contact.html.haml

@@ -6,11 +6,10 @@
       get :home
       get :about
       get :contact
+      post :make_contact
     end
   end
 
-  post 'pages/make_contact'
-
   # The priority is based upon order of creation:
   # first created -> highest priority.