Merged dev branch

.gitignore

@@ -1,3 +1,4 @@
 .sass-cache
 .vagrant
-node_modules
+node_modules
+npm-debug.log

.travis.yml

@@ -0,0 +1,16 @@
+language: node_js
+node_js:
+  - "5"
+  - "5.1"
+  - "4"
+  - "4.2"
+  - "4.1"
+  - "4.0"
+  - "0.12"
+  - "0.11"
+  - "0.10"
+before_install: 
+  - npm install -g grunt-cli
+  - gem install sass
+install: npm install
+before_script: grunt

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Stefan Cosma
+Copyright (c) 2016 Stefan Cosma
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,17 +1,53 @@
-uptimey
+uptimey 
 =======
 
-Are you proud of your server uptime because you put a lot of time into configuring it?
+[![Build Status](https://travis-ci.org/stefanbc/uptimey.svg?branch=dev)](https://travis-ci.org/stefanbc/uptimey) [![Dependency Status](https://www.versioneye.com/user/projects/572c7efaa0ca35004cf77288/badge.svg?style=flat)](https://www.versioneye.com/user/projects/572c7efaa0ca35004cf77288)
 
-Showcase your server uptime with **uptimey** - a beautiful Server Uptime Monitor!
+If you're proud of your server uptime, because you put a lot of time into configuring it, then you can showcase it with **uptimey** - a beautiful Server Uptime Monitor!
 
-Just fork the repo on your web server and then access `/uptimey` in your browser. Simple as that!
+Just clone the repo on your web server and then access your server's host followed by `/uptimey`, in your browser. Simple as that!
 
-**Features**
+Features
+--
 
-* Background image is the Bing image of the day and it changes automatically!
-* Works on Linux, Windows, Mac OS servers
+* The background image is a random image from [Unsplash](http://unsplash.com)!
+* Works on Linux, Windows, Mac OS servers.
+* Automatically gathers data from the server.
+* Knows if it's nighttime or daytime.
+* Knows your aprox server location (based on IP).
+* Tweet your awesome uptime!
+* Screenshot the server uptime and show it to your devops buddies! :)
+* Configure it to your liking. You can modify the `client/bin/settings.json` file.
 
-![Screenshot](http://i.imgur.com/isg9t8n.png)
+![Screenshot](https://i.imgur.com/BdIzEkg.png)
 
-Made by [Stefan Cosma](http://coderbits.com/stefanbc)
+Requirements
+--
+
+* Apache server
+* PHP
+* Access to the Internet
+
+Developers
+--
+
+Make sure you have Node and npm installed. You'll need to have Grunt and Sass installed. Use these commands:
+
+```
+npm install -g grunt-cli
+gem install sass
+```
+
+You can then install all the project dependencies using:
+
+```
+npm install
+```
+
+Available Grunt tasks:
+
+* `grunt` - will build the whole project.
+* `grunt watch` - will watch for any file modifications and will build. Will also build on start.
+* `grunt test` - will test the main app js file using `jshint` (more tests are comming soon).
+
+For local development you can use Vagrant and you can check if the build passes using Travis-CI.

Vagrantfile

@@ -6,6 +6,6 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "hashicorp/precise32"
-  config.vm.provision :shell, path: "testing.sh"
+  config.vm.provision :shell, path: "vagrant-setup.sh"
   config.vm.network "forwarded_port", guest: 80, host: 8080
 end

client/bin/config.js

@@ -0,0 +1,20 @@
+var config = {
+    production: {},
+    development: {
+        url: '',
+        mail: {
+            transport: 'SMTP',
+            options: {
+                service: 'Mailgun',
+                auth: {
+                    user: '', // mailgun username
+                    pass: ''  // mailgun password
+                }
+            }
+        },
+        server: {
+            host: '127.0.0.1',
+            port: '8080'
+        }
+    } 
+}

client/bin/settings.json

@@ -0,0 +1,23 @@
+{
+    "background_color" : "",
+    "background_image" : "",
+    "buttons": [{
+        "refresh"     : true,
+        "advanced"    : true,
+        "twitter"     : true,
+        "google-plus" : false,
+        "facebook"    : false,
+        "screenshot"  : true
+    }],
+    "debug_mode"       : false,
+    "default_view"     : "default",
+    "display_timezone" : "Europe/Bucharest",
+    "font_color"       : "",
+    "font_family"      : "",
+    "menu_placement"   : "top",
+    "remove_menu"      : false, 
+    "show_am_pm"       : true,
+    "show_location"    : true,
+    "show_menu_always" : false,
+    "use_24h_clock"    : false
+}