ISUCT · Kirill-Bokov · Oct 3, 2023 · Nov 28, 2023 · Dec 7, 2023 · Dec 15, 2023
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,7 +2,12 @@ stages:
   - lint_saga
   - test_saga
   - lint_shop
+<<<<<<< HEAD
   - test_shop
+=======
+  - test_server
+  - test_client
+>>>>>>> upstream/master
 
 include:
   - local: /rpgsaga/.gitlab-ci.yml

diff --git a/README.md b/README.md
@@ -5,8 +5,30 @@ This project is your Portfolio: your future interviewer will take a look at that
 1. Issues/Board/Milestones (how many issues/milesones were closed, tickets management quality, etc.)
 1. Merge Requests (overall MRs qualry, all MRs must be reviewed and approved, etc.)
 
+<<<<<<< HEAD
+=======
+If you have any blockers or questions please feel free to ping both Bootcamp LT or PT Mentor (depends on what task you are currently doing).
+
+As output of your learning on Bootcamp you should have 3 folders:
+>>>>>>> upstream/master
 1. codewars 
 1. rpgsaga
 1. onlineshop
 
+<<<<<<< HEAD
+=======
+For RpgSaga and online shop we have following templates
+RpgSaga: 
+- [Python](https://gitlab.akvelon.net:9443/bootcamp/rpgsagapython)
+- [NodeJs](https://gitlab.akvelon.net:9443/bootcamp/rpgsagats)
+- [.Net](https://gitlab.akvelon.net:9443/bootcamp/rpgsaganetcore)
+
+Online Shop:
+- [.Net](https://gitlab.akvelon.net:9443/bootcamp/net-react-template)
+- [NodeJs](https://gitlab.akvelon.net:9443/bootcamp/nest-react-template)
+- [Python](https://gitlab.akvelon.net:9443/bootcamp/python-react-template)
+
+Also each issue in the project must have a comment with sign off from reviewer that task is fully done.
+
+>>>>>>> upstream/master
 ## Good Luck!
diff --git a/codewars/Array Deep Count/deepCount.js b/codewars/Array Deep Count/deepCount.js
diff --git a/codewars/Build Tower/towerBuilder.js b/codewars/Build Tower/towerBuilder.js
diff --git a/codewars/Convert string to camel case/toCamelCase.js b/codewars/Convert string to camel case/toCamelCase.js
diff --git a/codewars/Duplicate Encoder/duplicateEncode.js b/codewars/Duplicate Encoder/duplicateEncode.js
diff --git a/codewars/Find the missing letter/findMissingLetter.js b/codewars/Find the missing letter/findMissingLetter.js
diff --git a/codewars/Moving Zeros To The End/moveZeros.js b/codewars/Moving Zeros To The End/moveZeros.js
diff --git a/codewars/Permutations/perm.js b/codewars/Permutations/perm.js
diff --git a/codewars/Sum of Digits - Digital Root/digitalRoot.js b/codewars/Sum of Digits - Digital Root/digitalRoot.js
diff --git a/onlineshop/.env b/onlineshop/.env
@@ -0,0 +1,11 @@
+HELLO=app
+HTTPS=true
+NODE_ENV=development
+SERVER_HOST=localhost
+SERVER_PORT=3000
+SERVER_WEB_HOST=localhost
+SERVER_WEB_PORT=4000
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_NAME=cats
+DB_PORT=5432
diff --git a/onlineshop/.gitignore b/onlineshop/.gitignore
@@ -17,3 +17,5 @@
 !.vscode/launch.json
 !.vscode/extensions.json
 
+.env
+temp/
diff --git a/onlineshop/.gitlab-ci.yml b/onlineshop/.gitlab-ci.yml
@@ -20,7 +20,7 @@ test_server:
   image: node
   tags:
     - docker
-  stage: test_shop
+  stage: test_server
   script:
     - cd ./onlineshop/source/server/
     - npm ci
@@ -34,7 +34,7 @@ test_client:
   image: node
   tags:
     - docker
-  stage: test_shop
+  stage: test_client
   script:
     - cd ./onlineshop/source/client/
     - npm ci

diff --git a/onlineshop/docker-compose.yaml b/onlineshop/docker-compose.yaml
@@ -8,8 +8,8 @@ services:
       - POSTGRES_USER=${DB_USER}
       - POSTGRES_PASSWORD=${DB_PASSWORD}
       - POSTGRES_DB=${DB_NAME}
-    volumes:
-      - ./pgdata:/var/lib/postgresql/data
+    # volumes:
+    #   - ./pgdata:/var/lib/postgresql/data
     ports:
       - "${DB_PORT}:5432"
 

diff --git a/onlineshop/nest.code-workspace b/onlineshop/nest.code-workspace
@@ -1,19 +1,45 @@
+<<<<<<< HEAD
 {
 	"folders": [
-		{
-			"name": "Server",
-			"path": "packages/server"
-		},
-		{
-			"name": "Client",
-			"path": "packages/client"
-		},
-		{
-			"name": "Configs (Root)",
-			"path": "."
+        {
+            "name": "Server",
+            "path": "source/server"
+        },
+        {
+            "name": "Client",
+            "path": "source/client"
+        },
+        {
+            "name": "Configs (Root)",
+            "path": "."
+        }
+    ],
+	"settings": {
+		"files.exclude": {
+			"**/.git": true,
+			"**/node_modules": true,
+			"**/build": true,
+			"**/dist": true
 		},
-
-	],
+		"editor.detectIndentation": false,
+		"editor.tabSize": 4,
+	}
+=======
+{
+	"folders": [
+        {
+            "name": "Server",
+            "path": "source/server"
+        },
+        {
+            "name": "Client",
+            "path": "source/client"
+        },
+        {
+            "name": "Configs (Root)",
+            "path": "."
+        }
+    ],
 	"settings": {
 		"files.exclude": {
 			"**/.git": true,
@@ -24,4 +50,5 @@
 		"editor.detectIndentation": false,
 		"editor.tabSize": 4,
 	}
+>>>>>>> upstream/master
 }
diff --git a/onlineshop/sample.env b/onlineshop/sample.env
@@ -0,0 +1,24 @@
+<<<<<<< HEAD
+HELLO=app
+HTTPS=true
+NODE_ENV=development
+SERVER_HOST=localhost
+SERVER_PORT=3000
+SERVER_WEB_HOST=localhost
+SERVER_WEB_PORT=4000
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_NAME=cats
+=======
+HELLO=app
+HTTPS=true
+NODE_ENV=development
+SERVER_HOST=localhost
+SERVER_PORT=3000
+SERVER_WEB_HOST=localhost
+SERVER_WEB_PORT=4000
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_NAME=cats
+>>>>>>> upstream/master
+DB_PORT=5432
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,3 +17,5 @@ @@
     !.vscode/launch.json
     !.vscode/extensions.json
+    .env
+    temp/