Skip to content

Commit

Permalink
Merge pull request #39 from bjelicaluka/develop
Browse files Browse the repository at this point in the history
Merge of develop into master for 0.0.1-alpha
  • Loading branch information
draganaF authored Dec 25, 2022
2 parents 0a791ce + 4ee4bd4 commit 4093731
Show file tree
Hide file tree
Showing 196 changed files with 26,775 additions and 3,412 deletions.
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"marquee.widgets.npm-stats.packageNames": [
"siithub-backend"
]
}
15 changes: 14 additions & 1 deletion siithub-backend/.env
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
PORT=3000
PORT=3001

TOKEN_SECRET=6b3efe8ca57eb75f062b34a310355748d4e7561d2297a8650cfcfe51f88ff017

GITHUB_CLIENT_ID=fac8103c08404fb3370f
GITHUB_SECRET=02625c097107ff31e7b3622428826b40d68d2fda

GITSERVER_HOST=http://localhost
GITSERVER_PORT=3002

MONGODB_URL=mongodb://localhost:27017/
MONGODB_USERNAME=root
MONGODB_PASSWORD=password
MONGODB_DATABASE=siithub
8 changes: 8 additions & 0 deletions siithub-backend/.env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
PORT=3001

TOKEN_SECRET=09f26e402586e2faa8da4c98a35f1b20d6b033c6097befa8be3486a829587fe2

MONGODB_URL=mongodb://localhost:27017/
MONGODB_USERNAME=root
MONGODB_PASSWORD=password
MONGODB_DATABASE=siithub_test
5 changes: 5 additions & 0 deletions siithub-backend/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"marquee.widgets.npm-stats.packageNames": [
"siithub-backend"
]
}
19 changes: 19 additions & 0 deletions siithub-backend/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
services:
mongo:
image: mongo
restart: always
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: password
ports:
- 27017:27017

mongo-express:
image: mongo-express
restart: always
ports:
- 8081:8081
environment:
ME_CONFIG_MONGODB_ADMINUSERNAME: root
ME_CONFIG_MONGODB_ADMINPASSWORD: password
ME_CONFIG_MONGODB_URL: mongodb://root:password@mongo:27017/
Loading

0 comments on commit 4093731

Please sign in to comment.