commit 21b767abc24f81dc2dac94919f78581d37d04b32
Author: Troplo <troplo@troplo.com>
Date:   Sun Jun 5 22:34:57 2022 +1000

    add .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..643c85c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+.env
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+.sentryclirc
+
+backend/node_modules
+backend/config/config.json
+backend/.env
\ No newline at end of file
diff --git a/backend/.gitignore b/backend/.gitignore
new file mode 100644
index 0000000..b601da8
--- /dev/null
+++ b/backend/.gitignore
@@ -0,0 +1,82 @@
+<<<<<<< HEAD
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# temp directory
+tmp
+=======
+.DS_Store
+node_modules/
+dist/
+yarn-debug.log*
+yarn-error.log*
+
+# Config folder
+config/config.json
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+>>>>>>> frontend
+frontend/dist1/
+rendering/global
+rendering/global/5c2f8896a2b7169d4e253944f3b733e2.png
+rendering/global/81df1ac4d303319a79db19f45c5c475c.png
+rendering/global/d24b3e361c4fc6263e0276f52ada9694.png
+rendering/marketplacecontent
+rendering/usercontent
+nodeinfo.json
+
+.env
+
+usercontent