Merge branch 'develop' into feature/test-flashcard

huythai855 · Aug 6, 2023 · ba3ce03 · ba3ce03
2 parents 5315d2a + 1edc5e3
commit ba3ce03
Show file tree

Hide file tree

Showing 987 changed files with 13,975 additions and 1,029 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 /.vscode
 /frontend/build
-.env
+.env
+/frontend/node_modules
+.gitignore
+/node_modules
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/...a/shelf/Uncommitted_changes_before_Checkout_at_04_08_2023_3_43_PM_[Changes]/shelved.patch b/...a/shelf/Uncommitted_changes_before_Checkout_at_04_08_2023_3_43_PM_[Changes]/shelved.patch
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_04_08_2023_3_43_PM__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_04_08_2023_3_43_PM__Changes_.xml
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/0.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/0.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/1.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/1.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/10.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/10.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/11.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/11.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/12.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/12.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/13.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/13.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/14.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/14.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/15.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/15.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/16.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/16.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/17.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/17.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/18.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/18.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/2.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/2.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/3.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/3.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/4.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/4.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/5.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/5.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/6.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/6.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/7.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/7.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/8.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/8.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/9.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/9.pack
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/index.pack b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/index.pack
diff --git a/.../shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/index.pack.old b/.../shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/index.pack.old
diff --git a/...a/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/shelved.patch b/...a/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM_[Changes]/shelved.patch
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_05_08_2023_6_04_PM__Changes_.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml