From 80f9fb999a2b5ad48c797fab062c940932a1518f Mon Sep 17 00:00:00 2001 From: Diana Chukhrai Date: Tue, 10 Mar 2026 11:36:38 +0100 Subject: [PATCH 1/3] task-1 and task-2 completed --- package-lock.json | 4 ++-- task-1/server/delete.sh | 5 +++++ task-1/server/get.sh | 5 +++++ task-1/server/patch.sh | 7 +++++++ task-1/server/post.sh | 8 ++++++++ task-2/services.js | 13 ++++++++++++- 6 files changed, 39 insertions(+), 3 deletions(-) create mode 100755 task-1/server/delete.sh create mode 100755 task-1/server/get.sh create mode 100755 task-1/server/patch.sh create mode 100755 task-1/server/post.sh diff --git a/package-lock.json b/package-lock.json index 020596f..837218f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "core-assignment-week-10", + "name": "core-assignment-week-9", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "core-assignment-week-10", + "name": "core-assignment-week-9", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/task-1/server/delete.sh b/task-1/server/delete.sh new file mode 100755 index 0000000..727af8e --- /dev/null +++ b/task-1/server/delete.sh @@ -0,0 +1,5 @@ + + +#!/bin/bash + +curl -X DELETE 'http://localhost:3000/users/11' \ No newline at end of file diff --git a/task-1/server/get.sh b/task-1/server/get.sh new file mode 100755 index 0000000..f75d031 --- /dev/null +++ b/task-1/server/get.sh @@ -0,0 +1,5 @@ + + +#!/bin/bash + +curl 'http://localhost:3000/users/11' \ No newline at end of file diff --git a/task-1/server/patch.sh b/task-1/server/patch.sh new file mode 100755 index 0000000..491a661 --- /dev/null +++ b/task-1/server/patch.sh @@ -0,0 +1,7 @@ + +#!/bin/bash + +curl 'http://localhost:3000/users/11' \ + -X PATCH \ + -H 'Content-Type: application/json' \ + -d '{"email":"johndoe@example.com"}' \ No newline at end of file diff --git a/task-1/server/post.sh b/task-1/server/post.sh new file mode 100755 index 0000000..3b847a9 --- /dev/null +++ b/task-1/server/post.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +curl 'http://localhost:3000/users' \ + -X POST \ + -H 'Content-Type: application/json' \ + -d '{"name": "John Doe","email":"john.doe@example.com", "password": "secret123", "role": "user", "active": true, "department": "Engineering"}' + + \ No newline at end of file diff --git a/task-2/services.js b/task-2/services.js index 2126969..e3e6377 100644 --- a/task-2/services.js +++ b/task-2/services.js @@ -15,7 +15,18 @@ const API_BASE_URL = 'https://api.nobelprize.org/2.1'; * @param {Function} onError - Callback for fetch errors */ export function fetchNobelPrizes(filters = {}, onSuccess, onError) { - let url = ''; // TODO Construct the full URL with query parameters; + const params = new URLSearchParams(); + params.append("offset", filters.offset); + params.append("limit", filters.limit); + params.append("sort", "desc"); + if (filters.year !== "all") { + params.append("nobelPrizeYear", filters.year); + } + if (filters.category !== "all") { + params.append("nobelPrizeCategory", filters.category); + } + let url = `${API_BASE_URL}/nobelPrizes?${params.toString()}`; fetchData(url, onSuccess, onError); } + From 400691dbc2d9767ca0c27b441ce9f48aeccc2986 Mon Sep 17 00:00:00 2001 From: Diana Chukhrai Date: Tue, 10 Mar 2026 11:49:56 +0100 Subject: [PATCH 2/3] Fix bash scripts location in task-1 --- task-1/server/delete.sh | 5 ----- task-1/server/get.sh | 5 ----- task-1/server/patch.sh | 7 ------- task-1/server/post.sh | 8 -------- 4 files changed, 25 deletions(-) delete mode 100755 task-1/server/delete.sh delete mode 100755 task-1/server/get.sh delete mode 100755 task-1/server/patch.sh delete mode 100755 task-1/server/post.sh diff --git a/task-1/server/delete.sh b/task-1/server/delete.sh deleted file mode 100755 index 727af8e..0000000 --- a/task-1/server/delete.sh +++ /dev/null @@ -1,5 +0,0 @@ - - -#!/bin/bash - -curl -X DELETE 'http://localhost:3000/users/11' \ No newline at end of file diff --git a/task-1/server/get.sh b/task-1/server/get.sh deleted file mode 100755 index f75d031..0000000 --- a/task-1/server/get.sh +++ /dev/null @@ -1,5 +0,0 @@ - - -#!/bin/bash - -curl 'http://localhost:3000/users/11' \ No newline at end of file diff --git a/task-1/server/patch.sh b/task-1/server/patch.sh deleted file mode 100755 index 491a661..0000000 --- a/task-1/server/patch.sh +++ /dev/null @@ -1,7 +0,0 @@ - -#!/bin/bash - -curl 'http://localhost:3000/users/11' \ - -X PATCH \ - -H 'Content-Type: application/json' \ - -d '{"email":"johndoe@example.com"}' \ No newline at end of file diff --git a/task-1/server/post.sh b/task-1/server/post.sh deleted file mode 100755 index 3b847a9..0000000 --- a/task-1/server/post.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -curl 'http://localhost:3000/users' \ - -X POST \ - -H 'Content-Type: application/json' \ - -d '{"name": "John Doe","email":"john.doe@example.com", "password": "secret123", "role": "user", "active": true, "department": "Engineering"}' - - \ No newline at end of file From d1af8eb935f6f2a7eb63a5e1edee896f5cd3a3f1 Mon Sep 17 00:00:00 2001 From: Diana Chukhrai Date: Tue, 10 Mar 2026 11:56:34 +0100 Subject: [PATCH 3/3] Fix bash scripts location in task-1 --- task-1/delete.sh | 5 +++++ task-1/get.sh | 5 +++++ task-1/patch.sh | 7 +++++++ task-1/post.sh | 8 ++++++++ 4 files changed, 25 insertions(+) create mode 100755 task-1/delete.sh create mode 100755 task-1/get.sh create mode 100755 task-1/patch.sh create mode 100755 task-1/post.sh diff --git a/task-1/delete.sh b/task-1/delete.sh new file mode 100755 index 0000000..727af8e --- /dev/null +++ b/task-1/delete.sh @@ -0,0 +1,5 @@ + + +#!/bin/bash + +curl -X DELETE 'http://localhost:3000/users/11' \ No newline at end of file diff --git a/task-1/get.sh b/task-1/get.sh new file mode 100755 index 0000000..f75d031 --- /dev/null +++ b/task-1/get.sh @@ -0,0 +1,5 @@ + + +#!/bin/bash + +curl 'http://localhost:3000/users/11' \ No newline at end of file diff --git a/task-1/patch.sh b/task-1/patch.sh new file mode 100755 index 0000000..491a661 --- /dev/null +++ b/task-1/patch.sh @@ -0,0 +1,7 @@ + +#!/bin/bash + +curl 'http://localhost:3000/users/11' \ + -X PATCH \ + -H 'Content-Type: application/json' \ + -d '{"email":"johndoe@example.com"}' \ No newline at end of file diff --git a/task-1/post.sh b/task-1/post.sh new file mode 100755 index 0000000..3b847a9 --- /dev/null +++ b/task-1/post.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +curl 'http://localhost:3000/users' \ + -X POST \ + -H 'Content-Type: application/json' \ + -d '{"name": "John Doe","email":"john.doe@example.com", "password": "secret123", "role": "user", "active": true, "department": "Engineering"}' + + \ No newline at end of file