Merge branch 'develop' into feature/login-redirect

Conflicts:
	src/foreclojure/login.clj

README.md

@@ -40,7 +40,7 @@ vaguely like this:
 
  * David Byrne <david.r.byrne@gmail.com>
  * Alan Malloy
- * Anthony Simpson
+ * Anthony Grimes
  * Carin Meier
 
 Problem sources:

config.clj

@@ -1,4 +1,7 @@
 {:wrap-reload false
  :db-host "localhost"
  :db-user nil
- :db-pwd nil}
+ :db-pwd nil
+ :host "smtp.googlemail.com"
+ :user "team@4clojure.com"
+ :pass ""}

load-data.bat

@@ -0,0 +1,3 @@
+@echo off
+for /f %%a in ('lein classpath') do @set project_classpath=%%a
+java -cp %project_classpath% clojure.main .\src\foreclojure\data_set.clj

project.clj

@@ -1,4 +1,4 @@
-(defproject foreclojure "0.0.3"
+(defproject foreclojure "0.1.1"
   :description "4clojure - a website for lisp beginners"
   :dependencies [[org.clojure/clojure "1.2.1"]
                  [org.clojure/clojure-contrib "1.2.0"]
@@ -11,7 +11,8 @@
                  [amalloy/utils "[0.3.7,)"]
                  [clj-github "1.0.0-SNAPSHOT"]
                  [ring "0.3.7"]
-                 [clj-config "0.1.0"]]
+                 [clj-config "0.1.0"]
+                 [org.apache.commons/commons-email "1.2"]]
   :dev-dependencies [[lein-ring "0.4.0"]
                      [swank-clojure "1.2.1"]]
   :main foreclojure.core

resources/public/css/style.css

@@ -1,4 +1,3 @@
-
 body {
   background-color: #bbddee;
   font-size: 12px;
@@ -8,6 +7,21 @@ body {
   text-align: center;
 }
 
+#account{
+  float:right;
+  width: 100%;
+  text-align: right;
+  padding: 0px 15px 0px 0px;
+  background-color: #fff;
+  font-weight: bold;
+}
+
+#account a:link {color: #445599;}
+#account a:visited {color: #445599;}
+#account a:active {color: #445599;}
+#account a:hover {color: #7CFC00;}
+#account a {text-decoration: none; font-size: 12px; font-weight:bold;}
+
 #content { 
   width: 95%;
   padding: 15px 0px 15px 0px;
@@ -30,10 +44,11 @@ h3 {
 
 #menu{
   background-color:#445599; 
-  padding: 15px;
-  color: #fff
+  padding: 20px 15px 15px 15px;
+  color: #fff;
 }
 
+a.novisited {color: #00e;}
 
 #menu a:link {color: #fff;}
 #menu a:visited {color: #fff;}
@@ -150,7 +165,10 @@ div#restrictions {
   font-size: 16px;
 }
 
-
+#contact {
+    color: #FFFFFF;
+    margin-left: 1.3em;
+}    
 
 textarea#code-box {
   width: 500px;
@@ -175,6 +193,54 @@ table.my-table th {
   padding: 10px 0px 0px 0px;
   font-size: 14px;
   font-weight: bold;
+}
 
- }
 
+button {
+  border: 1px solid #A1CC59;
+  color: #32401C;
+  font-size: 14px;
+  font-weight: bold;
+  height: 23px;
+  margin: 4px;
+  padding: 1px 6px 2px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  background: #BCEE68;
+  background: -moz-linear-gradient(top, #BCEE68, #A1CC59);
+  background: -webkit-gradient(linear, left top, left bottom, from(#BCEE68), to(#A1CC59));
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#BCEE68', endColorstr='#A1CC59')";
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#BCEE68', endColorstr='#A1CC59');
+}
+
+button.large {
+  font-size: 16px;
+  padding: 3px 10px;
+  height: 26px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+}
+
+button:hover {
+  cursor: pointer;
+  outline: none;
+  text-decoration: none;
+  background: #D1F09E;
+  background: -moz-linear-gradient(top, #D1F09E, #A1CC59);
+  background: -webkit-gradient(linear, left top, left bottom, from(#D1F09E), to(#A1CC59));
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#D1F09E', endColorstr='#A1CC59')";
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#D1F09E', endColorstr='#A1CC59');
+}
+
+button:active {
+  position: relative;
+  top: 1px;
+  outline: none;
+  background: #A1CC59;
+  background: -moz-linear-gradient(top, #A1CC59, #A7D45C);
+  background: -webkit-gradient(linear, left top, left bottom, from(#A1CC59), to(#A7D45C));
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#A1CC59', endColorstr='#A7D45C')";
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#A1CC59', endColorstr='#A7D45C');
+}

src/foreclojure/config.clj

@@ -0,0 +1,7 @@
+(ns foreclojure.config
+  (:use [clojure.java.io :only [file]]
+        [clj-config.core :only [safely read-config]]))
+
+(def config-file (file (System/getProperty "user.dir") "config.clj"))
+
+(def config (safely read-config config-file))

src/foreclojure/core.clj

@@ -1,25 +1,22 @@
 (ns foreclojure.core
   (:use compojure.core
-        [foreclojure static problems login register users]
+        [foreclojure static problems login register
+         users config social]
         ring.adapter.jetty
         somnium.congomongo
-        [ring.middleware.reload :only [wrap-reload]]
-        [clojure.java.io :only [file]]
-        [clj-config.core :only [safely get-key]])
+        [ring.middleware.reload :only [wrap-reload]])
   (:require [compojure [route :as route] [handler :as handler]]
             [sandbar.stateful-session :as session]
             [ring.util.response :as response]))
 
-(def config-file (file (System/getProperty "user.dir") "config.clj"))
-
 (mongo!
- :host (if-let [host (safely get-key config-file :db-host)]
+ :host (if-let [host (:db-host config)]
          host
          "localhost")
  :db "mydb")
 
-(if-let [db-user (safely get-key config-file :db-user)]
-  (if-let [db-pwd  (safely get-key config-file :db-pwd)]
+(if-let [db-user (:db-user config)]
+  (if-let [db-pwd (:db-pwd config)]
     (authenticate db-user db-pwd)))
 
 (add-index! :users [:user] :unique true)
@@ -32,18 +29,19 @@
   problems-routes
   users-routes
   static-routes
+  social-routes
   (route/resources "/")
   (route/not-found "Page not found"))
 
 (def app
   (handler/site
    (session/wrap-stateful-session
-    (if (safely get-key config-file :wrap-reload)
+    (if (:wrap-reload config)
       (wrap-reload #'main-routes '(foreclojure.core))
       #'main-routes))))
 
 (defn run []
   (run-jetty (var app) {:join? false :port 8080}))
 
 (defn -main [& args]
-  (run))
+  (run))