From d3cc1a346f49fcdd3adab8140f9873dbfd189245 Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 13:56:56 -0700 Subject: [PATCH 01/27] added basic sidebar and setup for driver cockpit 3.0 --- .../cockpit2/frontend/drivers-orders.phtml | 3 ++ .../cockpit2/frontend/drivers-shifts.phtml | 4 ++ .../default/cockpit2/layout/html.body.phtml | 20 +++++++- www/assets/cockpit/js/cockpit.js | 13 ++++- www/assets/cockpit/js/controllers.js | 25 +++++++--- www/assets/cockpit/js/service.account.js | 13 ++++- www/assets/cockpit/scss/cockpit.scss | 47 ++++++++----------- 7 files changed, 88 insertions(+), 37 deletions(-) create mode 100644 include/views/default/cockpit2/frontend/drivers-orders.phtml create mode 100644 include/views/default/cockpit2/frontend/drivers-shifts.phtml diff --git a/include/views/default/cockpit2/frontend/drivers-orders.phtml b/include/views/default/cockpit2/frontend/drivers-orders.phtml new file mode 100644 index 000000000..05049e2f2 --- /dev/null +++ b/include/views/default/cockpit2/frontend/drivers-orders.phtml @@ -0,0 +1,3 @@ +
+ +orders \ No newline at end of file diff --git a/include/views/default/cockpit2/frontend/drivers-shifts.phtml b/include/views/default/cockpit2/frontend/drivers-shifts.phtml new file mode 100644 index 000000000..0de16e0b1 --- /dev/null +++ b/include/views/default/cockpit2/frontend/drivers-shifts.phtml @@ -0,0 +1,4 @@ +
+ + +shifts \ No newline at end of file diff --git a/include/views/default/cockpit2/layout/html.body.phtml b/include/views/default/cockpit2/layout/html.body.phtml index bffdc3a8d..207e143b4 100644 --- a/include/views/default/cockpit2/layout/html.body.phtml +++ b/include/views/default/cockpit2/layout/html.body.phtml @@ -2,6 +2,23 @@
    +
  • + + + + + +
    Orders
    +
    • +
  • + + + + + +
    Shifts
    +
    • + @@ -66,10 +83,11 @@
    + */ ?>
  • - +
    Sign Out
    diff --git a/www/assets/cockpit/js/cockpit.js b/www/assets/cockpit/js/cockpit.js index 724d92ab8..a3699cfe7 100644 --- a/www/assets/cockpit/js/cockpit.js +++ b/www/assets/cockpit/js/cockpit.js @@ -41,6 +41,16 @@ NGApp.config(function($compileProvider){ NGApp.config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider, RestaurantsService) { $routeProvider + .when('/drivers/orders', { + action: 'drivers-orders', + controller: 'DriversOrdersCtrl', + templateUrl: 'assets/view/drivers-orders.html' + }) + .when('/drivers/shifts', { + action: 'drivers-shifts', + controller: 'DriversShiftsCtrl', + templateUrl: 'assets/view/drivers-shifts.html' + }) .otherwise({ action: 'home', controller: 'DefaultCtrl', @@ -69,7 +79,7 @@ NGApp.controller('AppController', function ($scope, $route, $http, $routeParams, $rootScope.$on('userAuth', function(e, data) { $rootScope.$safeApply(function($scope) { App.snap.close(); - $rootScope.reload(); + $rootScope.reload(); }); }); @@ -117,6 +127,7 @@ NGApp.controller('AppController', function ($scope, $route, $http, $routeParams, $scope.$on('$routeChangeSuccess', function ($currentRoute, $previousRoute) { // Store the actual page MainNavigationService.page = $route.current.action; + console.log($route.current.action); App.rootScope.current = MainNavigationService.page; App.track('page', $route.current.action); diff --git a/www/assets/cockpit/js/controllers.js b/www/assets/cockpit/js/controllers.js index a48878e31..a1eb4d8f9 100644 --- a/www/assets/cockpit/js/controllers.js +++ b/www/assets/cockpit/js/controllers.js @@ -1,13 +1,15 @@ -NGApp.controller('DefaultCtrl', function ($scope, $http, $location) { +NGApp.controller('DefaultCtrl', function ($scope, $http, $location, MainNavigationService) { + MainNavigationService.link('/drivers/orders'); +}); + +NGApp.controller('MainHeaderCtrl', function ( $scope, $rootScope) { }); -NGApp.controller( 'MainHeaderCtrl', function ( $scope, $rootScope) { - -}); - -NGApp.controller( 'SideMenuCtrl', function () { - +NGApp.controller('SideMenuCtrl', function ($scope) { + $scope.setupPermissions = function() { + + } }); NGApp.controller('LoginCtrl', function($scope, AccountService) { @@ -18,4 +20,13 @@ NGApp.controller('LoginCtrl', function($scope, AccountService) { // }) }); } +}); + + +NGApp.controller('DriversOrdersCtrl', function ($scope, $rootScope) { + +}); + +NGApp.controller('DriversShiftsCtrl', function ($scope, $rootScope) { + }); \ No newline at end of file diff --git a/www/assets/cockpit/js/service.account.js b/www/assets/cockpit/js/service.account.js index 4dcadb986..cba242e72 100644 --- a/www/assets/cockpit/js/service.account.js +++ b/www/assets/cockpit/js/service.account.js @@ -1,5 +1,8 @@ NGApp.factory('AccountService', function($http, $rootScope) { - var service = {}; + var service = { + permissions: {}, + user: null + }; service.checkUser = function() { service.user = App.config.user; @@ -29,6 +32,14 @@ NGApp.factory('AccountService', function($http, $rootScope) { $rootScope.$broadcast('userAuth'); }) }; + + $rootScope.$on('userAuth', function(e, data) { + if (service.user.id_admin) { + + } else { + + } + }); return service; }); \ No newline at end of file diff --git a/www/assets/cockpit/scss/cockpit.scss b/www/assets/cockpit/scss/cockpit.scss index d88d1291f..8603aee22 100644 --- a/www/assets/cockpit/scss/cockpit.scss +++ b/www/assets/cockpit/scss/cockpit.scss @@ -370,53 +370,49 @@ p { margin:0; list-style-type:none; } - .snap-drawer li:first-child { - border-top:1px solid rgba(0,0,0,0.1); + .snap-drawer li.nav-active .side-menu-wrap { + background: $green; + color: #fff; } .snap-drawer li { display:block; - border-bottom:1px solid rgba(0,0,0,0.1); padding:8px 0 2px 0; text-decoration:none; color:$navLinkColor; text-indent:20px; cursor: pointer; } - .snap-drawer li.nav-active:before { - display: block; - height: 38px; - float: left; - margin-top: -8px; - width: 4px; - content: " "; - background: #f78155; - position: absolute; - } - .snap-drawer p { - opacity:0.5; - padding:15px; - font-size:12px; - } @-moz-document url-prefix() { .snap-content { transform:none; } } .snap-drawer .fa { - font-size:25px; + font-size: 15px; } .side-menu-wrap { height: 28px; - } - .side-menu-wrap { - margin-left: -20px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 249px; + margin-left: 8px; } .side-menu-label { - margin-top: -10px; vertical-align: top; line-height: 1.6em; - margin-bottom: 20px; font-size: 14px; + font-family: Ruda, Open Sans, Helvetica, Arial, sans-serif; + } + + .side-menu-icon { + line-height: 2.2em; + width: 40px; + margin-left: -20px; + } + + .side-menu-label, .side-menu-icon { + padding: 12px 0 10px 0; } } @@ -443,9 +439,6 @@ p { height: 1px; } -.side-menu-icon { - width: 70px; -} .no-init .hide-before-init { display: none !important; From 66d474c0f40523db21d9e30a64f8fc8a4eb0f689 Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 15:00:18 -0700 Subject: [PATCH 02/27] cockpit 3.0 progress --- .../cockpit2/frontend/drivers-orders.phtml | 7 ++++- .../default/cockpit2/layout/html.body.phtml | 16 ++++++++++ www/assets/cockpit/js/cockpit.js | 9 +++--- www/assets/cockpit/scss/cockpit.scss | 31 +++++++++++++++++-- 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/include/views/default/cockpit2/frontend/drivers-orders.phtml b/include/views/default/cockpit2/frontend/drivers-orders.phtml index 05049e2f2..b7aa666a4 100644 --- a/include/views/default/cockpit2/frontend/drivers-orders.phtml +++ b/include/views/default/cockpit2/frontend/drivers-orders.phtml @@ -1,3 +1,8 @@
    -orders \ No newline at end of file +
    +
    + In order to receive payment for orders that you deliver, you MUST confirm all orders that you've delivered. + Make sure your orders are confirmed and delivered! +
    +
    diff --git a/include/views/default/cockpit2/layout/html.body.phtml b/include/views/default/cockpit2/layout/html.body.phtml index 207e143b4..de8820bb6 100644 --- a/include/views/default/cockpit2/layout/html.body.phtml +++ b/include/views/default/cockpit2/layout/html.body.phtml @@ -107,8 +107,24 @@
    + +
    +
    + +
    +
    + +
    + + +
    + */ ?> +
+ +
diff --git a/www/assets/cockpit/js/cockpit.js b/www/assets/cockpit/js/cockpit.js index a3699cfe7..7611cdede 100644 --- a/www/assets/cockpit/js/cockpit.js +++ b/www/assets/cockpit/js/cockpit.js @@ -201,11 +201,12 @@ App.go = function( url, transition ){ } }; -App.toggleMenu = function() { - if (App.snap.state().state == 'left') { +App.toggleMenu = function(side) { + side = side || 'left'; + if (App.snap.state().state == side) { App.snap.close(); } else { - App.snap.open('left'); + App.snap.open(side); } }; @@ -325,7 +326,7 @@ App.init = function(config) { element: document.getElementById('snap-content'), menu: document.getElementById('side-menu'), menuDragDistance: 95, - disable: 'right' + disable: '' }); var snapperCheck = function() { diff --git a/www/assets/cockpit/scss/cockpit.scss b/www/assets/cockpit/scss/cockpit.scss index 8603aee22..e7fc4cb96 100644 --- a/www/assets/cockpit/scss/cockpit.scss +++ b/www/assets/cockpit/scss/cockpit.scss @@ -235,7 +235,7 @@ p { font-size: 12px; } .top-pad { - height: 90px; + height: 67px; } } @media(max-width:499px) { @@ -253,7 +253,7 @@ p { margin: 3px 10px 0 0; } .top-pad { - height: 71px; + height: 58px; } } .divider { @@ -612,7 +612,7 @@ input { margin-bottom: 1em; border-radius: 4px; font-size: 1.2em; - line-height: 1.4em; + line-height: 1.45em; padding: .7em .9em .5em .9em; } @@ -623,3 +623,28 @@ input { .dialog-message-success { background: #77c675; } + + +.notifications { + float: right; + margin: 2px 10px 0 0; +} + +.notifications .notification { + border: 1px solid #666666; + border-radius: 4px; + height: 27px; + width: 27px; + color: #666666; + font-size: 16px; + overflow: hidden; + line-height: 1.7em; + text-align: center; + float: left; + margin-right: 9px; + cursor: pointer; +} + +.notifications .notification:last-child { + margin-right: 1px; +} \ No newline at end of file From 3f7e3399411e31f5282399be3c133cea104d8ac4 Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 15:28:02 -0700 Subject: [PATCH 03/27] added ability to have a right side menu --- .../default/cockpit2/layout/html.body.phtml | 7 +++- www/assets/cockpit/js/cockpit.js | 2 +- www/assets/cockpit/scss/cockpit.scss | 6 +++- www/assets/js/app.js | 2 +- www/assets/js/snap.js | 32 +++++++++++++++---- 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/include/views/default/cockpit2/layout/html.body.phtml b/include/views/default/cockpit2/layout/html.body.phtml index de8820bb6..5f62b40dc 100644 --- a/include/views/default/cockpit2/layout/html.body.phtml +++ b/include/views/default/cockpit2/layout/html.body.phtml @@ -95,7 +95,12 @@ -
+
+
+

We will soon have a chat feature that goes to support here

+
+ +
diff --git a/www/assets/cockpit/js/cockpit.js b/www/assets/cockpit/js/cockpit.js index 7611cdede..4d4e1436c 100644 --- a/www/assets/cockpit/js/cockpit.js +++ b/www/assets/cockpit/js/cockpit.js @@ -324,7 +324,7 @@ App.init = function(config) { App.snap = new Snap({ element: document.getElementById('snap-content'), - menu: document.getElementById('side-menu'), + menu: $('#side-menu, #side-menu-right'), menuDragDistance: 95, disable: '' }); diff --git a/www/assets/cockpit/scss/cockpit.scss b/www/assets/cockpit/scss/cockpit.scss index e7fc4cb96..cc1c1575b 100644 --- a/www/assets/cockpit/scss/cockpit.scss +++ b/www/assets/cockpit/scss/cockpit.scss @@ -353,10 +353,14 @@ p { height:auto; overflow:hidden; } - .snap-drawer-left, .snap-drawer-right { + .snap-drawer-left { left:0; z-index:1; } + .snap-drawer-right { + right: 0; + z-index:1; + } .snapjs-left .snap-drawer-right, .snapjs-right .snap-drawer-left { display: none; diff --git a/www/assets/js/app.js b/www/assets/js/app.js index bcbdcd64b..59524e6bc 100644 --- a/www/assets/js/app.js +++ b/www/assets/js/app.js @@ -736,7 +736,7 @@ App.init = function(config) { App.snap = new Snap({ element: document.getElementById('snap-content'), - menu: document.getElementById('side-menu'), + menu: $('#side-menu'), menuDragDistance: 95, disable: 'right' }); diff --git a/www/assets/js/snap.js b/www/assets/js/snap.js index 2958b3c09..265968c66 100644 --- a/www/assets/js/snap.js +++ b/www/assets/js/snap.js @@ -186,7 +186,9 @@ settings.element.style[cache.vendor+'Transition'] = ''; // paralax menu if (settings.menu) { - settings.menu.style[cache.vendor+'Transition'] = ''; + settings.menu.each(function() { + this.style[cache.vendor+'Transition'] = ''; + }); } cache.translation = action.translate.get.matrix(4); @@ -214,7 +216,9 @@ // paralax menu if (settings.menu) { - settings.menu.style[cache.vendor+'Transition'] = 'all ' + settings.transitionSpeed + 's ' + settings.easing; + settings.menu.each(function() { + this.style[cache.vendor+'Transition'] = 'all ' + settings.transitionSpeed + 's ' + settings.easing; + }); } cache.animatingInterval = setInterval(function() { @@ -262,10 +266,22 @@ // paralax menu if (settings.menu) { - var hideDistance = settings.menuDragDistance; - var nn = ((n / settings.maxPosition) * hideDistance) - hideDistance; - var theSideTranslate = 'translate3d(' + nn + 'px, 0,0)'; - settings.menu.style[cache.vendor+'Transform'] = theSideTranslate; + var getTranslate = function(dir) { + var hideDistance = settings.menuDragDistance; + if (dir == 'left') { + var dirDistance = -hideDistance; + } else { + var dirDistance = hideDistance; + } + var nn = ((n / settings.maxPosition) * hideDistance) + dirDistance; + var theSideTranslate = 'translate3d(' + nn + 'px, 0,0)'; + return theSideTranslate; + }; + settings.menu.get(0).style[cache.vendor+'Transform'] = getTranslate('left'); + if (settings.menu.get(1)) { + settings.menu.get(1).style[cache.vendor+'Transform'] = getTranslate('right'); + } + } } else { @@ -321,7 +337,9 @@ utils.dispatchEvent('start'); settings.element.style[cache.vendor+'Transition'] = ''; if (settings.menu) { - settings.menu.style[cache.vendor+'Transition'] = ''; + settings.menu.each(function() { + this.style[cache.vendor+'Transition'] = ''; + }); } cache.isDragging = true; cache.hasIntent = null; From a5117c0b1466663fe83184e222c2f56b2d2dc962 Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 23:42:55 -0700 Subject: [PATCH 04/27] fixed issues with server var --- include/library/Crunchbutton/App.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php index 1ae885d19..d5f7247dd 100755 --- a/include/library/Crunchbutton/App.php +++ b/include/library/Crunchbutton/App.php @@ -110,6 +110,11 @@ class Crunchbutton_App extends Cana_App { $_SERVER['SERVER_NAME'] = '_DOMAIN_'; $host_callback = 'staging.crunchr.co'; break; + case '/Users/arzynik/Sites/crunchbutton/include/library/Crunchbutton': + $params['env'] = 'local'; + $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'] = 'crunchbutton.localhost'; + $host_callback = 'crunchbutton.localhost'; + break; default: if (getenv('TRAVIS')) { $params['env'] = 'travis'; @@ -182,13 +187,11 @@ class Crunchbutton_App extends Cana_App { $config = $this->config(); $config->site = Crunchbutton_Site::byDomain(); - - if ($config->site->name == 'redirect' && $config->site->theme) { header('Location: '.$config->site->theme.$_SERVER['REQUEST_URI']); exit; } - + if ($config->site->name == 'Cockpit' || $config->site->name == 'Cockpit2') { array_unshift($GLOBALS['config']['libraries'], 'Cockpit'); } From e11564310aaec37e5bb8545dae890855f8aaed6a Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 23:43:07 -0700 Subject: [PATCH 05/27] added backup script --- cli/dbbackup.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 cli/dbbackup.php diff --git a/cli/dbbackup.php b/cli/dbbackup.php new file mode 100755 index 000000000..50b7f128c --- /dev/null +++ b/cli/dbbackup.php @@ -0,0 +1,30 @@ +#!/usr/bin/php +db->{c::app()->env()}; + +$cmd[] = 'rm '.$file; +$cmd[] = $dump.' -q -u '.$connect->user.' -p'.$connect->pass.' '.$connect->db.' > '.$file; +$cmd[] = 'sed "s/\`devin\`@\`%\`/\`root\`@\`localhost\`/g" '.$file.' > '.$file.'tmp'; +$cmd[] = 'mv '.$file.'tmp '.$file; + +foreach ($cmd as $c) { + echo $c; + exec($c); +} + From 95458576b69494444f4e4cda111ed762680ef02a Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 23:43:44 -0700 Subject: [PATCH 06/27] updated side menu --- include/views/default/cockpit2/layout/html.body.phtml | 7 ++++--- www/assets/cockpit/js/cockpit.js | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/views/default/cockpit2/layout/html.body.phtml b/include/views/default/cockpit2/layout/html.body.phtml index 5f62b40dc..44e22ae2e 100644 --- a/include/views/default/cockpit2/layout/html.body.phtml +++ b/include/views/default/cockpit2/layout/html.body.phtml @@ -97,7 +97,8 @@
-

We will soon have a chat feature that goes to support here

+

We will soon have a chat feature that goes to support here. Until then, text us at:

(646) 783-1444 +

@@ -110,8 +111,8 @@
-
-
+
+
diff --git a/www/assets/cockpit/js/cockpit.js b/www/assets/cockpit/js/cockpit.js index 4d4e1436c..b76f3d804 100644 --- a/www/assets/cockpit/js/cockpit.js +++ b/www/assets/cockpit/js/cockpit.js @@ -123,6 +123,8 @@ NGApp.controller('AppController', function ($scope, $route, $http, $routeParams, this.$apply(fn); } }; + + $rootScope.hasBack = false; $scope.$on('$routeChangeSuccess', function ($currentRoute, $previousRoute) { // Store the actual page From 93b11cd56b1978d160b8d0a0455ee41db9332576 Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 23:43:54 -0700 Subject: [PATCH 07/27] added stackscripts to start up servers --- stackscript/cockpit.sh | 28 ++++++ stackscript/lamp.sh | 203 +++++++++++++++++++++++++++++++++++++++++ stackscript/tune.sh | 68 ++++++++++++++ 3 files changed, 299 insertions(+) create mode 100644 stackscript/cockpit.sh create mode 100644 stackscript/lamp.sh create mode 100644 stackscript/tune.sh diff --git a/stackscript/cockpit.sh b/stackscript/cockpit.sh new file mode 100644 index 000000000..d884111f9 --- /dev/null +++ b/stackscript/cockpit.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# +# + +source + +function install_cockpit { + apache_virtualhost $MACHINENAME + + setup_github + + +} + +# set basic shit +set_hostname $MACHINENAME +set_timezone + +# update and install shit +system_update +apache_install +mysql_install $MYSQLROOTPW +php_install +install_basics +install_cockpit + +# restart it +restart_services diff --git a/stackscript/lamp.sh b/stackscript/lamp.sh new file mode 100644 index 000000000..0778168fb --- /dev/null +++ b/stackscript/lamp.sh @@ -0,0 +1,203 @@ +#!/bin/bash + +# set the hostname +function set_hostname { + echo setting hostname to $1 + echo "HOSTNAME=$1" >> /etc/sysconfig/network + hostname "$1" + + # update /etc/hosts + echo $(system_primary_ip) $(get_rdns_primary_ip) $(hostname) >> /etc/hosts +} + + +# set the timezone +function set_timezone { + echo setting the timezone to LA + ln -sf /usr/share/zoneinfo/America/Los_Angeles /etc/localtime +} + + +# update from repos +function system_update { + yum -yq update +} + + +# returns the primary IP assigned to eth0 +function system_primary_ip { + echo $(ifconfig eth0 | awk -F: '/inet addr:/ {print $2}' | awk '{ print $1 }') +} + + +# installs apache2 and set it to listen +function apache_install { + yum -yq install httpd + + mkdir /etc/httpd/sites-available + mkdir /etc/httpd/sites-enabled + + # sed -i -e 's/^#NameVirtualHost \*:80$/NameVirtualHost *:80/' /etc/httpd/conf/httpd.conf + + echo "Include sites-enabled/*" >> /etc/httpd/conf/httpd.conf + echo "NameVirtualHost *:80" >> /etc/httpd/conf/httpd.conf + echo "NameVirtualHost *:443" >> /etc/httpd/conf/httpd.conf + echo "NameVirtualHost [::]:80" >> /etc/httpd/conf/httpd.conf + echo "NameVirtualHost [::]:443" >> /etc/httpd/conf/httpd.conf + + touch /tmp/restart-httpd +} + + +# adds a virtual host to sites avail/enabled +function apache_virtualhost { + # Configures a VirtualHost + # $1 - required - the hostname of the virtualhost to create + + if [ ! -n "$1" ]; then + echo "apache_virtualhost() requires the hostname as the first argument" + return 1; + fi + + if [ -e "/etc/httpd/sites-available/${1}.conf" ]; then + echo /etc/httpd/sites-available/${1}.conf already exists + return; + fi + + mkdir -p /home/$1/www /home/$1/logs + + echo "" > /etc/httpd/conf.d/sites-available/${1}.conf + echo " ServerName $1" >> /etc/httpd/conf.d/sites-available/${1}.conf + echo " DocumentRoot /home/$1/www/" >> /etc/httpd/conf.d/sites-available/${1}.conf + echo " " >> /etc/httpd/conf.d/sites-available/${1}.conf + echo " AllowOverride All" >> /etc/httpd/conf.d/sites-available/${1}.conf + echo " " >> /etc/httpd/conf.d/sites-available/${1}.conf + echo " ErrorLog /home/$1/logs/error.log" >> /etc/httpd/conf.d/sites-available/${1}.conf + echo " CustomLog /home/$1/logs/access.log combined" >> /etc/httpd/conf.d/sites-available/${1}.conf + echo "" >> /etc/httpd/conf.d/sites-available/${1}.conf + + ln -s /etc/httpd/sites-available/${1}.conf /etc/httpd/sites-enabled/${1}.conf + + touch /tmp/restart-httpd +} + + +# install and configure mysql +function mysql_install { + # $1 - the mysql root password + + if [ ! -n "$1" ]; then + echo "mysql_install() requires the root pass as its first argument" + return 1; + fi + + yum -yq install mysql-server + + service mysqld start + + echo "Sleeping while MySQL starts up for the first time..." + sleep 20 + + # Remove anonymous users + echo "DELETE FROM mysql.user WHERE User='';" | mysql -u root + # Remove remote root + echo "DELETE FROM mysql.user WHERE User='root' AND Host!='localhost';" | mysql -u root + # Remove test db + echo "DROP DATABASE test;" | mysql -u root + # Set root password + echo "UPDATE mysql.user SET Password=PASSWORD('$1') WHERE User='root';" | mysql -u root + # Flush privs + echo "FLUSH PRIVILEGES;" | mysql -u root + + touch /tmp/restart-mysqld +} + + +# create a mysql db +function mysql_create_database { + # $1 - the mysql root password + # $2 - the db name to create + + if [ ! -n "$1" ]; then + echo "mysql_create_database() requires the root pass as its first argument" + return 1; + fi + if [ ! -n "$2" ]; then + echo "mysql_create_database() requires the name of the database as the second argument" + return 1; + fi + + echo "CREATE DATABASE $2;" | mysql -u root -p"$1" +} + + +# add a mysql user +function mysql_create_user { + # $1 - the mysql root password + # $2 - the user to create + # $3 - their password + + if [ ! -n "$1" ]; then + echo "mysql_create_user() requires the root pass as its first argument" + return 1; + fi + if [ ! -n "$2" ]; then + echo "mysql_create_user() requires username as the second argument" + return 1; + fi + if [ ! -n "$3" ]; then + echo "mysql_create_user() requires a password as the third argument" + return 1; + fi + + echo "CREATE USER '$2'@'localhost' IDENTIFIED BY '$3';" | mysql -u root -p"$1" +} + + +# add a mysql users permissions +function mysql_grant_user { + # $1 - the mysql root password + # $2 - the user to bestow privileges + # $3 - the database + + if [ ! -n "$1" ]; then + echo "mysql_create_user() requires the root pass as its first argument" + return 1; + fi + if [ ! -n "$2" ]; then + echo "mysql_create_user() requires username as the second argument" + return 1; + fi + if [ ! -n "$3" ]; then + echo "mysql_create_user() requires a database as the third argument" + return 1; + fi + + echo "GRANT ALL PRIVILEGES ON $3.* TO '$2'@'localhost';" | mysql -u root -p"$1" + echo "FLUSH PRIVILEGES;" | mysql -u root -p"$1" + +} + + +# install php from a 3rd party repo +function php_install { + # yum -y remove php-common + rpm -Uvh http://mirror.webtatic.com/yum/el6/latest.rpm + yum -y install php55w php55w-opcache +} + + + +# restarts services that have a file in /tmp/needs-restart/ +function restart_services { + for service in $(ls /tmp/restart-* | cut -d- -f2); do + service $service restart + rm -f /tmp/restart-$service + done +} + + +# installs my shit +function install_basics { + yum -yq install git wget +} \ No newline at end of file diff --git a/stackscript/tune.sh b/stackscript/tune.sh new file mode 100644 index 000000000..b08efe9b6 --- /dev/null +++ b/stackscript/tune.sh @@ -0,0 +1,68 @@ + + + + +function apache_tune { + # Tunes Apache's memory to use the percentage of RAM you specify, defaulting to 40% + # $1 - the percent of system memory to allocate towards Apache + + if [ ! -n "$1" ]; + then PERCENT=40 + else PERCENT="$1" + fi + + yum -yq install httpd + PERPROCMEM=10 # the amount of memory in MB each apache process is likely to utilize + MEM=$(get_physical_memory) + MAXCLIENTS=$((MEM*PERCENT/100/PERPROCMEM)) # calculate MaxClients + MAXCLIENTS=${MAXCLIENTS/.*} # cast to an integer + sed -i -e "s/\(^[ \t]*\(MaxClients\|ServerLimit\)[ \t]*\)[0-9]*/\1$MAXCLIENTS/" /etc/httpd/conf/httpd.conf + + touch /tmp/restart-httpd +} + +function php_tune { + # Tunes PHP to utilize up to nMB per process, 32 by default + if [ ! -n "$1" ]; + then MEM="32" + else MEM="${1}" + fi + + sed -i'-orig' "s/memory_limit = [0-9]\+M/memory_limit = ${MEM}M/" /etc/php.ini + touch /tmp/restart-httpd +} + +function mysql_tune { + # Tunes MySQL's memory usage to utilize the percentage of memory you specify, defaulting to 40% + + # $1 - the percent of system memory to allocate towards MySQL + + if [ ! -n "$1" ]; + then PERCENT=40 + else PERCENT="$1" + fi + + MEM=$(get_physical_memory) + MYMEM=$((MEM*PERCENT/100)) # how much memory we'd like to tune mysql with + MYMEMCHUNKS=$((MYMEM/4)) # how many 4MB chunks we have to play with + + # mysql config options we want to set to the percentages in the second list, respectively + OPTLIST=(key_buffer sort_buffer_size read_buffer_size read_rnd_buffer_size myisam_sort_buffer_size query_cache_size) + DISTLIST=(75 1 1 1 5 15) + + for opt in ${OPTLIST[@]}; do + sed -i -e "/\[mysqld\]/,/\[.*\]/s/^$opt/#$opt/" /etc/my.cnf + done + + for i in ${!OPTLIST[*]}; do + val=$(echo | awk "{print int((${DISTLIST[$i]} * $MYMEMCHUNKS/100))*4}") + if [ $val -lt 4 ] + then val=4 + fi + config="${config}\n${OPTLIST[$i]} = ${val}M" + done + + sed -i -e "s/\(\[mysqld\]\)/\1\n$config\n/" /etc/my.cnf + + touch /tmp/restart-mysqld +} \ No newline at end of file From e5fdaf89d1f7c5a5c24ecbfecd23c921599950bc Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 23:50:03 -0700 Subject: [PATCH 08/27] fixed snap issue --- www/assets/js/snap.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/www/assets/js/snap.js b/www/assets/js/snap.js index 265968c66..6c922e6d6 100644 --- a/www/assets/js/snap.js +++ b/www/assets/js/snap.js @@ -277,7 +277,9 @@ var theSideTranslate = 'translate3d(' + nn + 'px, 0,0)'; return theSideTranslate; }; - settings.menu.get(0).style[cache.vendor+'Transform'] = getTranslate('left'); + if (settings.menu.get(0)) { + settings.menu.get(0).style[cache.vendor+'Transform'] = getTranslate('left'); + } if (settings.menu.get(1)) { settings.menu.get(1).style[cache.vendor+'Transform'] = getTranslate('right'); } From a0531c90fd865c1ae47afc5f882e88c1f8489c9f Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 23:53:20 -0700 Subject: [PATCH 09/27] added cron backup script --- cli/dbbackup.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 cli/dbbackup.sh diff --git a/cli/dbbackup.sh b/cli/dbbackup.sh new file mode 100755 index 000000000..2972d9bdd --- /dev/null +++ b/cli/dbbackup.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /home/cockpit.crunchbutton/cli && /home/cockpit.crunchbutton/cli/dbbackup.php -e=live +mv /home/cockpit.crunchbutton/db/backup.sql /home/backup/latest.sql From 4c0dada679686a66873e8b6f71bad1639190e0af Mon Sep 17 00:00:00 2001 From: arzynik Date: Fri, 25 Apr 2014 23:54:14 -0700 Subject: [PATCH 10/27] fixed php path --- cli/dbbackup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/dbbackup.php b/cli/dbbackup.php index 50b7f128c..736f1fb0e 100755 --- a/cli/dbbackup.php +++ b/cli/dbbackup.php @@ -1,4 +1,4 @@ -#!/usr/bin/php +#!/usr/local/bin/php Date: Sat, 26 Apr 2014 13:27:03 -0700 Subject: [PATCH 11/27] stackscript updates --- stackscript/cockpit.sh | 18 +++++++++++++++--- stackscript/lamp.sh | 18 +++++++++--------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/stackscript/cockpit.sh b/stackscript/cockpit.sh index d884111f9..d39b02576 100644 --- a/stackscript/cockpit.sh +++ b/stackscript/cockpit.sh @@ -3,12 +3,23 @@ # source +source + +DEPLOYNAME=deployer + function install_cockpit { - apache_virtualhost $MACHINENAME + apache_virtualhost $1 - setup_github + groupadd dev + useradd -m -s /bin/bash -G dev $2 + + setup_github $2 + rm -Rf /home/$1 + chown $2:dev /home + sudo -u $2 git clone git@github.com:crunchbutton/crunchbutton.git /home/$1 + mkdir /home/$1/logs } @@ -19,10 +30,11 @@ set_timezone # update and install shit system_update apache_install +apache_virtualhost $MACHINENAME mysql_install $MYSQLROOTPW php_install install_basics -install_cockpit +install_cockpit $MACHINENAME $DEPLOYNAME # restart it restart_services diff --git a/stackscript/lamp.sh b/stackscript/lamp.sh index 0778168fb..9b6534f6d 100644 --- a/stackscript/lamp.sh +++ b/stackscript/lamp.sh @@ -66,15 +66,15 @@ function apache_virtualhost { mkdir -p /home/$1/www /home/$1/logs - echo "" > /etc/httpd/conf.d/sites-available/${1}.conf - echo " ServerName $1" >> /etc/httpd/conf.d/sites-available/${1}.conf - echo " DocumentRoot /home/$1/www/" >> /etc/httpd/conf.d/sites-available/${1}.conf - echo " " >> /etc/httpd/conf.d/sites-available/${1}.conf - echo " AllowOverride All" >> /etc/httpd/conf.d/sites-available/${1}.conf - echo " " >> /etc/httpd/conf.d/sites-available/${1}.conf - echo " ErrorLog /home/$1/logs/error.log" >> /etc/httpd/conf.d/sites-available/${1}.conf - echo " CustomLog /home/$1/logs/access.log combined" >> /etc/httpd/conf.d/sites-available/${1}.conf - echo "" >> /etc/httpd/conf.d/sites-available/${1}.conf + echo "" > /etc/httpd/sites-available/${1}.conf + echo " ServerName $1" >> /etc/httpd/sites-available/${1}.conf + echo " DocumentRoot /home/$1/www/" >> /etc/httpd/sites-available/${1}.conf + echo " " >> /etc/httpd/sites-available/${1}.conf + echo " AllowOverride All" >> /etc/httpd/sites-available/${1}.conf + echo " " >> /etc/httpd/sites-available/${1}.conf + echo " ErrorLog /home/$1/logs/error.log" >> /etc/httpd/sites-available/${1}.conf + echo " CustomLog /home/$1/logs/access.log combined" >> /etc/httpd/sites-available/${1}.conf + echo "" >> /etc/httpd/sites-available/${1}.conf ln -s /etc/httpd/sites-available/${1}.conf /etc/httpd/sites-enabled/${1}.conf From 7c459c1fc42163ba818464a49c608fd1e1b3b25a Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 15:15:21 -0700 Subject: [PATCH 12/27] progress on stackstripts --- stackscript/cockpit.sh | 15 +++++++-------- stackscript/lamp.sh | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/stackscript/cockpit.sh b/stackscript/cockpit.sh index d39b02576..5cd5f3c14 100644 --- a/stackscript/cockpit.sh +++ b/stackscript/cockpit.sh @@ -5,20 +5,19 @@ source source -DEPLOYNAME=deployer - function install_cockpit { apache_virtualhost $1 groupadd dev - useradd -m -s /bin/bash -G dev $2 + useradd -m -s /bin/bash -G dev deploy + # echo "sup3rb4c0n" | passwd --stdin deploy - setup_github $2 + setup_github rm -Rf /home/$1 - chown $2:dev /home - sudo -u $2 git clone git@github.com:crunchbutton/crunchbutton.git /home/$1 + chown deploy:dev /home + sudo -u deploy git clone git@github.com:crunchbutton/crunchbutton.git /home/$1 mkdir /home/$1/logs } @@ -31,10 +30,10 @@ set_timezone system_update apache_install apache_virtualhost $MACHINENAME -mysql_install $MYSQLROOTPW +# mysql_install $MYSQLROOTPW php_install install_basics -install_cockpit $MACHINENAME $DEPLOYNAME +install_cockpit $MACHINENAME # restart it restart_services diff --git a/stackscript/lamp.sh b/stackscript/lamp.sh index 9b6534f6d..9440abf36 100644 --- a/stackscript/lamp.sh +++ b/stackscript/lamp.sh @@ -183,7 +183,7 @@ function mysql_grant_user { function php_install { # yum -y remove php-common rpm -Uvh http://mirror.webtatic.com/yum/el6/latest.rpm - yum -y install php55w php55w-opcache + yum -y install php55w php55w-opcache php55w-xml } From b1fa591cb33a29e53b6d68afaa1f3ec034dfb57e Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 15:15:50 -0700 Subject: [PATCH 13/27] removed broken code --- include/library/Crunchbutton/App.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php index d5f7247dd..4c71d81ef 100755 --- a/include/library/Crunchbutton/App.php +++ b/include/library/Crunchbutton/App.php @@ -112,7 +112,7 @@ class Crunchbutton_App extends Cana_App { break; case '/Users/arzynik/Sites/crunchbutton/include/library/Crunchbutton': $params['env'] = 'local'; - $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'] = 'crunchbutton.localhost'; + $_SERVER['SERVER_NAME'] = 'crunchbutton.localhost'; $host_callback = 'crunchbutton.localhost'; break; default: From b425daef54a52506e32d9e7795eb7eb1b6ea9d62 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 15:28:06 -0700 Subject: [PATCH 14/27] added new domains --- include/library/Crunchbutton/App.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php index 4c71d81ef..c1ad168b1 100755 --- a/include/library/Crunchbutton/App.php +++ b/include/library/Crunchbutton/App.php @@ -35,6 +35,8 @@ class Crunchbutton_App extends Cana_App { case 'cockpit.crunchr.co': case 'cockpit._DOMAIN_': case 'cbtn.io': + case 'cockpit.la': + case 'dispatch.la': $env = 'live'; break; case 'wenzel.beta.crunchr.co': From ae2e504bc71f74abffa421bd2428057ac8b2c6bc Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 15:30:38 -0700 Subject: [PATCH 15/27] new domains --- include/library/Crunchbutton/App.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php index c1ad168b1..732d296b6 100755 --- a/include/library/Crunchbutton/App.php +++ b/include/library/Crunchbutton/App.php @@ -67,6 +67,8 @@ class Crunchbutton_App extends Cana_App { case '_DOMAIN_': case 'staging._DOMAIN_': case 'spicywithdelivery.com': + case 'cockpit.la': + case 'dispatch.la': $isStaging = true; $params['env'] = 'live'; break; From cdc60ba581b363ab1d8edbeb5ca258cf1b78d0f2 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 15:41:07 -0700 Subject: [PATCH 16/27] progress --- stackscript/cockpit.sh | 6 +++--- stackscript/lamp.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stackscript/cockpit.sh b/stackscript/cockpit.sh index 5cd5f3c14..ce519d922 100644 --- a/stackscript/cockpit.sh +++ b/stackscript/cockpit.sh @@ -15,10 +15,10 @@ function install_cockpit { setup_github - rm -Rf /home/$1 + rm -Rf /home/${1} chown deploy:dev /home - sudo -u deploy git clone git@github.com:crunchbutton/crunchbutton.git /home/$1 - mkdir /home/$1/logs + sudo -u deploy git clone git@github.com:crunchbutton/crunchbutton.git /home/${1} + mkdir /home/${1}/logs } diff --git a/stackscript/lamp.sh b/stackscript/lamp.sh index 9440abf36..e2e09617b 100644 --- a/stackscript/lamp.sh +++ b/stackscript/lamp.sh @@ -183,7 +183,7 @@ function mysql_grant_user { function php_install { # yum -y remove php-common rpm -Uvh http://mirror.webtatic.com/yum/el6/latest.rpm - yum -y install php55w php55w-opcache php55w-xml + yum -y install php55w php55w-opcache php55w-xml php55w-mysql php55w-mbstring php55w-mcrypt } From 7bc3f4beeb949655b85299ab1a8537fe886aaff4 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 15:50:39 -0700 Subject: [PATCH 17/27] more progress --- stackscript/cockpit.sh | 4 +++- stackscript/lamp.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stackscript/cockpit.sh b/stackscript/cockpit.sh index ce519d922..cf1f69b29 100644 --- a/stackscript/cockpit.sh +++ b/stackscript/cockpit.sh @@ -18,7 +18,9 @@ function install_cockpit { rm -Rf /home/${1} chown deploy:dev /home sudo -u deploy git clone git@github.com:crunchbutton/crunchbutton.git /home/${1} - mkdir /home/${1}/logs + mkdir /home/${1}/logs /home/${1}/cache + mkdir /home/${1}/cache/min /home/${1}/cache/thumb /home/${1}/data + chmod -R 0777 /home/${1}/cache } diff --git a/stackscript/lamp.sh b/stackscript/lamp.sh index e2e09617b..c07260110 100644 --- a/stackscript/lamp.sh +++ b/stackscript/lamp.sh @@ -183,7 +183,7 @@ function mysql_grant_user { function php_install { # yum -y remove php-common rpm -Uvh http://mirror.webtatic.com/yum/el6/latest.rpm - yum -y install php55w php55w-opcache php55w-xml php55w-mysql php55w-mbstring php55w-mcrypt + yum -y install php55w php55w-opcache php55w-xml php55w-mysql php55w-mbstring php55w-mcrypt php55w-pear } From f9eb57acd2949c46eba87b7525b0f66b9ba949a5 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 15:50:46 -0700 Subject: [PATCH 18/27] dont bundle new cockpit --- include/library/Crunchbutton/App.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php index 732d296b6..9d1bad9ac 100755 --- a/include/library/Crunchbutton/App.php +++ b/include/library/Crunchbutton/App.php @@ -226,7 +226,7 @@ class Crunchbutton_App extends Cana_App { $this->buildAuth($this->db()); - if ($params['env'] != 'local' && $_SERVER['SERVER_NAME'] != 'dev.crunchr.co') { + if ($params['env'] != 'local' && $_SERVER['SERVER_NAME'] != 'dev.crunchr.co' && $_SERVER['SERVER_NAME'] != 'cockpit.la') { $config->bundle = true; } From ec0581f8965bc01e10357741c8360a882c57c13f Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 16:02:17 -0700 Subject: [PATCH 19/27] fixed excape --- include/library/Crunchbutton/Admin/Auth.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/include/library/Crunchbutton/Admin/Auth.php b/include/library/Crunchbutton/Admin/Auth.php index 2124b5af8..c8fa66df5 100644 --- a/include/library/Crunchbutton/Admin/Auth.php +++ b/include/library/Crunchbutton/Admin/Auth.php @@ -8,17 +8,14 @@ class Crunchbutton_Admin_Auth extends Cana_Model { public static function localLogin($email, $password) { $password = self::passwordEncrypt($password); - $query = sprintf(' - SELECT * - FROM admin - WHERE - login="%s" - AND pass="%s" - AND active=1 - LIMIT 1', - @mysql_real_escape_string($email), - @mysql_real_escape_string($password) - ); + $query = ' + SELECT * + FROM admin + WHERE + login="'.c::db()->escape($email).'" + AND pass="'.c::db()->escape($password).'" + AND active=1 + LIMIT 1'; return Admin::q($query)->get(0); From 214768f189d39d7f6f689e77de9bf64fd6fe0046 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 18:24:54 -0700 Subject: [PATCH 20/27] stackscript progress --- stackscript/cockpit.sh | 4 ++++ stackscript/lamp.sh | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/stackscript/cockpit.sh b/stackscript/cockpit.sh index cf1f69b29..9b0467245 100644 --- a/stackscript/cockpit.sh +++ b/stackscript/cockpit.sh @@ -1,6 +1,7 @@ #!/bin/bash # # +# source source @@ -30,6 +31,9 @@ set_timezone # update and install shit system_update + +ssh_port $SSHPORT + apache_install apache_virtualhost $MACHINENAME # mysql_install $MYSQLROOTPW diff --git a/stackscript/lamp.sh b/stackscript/lamp.sh index c07260110..dd018eca6 100644 --- a/stackscript/lamp.sh +++ b/stackscript/lamp.sh @@ -184,6 +184,8 @@ function php_install { # yum -y remove php-common rpm -Uvh http://mirror.webtatic.com/yum/el6/latest.rpm yum -y install php55w php55w-opcache php55w-xml php55w-mysql php55w-mbstring php55w-mcrypt php55w-pear + + sed -i -e 's/^short_open_tag = Off$/short_open_tag = On/' /etc/php.ini } @@ -200,4 +202,10 @@ function restart_services { # installs my shit function install_basics { yum -yq install git wget +} + + +# changes sshs port +function ssh_port { + sed -i -e 's/^#Port 22$/Port $1/' /etc/ssh/sshd_config } \ No newline at end of file From 29c51c0dd415cf98d94b33c4666b5ff297f5d53a Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 18:34:55 -0700 Subject: [PATCH 21/27] db test --- include/config/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config/config.xml b/include/config/config.xml index 1de9ec2c5..7cdb755ab 100755 --- a/include/config/config.xml +++ b/include/config/config.xml @@ -20,7 +20,7 @@ ***REMOVED*** ***REMOVED*** crunchbutton_dev - localhost + _DOMAIN_ From 3790e4b81c6055472e9f7b38d9a1452524b2e3ec Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 18:35:56 -0700 Subject: [PATCH 22/27] updated host name --- include/config/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config/config.xml b/include/config/config.xml index 7cdb755ab..a1c4cd7b8 100755 --- a/include/config/config.xml +++ b/include/config/config.xml @@ -13,7 +13,7 @@ ***REMOVED*** ***REMOVED*** crunchbutton - localhost + _DOMAIN_ From 5219016367142ad3abdc025da7f497bb7aa597bd Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 18:36:40 -0700 Subject: [PATCH 23/27] reorder --- stackscript/cockpit.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stackscript/cockpit.sh b/stackscript/cockpit.sh index 9b0467245..e35dc3f85 100644 --- a/stackscript/cockpit.sh +++ b/stackscript/cockpit.sh @@ -16,8 +16,9 @@ function install_cockpit { setup_github - rm -Rf /home/${1} chown deploy:dev /home + rm -Rf /home/${1} + sudo -u deploy git clone git@github.com:crunchbutton/crunchbutton.git /home/${1} mkdir /home/${1}/logs /home/${1}/cache mkdir /home/${1}/cache/min /home/${1}/cache/thumb /home/${1}/data From 7aca564686a4eaba6b588d0068467dd465455857 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sat, 26 Apr 2014 18:40:35 -0700 Subject: [PATCH 24/27] fixed monor spacing issue --- www/assets/cockpit/scss/cockpit.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/assets/cockpit/scss/cockpit.scss b/www/assets/cockpit/scss/cockpit.scss index cc1c1575b..da6dca6e2 100644 --- a/www/assets/cockpit/scss/cockpit.scss +++ b/www/assets/cockpit/scss/cockpit.scss @@ -383,7 +383,7 @@ p { padding:8px 0 2px 0; text-decoration:none; color:$navLinkColor; - text-indent:20px; + text-indent:10px; cursor: pointer; } @-moz-document url-prefix() { From 98d9d2fa1d9ccfb0b6d9405d35b387276a91e270 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sun, 27 Apr 2014 13:39:52 -0700 Subject: [PATCH 25/27] partial #2546 --- .../cockpit2/api/driverorders/index.php | 34 +++++++++++++ .../default/cockpit2/api/orders/index.php | 7 --- .../cockpit2/frontend/drivers-orders.phtml | 51 +++++++++++++++++++ www/assets/cockpit/js/controllers.js | 50 ++++++++++++++++-- 4 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 include/controllers/default/cockpit2/api/driverorders/index.php delete mode 100644 include/controllers/default/cockpit2/api/orders/index.php diff --git a/include/controllers/default/cockpit2/api/driverorders/index.php b/include/controllers/default/cockpit2/api/driverorders/index.php new file mode 100644 index 000000000..83dd1adcb --- /dev/null +++ b/include/controllers/default/cockpit2/api/driverorders/index.php @@ -0,0 +1,34 @@ + $order->id_order, + 'lastStatus' => $order->deliveryLastStatus(), + 'name' => $order->name, + 'phone' => $order->phone, + 'date' => $order->date(), + 'restaurant' => $order->restaurant()->name, + ]); + } + +// if( !$justMineOrders || ( $justMineOrders && $order->lastStatus[ 'id_admin' ] == c::admin()->id_admin ) ){ + + usort($exports, function($a, $b) { + if ($a->lastStatus['status'] == $b->lastStatus['status']) { + return $a->id_order < $b->id_order; + } + return ($a->lastStatus['order'] > $b->lastStatus['order']); + }); + + echo json_encode($exports); + + } +} \ No newline at end of file diff --git a/include/controllers/default/cockpit2/api/orders/index.php b/include/controllers/default/cockpit2/api/orders/index.php deleted file mode 100644 index 6f51e1fec..000000000 --- a/include/controllers/default/cockpit2/api/orders/index.php +++ /dev/null @@ -1,7 +0,0 @@ -In order to receive payment for orders that you deliver, you MUST confirm all orders that you've delivered. Make sure your orders are confirmed and delivered!
+ +
Last Updated: just now
+ +
+
+
+ + + Delivered by {{order.lastStatus.name}} + Picked up by {{order.lastStatus.name}} + Accepted by {{order.lastStatus.name}} + + + +
+ + + Delivered by {{order.lastStatus.name}} + Picked up by {{order.lastStatus.name}} + Accepted by {{order.lastStatus.name}} + + + +
+ + + +
+ +
+
{{order.date | date:'M/d'}}
+
{{order.date | date:'h/m'}}
+
{{order.date | date:'a'}}
+
+
+
+ {{order.restaurant.name}} +
+
+ {{order.name}} +
+
+
+
+
+ +
+ You currently have no orders to deliver. +
+
+
diff --git a/www/assets/cockpit/js/controllers.js b/www/assets/cockpit/js/controllers.js index a1eb4d8f9..f190bdf3a 100644 --- a/www/assets/cockpit/js/controllers.js +++ b/www/assets/cockpit/js/controllers.js @@ -1,5 +1,7 @@ -NGApp.controller('DefaultCtrl', function ($scope, $http, $location, MainNavigationService) { - MainNavigationService.link('/drivers/orders'); +NGApp.controller('DefaultCtrl', function ($scope, $http, $location, MainNavigationService, AccountService) { + if (AccountService.user.id_admin) { + MainNavigationService.link('/drivers/orders'); + } }); NGApp.controller('MainHeaderCtrl', function ( $scope, $rootScope) { @@ -22,11 +24,49 @@ NGApp.controller('LoginCtrl', function($scope, AccountService) { } }); - -NGApp.controller('DriversOrdersCtrl', function ($scope, $rootScope) { +NGApp.controller('DriversOrderCtrl', function ($http, $scope, $rootScope) { }); -NGApp.controller('DriversShiftsCtrl', function ($scope, $rootScope) { + +NGApp.controller('DriversOrdersCtrl', function ($http, $scope, $rootScope) { + + $scope.loadOrders = function() { + $http.get(App.service + 'orders').success(function(orders) { + $scope.orders = orders; + }); + }; + + $scope.loadOrders(); + + $scope.accept = function(id_order) { + $rootScope.makebusy(); + $http.post(App.service + 'order/' + id_order + '/delivery-accept').success(function(json) { + if (json.status) { + $scope.loadOrders(); + } else { + var name = json['delivery-status'].accepted.name ? ' by ' + json[ 'delivery-status' ].accepted.name : ''; + App.alert('Ops, error!\n It seems this order was already accepted' + name + '!' ); + $scope.loadOrders(); + } + }); + }; + + $scope.pickedup = function(id_order) { + $rootScope.makebusy(); + $http.post(App.service + 'order/' + id_order + '/delivery-pickedup').success(function() { + $scope.loadOrders(); + }); + }; + + $scope.delivered = function(id_order) { + $rootScope.makebusy(); + $http.post(App.service + 'order/' + id_order + '/delivery-delivered').success(function() { + $scope.loadOrders(); + }); + }; +}); + +NGApp.controller('DriversShiftsCtrl', function ($http, $scope, $rootScope) { }); \ No newline at end of file From 269d89c0031f1632af40f0f194b336975d1ec4c7 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sun, 27 Apr 2014 14:43:25 -0700 Subject: [PATCH 26/27] updated cockpit 3.0 desktop view --- .../default/cockpit/drivers/index.php | 2 + .../default/cockpit2/layout/html.body.phtml | 1 - www/assets/cockpit/js/cockpit.js | 2 +- www/assets/cockpit/scss/cockpit.scss | 197 ++++++++++-------- 4 files changed, 115 insertions(+), 87 deletions(-) diff --git a/include/controllers/default/cockpit/drivers/index.php b/include/controllers/default/cockpit/drivers/index.php index 167f5c274..18e01fc54 100644 --- a/include/controllers/default/cockpit/drivers/index.php +++ b/include/controllers/default/cockpit/drivers/index.php @@ -24,6 +24,8 @@ class Controller_drivers extends Crunchbutton_Controller_Account { if ( c::admin()->permission()->check( [ 'global','drivers-all', 'drivers-page' ] ) ) { c::view()->page = 'drivers'; c::view()->display( 'drivers/index' ); + } else { + c::view()->display( 'home/index' ); } break; } diff --git a/include/views/default/cockpit2/layout/html.body.phtml b/include/views/default/cockpit2/layout/html.body.phtml index 44e22ae2e..434d13600 100644 --- a/include/views/default/cockpit2/layout/html.body.phtml +++ b/include/views/default/cockpit2/layout/html.body.phtml @@ -1,4 +1,3 @@ -{{navigation.page}}
    diff --git a/www/assets/cockpit/js/cockpit.js b/www/assets/cockpit/js/cockpit.js index b76f3d804..dcf0880a1 100644 --- a/www/assets/cockpit/js/cockpit.js +++ b/www/assets/cockpit/js/cockpit.js @@ -332,7 +332,7 @@ App.init = function(config) { }); var snapperCheck = function() { - if ($(window).width() <= 768) { + if ($(window).width() <= 1024) { App.snap.enable(); } else { App.snap.close(); diff --git a/www/assets/cockpit/scss/cockpit.scss b/www/assets/cockpit/scss/cockpit.scss index da6dca6e2..f85de8c5d 100644 --- a/www/assets/cockpit/scss/cockpit.scss +++ b/www/assets/cockpit/scss/cockpit.scss @@ -101,7 +101,6 @@ html { .nav .content, .content-padding { /*max-width: 767px;*/ - max-width: 1024px; margin: 0 auto; } } @@ -135,11 +134,6 @@ html { font-weight: bold; } -@media screen and (min-width: 769px) { - .logo { - text-align: left; - } -} @media screen and (min-width: 1025px) { .nav-back { display: none; @@ -249,9 +243,6 @@ p { .nav-back { margin: 3px 0 0 6px; } - .nav-cart { - margin: 3px 10px 0 0; - } .top-pad { height: 58px; } @@ -266,18 +257,16 @@ p { - - - - -/* SNAPS */ -@media(min-width:769px) { - .snap-drawers { - display:none; - } +.nav-top { + background: $navColor; + background: rgba($navColor, .97); + padding-top: 15px; + border-bottom: 1px solid rgba(darken($navColor, 50%), .97); + height: 4em; } -@media(max-width:768px) { + +@media(max-width:1024px) { body { position: fixed; top: 0; @@ -286,9 +275,6 @@ p { left: 0; overflow: hidden; } - .footer { - display: none; - } .snap-content-inner { position:absolute; top:0; @@ -339,11 +325,9 @@ p { -ms-transition: width 0.3s ease; -o-transition: width 0.3s ease; transition: width 0.3s ease; - + } .snap-drawers { - background: $sideBg; - color:#eee; position:absolute; top:0; right:0; @@ -353,70 +337,121 @@ p { height:auto; overflow:hidden; } - .snap-drawer-left { - left:0; - z-index:1; +} + + +.snap-drawers { + background: $sideBg; + color:#eee; +} + +.snap-drawer-left { + left:0; + z-index:1; +} +.snap-drawer-right { + right: 0; + z-index:1; +} +.snapjs-left .snap-drawer-right, +.snapjs-right .snap-drawer-left { + display: none; +} +.snapjs-expand-left .snap-drawer-left, +.snapjs-expand-right .snap-drawer-right { + width: 100%; +} +.snap-drawer ul { + padding:0; + margin:0; + list-style-type:none; +} +.snap-drawer li.nav-active .side-menu-wrap { + background: $green; + color: #fff; +} +.snap-drawer li { + display:block; + padding:8px 0 2px 0; + text-decoration:none; + color:$navLinkColor; + text-indent:10px; + cursor: pointer; +} +@-moz-document url-prefix() { + .snap-content { + transform:none; } - .snap-drawer-right { - right: 0; - z-index:1; +} +.snap-drawer .fa { + font-size: 15px; +} +.side-menu-wrap { + height: 28px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + width: 249px; + margin-left: 8px; +} +.side-menu-label { + vertical-align: top; + line-height: 1.6em; + font-size: 14px; + font-family: Ruda, Open Sans, Helvetica, Arial, sans-serif; +} + +.side-menu-icon { + line-height: 2.2em; + width: 40px; + margin-left: -20px; +} + +.side-menu-label, .side-menu-icon { + padding: 12px 0 10px 0; +} + + + +/* SNAPS */ +@media(min-width:1025px) { + .wrapper { + float: left; } - .snapjs-left .snap-drawer-right, - .snapjs-right .snap-drawer-left { + #side-menu-right { display: none; } - .snapjs-expand-left .snap-drawer-left, - .snapjs-expand-right .snap-drawer-right { - width: 100%; + .snap-drawers { + width: 225px; + float: left; + height: 100%; + bottom: 0; + top: 0; + position: absolute; } - .snap-drawer ul { - padding:0; - margin:0; - list-style-type:none; + .snap-content-inner { + margin-left: 235px; + margin-right: 10px; } - .snap-drawer li.nav-active .side-menu-wrap { - background: $green; - color: #fff; + .snap-drawer-left { + margin-top: 65px; + -webkit-transform: translateX(0) !important; } - .snap-drawer li { - display:block; - padding:8px 0 2px 0; - text-decoration:none; - color:$navLinkColor; - text-indent:10px; - cursor: pointer; - } - @-moz-document url-prefix() { - .snap-content { - transform:none; - } - } - .snap-drawer .fa { - font-size: 15px; + .nav-top { + background: #22242a; + border-botom: 0; } .side-menu-wrap { - height: 28px; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - width: 249px; - margin-left: 8px; + width: 208px; } - .side-menu-label { - vertical-align: top; - line-height: 1.6em; - font-size: 14px; - font-family: Ruda, Open Sans, Helvetica, Arial, sans-serif; + .menu { + display: none; } - - .side-menu-icon { - line-height: 2.2em; - width: 40px; - margin-left: -20px; + .nav-top .logo { + margin-left: 10px; } - - .side-menu-label, .side-menu-icon { - padding: 12px 0 10px 0; + .logo { + text-align: left; } } @@ -448,14 +483,6 @@ p { display: none !important; } -.nav-top { - background: $navColor; - background: rgba($navColor, .97); - padding-top: 15px; - border-bottom: 1px solid rgba(darken($navColor, 50%), .97); - height: 4em; -} - .login-wrap { background: $navColor; position: fixed; From fdbdc59e178a68c7058f80c4c28a3a17ed205387 Mon Sep 17 00:00:00 2001 From: arzynik Date: Sun, 27 Apr 2014 16:59:14 -0700 Subject: [PATCH 27/27] partial #2546 --- .../views/default/cockpit2/bundle/js.phtml | 3 +- .../cockpit2/frontend/drivers-orders.phtml | 26 +++------ .../default/cockpit2/layout/html.body.phtml | 46 ++++++++------- www/assets/cockpit/js/controllers.js | 10 +--- www/assets/cockpit/js/service.driverorders.js | 58 +++++++++++++++++++ www/assets/cockpit/scss/cockpit.scss | 18 +++++- 6 files changed, 111 insertions(+), 50 deletions(-) create mode 100644 www/assets/cockpit/js/service.driverorders.js diff --git a/include/views/default/cockpit2/bundle/js.phtml b/include/views/default/cockpit2/bundle/js.phtml index 87230f773..027ca4ee2 100644 --- a/include/views/default/cockpit2/bundle/js.phtml +++ b/include/views/default/cockpit2/bundle/js.phtml @@ -38,4 +38,5 @@ - \ No newline at end of file + + diff --git a/include/views/default/cockpit2/frontend/drivers-orders.phtml b/include/views/default/cockpit2/frontend/drivers-orders.phtml index 4a96c626a..fd7506e73 100644 --- a/include/views/default/cockpit2/frontend/drivers-orders.phtml +++ b/include/views/default/cockpit2/frontend/drivers-orders.phtml @@ -10,17 +10,7 @@
    -
    - - - Delivered by {{order.lastStatus.name}} - Picked up by {{order.lastStatus.name}} - Accepted by {{order.lastStatus.name}} - - - -
    - +
    Delivered by {{order.lastStatus.name}} Picked up by {{order.lastStatus.name}} @@ -29,19 +19,19 @@
    - - - + + +
    -
    {{order.date | date:'M/d'}}
    -
    {{order.date | date:'h/m'}}
    -
    {{order.date | date:'a'}}
    +
    {{order.date.date | date:'M/d'}}
    +
    {{order.date.date | date:'h/m'}}
    +
    {{order.date.date | date:'a'}}
    - {{order.restaurant.name}} + {{order.restaurant}}
    {{order.name}} diff --git a/include/views/default/cockpit2/layout/html.body.phtml b/include/views/default/cockpit2/layout/html.body.phtml index 434d13600..e864621a9 100644 --- a/include/views/default/cockpit2/layout/html.body.phtml +++ b/include/views/default/cockpit2/layout/html.body.phtml @@ -115,6 +115,7 @@
    +
    {{newDriverOrders}}
    @@ -151,31 +152,32 @@