Remove React plugin submodule

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "GermanAirlinesVA-Schooling"]
 	path = GermanAirlinesVA-Schooling
 	url = https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Schooling.git
+[submodule "GermanAirlinesVA-Routes"]
+	path = GermanAirlinesVA-Routes
+	url = https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Routes.git
+[submodule "GermanAirlinesVA-Social"]
+	path = GermanAirlinesVA-Social
+	url = https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Social.git

composer.json

@@ -5,6 +5,9 @@
   "require": {
     "germanairlinesva/graphql": "dev-master",
     "germanairlinesva/schooling": "dev-master",
-    "germanairlinesva/fleet": "dev-master"
+    "germanairlinesva/fleet": "dev-master",
+    "germanairlinesva/react": "dev-master",
+    "germanairlinesva/routes": "dev-master",
+    "germanairlinesva/social": "dev-master"
   }
-}
+}

installer/ga_install.sh

@@ -9,6 +9,10 @@ repos="{
     \"type\": \"git\",
     \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-GraphQL.git\"
   },
+  \"ga.react\": {
+    \"type\": \"git\",
+    \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-React.git\"
+  },
   \"ga.schooling\": {
     \"type\": \"git\",
     \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Schooling.git\"
@@ -16,6 +20,14 @@ repos="{
   \"ga.fleet\": {
     \"type\": \"git\",
     \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Fleet.git\"
+  },
+  \"ga.routes\": {
+    \"type\": \"git\",
+    \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Routes.git\"
+  },
+  \"ga.social\": {
+    \"type\": \"git\",
+    \"url\": \"https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Social.git\"
   }
 }"
 require="{

installer/ga_install_prereq.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
 
 whiptail --msgbox "Installing GA Prerequisites" 7 31
-apt install npm git jq
+apt install npm git jq -y
+npm i -g yarn
+npm i -g n
+n 12
 if [ $? != 0 ]; then
   echo -e "\033[0;31mCould not install GermanAirlines specific prerequisites"
   exit 1
 fi
+

installer/ga_postinstall_setup.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+tmp=$(mktemp)
+
+cd /var/www/ga
+
+whiptail --msgbox "Linking graphs directory" 7 28
+mkdir graphql
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not add graphql directory"
+  exit 1
+fi
+cd graphql
+ln -s ../plugins/germanairlinesva/graphql/graphs
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not link graphs directory"
+  exit 1
+fi
+
+whiptail --msgbox "Installing packages" 7 23
+cd ../plugins/germanairlinesva/fleet
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install fleet packages"
+  exit 1
+fi
+cd ../graphql
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install graphql packages"
+  exit 1
+fi
+cd ../react
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install react packages"
+  exit 1
+fi
+cd ../routes
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install routes packages"
+  exit 1
+fi
+cd ../schooling
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install schooling packages"
+  exit 1
+fi
+cd ../social
+yarn install
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not install social packages"
+  exit 1
+fi
+
+cd /var/www/ga
+
+whiptail --msgbox "Setting ownership" 7 21
+chown www-data:www-data -R .
+if [ $? != 0 ]; then
+  echo -e "\033[0;31mCould not set ownership to www-data"
+  exit 1
+fi

installer/ga_preinstall_setup.sh

@@ -17,7 +17,6 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-
 cd config
 
 whiptail --msgbox "Adding BROADCAST_DRIVER env" 7 31
@@ -27,27 +26,3 @@ if [ $? != 0 ]; then
   echo -e "\033[0;31mCould not patch broadcasting config"
   exit 1
 fi
-
-cd ..
-
-whiptail --msgbox "Linking graphs directory" 7 28
-mkdir graphql
-if [ $? != 0 ]; then
-  echo -e "\033[0;31mCould not add graphql directory"
-  exit 1
-fi
-cd graphql
-ln -s ../plugins/germanairlinesva/graphql/graphs
-if [ $? != 0 ]; then
-  echo -e "\033[0;31mCould not link graphs directory"
-  exit 1
-fi
-
-cd ..
-
-whiptail --msgbox "Setting ownership" 7 21
-chown www-data -R .
-if [ $? != 0 ]; then
-  echo -e "\033[0;31mCould not set ownership to www-data"
-  exit 1
-fi

installer/install.sh

@@ -26,11 +26,15 @@ fi
 if [ $? != 0 ]; then
   exit 1
 fi
+./ga_preinstall_setup.sh
+if [ $? != 0 ]; then
+  exit 1
+fi
 ./ga_install.sh
 if [ $? != 0 ]; then
   exit 1
 fi
-./ga_setup.sh
+./ga_postinstall_setup.sh
 if [ $? != 0 ]; then
   exit 1
 fi

installer/october_db_setup.sql

@@ -1,6 +1,9 @@
 create database october;
 create database germanairlinesva_fleet;
+create database germanairlinesva_graphql;
+create database germanairlinesva_routes;
 create database germanairlinesva_schooling;
+create database germanairlinesva_social;
 
 create user 'october'@'localhost' identified by '1582';
 

installer/october_install_prereq.sh

@@ -3,7 +3,7 @@
 tmp=$(mktemp)
 
 whiptail --msgbox "Installing LAMP + Redis" 7 27
-apt install apache2 libapache2-mod-php php mysql-server mysql-client php-mysql redis php-redis php-ctype php-curl php-xml php-fileinfo php-gd php-json php-mbstring php-zip
+apt install apache2 libapache2-mod-php php mysql-server mysql-client php-mysql redis php-redis php-ctype php-curl php-xml php-fileinfo php-gd php-json php-mbstring php-zip -y
 if [ $? != 0 ]; then
   echo -e "\033[0;31mapt failed to run"
   exit 1