From 939b31bc829089972fae41a74d9b85cde09db37d Mon Sep 17 00:00:00 2001 From: Houston_Boston Date: Fri, 14 Jun 2024 15:23:52 -0400 Subject: [PATCH 1/6] Added task details text field and calendar icon. Work needs to be done there. --- package-lock.json | 19 +++++++++---------- package.json | 2 +- src/components/Cards/TaskCard.js | 17 ++++++++++++++++- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 419dc0f..ae14b16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@emotion/cache": "^11.11.0", "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@hello-pangea/dnd": "^16.6.0", + "@hello-pangea/dnd": "github:hello-pangea/dnd", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@mui/material-nextjs": "^5.15.7", @@ -11378,8 +11378,7 @@ }, "node_modules/@hello-pangea/dnd": { "version": "16.6.0", - "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-16.6.0.tgz", - "integrity": "sha512-vfZ4GydqbtUPXSLfAvKvXQ6xwRzIjUSjVU0Sx+70VOhc2xx6CdmJXJ8YhH70RpbTUGjxctslQTHul9sIOxCfFQ==", + "resolved": "git+ssh://git@github.com/hello-pangea/dnd.git#8f8cc785171bf67f660f7306d16666a1945e29a6", "dependencies": { "@babel/runtime": "^7.24.1", "css-box-model": "^1.2.1", @@ -15063,12 +15062,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -16965,9 +16964,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/package.json b/package.json index 5d3c242..d8eddd9 100755 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@emotion/cache": "^11.11.0", "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@hello-pangea/dnd": "^16.6.0", + "@hello-pangea/dnd": "github:hello-pangea/dnd", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@mui/material-nextjs": "^5.15.7", diff --git a/src/components/Cards/TaskCard.js b/src/components/Cards/TaskCard.js index 7d6b2d5..8b4cf0f 100644 --- a/src/components/Cards/TaskCard.js +++ b/src/components/Cards/TaskCard.js @@ -3,6 +3,10 @@ import Card from '@mui/material/Card'; import TextField from '@mui/material/TextField'; import Radio from '@mui/material/Radio'; +import IconButton from '@mui/material/IconButton'; +import NotesIcon from '@mui/icons-material/Notes'; +import List from '@mui/material/List'; +import CalendarMonthIcon from '@mui/icons-material/CalendarMonth'; //React import React from 'react'; @@ -12,11 +16,22 @@ export default function TaskCard() { return ( <>
+ -
+ +
+ +
+ + +
+ +
+ +
From ba84d1f052d5adef92dc7da4023eb8d53391bdb3 Mon Sep 17 00:00:00 2001 From: RoshanKarthikRajesh Date: Sun, 16 Jun 2024 13:34:49 -0400 Subject: [PATCH 2/6] node version changed to 22 in ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ac05321..e8f0b45 100755 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v2 with: - node-version: '20' + node-version: '22' - name: Install dependencies run: npm install From ac1ca51b3d7ea17f3f705c7fcc51d2ec70dfd166 Mon Sep 17 00:00:00 2001 From: RoshanKarthikRajesh Date: Tue, 18 Jun 2024 11:53:01 -0400 Subject: [PATCH 3/6] package changes when installing @hello-pangea/dnd --- package-lock.json | 6 ++++-- package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae14b16..0cd0cf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@emotion/cache": "^11.11.0", "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@hello-pangea/dnd": "github:hello-pangea/dnd", + "@hello-pangea/dnd": "^16.6.0", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@mui/material-nextjs": "^5.15.7", @@ -11378,7 +11378,9 @@ }, "node_modules/@hello-pangea/dnd": { "version": "16.6.0", - "resolved": "git+ssh://git@github.com/hello-pangea/dnd.git#8f8cc785171bf67f660f7306d16666a1945e29a6", + "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-16.6.0.tgz", + "integrity": "sha512-vfZ4GydqbtUPXSLfAvKvXQ6xwRzIjUSjVU0Sx+70VOhc2xx6CdmJXJ8YhH70RpbTUGjxctslQTHul9sIOxCfFQ==", + "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.24.1", "css-box-model": "^1.2.1", diff --git a/package.json b/package.json index d8eddd9..5d3c242 100755 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@emotion/cache": "^11.11.0", "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@hello-pangea/dnd": "github:hello-pangea/dnd", + "@hello-pangea/dnd": "^16.6.0", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@mui/material-nextjs": "^5.15.7", From b12d647e1638452e72893f1e1cfd57e21fd99585 Mon Sep 17 00:00:00 2001 From: RoshanKarthikRajesh Date: Wed, 19 Jun 2024 12:06:58 -0400 Subject: [PATCH 4/6] Added date/time icon and text. Need to change the button's highlight color. --- src/components/Cards/TaskCard.js | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/Cards/TaskCard.js b/src/components/Cards/TaskCard.js index 8b4cf0f..eb868cc 100644 --- a/src/components/Cards/TaskCard.js +++ b/src/components/Cards/TaskCard.js @@ -7,30 +7,39 @@ import IconButton from '@mui/material/IconButton'; import NotesIcon from '@mui/icons-material/Notes'; import List from '@mui/material/List'; import CalendarMonthIcon from '@mui/icons-material/CalendarMonth'; +import Typography from "@mui/material/Typography"; +import Button from "@mui/material/Button"; + //React import React from 'react'; -export default function TaskCard() { +export default function TaskCard () +{ return ( <>
- + - +
- +
- -
- + +
+
From 3b83362f922c5e355c8dc3d0231afc3033f65970 Mon Sep 17 00:00:00 2001 From: Houston_Boston Date: Thu, 20 Jun 2024 21:16:04 -0400 Subject: [PATCH 5/6] y --- package-lock.json | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae14b16..4e78cfe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@emotion/cache": "^11.11.0", "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@hello-pangea/dnd": "github:hello-pangea/dnd", + "@hello-pangea/dnd": "^16.6.0", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@mui/material-nextjs": "^5.15.7", diff --git a/package.json b/package.json index d8eddd9..733c50e 100755 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@emotion/cache": "^11.11.0", "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@hello-pangea/dnd": "github:hello-pangea/dnd", + "@hello-pangea/dnd": "^16.6.0", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@mui/material-nextjs": "^5.15.7", @@ -43,4 +43,4 @@ "eslint-config-next": "^14.1.3", "typescript": "^5.3.3" } -} +} \ No newline at end of file From f0cc16d162c86bf0fb368c484fe5f9ba985bce15 Mon Sep 17 00:00:00 2001 From: RoshanKarthikRajesh Date: Thu, 20 Jun 2024 21:17:50 -0400 Subject: [PATCH 6/6] y --- src/components/Cards/TaskCard.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/Cards/TaskCard.js b/src/components/Cards/TaskCard.js index eb868cc..11f0757 100644 --- a/src/components/Cards/TaskCard.js +++ b/src/components/Cards/TaskCard.js @@ -3,9 +3,7 @@ import Card from '@mui/material/Card'; import TextField from '@mui/material/TextField'; import Radio from '@mui/material/Radio'; -import IconButton from '@mui/material/IconButton'; import NotesIcon from '@mui/icons-material/Notes'; -import List from '@mui/material/List'; import CalendarMonthIcon from '@mui/icons-material/CalendarMonth'; import Typography from "@mui/material/Typography"; import Button from "@mui/material/Button";