Merge branch 'develop'

2024-Techeer-Summer-Bootcamp-Team-D · Jul 14, 2024 · d4c3f98 · d4c3f98
2 parents aad1056 + e3a1128
commit d4c3f98
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
-*.log
+*.log
+venv
diff --git a/.idea/MVStudio-Docker.iml b/.idea/MVStudio-Docker.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/MVStudio-Backend b/MVStudio-Backend
diff --git a/MVStudio-Frontend b/MVStudio-Frontend
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -27,7 +27,7 @@ services:
   celery:
     build:
       context: ./MVStudio-Backend
-    command: celery -A config worker --loglevel=info
+    command: celery -A config worker --loglevel=info --concurrency=2
     depends_on:
       - redis
       - rabbitmq
@@ -114,7 +114,7 @@ services:
             python manage.py migrate &&
             python manage.py search_index --create &&
             python manage.py search_index --rebuild -f&&
-            python manage.py runserver 0.0.0.0:8000"
+            gunicorn --bind 0.0.0.0:8000 config.wsgi:application -w 2"
 
   frontend:
     container_name: MVStudio-Frontend
+1 −1		config/__init__.py
+4 −0		config/celery.py
+23 −0		config/settings.py
+40 −0		music_videos/documents.py
+238 −1		music_videos/tasks.py
+1 −0		music_videos/urls.py
+88 −231		music_videos/views.py
+3 −1		requirements.txt
+0 −1		.gitignore
+0 −91		package-lock.json
+0 −1		package.json
+1 −3		src/App.jsx
+13 −0		src/GlobalStyles.js
+0 −16		src/api/axios.config.js
+0 −19		src/api/login.js
+3 −3		src/components/LongCover.jsx
+0 −0		src/components/Lyricscover.jsx
+3 −4		src/components/Navbar.jsx
+66 −133		src/components/Sidebar.jsx
+0 −0		src/index.css
+1 −1		src/main.jsx
+9 −11		src/pages/AppRouter.jsx
+0 −497		src/pages/Auth.jsx
+172 −476		src/pages/Create.jsx
+0 −168		src/pages/EditProfile.jsx
+263 −0		src/pages/Join.jsx
+158 −0		src/pages/Login.jsx
+8 −139		src/pages/LyricsSelect.jsx
+12 −61		src/pages/Main.jsx
+483 −399		src/pages/MainPage.jsx
+100 −208		src/pages/Mypage.jsx
+49 −75		src/pages/OnBoardingPage.jsx
+85 −158		src/pages/Play.jsx
+1 −1		src/pages/Search.jsx
+81 −229		src/pages/ViewChart.jsx
+0 −78		src/styles/GlobalStyles.js
+1 −1		src/util/igonerePath.js