Browse Source

Minor bug fixes

Owen Diffey 3 years ago
parent
commit
aa6a7f54cd
3 changed files with 5 additions and 3 deletions
  1. 2 2
      frontend/bootstrap.sh
  2. 1 0
      frontend/src/components/modals/ManageStation/index.vue
  3. 2 1
      musare.sh

+ 2 - 2
frontend/bootstrap.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 if [ "$FRONTEND_MODE" == "prod" ] ; then
-	nginx -c /opt/app/$FRONTEND_MODE.nginx.conf -g "daemon off;"
 	cd /opt/app ; npm run $FRONTEND_MODE
+	nginx -c /opt/app/$FRONTEND_MODE.nginx.conf -g "daemon off;"
 elif [ "$FRONTEND_MODE" == "dev" ] ; then
 	nginx -c /opt/app/$FRONTEND_MODE.nginx.conf
 	cd /opt/app; npm run $FRONTEND_MODE
-fi
+fi

+ 1 - 0
frontend/src/components/modals/ManageStation/index.vue

@@ -6,6 +6,7 @@
 				? 'Add Song to Queue'
 				: 'Manage Station'
 		"
+		:style="`--primary-color: var(--${station.theme})`"
 		class="manage-station-modal"
 	>
 		<template #body>

+ 2 - 1
musare.sh

@@ -172,6 +172,7 @@ if [[ -x "$(command -v docker)" && -x "$(command -v docker-compose)" ]]; then
         else
             git pull
             docker-compose build
+            docker-compose stop
             docker-compose up -d
         fi
         ;;
@@ -297,4 +298,4 @@ elif [[ ! -x "$(command -v docker)" && -x "$(command -v docker-compose)" ]]; the
     echo -e "${RED}Error: docker not installed.${NC}"
 else
     echo -e "${RED}Error: docker and docker-compose not installed.${NC}"
-fi
+fi