feat: complete NutriScan redesign

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
@@ -40,7 +39,6 @@ next-env.d.ts
 #database
 /prisma/db
 /prisma/migrations
-=======
 # Logs
 logs
 *.log
@@ -171,4 +169,8 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
->>>>>>> ad0ba4c28c763a4748bd81d9039ccce4feab6b9e
+
+.env*
+.flaskenv*
+!.env.project
+!.env.vault