rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '334-trans-make-env-entry-for-disabling-dashboard' into '329-transition-branch-for-cmb-and-resq-merging'

Browse source 
Resolve "TRANS - make .env entry for disabling dashboard"

See merge request jankstudio/resq!392
This commit is contained in:
Kendrick Chan 2020-02-19 05:26:08 +00:00
commit 03d2133716
3 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.env.dist
View file

@ -15,7 +15,7 @@ APP_SECRET=b344cd6cd151ae1d61403ed55806c5ce
# Configure your db driver and server_version in config/packages/doctrine.yaml # Configure your db driver and server_version in config/packages/doctrine.yaml
DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
###< doctrine/doctrine-bundle ### ###< doctrine/doctrine-bundle ###
GMAPS_API_KEY=insertgmapsapikeyhere GMAPS_API_KEY=insert_gmapsapikey_here
# rising tide sms gateway # rising tide sms gateway
RT_USER=rt_user RT_USER=rt_user
@ -28,7 +28,7 @@ RT_SHORTCODE=1234
MQTT_IP_ADDRESS=localhost MQTT_IP_ADDRESS=localhost
MQTT_PORT=8883 MQTT_PORT=8883
MQTT_CERT=/location/of/cert/file.crt MQTT_CERT=/location/of/cert/file.crt
MQTT_WS_HOST=insertiphere MQTT_WS_HOST=insert_ip_here
MQTT_WS_PORT=8083 MQTT_WS_PORT=8083
# redis client # redis client
@ -38,20 +38,22 @@ REDIS_CLIENT_PORT=6379
REDIS_CLIENT_PASSWORD=foobared REDIS_CLIENT_PASSWORD=foobared
# privacy policy ids # privacy policy ids
POLICY_PROMO=insertpromopolicyidhere POLICY_PROMO=insert_promopolicyid_here
POLICY_THIRD_PARTY=insertthirdpartypolicyidhere POLICY_THIRD_PARTY=insert_thirdpartypolicyid_here
POLICY_MOBILE=insertmobilepolicyidhere POLICY_MOBILE=insert_mobilepolicyid_here
# OTP # OTP
OTP_MODE=settotestorrandom OTP_MODE=set_to_test_or_random
# geofence # geofence
GEOFENCE_ENABLE=settotrueorfalse GEOFENCE_ENABLE=set_to_true_or_false
# unknown manufacturer and vehicle ids # unknown manufacturer and vehicle ids
CVU_MFG_ID=insertmfgidforunknownvehicles CVU_MFG_ID=insert_mfgid_for_unknown_vehicles
CVU_BRAND_ID=insertbrandidforunknownvehicles CVU_BRAND_ID=insert_brandid_for_unknown_vehicles
# country code prefix # country code prefix
COUNTRY_CODE=+insertcountrycodehere COUNTRY_CODE=+insert_country_code_here
# dashboard
DASHBOARD_ENABLE=set_to_true_or_false

1
config/packages/twig.yaml
View file

@ -6,3 +6,4 @@ twig:
gmaps_api_key: "%env(GMAPS_API_KEY)%" gmaps_api_key: "%env(GMAPS_API_KEY)%"
mqtt_host: "%env(MQTT_WS_HOST)%" mqtt_host: "%env(MQTT_WS_HOST)%"
mqtt_port: "%env(MQTT_WS_PORT)%" mqtt_port: "%env(MQTT_WS_PORT)%"
dashboard_enable: "%env(DASHBOARD_ENABLE)%"

14
templates/home.html.twig
View file

@ -15,7 +15,9 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.min.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.min.js" type="text/javascript"></script>
<script src="{{ asset('assets/js/dashboard_map.js') }}"></script> <script src="{{ asset('assets/js/dashboard_map.js') }}"></script>
<script src="{{ asset('assets/js/map_mqtt.js') }}"></script> <script src="{{ asset('assets/js/map_mqtt.js') }}"></script>
{{ include('map/' ~ map_js_file) }} {% if dashboard_enable == 'true' %}
{{ include('map/' ~ map_js_file) }}
{% endif %}
<script> <script>
function initMap(r_markers, c_markers, icons) { function initMap(r_markers, c_markers, icons) {
@ -58,6 +60,7 @@ function initEventHandler(dashmap) {
event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }}); event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }});
} }
{% if dashboard_enable == 'true' %}
// create icons // create icons
var icons = { var icons = {
'rider_active_jo': L.divIcon({ 'rider_active_jo': L.divIcon({
@ -80,11 +83,12 @@ var icons = {
}) })
}; };
var r_markers = {}; var r_markers = {};
var c_markers = {}; var c_markers = {};
var dashmap = initMap(r_markers, c_markers, icons); var dashmap = initMap(r_markers, c_markers, icons);
initEventHandler(dashmap, icons); initEventHandler(dashmap, icons);
{% endif %}
</script> </script>
{% endblock %} {% endblock %}