diff --git a/client/templates/layout/layout.html.jade b/client/templates/layout/layout.html.jade
index 56d7f8b..025de1d 100644
--- a/client/templates/layout/layout.html.jade
+++ b/client/templates/layout/layout.html.jade
@@ -1,8 +1,11 @@
head
meta(name="viewport" content="width=device-width, initial-scale=1")
link(rel="icon" href="/favicon.ico")
- script(type='text/javascript' src='https://www.google.com/jsapi?autoload={"modules":[{"name":"visualization","version":"1","packages":["corechart"]}]}]}')
-
+ script(src='https://www.gstatic.com/charts/loader.js')
+ script
+ | google.charts.load('current', {packages: ['corechart']})
+ | google.charts.setOnLoadCallback(drawChart)
+
template(name="layout")
if currentUser
+yield(region="header")
diff --git a/package.json b/package.json
index 4fb3354..57e566e 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,6 @@
},
"dependencies": {
"babel-runtime": "^6.26.0",
- "bcrypt": "^0.8.7"
+ "bcrypt-nodejs": ""
}
}
diff --git a/support/install_flowbat_centos6.sh b/support/install_flowbat_centos6.sh
deleted file mode 100644
index 7c1bd97..0000000
--- a/support/install_flowbat_centos6.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/bash
-# Automatic FlowBAT Installation Script for CentOS6.5
-# Chris Sanders & Jason Smith
-
-workingDir=$PWD
-
-ask() {
- # http://djm.me/ask
- while true; do
-
- if [ "${2:-}" = "Y" ]; then
- prompt="Y/n"
- default=Y
- elif [ "${2:-}" = "N" ]; then
- prompt="y/N"
- default=N
- else
- prompt="y/n"
- default=
- fi
-
- # Ask the question
- read -p "$1 [$prompt] " REPLY
-
- # Default?
- if [ -z "$REPLY" ]; then
- REPLY=$default
- fi
-
- # Check if the reply is valid
- case "$REPLY" in
- Y|y) return 0 ;;
- N|n) return 1 ;;
- *) echo "You must give a y or n answer." ;;
- esac
-
- done
-}
-
-if [ "$1" = "--update" ]; then
-echo "$(tput setaf 6)This script will install flowbat updates automatically. If it is not up-to-date, it will require a FlowBAT restart.$(tput sgr0)"
- if ask "$(tput setaf 3)Are you sure you want to update?$(tput sgr0)"; then
- cd "$workingDir"/FlowBAT/
- git pull
- exit
- else
- exit 1
- fi
-fi
-
-if [ ! -d "$workingDir/FlowBAT/" ]; then
- echo "$(tput setaf 6)This script will install flowbat locally, to be accessed at http://localhost:1800$(tput sgr0)"
- if ask "$(tput setaf 3)Are you sure you want to install?$(tput sgr0)"; then
- echo
- else
- exit 1
- fi
-fi
-
-echo "$(tput setaf 6)Installing Dependencies...$(tput sgr0)"
-sudo yum install -y -q curl
-sudo yum install -y -q git-core
-
-if [ ! -d "$workingDir/FlowBAT/" ]; then
- echo "$(tput setaf 6)Downloading FlowBAT...$(tput sgr0)"
- git clone https://github.com/chrissanders/FlowBAT.git
-fi
-cd FlowBAT/
-
-echo""
-echo "$(tput setaf 6)Checking for nodejs. This may take a minute...$(tput sgr0)"
- sudo yum install -q -y epel-release
- sudo yum install -q -y nodejs
- sudo yum install -q -y npm
-
-echo""
-echo "$(tput setaf 6)Checking for meteorite...$(tput sgr0)"
-if ! which mrt > /dev/null; then
- echo -e "$(tput setaf 6)Meteorite not found! Installing...$(tput sgr0)"
- sudo npm install --silent -g meteorite
-fi
-echo ""
-echo "$(tput setaf 6)Checking for meteor...$(tput sgr0)"
-if ! which meteor > /dev/null; then
- echo -e "$(tput setaf 6)Meteor not installed. Attempting Install.$(tput sgr0)"
- curl https://install.meteor.com | /bin/sh
-fi
-
-#Arranging for localhost configuration
-cat settings/prod.sample.json | sed 's/flowbat.com/127.0.0.1:1800/' | sed 's/mailUrl.*/mailUrl": "",/' > settings/dev.json
-
-cd "$workingDir"/FlowBAT
-mrt install
-
-#Generating upstart configuration for FlowBAT
-cat < flowbat.conf
-# meteorjs - FlowBAT job file
-
-description "FlowBAT"
-
-# When to start the service
-start on runlevel [2345]
-
-# When to stop the service
-stop on runlevel [016]
-
-# Automatically restart process if crashed
-respawn
-
-# Essentially lets upstart know the process will detach itself to the background
-expect fork
-
-chdir $workingDir/FlowBAT
-
-script
-
-cd $workingDir/FlowBAT
-exec su - $USER -c "cd $workingDir/FlowBAT && meteor --port 1800 run --settings $workingDir/FlowBAT/settings/dev.json"
-
-end script
-EOF
-
-if [ ! -f /etc/init/flowbat.conf ]; then
- if ask "$(tput setaf 3)Do you wish to have FlowBAT start on boot in the background?$(tput sgr0)"; then
- sudo cp flowbat.conf /etc/init/
- else
- echo "$(tput setaf 2)For future reference, move flowbat.conf to /etc/init/ if you would like to have FlowBAT start on boot.$(tput sgr0)".
- fi
-fi
-
-sudo chown -R "$USER":"$USER" $workingDir/FlowBAT/
-sudo chown -R "$USER":"$USER" $workingDir/.npm
-
-echo -e "$(tput setaf 2)To manually run FlowBAT, cd to $workingDir/FlowBAT and run:"
-echo -e 'meteor --port 1800 run --settings settings/dev.json "$@"'
-echo -e 'or to run FlowBAT in the background:'
-echo -e 'nohup meteor --port 1800 run --settings settings/dev.json "$@" &'
-echo -e "$(tput sgr0)"
-
-echo "$(tput setaf 2)Attempting startup. This may take a few minutes if it is the first time. Press ctrl+c to stop FlowBAT after the application says it is running or proceed to 127.0.0.1:1800 in a browser.$(tput sgr0)"
-
-meteor --port 1800 run --settings settings/dev.json "$@"
diff --git a/support/install_flowbat_ubuntu.sh b/support/install_flowbat_ubuntu.sh
index 4a4f99b..1dc4c31 100755
--- a/support/install_flowbat_ubuntu.sh
+++ b/support/install_flowbat_ubuntu.sh
@@ -20,7 +20,7 @@ fi
sudo apt-get install -y curl build-essential git unzip
# Clone the FlowBAT repo
-git clone https://github.com/chrissanders/FlowBAT.git
+git clone https://github.com/WojRep/FlowBAT.git
# Install meteor and build package. Removes any existing bundle folders.
curl https://install.meteor.com/ | sh
diff --git a/support/silkonabox.sh b/support/silkonabox.sh
index daae6dc..062bc01 100644
--- a/support/silkonabox.sh
+++ b/support/silkonabox.sh
@@ -233,9 +233,8 @@ EOF
fi
-## Download country code database - These can be updated as needed via the commands below
-wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
-unzip GeoIPCountryCSV.zip ; cat GeoIPCountryWhois.csv | rwgeoip2ccmap --csv-input > country_codes.pmap
+## Download country code database manual !!!
+cat GeoIPCountryWhois.csv | rwgeoip2ccmap --csv-input > country_codes.pmap
sudo mv country_codes.pmap /usr/local/share/silk/
# Start up services