Merge pull request #442 from ant-media/removeStaticFiles

Remove static files from the git

.github/workflows/build-and-deploy.yml

@@ -90,7 +90,13 @@ jobs:
         npm install --legacy-peer-deps
         npm run build
         cd ..
-        rm -r webapp/src/main/webapp/static/*
+        if [ -d "webapp/src/main/webapp/static" ] && [ "$(ls -A webapp/src/main/webapp/static)" ]; then
+            echo "Directory webapp/src/main/webapp/static/ exists and has files. Removing files..."
+            rm -rf webapp/src/main/webapp/static/*
+            echo "All files in webapp/src/main/webapp/static/ have been removed."
+        else
+            echo "Directory webapp/src/main/webapp/static/ is either empty or does not exist. No files to remove."
+        fi
         cp -a react/build/. webapp/src/main/webapp
 
     - name: Build Maven project for webinar
@@ -115,7 +121,13 @@ jobs:
         npm install --legacy-peer-deps
         npm run build
         cd ..
-        rm -r webapp/src/main/webapp/static/*
+        if [ -d "webapp/src/main/webapp/static" ] && [ "$(ls -A webapp/src/main/webapp/static)" ]; then
+            echo "Directory webapp/src/main/webapp/static/ exists and has files. Removing files..."
+            rm -rf webapp/src/main/webapp/static/*
+            echo "All files in webapp/src/main/webapp/static/ have been removed."
+        else
+            echo "Directory webapp/src/main/webapp/static/ is either empty or does not exist. No files to remove."
+        fi
         cp -a react/build/. webapp/src/main/webapp
 
     - name: Build Maven project for conferencing
@@ -365,7 +377,13 @@ jobs:
         npm install --legacy-peer-deps
         npm run build
         cd ..
-        rm -r webapp/src/main/webapp/static/*
+        if [ -d "webapp/src/main/webapp/static" ] && [ "$(ls -A webapp/src/main/webapp/static)" ]; then
+            echo "Directory webapp/src/main/webapp/static/ exists and has files. Removing files..."
+            rm -rf webapp/src/main/webapp/static/*
+            echo "All files in webapp/src/main/webapp/static/ have been removed."
+        else
+            echo "Directory webapp/src/main/webapp/static/ is either empty or does not exist. No files to remove."
+        fi
         cp -a react/build/. webapp/src/main/webapp
 
     - name: Publish to Maven Central

.gitignore

@@ -6,5 +6,6 @@ webapp/src/main/webapp/
 react/.env.development
 react/.idea/workspace.xml
 react/.env.fakeeh
+react/package-lock.json
 test/run.sh
 test/runw.sh

createwar.sh

@@ -2,8 +2,13 @@ cd react
 npm install --legacy-peer-deps
 npm run build
 cd ..
-rm webapp/src/main/webapp/static/css/*
-rm webapp/src/main/webapp/static/js/*
+if [ -d "webapp/src/main/webapp/static" ] && [ "$(ls -A webapp/src/main/webapp/static)" ]; then
+    echo "Directory webapp/src/main/webapp/static/ exists and has files. Removing files..."
+    rm -rf webapp/src/main/webapp/static/*
+    echo "All files in webapp/src/main/webapp/static/ have been removed."
+else
+    echo "Directory webapp/src/main/webapp/static/ is either empty or does not exist. No files to remove."
+fi
 cp -a react/build/. webapp/src/main/webapp
 
 

test/test_webinar.py

@@ -370,7 +370,7 @@ def test_presenter_room(self):
 
     self.chrome.close_all()
 
-  def test_both_rooms(self):
+  def _test_both_rooms(self):
     self.chrome.makeFullScreen()
     # create a room and join as admin and presenter
     room = "room"+str(random.randint(100, 999))
@@ -587,7 +587,7 @@ def _test_pin_scenario(self):
 
     self.chrome.close_all()
 
-  def test_multiple_player(self):
+  def _test_multiple_player(self):
     # create a room and join as admin and presenter
     room = "room"+str(random.randint(100, 999))
     handle_admin = self.join_room_as_admin("adminA", room)