add background-color in place of image

.gitignore

@@ -23,6 +23,7 @@ include/config/config.xml
 # files in cache
 /cache
 /logs/*
+/Logs/*
 /www/cache/*
 
 # files in build
@@ -47,8 +48,7 @@ vendor/*
 npm-debug.log
 
 composer.phar
-composer.lock
 
 .env
 
-node_modules
+node_modules

Nginx/Dockerfile

@@ -1,4 +1,5 @@
-FROM debian:jessie
+
+FROM debian:buster
 
 RUN apt-get update && apt-get install -y nginx
 
@@ -6,4 +7,4 @@ RUN usermod -u 1000 www-data
 CMD ["nginx"]
 
 EXPOSE 80
-EXPOSE 443
+EXPOSE 443

PHP7fpm/Dockerfile

@@ -1,13 +1,30 @@
-FROM php:7.2.1-fpm
+# On PHP 8:Lots of PHP syntax changes
+FROM php:7.2-fpm
 
-RUN echo 'deb http://httpredir.debian.org/debian jessie contrib' >> /etc/apt/sources.list
+RUN echo 'deb http://deb.debian.org/debian buster contrib' >> /etc/apt/sources.list
 
 RUN apt-get update
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y --force-yes libssl-dev curl  libcurl4-gnutls-dev libxml2-dev libicu-dev libmcrypt4 libmemcached11 openssl
+RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y --force-yes zip nano libzip-dev libonig-dev libssl-dev curl libcurl4-gnutls-dev libxml2-dev libicu-dev libmcrypt4 libmemcached11 openssl
+
+#Install Blackfire
+# Please note that the Blackfire Probe is dependent on the session module.
+# If it isn't present in your install, you will need to enable it yourself.
+
+RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION.(PHP_ZTS ? '-zts' : '');") \
+&& architecture=$(uname -m) \
+&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/$architecture/$version \
+&& mkdir -p /tmp/blackfire \
+&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
+&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
+&& printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8307\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
+&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 RUN docker-php-ext-install opcache
 
-RUN pecl install apcu-5.1.5 && docker-php-ext-enable apcu
+RUN pecl install apcu-5.1.23 && docker-php-ext-enable apcu
 
 RUN docker-php-ext-install bcmath
 RUN apt-get update
@@ -22,10 +39,13 @@ RUN docker-php-ext-install pdo pdo_mysql
 RUN docker-php-ext-install mbstring
 RUN docker-php-ext-install zip
 RUN apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng16-16
+# On PHP 7: 
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
+# On PHP 8: 
+#RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
 RUN docker-php-ext-install gd
 
 CMD /var/app/cli/build.sh 
 
 EXPOSE 9000
-CMD ["php-fpm"]
+CMD ["php-fpm"]

cli/install.php

@@ -16,6 +16,7 @@ $db = new \PDO($type.':host='.$url['host'].($url['port'] ? ';port='.$url['port']
 $db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 $db->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
 
+
 if ($argv[1] == '--force') {
 	// drop all the tables and force install
 	echo "\nDroping existing tables...";
@@ -31,10 +32,12 @@ if ($argv[1] == '--force') {
 	echo "complete.";
 }
 
+
 echo "\nCreating db schema...";
 $db->exec(file_get_contents(__DIR__ . '/../db/dump.sql'));
 echo "complete.\n";
 
+
 echo "Running db migrate scripts...\n";
 
 $dirs = [__DIR__ . '/../db/migrate'];
@@ -90,4 +93,4 @@ if ($error) {
 	exit(1);
 } else {
 	exit(0);
-}
+}

cli/install.sh

@@ -1,2 +1,6 @@
 #!/usr/bin/env bash
-docker exec -it cb_server php /var/app/cli/install.php --force
+docker exec --workdir /var/app -it sd_server composer update
+docker exec --workdir /var/app -it sd_server composer install
+
+docker exec -it sd_server php /var/app/cli/install.php --force
+

composer.json

@@ -16,10 +16,10 @@
 		"lob/lob-php": "^1.4",
 		"aws/aws-sdk-php": "^3.12",
 		"vlucas/phpdotenv": "^2.4",
-		"phpseclib/mcrypt_compat": "dev-master"
+		"phpseclib/mcrypt_compat": "^2.0.6"
 	},
 	"require-dev": {
-		"satooshi/php-coveralls": "dev-master",
+		"php-coveralls/php-coveralls": "^2.7",
 		"phpunit/phpunit": "^5.0"
 	}
 }

docker-compose.yml

@@ -1,12 +1,12 @@
-version: "2"
 services:
   fpm:
     build: PHP7fpm
-    # restart: always
+    restart: unless-stopped
     volumes:
       - ./:/var/app
     environment:
-      - DATABASE_URL=mysql://root:root@cb_db/api_db
+    # mysqlsoftware://user:pass@container-name/database-name
+      - DATABASE_URL=mysql://root:root@sd_db/sd_db
       - ENV=dev
 
     ports:
@@ -14,7 +14,7 @@ services:
     links:
       - mysql
 
-    container_name: cb_server
+    container_name: sd_server
 
   nginx:
     build: Nginx
@@ -28,16 +28,24 @@ services:
       - "443:443"
     links:
       - fpm
-    container_name: cb_nginx
+    container_name: sd_nginx
 
   mysql:
     image: mysql:5.7
-    #restart: always
+    restart: unless-stopped
     ports:
       - "3306:3306"
+    ulimits:
+      nofile:
+        soft: "1048576"
+        hard: "1048576"
+    env_file:
+      - path: ./.env
     environment:
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_DATABASE=api_db
+    # information comes from ./.env file
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
+      - MYSQL_ROOT_HOST=${MYSQL_ROOT_HOST}
     volumes:
       - ./data/db:/var/lib/mysql
-    container_name: cb_db
+    container_name: sd_db

include/config/config.xml

@@ -15,8 +15,8 @@
 			<adapter>file</adapter>
 		</file>
 	</cache>
-	<imgCache>http://i.crunchbutton.com/cache/</imgCache>
-	<powered>Sex &amp; Drugs</powered>
+	<imgCache>http://i.sharpetronics.com/cache/</imgCache>
+	<powered>SharpeTronics LLC</powered>
 	<server>In Training</server>
 	<s3>
 		<key>_KEY_</key>
@@ -301,4 +301,4 @@
 	<test>
 		<key>HELLO</key>
 	</test>
-</data>
+</data>

include/views/default/cockpit/restaurants/restaurant.phtml

@@ -1377,7 +1377,9 @@
 		</div>
 	</div>
 
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&key=AIzaSyDNJ0f3yxbeksuiQh0iG1_drBO1Mmhg_Bg"></script>
+<script async
+    src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBc0kY5R4DbnT9s4X011lWrdiqBwn0obJs&loading=async&libraries=places">
+</script>
 <script type="text/javascript" src="/assets/js/admin_restaurant.js?v=<?=$_ENV['HEROKU_SLUG_COMMIT']?>"></script>
 <script type="text/javascript" src="/assets/js/intro.js?v=<?=$_ENV['HEROKU_SLUG_COMMIT']?>"></script>
 <script>
@@ -1464,4 +1466,4 @@ function isDeliveryServiceChecked(){
 var _id_restaurant = '<?php echo $this->restaurant->id_restaurant?>';
 var expanded_view_checked = <?php echo ( Crunchbutton_Config::getVal( 'cockpit-expanded-view-checked-as-default' ) == '1' ) ? '1' : '0'; ?>;
 ADMIN.restaurant_init(<?php echo $this->restaurant->id_restaurant?>);
-</script>
+</script>

include/views/default/cockpit/restaurants/weight/form.phtml

@@ -106,7 +106,9 @@
 
 <script type="text/javascript" src="/assets/js/location.js"></script>
 <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&key=AIzaSyDNJ0f3yxbeksuiQh0iG1_drBO1Mmhg_Bg"></script>
+<script async
+    src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBc0kY5R4DbnT9s4X011lWrdiqBwn0obJs&loading=async&libraries=places">
+</script>
 <script type="text/javascript">
 $(function() {
 
@@ -215,4 +217,4 @@ function resetDivs(){
 }
 
 
-</script>
+</script>

include/views/default/cockpit2/layout/html.bottom.phtml

@@ -4,7 +4,9 @@
 
 <script src="//media.twiliocdn.com/sdk/js/client/v1.3/twilio.min.js"></script>
 <script src="https://www.google.com/jsapi"></script>
-<script src="https://maps.googleapis.com/maps/api/js?libraries=places&sensor=false&key=AIzaSyDNJ0f3yxbeksuiQh0iG1_drBO1Mmhg_Bg"></script>
+<script async
+    src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBc0kY5R4DbnT9s4X011lWrdiqBwn0obJs&loading=async&libraries=places">
+</script>
 <script src="https://js.stripe.com/v2/" bundle="false"></script>
 <script>
 	Stripe.setPublishableKey( '<?=c::config()->stripe->{c::getEnv()}->{'public'}?>' );

include/views/default/crunchbutton/layout/html.phtml

@@ -32,4 +32,6 @@ window.twttr = ( function(d, s, id) {
 
 <?=$this->display('layout/html.bottom')?>
 
-<script src="//maps.googleapis.com/maps/api/js?libraries=places&sensor=false&key=AIzaSyDNJ0f3yxbeksuiQh0iG1_drBO1Mmhg_Bg"></script>
+<script async
+    src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBc0kY5R4DbnT9s4X011lWrdiqBwn0obJs&loading=async&libraries=places">
+</script>

www/assets/cockpit/css/preload.css

@@ -9,7 +9,7 @@ body {
 	left: 0;
 	right: 0;
 	bottom: 0;
-	background: url(https://d1f9xa61stkpgn.cloudfront.net/viztango-usc.jpg) center center no-repeat;
+	background-color: #444444;
 	-webkit-filter: brightness(0.6) contrast(125%);
 	background-size:cover;
 	position: fixed;

www/assets/cockpit/scss/cockpit.scss

@@ -814,7 +814,7 @@ p {
 
 
 @mixin page-login-bg() {
-	background: url(https://d1f9xa61stkpgn.cloudfront.net/viztango-usc.jpg) center center no-repeat;
+	background-color: #444444;
 	-webkit-filter: brightness(0.6) contrast(125%);
 	background-size:cover;
 	z-index: -1;
@@ -5029,4 +5029,4 @@ a.button {
 }
 .mfp-hide {
   display: none !important; 
-}
+}