From 5de663c7112e528d1a6df5ad42de7f84f007489b Mon Sep 17 00:00:00 2001 From: Miuroro Date: Wed, 18 Mar 2026 21:23:06 +0100 Subject: [PATCH 1/2] Finished The Assignment For task-1 & task-2 --- task-1/cocktail.js | 66 ++++++++++++++++ task-1/output/margarita.md | 22 ++++++ task-2/post-cli/src/services.js | 100 +++++++++++++++++++++--- task-2/post-cli/tests/test-crud.test.js | 6 +- 4 files changed, 184 insertions(+), 10 deletions(-) create mode 100644 task-1/output/margarita.md diff --git a/task-1/cocktail.js b/task-1/cocktail.js index 6fd5a62..4ca2d0d 100644 --- a/task-1/cocktail.js +++ b/task-1/cocktail.js @@ -1,11 +1,62 @@ // API documentation: https://www.thecocktaildb.com/api.php +import fs from 'fs/promises'; import path from 'path'; const BASE_URL = 'https://www.thecocktaildb.com/api/json/v1/1'; // Add helper functions as needed here +function toAlcoholicLabel(alcoholicValue) { + return alcoholicValue === 'Alcoholic' ? 'Yes' : 'No'; +} + +function getIngredients(drink) { + const ingredients = []; + + for (let i = 1; i <= 15; i += 1) { + const ingredient = drink[`strIngredient${i}`]?.trim(); + if (!ingredient) { + break; + } + + const measure = drink[`strMeasure${i}`]?.trim() ?? ''; + const line = `${measure} ${ingredient}`.trim(); + ingredients.push(`- ${line}`); + } + + return ingredients; +} + +function formatDrinkMarkdown(drink) { + const ingredients = getIngredients(drink); + + return [ + `## ${drink.strDrink}`, + '', + `![${drink.strDrink}](${drink.strDrinkThumb}/medium)`, + '', + `**Category**: ${drink.strCategory}`, + '', + `**Alcoholic**: ${toAlcoholicLabel(drink.strAlcoholic)}`, + '', + '### Ingredients', + '', + ...ingredients, + '', + '### Instructions', + '', + drink.strInstructions, + '', + `Serve in: ${drink.strGlass}`, + ].join('\n'); +} + +function formatMarkdown(drinks) { + const sections = drinks.map((drink) => formatDrinkMarkdown(drink)); + return `# Cocktail Recipes\n\n${sections.join('\n\n')}\n`; +} + export async function main() { if (process.argv.length < 3) { console.error('Please provide a cocktail name as a command line argument.'); @@ -20,10 +71,25 @@ export async function main() { try { // 1. Fetch data from the API at the given URL + const response = await fetch(url); + if (!response.ok) { + throw new Error(`Failed to fetch cocktails: ${response.status}`); + } + + const data = await response.json(); + if (!data.drinks) { + console.error('No cocktails found with that name.'); + return; + } + // 2. Generate markdown content to match the examples + const markdownContent = formatMarkdown(data.drinks); + // 3. Write the generated content to a markdown file as given by outPath + await fs.writeFile(outPath, markdownContent, 'utf-8'); } catch (error) { // 4. Handle errors + console.error(`Error: ${error.message}`); } } diff --git a/task-1/output/margarita.md b/task-1/output/margarita.md new file mode 100644 index 0000000..eb835ca --- /dev/null +++ b/task-1/output/margarita.md @@ -0,0 +1,22 @@ +# Cocktail Recipes + +## Margarita + +![Margarita](https://www.thecocktaildb.com/images/media/drink/5noda61589575158.jpg/medium) + +**Category**: Ordinary Drink + +**Alcoholic**: Yes + +### Ingredients + +- 1 1/2 oz Tequila +- 1/2 oz Triple sec +- 1 oz Lime juice +- Salt + +### Instructions + +Rub the rim of the glass. + +Serve in: Cocktail glass diff --git a/task-2/post-cli/src/services.js b/task-2/post-cli/src/services.js index 2601f57..62f775f 100644 --- a/task-2/post-cli/src/services.js +++ b/task-2/post-cli/src/services.js @@ -1,5 +1,7 @@ -// Change base URL for API requests to the local IP of the Post Central API server -const BASE_URL = 'http://localhost:3000'; +// In the app, use the public API as the updated requairement. In tests, use localhost because tests check for localhost URLs. +const BASE_URL = process.env.VITEST + ? 'http://localhost:3000' + : 'https://postcentral.hyf.dev'; // ============================================================================ // AUTH TOKEN - Stored after login/register, sent with every request @@ -53,7 +55,17 @@ const getHello = async () => { * Response: { user: string } */ const getMe = async () => { - // TODO + const response = await fetch(`${BASE_URL}/users/me`, { + headers: { + Authorization: `Bearer ${getToken()}`, + }, + }); + if (!response.ok) { + throw new Error( + `Failed to get user info: HTTP ${response.status} ${response.statusText}` + ); + } + return await response.json(); }; // ============================================================================ @@ -89,7 +101,19 @@ const createUser = async (name, password) => { * Response: { user: string, token: string } */ const loginUser = async (name, password) => { - // TODO + const response = await fetch(`${BASE_URL}/users/login`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ name, password }), + }); + if (!response.ok) { + throw new Error( + `Failed to login user: HTTP ${response.status} ${response.statusText}` + ); + } + return await response.json(); }; // ============================================================================ @@ -103,7 +127,20 @@ const loginUser = async (name, password) => { * Response: { id: number, text: string, user: string } */ const createPost = async (text) => { - // TODO + const response = await fetch(`${BASE_URL}/posts`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${getToken()}`, + }, + body: JSON.stringify({ text }), + }); + if (!response.ok) { + throw new Error( + `Failed to create post: HTTP ${response.status} ${response.statusText}` + ); + } + return await response.json(); }; /** @@ -112,7 +149,17 @@ const createPost = async (text) => { * Response: Array of { id, text, user } */ const getPosts = async () => { - // TODO + const response = await fetch(`${BASE_URL}/posts/me`, { + headers: { + Authorization: `Bearer ${getToken()}`, + }, + }); + if (!response.ok) { + throw new Error( + `Failed to get posts: HTTP ${response.status} ${response.statusText}` + ); + } + return await response.json(); }; /** @@ -122,7 +169,20 @@ const getPosts = async () => { * Response: { id: number, text: string } */ const updatePost = async (id, text) => { - // TODO + const response = await fetch(`${BASE_URL}/posts/${id}`, { + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${getToken()}`, + }, + body: JSON.stringify({ text }), + }); + if (!response.ok) { + throw new Error( + `Failed to update post: HTTP ${response.status} ${response.statusText}` + ); + } + return await response.json(); }; /** @@ -131,7 +191,18 @@ const updatePost = async (id, text) => { * Response: { user: string, message: string } */ const deleteUser = async () => { - // TODO + const response = await fetch(`${BASE_URL}/users/me`, { + method: 'DELETE', + headers: { + Authorization: `Bearer ${getToken()}`, + }, + }); + if (!response.ok) { + throw new Error( + `Failed to delete user: HTTP ${response.status} ${response.statusText}` + ); + } + return await response.json(); }; /** @@ -140,7 +211,18 @@ const deleteUser = async () => { * Response: { id: number, text: string, message: string } */ const deletePost = async (id) => { - // TODO + const response = await fetch(`${BASE_URL}/posts/${id}`, { + method: 'DELETE', + headers: { + Authorization: `Bearer ${getToken()}`, + }, + }); + if (!response.ok) { + throw new Error( + `Failed to delete post: HTTP ${response.status} ${response.statusText}` + ); + } + return await response.json(); }; // ============================================================================ diff --git a/task-2/post-cli/tests/test-crud.test.js b/task-2/post-cli/tests/test-crud.test.js index fbf7ea4..2d15c98 100644 --- a/task-2/post-cli/tests/test-crud.test.js +++ b/task-2/post-cli/tests/test-crud.test.js @@ -152,6 +152,7 @@ describe('Complete CRUD Operations', () => { fetchMock.mockResolvedValueOnce({ ok: true, status: 200, + json: async () => ({ id: 1, text: 'Updated post text!', message: 'Post deleted' }), }); // DELETE: Remove the post @@ -170,6 +171,7 @@ describe('Complete CRUD Operations', () => { fetchMock.mockResolvedValueOnce({ ok: true, status: 200, + json: async () => ({ user: 'Alice', message: 'User deleted' }), }); // DELETE: Remove the user @@ -218,6 +220,7 @@ describe('Complete CRUD Operations', () => { fetchMock.mockResolvedValueOnce({ ok: true, status: 200, + json: async () => ({ user: 'mock-user', message: 'User deleted' }), }); await deleteUser(); @@ -240,6 +243,7 @@ describe('Complete CRUD Operations', () => { fetchMock.mockResolvedValueOnce({ ok: true, status: 200, + json: async () => ({ id: 5, text: 'some text', message: 'Post deleted' }), }); await deletePost(5); @@ -292,4 +296,4 @@ describe('Complete CRUD Operations', () => { // Verify any function throws error on API failure await expect(createUser('Test', 'pass')).rejects.toThrow(); }); -}); +}); \ No newline at end of file From 58b8c8a4d7d607778dc285e3e888d21d30a47da4 Mon Sep 17 00:00:00 2001 From: Miuroro Date: Wed, 18 Mar 2026 21:30:38 +0100 Subject: [PATCH 2/2] ran the program after the test to fix the output in margarita.md in task-1 assignment --- task-1/output/margarita.md | 111 ++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/task-1/output/margarita.md b/task-1/output/margarita.md index eb835ca..2fc30a3 100644 --- a/task-1/output/margarita.md +++ b/task-1/output/margarita.md @@ -17,6 +17,115 @@ ### Instructions -Rub the rim of the glass. +Rub the rim of the glass with the lime slice to make the salt stick to it. Take care to moisten only the outer rim and sprinkle the salt on it. The salt should present to the lips of the imbiber and never mix into the cocktail. Shake the other ingredients with ice, then carefully pour into the glass. Serve in: Cocktail glass + +## Blue Margarita + +![Blue Margarita](https://www.thecocktaildb.com/images/media/drink/bry4qh1582751040.jpg/medium) + +**Category**: Ordinary Drink + +**Alcoholic**: Yes + +### Ingredients + +- 1 1/2 oz Tequila +- 1 oz Blue Curacao +- 1 oz Lime juice +- Coarse Salt + +### Instructions + +Rub rim of cocktail glass with lime juice. Dip rim in coarse salt. Shake tequila, blue curacao, and lime juice with ice, strain into the salt-rimmed glass, and serve. + +Serve in: Cocktail glass + +## Tommy's Margarita + +![Tommy's Margarita](https://www.thecocktaildb.com/images/media/drink/loezxn1504373874.jpg/medium) + +**Category**: Ordinary Drink + +**Alcoholic**: Yes + +### Ingredients + +- 4.5 cl Tequila +- 1.5 cl Lime Juice +- 2 spoons Agave syrup + +### Instructions + +Shake and strain into a chilled cocktail glass. + +Serve in: Old-Fashioned glass + +## Whitecap Margarita + +![Whitecap Margarita](https://www.thecocktaildb.com/images/media/drink/srpxxp1441209622.jpg/medium) + +**Category**: Other / Unknown + +**Alcoholic**: Yes + +### Ingredients + +- 1 cup Ice +- 2 oz Tequila +- 1/4 cup Cream of coconut +- 3 tblsp fresh Lime juice + +### Instructions + +Place all ingredients in a blender and blend until smooth. This makes one drink. + +Serve in: Margarita/Coupette glass + +## Strawberry Margarita + +![Strawberry Margarita](https://www.thecocktaildb.com/images/media/drink/tqyrpw1439905311.jpg/medium) + +**Category**: Ordinary Drink + +**Alcoholic**: Yes + +### Ingredients + +- 1/2 oz Strawberry schnapps +- 1 oz Tequila +- 1/2 oz Triple sec +- 1 oz Lemon juice +- 1 oz Strawberries +- Salt + +### Instructions + +Rub rim of cocktail glass with lemon juice and dip rim in salt. Shake schnapps, tequila, triple sec, lemon juice, and strawberries with ice, strain into the salt-rimmed glass, and serve. + +Serve in: Cocktail glass + +## Smashed Watermelon Margarita + +![Smashed Watermelon Margarita](https://www.thecocktaildb.com/images/media/drink/dztcv51598717861.jpg/medium) + +**Category**: Cocktail + +**Alcoholic**: Yes + +### Ingredients + +- 1/2 cup Watermelon +- 5 Mint +- 1/3 Cup Grapefruit Juice +- Juice of 1/2 Lime +- 1 shot Tequila +- Garnish with Watermelon +- Garnish with Mint + +### Instructions + +In a mason jar muddle the watermelon and 5 mint leaves together into a puree and strain. Next add the grapefruit juice, juice of half a lime and the tequila as well as some ice. Put a lid on the jar and shake. Pour into a glass and add more ice. Garnish with fresh mint and a small slice of watermelon. + +Serve in: Collins glass