From cf09795e1ac9086d95774bf6a5e86b6d8b1a805c Mon Sep 17 00:00:00 2001
From: macias95 <116167450+macias95@users.noreply.github.com>
Date: Sat, 17 Dec 2022 12:27:07 +0100
Subject: [PATCH 01/37] Creat letter table
---
src/paths/pages/Letters.jsx | 59 +++++++++++++++++++++++++++++++++++++
src/paths/pages/Letters.tsx | 15 ----------
2 files changed, 59 insertions(+), 15 deletions(-)
create mode 100644 src/paths/pages/Letters.jsx
delete mode 100644 src/paths/pages/Letters.tsx
diff --git a/src/paths/pages/Letters.jsx b/src/paths/pages/Letters.jsx
new file mode 100644
index 0000000..7bc818f
--- /dev/null
+++ b/src/paths/pages/Letters.jsx
@@ -0,0 +1,59 @@
+import React, { useEffect, useState } from 'react'
+import Topbar from "../../components/Topbar"
+import Box from "@mui/system/Box"
+import { TableBody, TableCell, TableHead, TableRow } from "@mui/material"
+import TableContainer from "@mui/material/TableContainer"
+import Table from "@mui/material/Table"
+import Paper from "@mui/material/Paper"
+import Checkbox from "@mui/material/Checkbox"
+
+const Letters = () => {
+ const [list, setList] = useState([])
+
+ useEffect(()=> {
+ fetch('https://santa.deployed.space/api/wishlists/')
+ .then((response) => response.json())
+ .then((data) => {setList(data)})
+ },[])
+
+ return (
+ <>
+ Listy
+
+
+
+
+
+ Id listu
+ Imię i nazwisko
+ Poziom Grzeczności
+ Status
+ Kraj
+ Miasto
+ Data nadesłania
+
+
+
+ {list.map((item) => (
+
+
+
+ Przyklad
+
+ ))}
+
+
+
+
+
+ )
+}
+
+export default Letters
\ No newline at end of file
diff --git a/src/paths/pages/Letters.tsx b/src/paths/pages/Letters.tsx
deleted file mode 100644
index dfde9b1..0000000
--- a/src/paths/pages/Letters.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import Topbar from "../../components/Topbar"
-import Box from "@mui/system/Box"
-const Letters = () => {
- return (
- <>
- Letters topbar
- Letters
-
- )
-}
-
-export default Letters
\ No newline at end of file
From 08fd5ef6311114c42aabc17d674d89b5fa994a2b Mon Sep 17 00:00:00 2001
From: macias95 <116167450+macias95@users.noreply.github.com>
Date: Sat, 17 Dec 2022 12:37:11 +0100
Subject: [PATCH 02/37] improve code formating
---
src/paths/pages/Letters.jsx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/paths/pages/Letters.jsx b/src/paths/pages/Letters.jsx
index 7bc818f..524686f 100644
--- a/src/paths/pages/Letters.jsx
+++ b/src/paths/pages/Letters.jsx
@@ -12,8 +12,8 @@ const Letters = () => {
useEffect(()=> {
fetch('https://santa.deployed.space/api/wishlists/')
- .then((response) => response.json())
- .then((data) => {setList(data)})
+ .then((response) => response.json())
+ .then((data) => {setList(data)})
},[])
return (
@@ -22,7 +22,6 @@ const Letters = () => {
From f033d42a64400204304084bcc1fd4ee620ff72d1 Mon Sep 17 00:00:00 2001
From: MichaelAngeloTheFirst
Date: Sat, 17 Dec 2022 12:46:02 +0100
Subject: [PATCH 03/37] Table added
---
.../TablePackages/TablePackages.tsx | 119 ++++++++++++++++++
src/components/TablePackages/index.ts | 1 +
2 files changed, 120 insertions(+)
create mode 100644 src/components/TablePackages/TablePackages.tsx
create mode 100644 src/components/TablePackages/index.ts
diff --git a/src/components/TablePackages/TablePackages.tsx b/src/components/TablePackages/TablePackages.tsx
new file mode 100644
index 0000000..cd279b3
--- /dev/null
+++ b/src/components/TablePackages/TablePackages.tsx
@@ -0,0 +1,119 @@
+import { CheckBoxOutlineBlankOutlined } from "@mui/icons-material";
+import {
+ Table,
+ TableContainer,
+ Paper,
+ TableHead,
+ TableRow,
+ TableCell,
+ Typography,
+} from "@mui/material";
+import { Box } from "@mui/system";
+import { useEffect, useState } from "react";
+
+const headers = [
+ "ID listu",
+ "Imię i nazwisko",
+ "Status pakowania",
+ "Kraj",
+ "Miasto",
+ "Data Akceptacji",
+ "",
+];
+
+const mockTableElements: Packages[] = [
+ {
+ id: 1,
+ wishListId: 1,
+ name: "Joe Kernel",
+ kindness: 5,
+ status: "sent",
+ country: "Polska",
+ city: "Kraków",
+ createdAt: "2022-12-15T10:08:52.796000+01:00",
+ },
+ {
+ id: 2,
+ wishListId: 1,
+ name: "YES",
+ kindness: 5,
+ status: "sent",
+ country: "Polska",
+ city: "Kraków",
+ createdAt: "2022-12-15T10:08:52.796000+01:00",
+ },
+];
+
+interface HeadersValues {
+ headers: string[];
+}
+
+interface Packages {
+ id: number;
+ wishListId: number;
+ name: string;
+ kindness: number;
+ status: string;
+ country: string;
+ city: string;
+ createdAt: string;
+}
+
+const Headers = ({ headers }: HeadersValues) => {
+ return (
+ <>
+ {headers.map((element) => {
+ return (
+ <>
+
+
+ {element}
+
+
+
+ );
+ })}
+
+ );
+};
+
+const Row = ({ id, kindness, ...rest }: Packages) => {
+ return (
+
+
+
+ {Object.entries(rest).map(([key, element]) => {
+ return {element} ;
+ })}
+ Pakuj
+
+ );
+};
+
+const TablePackages = () => {
+ const [tableElements, setTableElements] =
+ useState(mockTableElements);
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+ {tableElements.map((element) => {
+ return |
;
+ })}
+
+
+
+ );
+};
+
+export default TablePackages;
diff --git a/src/components/TablePackages/index.ts b/src/components/TablePackages/index.ts
new file mode 100644
index 0000000..6ed1f6d
--- /dev/null
+++ b/src/components/TablePackages/index.ts
@@ -0,0 +1 @@
+export { default } from "./TablePackages";
From c34d96ddde211a5daf2fe2112c5aad255ce9304c Mon Sep 17 00:00:00 2001
From: MichaelAngeloTheFirst
Date: Sat, 17 Dec 2022 12:56:09 +0100
Subject: [PATCH 04/37] Timer__task_number_6
---
src/components/Timer/Timer.tsx | 77 ++++++++++++++++++++++++++++++++
src/components/Timer/index.ts | 3 ++
src/index.css | 1 +
src/paths/pages/Distribution.tsx | 2 +-
4 files changed, 82 insertions(+), 1 deletion(-)
create mode 100644 src/components/Timer/Timer.tsx
create mode 100644 src/components/Timer/index.ts
diff --git a/src/components/Timer/Timer.tsx b/src/components/Timer/Timer.tsx
new file mode 100644
index 0000000..83621b5
--- /dev/null
+++ b/src/components/Timer/Timer.tsx
@@ -0,0 +1,77 @@
+import { CircularProgress, Typography } from "@mui/material";
+import Box from "@mui/system/Box";
+import { useEffect, useState } from "react";
+
+interface TimerProps{
+ children: React.ReactNode;
+
+}
+
+type seconds = {
+ seconds : number;
+}
+
+const Timer = ({children} : TimerProps) =>{
+
+ const fetchData = async () => {
+ const data = await fetch(
+ "https://santa.deployed.space/api/distribution/timer/");
+ const response : seconds = await data.json();
+ setTime(response.seconds);
+ }
+
+ const [time, setTime] = useState();
+ useEffect( () =>{
+
+
+ fetchData();
+
+ const intervalID = setInterval(() => {
+
+ setTime((time) => {
+ if(time === 0 ){
+ fetchData();
+ }
+ if(time === undefined){
+ return time;
+ }
+
+ return time-1;
+ } );
+ }, 1000);
+
+ return () => clearInterval(intervalID);
+
+ },[])
+
+
+ if(time === undefined){
+ return(
+
+
+ )
+
+ }
+
+
+
+ return (
+ <>
+
+ Czas do odlotu:
+
+
+ { `${Math.floor(time/60)} min ${time%60} sek`}
+
+
+
+ )
+
+
+}
+
+
+export default Timer;
\ No newline at end of file
diff --git a/src/components/Timer/index.ts b/src/components/Timer/index.ts
new file mode 100644
index 0000000..e744132
--- /dev/null
+++ b/src/components/Timer/index.ts
@@ -0,0 +1,3 @@
+export { default } from './Timer';
+
+
diff --git a/src/index.css b/src/index.css
index 9d5a007..3ed6e4d 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,3 +1,4 @@
+@import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap');
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
diff --git a/src/paths/pages/Distribution.tsx b/src/paths/pages/Distribution.tsx
index ec713b9..a85840f 100644
--- a/src/paths/pages/Distribution.tsx
+++ b/src/paths/pages/Distribution.tsx
@@ -1,5 +1,6 @@
import Topbar from "../../components/Topbar";
import Box from "@mui/system/Box";
+import Timer from "../../components/Timer";
const Distribution = () => {
return (
@@ -9,7 +10,6 @@ const Distribution = () => {
backgroundColor: "#E7DCD5",
flexGrow: 1
}}>
- Distribution
)
From 70c0862cb1e5b5aa316d6738265a410de38f41fe Mon Sep 17 00:00:00 2001
From: MichaelAngeloTheFirst
Date: Sat, 17 Dec 2022 13:00:23 +0100
Subject: [PATCH 05/37] css fixed :)
---
src/components/TablePackages/TablePackages.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/TablePackages/TablePackages.tsx b/src/components/TablePackages/TablePackages.tsx
index cd279b3..fb26d5c 100644
--- a/src/components/TablePackages/TablePackages.tsx
+++ b/src/components/TablePackages/TablePackages.tsx
@@ -97,7 +97,7 @@ const TablePackages = () => {
return (
<>
-
+
From 10effa7322df00158d450605f8a22880e927e28a Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 13:08:08 +0100
Subject: [PATCH 06/37] Create modal
---
package.json | 8 +--
.../VerifyLetterModal/VerifyLetter.tsx | 72 +++++++++++++++++++
.../VerifyLetterModal/verifyLetter.css | 3 +
src/paths/pages/Letters.tsx | 2 +
4 files changed, 78 insertions(+), 7 deletions(-)
create mode 100644 src/components/VerifyLetterModal/VerifyLetter.tsx
create mode 100644 src/components/VerifyLetterModal/verifyLetter.css
diff --git a/package.json b/package.json
index dcc9d33..65c57a1 100644
--- a/package.json
+++ b/package.json
@@ -30,12 +30,6 @@
"@types/react-dom": "^18.0.0",
"typescript": "^4.4.2"
},
- "eslintConfig": {
- "extends": [
- "react-app",
- "react-app/jest"
- ]
- },
"browserslist": {
"production": [
">0.2%",
@@ -48,4 +42,4 @@
"last 1 safari version"
]
}
-}
+}
\ No newline at end of file
diff --git a/src/components/VerifyLetterModal/VerifyLetter.tsx b/src/components/VerifyLetterModal/VerifyLetter.tsx
new file mode 100644
index 0000000..c22c9d4
--- /dev/null
+++ b/src/components/VerifyLetterModal/VerifyLetter.tsx
@@ -0,0 +1,72 @@
+import React from "react";
+import { Box, Button, Card, CardContent, Grid, makeStyles, Modal, Paper, styled, Typography } from "@mui/material";
+
+
+export default function () {
+
+ const [open, setOpen] = React.useState(false);
+ const handleOpen = () => setOpen(true);
+ const handleClose = () => setOpen(false);
+
+ const style = {
+ position: 'absolute',
+ top: '50%',
+ left: '50%',
+ transform: 'translate(-50%, -50%)',
+ width: 650,
+ bgcolor: 'background.paper',
+ borderRadius: '12px',
+ boxShadow: 24,
+ p: 4,
+ display: 'flex',
+ padding: '0',
+ flexDirection: 'column',
+ };
+
+
+ return (<>
+ Open modal
+
+
+
+
+
+
+ Imię: Nazwisko: Wiek: Grzeczność: Kraj: Miasto: Ulica:
+
+
+
+
+ Imię: xxx xxxxxxxx
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/components/VerifyLetterModal/verifyLetter.css b/src/components/VerifyLetterModal/verifyLetter.css
new file mode 100644
index 0000000..43623a9
--- /dev/null
+++ b/src/components/VerifyLetterModal/verifyLetter.css
@@ -0,0 +1,3 @@
+.modalRounded{
+ border-radius: 25;
+}
\ No newline at end of file
diff --git a/src/paths/pages/Letters.tsx b/src/paths/pages/Letters.tsx
index dfde9b1..c7c5182 100644
--- a/src/paths/pages/Letters.tsx
+++ b/src/paths/pages/Letters.tsx
@@ -1,8 +1,10 @@
import Topbar from "../../components/Topbar"
import Box from "@mui/system/Box"
+import VerifyLetter from "../../components/VerifyLetterModal/VerifyLetter"
const Letters = () => {
return (
<>
+ Letters topbar
Date: Sat, 17 Dec 2022 13:13:16 +0100
Subject: [PATCH 07/37] Adding table to Packages component
---
src/paths/pages/Packages.tsx | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/paths/pages/Packages.tsx b/src/paths/pages/Packages.tsx
index a7d8175..3b11817 100644
--- a/src/paths/pages/Packages.tsx
+++ b/src/paths/pages/Packages.tsx
@@ -1,16 +1,23 @@
-import Box from "@mui/system/Box"
-import Topbar from "../../components/Topbar"
+import Box from "@mui/system/Box";
+import Topbar from "../../components/Topbar";
+import TablePackages from "../../components/TablePackages";
const Packages = () => {
return (
<>
Packages topbar
- Packages
+
+
- )
-}
+ );
+};
-export default Packages
\ No newline at end of file
+export default Packages;
From ddeb0351beb9115871228f98bba25f57f1509d4a Mon Sep 17 00:00:00 2001
From: dzlk17
Date: Sat, 17 Dec 2022 13:15:41 +0100
Subject: [PATCH 08/37] 3 - sleigh progress bar
---
src/components/ProgressBar/ProgressBar.tsx | 42 ++++++++++++++++++++++
src/components/ProgressBar/index.ts | 1 +
2 files changed, 43 insertions(+)
create mode 100644 src/components/ProgressBar/ProgressBar.tsx
create mode 100644 src/components/ProgressBar/index.ts
diff --git a/src/components/ProgressBar/ProgressBar.tsx b/src/components/ProgressBar/ProgressBar.tsx
new file mode 100644
index 0000000..98ae0ac
--- /dev/null
+++ b/src/components/ProgressBar/ProgressBar.tsx
@@ -0,0 +1,42 @@
+import { LinearProgress, Typography } from "@mui/material";
+import Box from "@mui/system/Box";
+import { useEffect, useState } from "react";
+
+interface ProgressBarProps {
+ children: React.ReactNode;
+}
+
+interface PackageDistribution {
+ id: number
+ name: string
+ address: string
+ postcode: string
+ city: string
+ country: string
+ lat: string
+ lng: string
+}
+
+const ProgressBar = ({children}: ProgressBarProps) => {
+
+ const fetchData=async()=>{
+ const data = await fetch('https://santa.deployed.space/api/distribution/');
+ const distribution : PackageDistribution[]= await data.json();
+ setVal(distribution.length);
+ }
+ const [val, setVal] = useState(0);
+
+ useEffect(()=>{
+ fetchData();
+ },[])
+ return (
+ <>
+ Obłożenie sań:
+ {Math.floor(val*100/15)}%
+
+
+ )
+}
+
+export default ProgressBar;
\ No newline at end of file
diff --git a/src/components/ProgressBar/index.ts b/src/components/ProgressBar/index.ts
new file mode 100644
index 0000000..fa15e6b
--- /dev/null
+++ b/src/components/ProgressBar/index.ts
@@ -0,0 +1 @@
+export { default } from './ProgressBar';
\ No newline at end of file
From 3177d39cfccd42394771f031c989ba886ac5054a Mon Sep 17 00:00:00 2001
From: MichaelAngeloTheFirst
Date: Sat, 17 Dec 2022 13:24:04 +0100
Subject: [PATCH 09/37] deleted unused parts of code
---
src/components/Timer/Timer.tsx | 6 +-----
src/paths/pages/Distribution.tsx | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/components/Timer/Timer.tsx b/src/components/Timer/Timer.tsx
index 83621b5..d10d29d 100644
--- a/src/components/Timer/Timer.tsx
+++ b/src/components/Timer/Timer.tsx
@@ -2,16 +2,12 @@ import { CircularProgress, Typography } from "@mui/material";
import Box from "@mui/system/Box";
import { useEffect, useState } from "react";
-interface TimerProps{
- children: React.ReactNode;
-
-}
type seconds = {
seconds : number;
}
-const Timer = ({children} : TimerProps) =>{
+const Timer = () =>{
const fetchData = async () => {
const data = await fetch(
diff --git a/src/paths/pages/Distribution.tsx b/src/paths/pages/Distribution.tsx
index a85840f..72400ce 100644
--- a/src/paths/pages/Distribution.tsx
+++ b/src/paths/pages/Distribution.tsx
@@ -1,6 +1,6 @@
import Topbar from "../../components/Topbar";
import Box from "@mui/system/Box";
-import Timer from "../../components/Timer";
+
const Distribution = () => {
return (
From 6a847c2ecd9a4e2fecb8bc1c32ac26a536f2201e Mon Sep 17 00:00:00 2001
From: MichaelAngeloTheFirst
Date: Sat, 17 Dec 2022 13:25:59 +0100
Subject: [PATCH 10/37] separeted into files
---
.../TablePackages/PackageTableRow.tsx | 19 ++++++
.../TablePackages/TablePackageHeaders.tsx | 22 +++++++
.../TablePackages/TablePackages.tsx | 58 ++-----------------
src/components/TablePackages/types.ts | 14 +++++
4 files changed, 61 insertions(+), 52 deletions(-)
create mode 100644 src/components/TablePackages/PackageTableRow.tsx
create mode 100644 src/components/TablePackages/TablePackageHeaders.tsx
create mode 100644 src/components/TablePackages/types.ts
diff --git a/src/components/TablePackages/PackageTableRow.tsx b/src/components/TablePackages/PackageTableRow.tsx
new file mode 100644
index 0000000..91e3255
--- /dev/null
+++ b/src/components/TablePackages/PackageTableRow.tsx
@@ -0,0 +1,19 @@
+import { CheckBoxOutlineBlankOutlined } from "@mui/icons-material";
+import { TableCell, TableRow } from "@mui/material";
+import { Packages } from "./types";
+
+const PackageTableRow = ({ id, kindness, ...rest }: Packages) => {
+ return (
+
+
+
+ {Object.entries(rest).map(([key, element]) => {
+ return {element} ;
+ })}
+ Pakuj
+
+ );
+};
+
+export default PackageTableRow;
diff --git a/src/components/TablePackages/TablePackageHeaders.tsx b/src/components/TablePackages/TablePackageHeaders.tsx
new file mode 100644
index 0000000..7552195
--- /dev/null
+++ b/src/components/TablePackages/TablePackageHeaders.tsx
@@ -0,0 +1,22 @@
+import { Box, TableCell, Typography } from "@mui/material";
+import { PackageHeadersValues } from "./types";
+
+const PackageTableHeaders = ({ headers }: PackageHeadersValues) => {
+ return (
+ <>
+ {headers.map((element) => {
+ return (
+ <>
+
+
+ {element}
+
+
+
+ );
+ })}
+
+ );
+};
+
+export default PackageTableHeaders;
diff --git a/src/components/TablePackages/TablePackages.tsx b/src/components/TablePackages/TablePackages.tsx
index fb26d5c..a6567a2 100644
--- a/src/components/TablePackages/TablePackages.tsx
+++ b/src/components/TablePackages/TablePackages.tsx
@@ -1,4 +1,6 @@
import { CheckBoxOutlineBlankOutlined } from "@mui/icons-material";
+import { Packages } from "./types";
+import PackageTableRow from "./PackageTableRow";
import {
Table,
TableContainer,
@@ -6,10 +8,9 @@ import {
TableHead,
TableRow,
TableCell,
- Typography,
} from "@mui/material";
-import { Box } from "@mui/system";
-import { useEffect, useState } from "react";
+import { useState } from "react";
+import PackageTableHeaders from "./TablePackageHeaders";
const headers = [
"ID listu",
@@ -44,53 +45,6 @@ const mockTableElements: Packages[] = [
},
];
-interface HeadersValues {
- headers: string[];
-}
-
-interface Packages {
- id: number;
- wishListId: number;
- name: string;
- kindness: number;
- status: string;
- country: string;
- city: string;
- createdAt: string;
-}
-
-const Headers = ({ headers }: HeadersValues) => {
- return (
- <>
- {headers.map((element) => {
- return (
- <>
-
-
- {element}
-
-
-
- );
- })}
-
- );
-};
-
-const Row = ({ id, kindness, ...rest }: Packages) => {
- return (
-
-
-
- {Object.entries(rest).map(([key, element]) => {
- return {element} ;
- })}
- Pakuj
-
- );
-};
-
const TablePackages = () => {
const [tableElements, setTableElements] =
useState(mockTableElements);
@@ -104,11 +58,11 @@ const TablePackages = () => {
-
{tableElements.map((element) => {
- return |
;
+ return
diff --git a/src/components/TablePackages/types.ts b/src/components/TablePackages/types.ts
new file mode 100644
index 0000000..1e96e5c
--- /dev/null
+++ b/src/components/TablePackages/types.ts
@@ -0,0 +1,14 @@
+export interface PackageHeadersValues {
+ headers: string[];
+}
+
+export interface Packages {
+ id: number;
+ wishListId: number;
+ name: string;
+ kindness: number;
+ status: string;
+ country: string;
+ city: string;
+ createdAt: string;
+}
From 9c028fc793f0748ac92ff1c2c43eda089b312660 Mon Sep 17 00:00:00 2001
From: dzlk17
Date: Sat, 17 Dec 2022 13:37:03 +0100
Subject: [PATCH 11/37] 3 - refactoring
---
src/components/ProgressBar/ProgressBar.tsx | 21 +++------------------
src/components/ProgressBar/types.ts | 13 +++++++++++++
2 files changed, 16 insertions(+), 18 deletions(-)
create mode 100644 src/components/ProgressBar/types.ts
diff --git a/src/components/ProgressBar/ProgressBar.tsx b/src/components/ProgressBar/ProgressBar.tsx
index 98ae0ac..c9dc939 100644
--- a/src/components/ProgressBar/ProgressBar.tsx
+++ b/src/components/ProgressBar/ProgressBar.tsx
@@ -1,21 +1,7 @@
import { LinearProgress, Typography } from "@mui/material";
import Box from "@mui/system/Box";
import { useEffect, useState } from "react";
-
-interface ProgressBarProps {
- children: React.ReactNode;
-}
-
-interface PackageDistribution {
- id: number
- name: string
- address: string
- postcode: string
- city: string
- country: string
- lat: string
- lng: string
-}
+import {ProgressBarProps, PackageDistribution} from './types';
const ProgressBar = ({children}: ProgressBarProps) => {
@@ -30,12 +16,11 @@ const ProgressBar = ({children}: ProgressBarProps) => {
fetchData();
},[])
return (
- <>
+
Obłożenie sań:
{Math.floor(val*100/15)}%
-
+
)
}
diff --git a/src/components/ProgressBar/types.ts b/src/components/ProgressBar/types.ts
new file mode 100644
index 0000000..f78652c
--- /dev/null
+++ b/src/components/ProgressBar/types.ts
@@ -0,0 +1,13 @@
+export interface ProgressBarProps {
+ children: React.ReactNode;
+}
+export interface PackageDistribution {
+ id: number
+ name: string
+ address: string
+ postcode: string
+ city: string
+ country: string
+ lat: string
+ lng: string
+ }
\ No newline at end of file
From 22c51f55fd1d660ac9668f85bc7e89f0a1014e2e Mon Sep 17 00:00:00 2001
From: MichaelAngeloTheFirst
Date: Sat, 17 Dec 2022 13:39:31 +0100
Subject: [PATCH 12/37] unnnecesary thigs deleted
---
src/components/TablePackages/PackageTableRow.tsx | 4 ----
src/components/TablePackages/TablePackageHeaders.tsx | 12 +++++-------
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/components/TablePackages/PackageTableRow.tsx b/src/components/TablePackages/PackageTableRow.tsx
index 91e3255..0ae4853 100644
--- a/src/components/TablePackages/PackageTableRow.tsx
+++ b/src/components/TablePackages/PackageTableRow.tsx
@@ -8,10 +8,6 @@ const PackageTableRow = ({ id, kindness, ...rest }: Packages) => {
- {Object.entries(rest).map(([key, element]) => {
- return {element} ;
- })}
- Pakuj
);
};
diff --git a/src/components/TablePackages/TablePackageHeaders.tsx b/src/components/TablePackages/TablePackageHeaders.tsx
index 7552195..91f378a 100644
--- a/src/components/TablePackages/TablePackageHeaders.tsx
+++ b/src/components/TablePackages/TablePackageHeaders.tsx
@@ -6,13 +6,11 @@ const PackageTableHeaders = ({ headers }: PackageHeadersValues) => {
<>
{headers.map((element) => {
return (
- <>
-
-
- {element}
-
-
-
+
+
+ {element}
+
+
);
})}
From 2480b4e15cfe3313594bdec2840ce80ead0ecc1b Mon Sep 17 00:00:00 2001
From: Michal Zabinski
Date: Sat, 17 Dec 2022 12:04:09 +0100
Subject: [PATCH 13/37] dziala
---
.../DisplayPackageAcceptDates.tsx | 23 +++++++++++++++++++
.../DisplayPackageAcceptDates/index.ts | 1 +
src/paths/pages/Packages.tsx | 1 +
3 files changed, 25 insertions(+)
create mode 100644 src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
create mode 100644 src/components/DisplayPackageAcceptDates/index.ts
diff --git a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
new file mode 100644
index 0000000..d7c0a58
--- /dev/null
+++ b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
@@ -0,0 +1,23 @@
+import React from 'react'
+
+const header = 'Data akceptacji'
+
+
+
+const DisplayPackageAcceptDates: React.FC<{dates: string[]} > = ({dates}) => {
+ const oneDate = dates.map((date) => {return {date}
})
+
+ return(
+
+ {oneDate}
+
+
+ )
+}
+
+
+
+
+export default DisplayPackageAcceptDates;
+
+
diff --git a/src/components/DisplayPackageAcceptDates/index.ts b/src/components/DisplayPackageAcceptDates/index.ts
new file mode 100644
index 0000000..3b5b16e
--- /dev/null
+++ b/src/components/DisplayPackageAcceptDates/index.ts
@@ -0,0 +1 @@
+export {default} from './DisplayPackageAcceptDates'
\ No newline at end of file
diff --git a/src/paths/pages/Packages.tsx b/src/paths/pages/Packages.tsx
index 3b11817..438f7f7 100644
--- a/src/paths/pages/Packages.tsx
+++ b/src/paths/pages/Packages.tsx
@@ -3,6 +3,7 @@ import Topbar from "../../components/Topbar";
import TablePackages from "../../components/TablePackages";
const Packages = () => {
+ const datesFoo: string[] = ['10-12.20022', '12-12-2022', '11-12-2022', '1-12-2022'];
return (
<>
Packages topbar
From ae06ca47615fb9c950af4729f6fec736f02c0ec3 Mon Sep 17 00:00:00 2001
From: Michal Zabinski
Date: Sat, 17 Dec 2022 13:05:44 +0100
Subject: [PATCH 14/37] zwracaTableCell
---
.../DisplayPackageAcceptDates.tsx | 45 ++++++++++++++++---
src/paths/pages/Packages.tsx | 2 +-
2 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
index d7c0a58..7ace513 100644
--- a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
+++ b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
@@ -1,23 +1,54 @@
import React from 'react'
-const header = 'Data akceptacji'
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+import Paper from '@mui/material/Paper';
+import { stringify } from 'querystring';
+function createData(
+ date: string,
+ ) {
+ return {date};
+ }
-const DisplayPackageAcceptDates: React.FC<{dates: string[]} > = ({dates}) => {
- const oneDate = dates.map((date) => {return {date}
})
+
+
+const DisplayPackageAcceptDates: React.FC<{date: string} > = ({date}) => {
+ const properDate = formatDate(date);
return(
-
- {oneDate}
-
+
+
+ {properDate}
+
+
+
+ );
+}
+
- )
+function formatDate(baseDate: string): string{
+
+ const newDate = new Date(baseDate);
+
+ const year = newDate.getFullYear();
+ const month = newDate.getMonth();
+ const day = newDate.getDay();
+
+ return day + "-" + month + "-" + year;
+
}
+
+
export default DisplayPackageAcceptDates;
diff --git a/src/paths/pages/Packages.tsx b/src/paths/pages/Packages.tsx
index 438f7f7..3def96c 100644
--- a/src/paths/pages/Packages.tsx
+++ b/src/paths/pages/Packages.tsx
@@ -3,7 +3,7 @@ import Topbar from "../../components/Topbar";
import TablePackages from "../../components/TablePackages";
const Packages = () => {
- const datesFoo: string[] = ['10-12.20022', '12-12-2022', '11-12-2022', '1-12-2022'];
+
return (
<>
Packages topbar
From 97c5b8b5701e0f595792778a0135c467d17f94eb Mon Sep 17 00:00:00 2001
From: CoreNest
Date: Sat, 17 Dec 2022 13:55:43 +0100
Subject: [PATCH 15/37] addig implements of package lis
---
src/components/PackagesList/PackagesList.tsx | 86 ++++++++++++++++++++
src/components/PackagesList/index.ts | 1 +
2 files changed, 87 insertions(+)
create mode 100644 src/components/PackagesList/PackagesList.tsx
create mode 100644 src/components/PackagesList/index.ts
diff --git a/src/components/PackagesList/PackagesList.tsx b/src/components/PackagesList/PackagesList.tsx
new file mode 100644
index 0000000..2d072a2
--- /dev/null
+++ b/src/components/PackagesList/PackagesList.tsx
@@ -0,0 +1,86 @@
+import Box from "@mui/system/Box"
+import * as React from 'react';
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+
+interface PackagesListProps {
+ children: React.ReactNode;
+}
+
+interface PackageDistribution {
+ id: number;
+ name: string;
+ address: string;
+ postcode: string;
+ city: string;
+ country: string;
+ lat: string;
+ lng: string;
+}
+
+const fetchData = () => {
+ const resp = fetch("https://santa.deployed.space/api/distribution");
+ return resp;
+}
+
+
+
+const PackagesList = ({ children }: PackagesListProps) => {
+ const pack = [
+ {
+ id: 2, name: " name", address: "miasto", postcode: "10-123",
+ city: "kraków", country: "Poland", lat: "471.66899", lan: "029"
+ },
+ {
+ id: 5, name: " Ka", address: "miasto", postcode: "10-123",
+ city: "kraków", country: "Poland", lat: "471.66899", lan: "029"
+ }
+ ]
+ const [packages , setPackages] = React.useState([]);
+ React.useEffect(
+ ()=> {
+ fetch("https://santa.deployed.space/api/distribution")
+ .then((response)=> response.json())
+ .then((data)=>{setPackages(data)});
+ }, [])
+
+
+ return (
+ <>
+
+
+
+
+
+ ID Paczki
+ Imie i Nazwisko
+ Adress
+
+
+
+ {
+ packages.map((row) => (
+ < TableRow >
+ {row.id}
+ {row.name}
+
+ {row.address} {row.postcode} {row.city} {row.country} {row.lat} {row.lng}
+
+
+ ))}
+
+
+
+
+
+ )
+}
+
+export default PackagesList
diff --git a/src/components/PackagesList/index.ts b/src/components/PackagesList/index.ts
new file mode 100644
index 0000000..0586362
--- /dev/null
+++ b/src/components/PackagesList/index.ts
@@ -0,0 +1 @@
+export { default } from './PackagesList';
\ No newline at end of file
From 43167eb77741e402055b9b51bfc8e74b6fc4d155 Mon Sep 17 00:00:00 2001
From: Michal Zabinski
Date: Sat, 17 Dec 2022 13:56:51 +0100
Subject: [PATCH 16/37] rebase on b_master
---
.../DisplayPackageAcceptDates.tsx | 12 +++---------
src/components/TablePackages/PackageTableRow.tsx | 4 +++-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
index 7ace513..1ac8b0d 100644
--- a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
+++ b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
@@ -16,13 +16,11 @@ function createData(
return {date};
}
-
-
const DisplayPackageAcceptDates: React.FC<{date: string} > = ({date}) => {
const properDate = formatDate(date);
return(
-
+
{properDate}
@@ -40,15 +38,11 @@ function formatDate(baseDate: string): string{
const month = newDate.getMonth();
const day = newDate.getDay();
- return day + "-" + month + "-" + year;
+
+ return (day<10 ? "0" + day : day) + "-" + month + "-" + year;
}
-
-
-
-
-
export default DisplayPackageAcceptDates;
diff --git a/src/components/TablePackages/PackageTableRow.tsx b/src/components/TablePackages/PackageTableRow.tsx
index 0ae4853..b6ffbd3 100644
--- a/src/components/TablePackages/PackageTableRow.tsx
+++ b/src/components/TablePackages/PackageTableRow.tsx
@@ -1,13 +1,15 @@
import { CheckBoxOutlineBlankOutlined } from "@mui/icons-material";
import { TableCell, TableRow } from "@mui/material";
import { Packages } from "./types";
+import DisplayPackageAcceptDates from "../DisplayPackageAcceptDates";
-const PackageTableRow = ({ id, kindness, ...rest }: Packages) => {
+const PackageTableRow = ({ id, kindness,createdAt, ...rest }: Packages) => {
return (
+
);
};
From 202b14da720a2e096112afc95edbe0174a47ab52 Mon Sep 17 00:00:00 2001
From: macias95 <116167450+macias95@users.noreply.github.com>
Date: Sat, 17 Dec 2022 13:46:18 +0100
Subject: [PATCH 17/37] component display kids names
---
src/components/Name/Name.tsx | 9 +++++++++
src/paths/pages/Letters.jsx | 2 ++
2 files changed, 11 insertions(+)
create mode 100644 src/components/Name/Name.tsx
diff --git a/src/components/Name/Name.tsx b/src/components/Name/Name.tsx
new file mode 100644
index 0000000..bdb380d
--- /dev/null
+++ b/src/components/Name/Name.tsx
@@ -0,0 +1,9 @@
+import Typography from '@mui/material/Typography';
+import React from 'react';
+
+const Name = ({fullName}: {fullName: string}) => {
+ return {fullName}
+}
+
+export default Name;
+
diff --git a/src/paths/pages/Letters.jsx b/src/paths/pages/Letters.jsx
index 524686f..3a46550 100644
--- a/src/paths/pages/Letters.jsx
+++ b/src/paths/pages/Letters.jsx
@@ -1,5 +1,6 @@
import React, { useEffect, useState } from 'react'
import Topbar from "../../components/Topbar"
+import Name from "../../components/Name/Name"
import Box from "@mui/system/Box"
import { TableBody, TableCell, TableHead, TableRow } from "@mui/material"
import TableContainer from "@mui/material/TableContainer"
@@ -45,6 +46,7 @@ const Letters = () => {
Przyklad
+
-
-
-
+
+
+
Imię: Nazwisko:
-
-
- Imię: xxx xxxxxxxx
+
+
+
+
+
+ ID x
+
+
+
+
+ category
+
+
+
+
+
+
+
+
+
+
+
+ Lista:AKCEPTUJ I WYŚLIJ
+ ODRZUĆ I DAJ RÓZGĘ
+
+
From af84ce23ca595dc42bee3116400e04a86306a0ad Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 13:08:08 +0100
Subject: [PATCH 19/37] Create modal
---
package.json | 8 +--
.../VerifyLetterModal/VerifyLetter.tsx | 72 +++++++++++++++++++
.../VerifyLetterModal/verifyLetter.css | 3 +
src/paths/pages/Letters.tsx | 17 +++++
4 files changed, 93 insertions(+), 7 deletions(-)
create mode 100644 src/components/VerifyLetterModal/VerifyLetter.tsx
create mode 100644 src/components/VerifyLetterModal/verifyLetter.css
create mode 100644 src/paths/pages/Letters.tsx
diff --git a/package.json b/package.json
index dcc9d33..65c57a1 100644
--- a/package.json
+++ b/package.json
@@ -30,12 +30,6 @@
"@types/react-dom": "^18.0.0",
"typescript": "^4.4.2"
},
- "eslintConfig": {
- "extends": [
- "react-app",
- "react-app/jest"
- ]
- },
"browserslist": {
"production": [
">0.2%",
@@ -48,4 +42,4 @@
"last 1 safari version"
]
}
-}
+}
\ No newline at end of file
diff --git a/src/components/VerifyLetterModal/VerifyLetter.tsx b/src/components/VerifyLetterModal/VerifyLetter.tsx
new file mode 100644
index 0000000..c22c9d4
--- /dev/null
+++ b/src/components/VerifyLetterModal/VerifyLetter.tsx
@@ -0,0 +1,72 @@
+import React from "react";
+import { Box, Button, Card, CardContent, Grid, makeStyles, Modal, Paper, styled, Typography } from "@mui/material";
+
+
+export default function () {
+
+ const [open, setOpen] = React.useState(false);
+ const handleOpen = () => setOpen(true);
+ const handleClose = () => setOpen(false);
+
+ const style = {
+ position: 'absolute',
+ top: '50%',
+ left: '50%',
+ transform: 'translate(-50%, -50%)',
+ width: 650,
+ bgcolor: 'background.paper',
+ borderRadius: '12px',
+ boxShadow: 24,
+ p: 4,
+ display: 'flex',
+ padding: '0',
+ flexDirection: 'column',
+ };
+
+
+ return (<>
+ Open modal
+
+
+
+
+
+
+ Imię: Nazwisko: Wiek: Grzeczność: Kraj: Miasto: Ulica:
+
+
+
+
+ Imię: xxx xxxxxxxx
+
+
+
+
+ )
+}
\ No newline at end of file
diff --git a/src/components/VerifyLetterModal/verifyLetter.css b/src/components/VerifyLetterModal/verifyLetter.css
new file mode 100644
index 0000000..43623a9
--- /dev/null
+++ b/src/components/VerifyLetterModal/verifyLetter.css
@@ -0,0 +1,3 @@
+.modalRounded{
+ border-radius: 25;
+}
\ No newline at end of file
diff --git a/src/paths/pages/Letters.tsx b/src/paths/pages/Letters.tsx
new file mode 100644
index 0000000..c7c5182
--- /dev/null
+++ b/src/paths/pages/Letters.tsx
@@ -0,0 +1,17 @@
+import Topbar from "../../components/Topbar"
+import Box from "@mui/system/Box"
+import VerifyLetter from "../../components/VerifyLetterModal/VerifyLetter"
+const Letters = () => {
+ return (
+ <>
+ Letters topbar
+ Letters
+
+ )
+}
+
+export default Letters
\ No newline at end of file
From fbd706a1100f1c76c536b468e8d6ce1645ba41cf Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 14:53:05 +0100
Subject: [PATCH 20/37] Update VerifyLetter.tsx
---
.../VerifyLetterModal/VerifyLetter.tsx | 51 ++++++++++++++-----
1 file changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/components/VerifyLetterModal/VerifyLetter.tsx b/src/components/VerifyLetterModal/VerifyLetter.tsx
index c22c9d4..af1ea78 100644
--- a/src/components/VerifyLetterModal/VerifyLetter.tsx
+++ b/src/components/VerifyLetterModal/VerifyLetter.tsx
@@ -1,5 +1,7 @@
import React from "react";
import { Box, Button, Card, CardContent, Grid, makeStyles, Modal, Paper, styled, Typography } from "@mui/material";
+import StarIcon from '@mui/icons-material/Star';
+import CloseIcon from '@mui/icons-material/Close';
export default function () {
@@ -34,10 +36,10 @@ export default function () {
>
-
-
-
+
+
+
Imię: Nazwisko:
-
-
- Imię: xxx xxxxxxxx
+
+
+
+
+
+ ID x
+
+
+
+
+ category
+
+
+
+
+
+
+
+
+
+
+
+ Lista:AKCEPTUJ I WYŚLIJ
+ ODRZUĆ I DAJ RÓZGĘ
+
+
From f17d7b996a852ad8ec38057e0e4f14b831dea0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20Kozio=C5=82?=
Date: Sat, 17 Dec 2022 15:00:45 +0100
Subject: [PATCH 21/37] Revert "Merge branch 'b_master' of
github.com:deployed/santa-workshop-2022 into b_master"
This reverts commit e6c35293805880691df303addfe959cd8a14f7e9, reversing
changes made to 71db72b05353fcc851163ef37ebb1272517c12c7.
---
src/components/PackagesList/PackagesList.tsx | 86 --------------------
src/components/PackagesList/index.ts | 1 -
2 files changed, 87 deletions(-)
delete mode 100644 src/components/PackagesList/PackagesList.tsx
delete mode 100644 src/components/PackagesList/index.ts
diff --git a/src/components/PackagesList/PackagesList.tsx b/src/components/PackagesList/PackagesList.tsx
deleted file mode 100644
index 2d072a2..0000000
--- a/src/components/PackagesList/PackagesList.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import Box from "@mui/system/Box"
-import * as React from 'react';
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableContainer from '@mui/material/TableContainer';
-import TableHead from '@mui/material/TableHead';
-import TableRow from '@mui/material/TableRow';
-
-interface PackagesListProps {
- children: React.ReactNode;
-}
-
-interface PackageDistribution {
- id: number;
- name: string;
- address: string;
- postcode: string;
- city: string;
- country: string;
- lat: string;
- lng: string;
-}
-
-const fetchData = () => {
- const resp = fetch("https://santa.deployed.space/api/distribution");
- return resp;
-}
-
-
-
-const PackagesList = ({ children }: PackagesListProps) => {
- const pack = [
- {
- id: 2, name: " name", address: "miasto", postcode: "10-123",
- city: "kraków", country: "Poland", lat: "471.66899", lan: "029"
- },
- {
- id: 5, name: " Ka", address: "miasto", postcode: "10-123",
- city: "kraków", country: "Poland", lat: "471.66899", lan: "029"
- }
- ]
- const [packages , setPackages] = React.useState([]);
- React.useEffect(
- ()=> {
- fetch("https://santa.deployed.space/api/distribution")
- .then((response)=> response.json())
- .then((data)=>{setPackages(data)});
- }, [])
-
-
- return (
- <>
-
-
-
-
-
- ID Paczki
- Imie i Nazwisko
- Adress
-
-
-
- {
- packages.map((row) => (
- < TableRow >
- {row.id}
- {row.name}
-
- {row.address} {row.postcode} {row.city} {row.country} {row.lat} {row.lng}
-
-
- ))}
-
-
-
-
-
- )
-}
-
-export default PackagesList
diff --git a/src/components/PackagesList/index.ts b/src/components/PackagesList/index.ts
deleted file mode 100644
index 0586362..0000000
--- a/src/components/PackagesList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './PackagesList';
\ No newline at end of file
From 06f6417bea9c94a1971d8c9240fd8b63dcaad41d Mon Sep 17 00:00:00 2001
From: CoreNest
Date: Sat, 17 Dec 2022 13:55:43 +0100
Subject: [PATCH 22/37] b_#4 package list
addig implements of package list
---
src/components/PackagesList/PackagesList.tsx | 86 ++++++++++++++++++++
src/components/PackagesList/index.ts | 1 +
src/paths/pages/Distribution.tsx | 4 +-
3 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 src/components/PackagesList/PackagesList.tsx
create mode 100644 src/components/PackagesList/index.ts
diff --git a/src/components/PackagesList/PackagesList.tsx b/src/components/PackagesList/PackagesList.tsx
new file mode 100644
index 0000000..2d072a2
--- /dev/null
+++ b/src/components/PackagesList/PackagesList.tsx
@@ -0,0 +1,86 @@
+import Box from "@mui/system/Box"
+import * as React from 'react';
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+
+interface PackagesListProps {
+ children: React.ReactNode;
+}
+
+interface PackageDistribution {
+ id: number;
+ name: string;
+ address: string;
+ postcode: string;
+ city: string;
+ country: string;
+ lat: string;
+ lng: string;
+}
+
+const fetchData = () => {
+ const resp = fetch("https://santa.deployed.space/api/distribution");
+ return resp;
+}
+
+
+
+const PackagesList = ({ children }: PackagesListProps) => {
+ const pack = [
+ {
+ id: 2, name: " name", address: "miasto", postcode: "10-123",
+ city: "kraków", country: "Poland", lat: "471.66899", lan: "029"
+ },
+ {
+ id: 5, name: " Ka", address: "miasto", postcode: "10-123",
+ city: "kraków", country: "Poland", lat: "471.66899", lan: "029"
+ }
+ ]
+ const [packages , setPackages] = React.useState([]);
+ React.useEffect(
+ ()=> {
+ fetch("https://santa.deployed.space/api/distribution")
+ .then((response)=> response.json())
+ .then((data)=>{setPackages(data)});
+ }, [])
+
+
+ return (
+ <>
+
+
+
+
+
+ ID Paczki
+ Imie i Nazwisko
+ Adress
+
+
+
+ {
+ packages.map((row) => (
+ < TableRow >
+ {row.id}
+ {row.name}
+
+ {row.address} {row.postcode} {row.city} {row.country} {row.lat} {row.lng}
+
+
+ ))}
+
+
+
+
+
+ )
+}
+
+export default PackagesList
diff --git a/src/components/PackagesList/index.ts b/src/components/PackagesList/index.ts
new file mode 100644
index 0000000..0586362
--- /dev/null
+++ b/src/components/PackagesList/index.ts
@@ -0,0 +1 @@
+export { default } from './PackagesList';
\ No newline at end of file
diff --git a/src/paths/pages/Distribution.tsx b/src/paths/pages/Distribution.tsx
index ec713b9..88e1f42 100644
--- a/src/paths/pages/Distribution.tsx
+++ b/src/paths/pages/Distribution.tsx
@@ -1,5 +1,6 @@
import Topbar from "../../components/Topbar";
import Box from "@mui/system/Box";
+import PackagesList from "../../components/PackagesList";
const Distribution = () => {
return (
@@ -9,7 +10,8 @@ const Distribution = () => {
backgroundColor: "#E7DCD5",
flexGrow: 1
}}>
- Distribution
+
+
)
From be2314445dacdc23304ff2d1bd34ff999e8c9d4e Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 15:03:18 +0100
Subject: [PATCH 23/37] Fixed package.json
---
package.json | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package.json b/package.json
index 65c57a1..07461b6 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,12 @@
"@types/react-dom": "^18.0.0",
"typescript": "^4.4.2"
},
+ "eslintConfig": {
+ "extends": [
+ "react-app",
+ "react-app/jest"
+ ]
+ },
"browserslist": {
"production": [
">0.2%",
From a202c1023aaef3c32c907f5a1b45ef4fd43d4187 Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 15:03:43 +0100
Subject: [PATCH 24/37] Delete verifyLetter.css
---
src/components/VerifyLetterModal/verifyLetter.css | 3 ---
1 file changed, 3 deletions(-)
delete mode 100644 src/components/VerifyLetterModal/verifyLetter.css
diff --git a/src/components/VerifyLetterModal/verifyLetter.css b/src/components/VerifyLetterModal/verifyLetter.css
deleted file mode 100644
index 43623a9..0000000
--- a/src/components/VerifyLetterModal/verifyLetter.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.modalRounded{
- border-radius: 25;
-}
\ No newline at end of file
From 815da50db79d5cd2ee5e2df34b8f7622d8da3926 Mon Sep 17 00:00:00 2001
From: Michal Zabinski
Date: Sat, 17 Dec 2022 15:03:46 +0100
Subject: [PATCH 25/37] imporvedAfterReview
---
.../DisplayPackageAcceptDates.tsx | 31 +------------------
.../DisplayPackageAcceptDates/index.ts | 2 +-
.../DisplayPackageAcceptDates/utils.ts | 14 +++++++++
3 files changed, 16 insertions(+), 31 deletions(-)
create mode 100644 src/components/DisplayPackageAcceptDates/utils.ts
diff --git a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
index 1ac8b0d..618e739 100644
--- a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
+++ b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
@@ -1,47 +1,18 @@
import React from 'react'
-
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
import TableCell from '@mui/material/TableCell';
-import TableContainer from '@mui/material/TableContainer';
-import TableHead from '@mui/material/TableHead';
-import TableRow from '@mui/material/TableRow';
-import Paper from '@mui/material/Paper';
-import { stringify } from 'querystring';
-
-function createData(
- date: string,
-
- ) {
- return {date};
- }
+import {formatDate} from './utils'
const DisplayPackageAcceptDates: React.FC<{date: string} > = ({date}) => {
const properDate = formatDate(date);
return(
-
{properDate}
-
-
);
}
-function formatDate(baseDate: string): string{
-
- const newDate = new Date(baseDate);
-
- const year = newDate.getFullYear();
- const month = newDate.getMonth();
- const day = newDate.getDay();
-
-
- return (day<10 ? "0" + day : day) + "-" + month + "-" + year;
-
-}
export default DisplayPackageAcceptDates;
diff --git a/src/components/DisplayPackageAcceptDates/index.ts b/src/components/DisplayPackageAcceptDates/index.ts
index 3b5b16e..7339e77 100644
--- a/src/components/DisplayPackageAcceptDates/index.ts
+++ b/src/components/DisplayPackageAcceptDates/index.ts
@@ -1 +1 @@
-export {default} from './DisplayPackageAcceptDates'
\ No newline at end of file
+export {default} from './DisplayPackageAcceptDates'
diff --git a/src/components/DisplayPackageAcceptDates/utils.ts b/src/components/DisplayPackageAcceptDates/utils.ts
new file mode 100644
index 0000000..41b7500
--- /dev/null
+++ b/src/components/DisplayPackageAcceptDates/utils.ts
@@ -0,0 +1,14 @@
+export function formatDate(baseDate: string): string{
+
+ const newDate = new Date(baseDate);
+
+ const year = newDate.getFullYear();
+ const month = newDate.getMonth();
+ const day = newDate.getDay();
+
+ return `${day < 10 ? `0${day}` : day }-${month}-${year}`;
+
+}
+
+
+
From e56ac868f2bcaed716c2d8f0434e63911d7e534c Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 15:04:54 +0100
Subject: [PATCH 26/37] Review fixes
---
package.json | 6 ++++++
src/components/VerifyLetterModal/verifyLetter.css | 3 ---
2 files changed, 6 insertions(+), 3 deletions(-)
delete mode 100644 src/components/VerifyLetterModal/verifyLetter.css
diff --git a/package.json b/package.json
index 65c57a1..07461b6 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,12 @@
"@types/react-dom": "^18.0.0",
"typescript": "^4.4.2"
},
+ "eslintConfig": {
+ "extends": [
+ "react-app",
+ "react-app/jest"
+ ]
+ },
"browserslist": {
"production": [
">0.2%",
diff --git a/src/components/VerifyLetterModal/verifyLetter.css b/src/components/VerifyLetterModal/verifyLetter.css
deleted file mode 100644
index 43623a9..0000000
--- a/src/components/VerifyLetterModal/verifyLetter.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.modalRounded{
- border-radius: 25;
-}
\ No newline at end of file
From 4db8135946bfa45b5838fbfa7b89bcae3896cfad Mon Sep 17 00:00:00 2001
From: Michal Zabinski
Date: Sat, 17 Dec 2022 15:07:27 +0100
Subject: [PATCH 27/37] newmovedNewLines
---
.../DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx | 4 ----
src/components/DisplayPackageAcceptDates/utils.ts | 5 -----
2 files changed, 9 deletions(-)
diff --git a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
index 618e739..77e637d 100644
--- a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
+++ b/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
@@ -12,8 +12,4 @@ const DisplayPackageAcceptDates: React.FC<{date: string} > = ({date}) => {
);
}
-
-
export default DisplayPackageAcceptDates;
-
-
diff --git a/src/components/DisplayPackageAcceptDates/utils.ts b/src/components/DisplayPackageAcceptDates/utils.ts
index 41b7500..39fe5d0 100644
--- a/src/components/DisplayPackageAcceptDates/utils.ts
+++ b/src/components/DisplayPackageAcceptDates/utils.ts
@@ -1,5 +1,4 @@
export function formatDate(baseDate: string): string{
-
const newDate = new Date(baseDate);
const year = newDate.getFullYear();
@@ -7,8 +6,4 @@ export function formatDate(baseDate: string): string{
const day = newDate.getDay();
return `${day < 10 ? `0${day}` : day }-${month}-${year}`;
-
}
-
-
-
From 6d7e12259c52bd20404bb581b104d17ca2a332ff Mon Sep 17 00:00:00 2001
From: macias95 <116167450+macias95@users.noreply.github.com>
Date: Sat, 17 Dec 2022 15:19:43 +0100
Subject: [PATCH 28/37] 13-component display country
---
src/components/Name/Country.tsx | 8 ++++++++
src/paths/pages/Letters.jsx | 4 ++++
2 files changed, 12 insertions(+)
create mode 100644 src/components/Name/Country.tsx
diff --git a/src/components/Name/Country.tsx b/src/components/Name/Country.tsx
new file mode 100644
index 0000000..ecd9a07
--- /dev/null
+++ b/src/components/Name/Country.tsx
@@ -0,0 +1,8 @@
+import Typography from '@mui/material/Typography/Typography'
+import React from 'react'
+
+const Country = ({country}: {country : string}) =>{
+ return ({country} )
+}
+
+export default Country;
\ No newline at end of file
diff --git a/src/paths/pages/Letters.jsx b/src/paths/pages/Letters.jsx
index 3a46550..56a9527 100644
--- a/src/paths/pages/Letters.jsx
+++ b/src/paths/pages/Letters.jsx
@@ -7,6 +7,7 @@ import TableContainer from "@mui/material/TableContainer"
import Table from "@mui/material/Table"
import Paper from "@mui/material/Paper"
import Checkbox from "@mui/material/Checkbox"
+import Country from '../../components/Name/Country'
const Letters = () => {
const [list, setList] = useState([])
@@ -47,6 +48,9 @@ const Letters = () => {
Przyklad
{country} )
-}
+const Country = ({country}: {country : string}) => (
+ {country}
+)
+
export default Country;
\ No newline at end of file
From 2b7c0c4aecdedd76b5e5c5bffee06f034fd8541d Mon Sep 17 00:00:00 2001
From: Michal Zabinski
Date: Sat, 17 Dec 2022 15:46:16 +0100
Subject: [PATCH 30/37] component added to table
---
.../CreationDate.tsx} | 4 ++--
src/components/CreationDate/index.ts | 1 +
.../{DisplayPackageAcceptDates => CreationDate}/utils.ts | 0
src/components/DisplayPackageAcceptDates/index.ts | 1 -
src/components/TablePackages/PackageTableRow.tsx | 4 ++--
src/components/TablePackages/TablePackages.tsx | 1 +
src/paths/pages/Letters.jsx | 3 +++
7 files changed, 9 insertions(+), 5 deletions(-)
rename src/components/{DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx => CreationDate/CreationDate.tsx} (69%)
create mode 100644 src/components/CreationDate/index.ts
rename src/components/{DisplayPackageAcceptDates => CreationDate}/utils.ts (100%)
delete mode 100644 src/components/DisplayPackageAcceptDates/index.ts
diff --git a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx b/src/components/CreationDate/CreationDate.tsx
similarity index 69%
rename from src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
rename to src/components/CreationDate/CreationDate.tsx
index 77e637d..7edc0e2 100644
--- a/src/components/DisplayPackageAcceptDates/DisplayPackageAcceptDates.tsx
+++ b/src/components/CreationDate/CreationDate.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import TableCell from '@mui/material/TableCell';
import {formatDate} from './utils'
-const DisplayPackageAcceptDates: React.FC<{date: string} > = ({date}) => {
+const CreationDate: React.FC<{date: string} > = ({date}) => {
const properDate = formatDate(date);
return(
@@ -12,4 +12,4 @@ const DisplayPackageAcceptDates: React.FC<{date: string} > = ({date}) => {
);
}
-export default DisplayPackageAcceptDates;
+export default CreationDate;
diff --git a/src/components/CreationDate/index.ts b/src/components/CreationDate/index.ts
new file mode 100644
index 0000000..66fd931
--- /dev/null
+++ b/src/components/CreationDate/index.ts
@@ -0,0 +1 @@
+export {default} from './CreationDate'
diff --git a/src/components/DisplayPackageAcceptDates/utils.ts b/src/components/CreationDate/utils.ts
similarity index 100%
rename from src/components/DisplayPackageAcceptDates/utils.ts
rename to src/components/CreationDate/utils.ts
diff --git a/src/components/DisplayPackageAcceptDates/index.ts b/src/components/DisplayPackageAcceptDates/index.ts
deleted file mode 100644
index 7339e77..0000000
--- a/src/components/DisplayPackageAcceptDates/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './DisplayPackageAcceptDates'
diff --git a/src/components/TablePackages/PackageTableRow.tsx b/src/components/TablePackages/PackageTableRow.tsx
index b6ffbd3..6433978 100644
--- a/src/components/TablePackages/PackageTableRow.tsx
+++ b/src/components/TablePackages/PackageTableRow.tsx
@@ -1,7 +1,7 @@
import { CheckBoxOutlineBlankOutlined } from "@mui/icons-material";
import { TableCell, TableRow } from "@mui/material";
import { Packages } from "./types";
-import DisplayPackageAcceptDates from "../DisplayPackageAcceptDates";
+import CreationDate from "../CreationDate";
const PackageTableRow = ({ id, kindness,createdAt, ...rest }: Packages) => {
return (
@@ -9,7 +9,7 @@ const PackageTableRow = ({ id, kindness,createdAt, ...rest }: Packages) => {
-
+
);
};
diff --git a/src/components/TablePackages/TablePackages.tsx b/src/components/TablePackages/TablePackages.tsx
index a6567a2..600d68c 100644
--- a/src/components/TablePackages/TablePackages.tsx
+++ b/src/components/TablePackages/TablePackages.tsx
@@ -11,6 +11,7 @@ import {
} from "@mui/material";
import { useState } from "react";
import PackageTableHeaders from "./TablePackageHeaders";
+import CreationDate from "../CreationDate";
const headers = [
"ID listu",
diff --git a/src/paths/pages/Letters.jsx b/src/paths/pages/Letters.jsx
index 3a46550..050348f 100644
--- a/src/paths/pages/Letters.jsx
+++ b/src/paths/pages/Letters.jsx
@@ -7,6 +7,7 @@ import TableContainer from "@mui/material/TableContainer"
import Table from "@mui/material/Table"
import Paper from "@mui/material/Paper"
import Checkbox from "@mui/material/Checkbox"
+import CreationDate from '../../components/CreationDate'
const Letters = () => {
const [list, setList] = useState([])
@@ -47,6 +48,8 @@ const Letters = () => {
Przyklad
+
))}
From 75177bb9ddf8a59768114db74543f0d5343ae86f Mon Sep 17 00:00:00 2001
From: CoreNest
Date: Sat, 17 Dec 2022 13:55:43 +0100
Subject: [PATCH 31/37] b_#4 package list
addig implements of package list
---
src/components/PackagesList/PackagesList.tsx | 62 ++++++++++++++++++++
src/components/PackagesList/index.ts | 1 +
src/components/PackagesList/types.ts | 10 ++++
src/paths/pages/Distribution.tsx | 4 +-
4 files changed, 76 insertions(+), 1 deletion(-)
create mode 100644 src/components/PackagesList/PackagesList.tsx
create mode 100644 src/components/PackagesList/index.ts
create mode 100644 src/components/PackagesList/types.ts
diff --git a/src/components/PackagesList/PackagesList.tsx b/src/components/PackagesList/PackagesList.tsx
new file mode 100644
index 0000000..59e93f7
--- /dev/null
+++ b/src/components/PackagesList/PackagesList.tsx
@@ -0,0 +1,62 @@
+import Box from "@mui/system/Box"
+import * as React from 'react';
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+import {PackageDistribution} from './types';
+
+interface PackagesListProps {
+ children: React.ReactNode;
+}
+function formatAddress (row: PackageDistribution)
+{
+
+ return <>{row.address} {row.postcode} {row.city} {row.country} {row.lat} {row.lng}
+}
+
+
+const PackagesList = () => {
+
+ const [packages, setPackages] = React.useState([]);
+
+ React.useEffect(
+ () => {
+ fetch("https://santa.deployed.space/api/distribution")
+ .then((response) => response.json())
+ .then((data) => { setPackages(data) });
+ }, [])
+
+
+ return (
+ <>
+
+
+
+
+
+ ID Paczki
+ Imie i Nazwisko
+ Adress
+
+
+
+ {
+ packages.map((row) => (
+
+ {row.id}
+ {row.name}
+ {formatAddress(row)}
+
+ ))}
+
+
+
+
+
+ )
+}
+
+export default PackagesList
diff --git a/src/components/PackagesList/index.ts b/src/components/PackagesList/index.ts
new file mode 100644
index 0000000..0586362
--- /dev/null
+++ b/src/components/PackagesList/index.ts
@@ -0,0 +1 @@
+export { default } from './PackagesList';
\ No newline at end of file
diff --git a/src/components/PackagesList/types.ts b/src/components/PackagesList/types.ts
new file mode 100644
index 0000000..dbac237
--- /dev/null
+++ b/src/components/PackagesList/types.ts
@@ -0,0 +1,10 @@
+export interface PackageDistribution {
+ id: number;
+ name: string;
+ address: string;
+ postcode: string;
+ city: string;
+ country: string;
+ lat: string;
+ lng: string;
+}
diff --git a/src/paths/pages/Distribution.tsx b/src/paths/pages/Distribution.tsx
index ec713b9..88e1f42 100644
--- a/src/paths/pages/Distribution.tsx
+++ b/src/paths/pages/Distribution.tsx
@@ -1,5 +1,6 @@
import Topbar from "../../components/Topbar";
import Box from "@mui/system/Box";
+import PackagesList from "../../components/PackagesList";
const Distribution = () => {
return (
@@ -9,7 +10,8 @@ const Distribution = () => {
backgroundColor: "#E7DCD5",
flexGrow: 1
}}>
- Distribution
+
+
)
From bc41652f6dab84f806fdd14e7fa987ad83432b5d Mon Sep 17 00:00:00 2001
From: dzlk17
Date: Sat, 17 Dec 2022 16:02:14 +0100
Subject: [PATCH 32/37] 9
---
.../PackagingStatus/PackagingStatus.tsx | 12 ++++++++++++
src/components/PackagingStatus/index.ts | 1 +
src/components/PackagingStatus/types.ts | 11 +++++++++++
.../TablePackages/PackageTableRow.tsx | 8 +++++++-
src/components/TablePackages/TablePackages.tsx | 17 +++++++++++++----
src/components/TablePackages/types.ts | 12 ++++++++++++
6 files changed, 56 insertions(+), 5 deletions(-)
create mode 100644 src/components/PackagingStatus/PackagingStatus.tsx
create mode 100644 src/components/PackagingStatus/index.ts
create mode 100644 src/components/PackagingStatus/types.ts
diff --git a/src/components/PackagingStatus/PackagingStatus.tsx b/src/components/PackagingStatus/PackagingStatus.tsx
new file mode 100644
index 0000000..1b21283
--- /dev/null
+++ b/src/components/PackagingStatus/PackagingStatus.tsx
@@ -0,0 +1,12 @@
+import Box from "@mui/system/Box";
+import { useEffect, useState } from "react";
+import {DeliveryStatus} from './types';
+
+const PackagingStatus = ({status}: {status:string}) => {
+ return (
+ {status}
+
+ )
+}
+
+export default PackagingStatus;
\ No newline at end of file
diff --git a/src/components/PackagingStatus/index.ts b/src/components/PackagingStatus/index.ts
new file mode 100644
index 0000000..f3b9e49
--- /dev/null
+++ b/src/components/PackagingStatus/index.ts
@@ -0,0 +1 @@
+export { default } from './PackagingStatus';
\ No newline at end of file
diff --git a/src/components/PackagingStatus/types.ts b/src/components/PackagingStatus/types.ts
new file mode 100644
index 0000000..f6c6677
--- /dev/null
+++ b/src/components/PackagingStatus/types.ts
@@ -0,0 +1,11 @@
+export interface DeliveryStatus{
+ id: number
+ wish_list_id: number
+ name: string
+ kindness: number
+ status: string
+ country: string
+ city: string
+ created_at: string
+ }
+
diff --git a/src/components/TablePackages/PackageTableRow.tsx b/src/components/TablePackages/PackageTableRow.tsx
index 6433978..16b55b2 100644
--- a/src/components/TablePackages/PackageTableRow.tsx
+++ b/src/components/TablePackages/PackageTableRow.tsx
@@ -1,15 +1,21 @@
import { CheckBoxOutlineBlankOutlined } from "@mui/icons-material";
import { TableCell, TableRow } from "@mui/material";
+import PackagingStatus from "../PackagingStatus";
import { Packages } from "./types";
import CreationDate from "../CreationDate";
-const PackageTableRow = ({ id, kindness,createdAt, ...rest }: Packages) => {
+const PackageTableRow = ({ id, kindness, createdAt, status, ...rest }: Packages) => {
return (
+
+
+
);
};
diff --git a/src/components/TablePackages/TablePackages.tsx b/src/components/TablePackages/TablePackages.tsx
index 600d68c..d744e65 100644
--- a/src/components/TablePackages/TablePackages.tsx
+++ b/src/components/TablePackages/TablePackages.tsx
@@ -9,9 +9,10 @@ import {
TableRow,
TableCell,
} from "@mui/material";
-import { useState } from "react";
+import { useEffect, useState } from "react";
import PackageTableHeaders from "./TablePackageHeaders";
import CreationDate from "../CreationDate";
+import {DeliveryStatus} from './types';
const headers = [
"ID listu",
@@ -47,9 +48,17 @@ const mockTableElements: Packages[] = [
];
const TablePackages = () => {
- const [tableElements, setTableElements] =
- useState(mockTableElements);
-
+ const [tableElements, setStat] = useState([]);
+ const fetchData=async()=>{
+ const data = await fetch('https://santa.deployed.space/api/packages/');
+ const delivery : Packages[]= await data.json();
+ setStat(delivery);
+ }
+
+ useEffect(()=>{
+ fetchData();
+ },[])
+
return (
<>
diff --git a/src/components/TablePackages/types.ts b/src/components/TablePackages/types.ts
index 1e96e5c..da63e8a 100644
--- a/src/components/TablePackages/types.ts
+++ b/src/components/TablePackages/types.ts
@@ -12,3 +12,15 @@ export interface Packages {
city: string;
createdAt: string;
}
+
+
+export interface DeliveryStatus{
+ id: number
+ wish_list_id: number
+ name: string
+ kindness: number
+ status: string
+ country: string
+ city: string
+ created_at: string
+}
From 1bff46613db2cb31f8fdc3650cb0bca8a8d92c83 Mon Sep 17 00:00:00 2001
From: dzlk17
Date: Sat, 17 Dec 2022 16:12:02 +0100
Subject: [PATCH 33/37] packaging
---
.../TablePackages/PackageTableRow.tsx | 18 +++++++++++++++---
src/paths/pages/Letters.tsx | 17 -----------------
2 files changed, 15 insertions(+), 20 deletions(-)
delete mode 100644 src/paths/pages/Letters.tsx
diff --git a/src/components/TablePackages/PackageTableRow.tsx b/src/components/TablePackages/PackageTableRow.tsx
index 16b55b2..446d42c 100644
--- a/src/components/TablePackages/PackageTableRow.tsx
+++ b/src/components/TablePackages/PackageTableRow.tsx
@@ -3,6 +3,8 @@ import { TableCell, TableRow } from "@mui/material";
import PackagingStatus from "../PackagingStatus";
import { Packages } from "./types";
import CreationDate from "../CreationDate";
+import Name from "../../components/Name/Name"
+import Country from '../../components/Name/Country'
const PackageTableRow = ({ id, kindness, createdAt, status, ...rest }: Packages) => {
return (
@@ -10,12 +12,22 @@ const PackageTableRow = ({ id, kindness, createdAt, status, ...rest }: Packages)
-
-
+ {id}
+
+
+
+
+
+
+
+
+ {rest.city}
+
+
);
};
diff --git a/src/paths/pages/Letters.tsx b/src/paths/pages/Letters.tsx
deleted file mode 100644
index c7c5182..0000000
--- a/src/paths/pages/Letters.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import Topbar from "../../components/Topbar"
-import Box from "@mui/system/Box"
-import VerifyLetter from "../../components/VerifyLetterModal/VerifyLetter"
-const Letters = () => {
- return (
- <>
- Letters topbar
- Letters
-
- )
-}
-
-export default Letters
\ No newline at end of file
From 7ce0d032024bb3c76f707c53429575da45bf854a Mon Sep 17 00:00:00 2001
From: MichaelAngeloTheFirst
Date: Sat, 17 Dec 2022 16:11:04 +0100
Subject: [PATCH 34/37] Send presents with list component
---
src/components/ListModal/ListModal.tsx | 50 ++++++++++
src/components/ListModal/index.ts | 1 +
src/components/SendPresents/SendPresents.tsx | 99 +++++++++++++++++++
src/components/SendPresents/index.ts | 1 +
.../TablePackages/PackageTableRow.tsx | 8 +-
src/paths/pages/Distribution.tsx | 3 +-
6 files changed, 160 insertions(+), 2 deletions(-)
create mode 100644 src/components/ListModal/ListModal.tsx
create mode 100644 src/components/ListModal/index.ts
create mode 100644 src/components/SendPresents/SendPresents.tsx
create mode 100644 src/components/SendPresents/index.ts
diff --git a/src/components/ListModal/ListModal.tsx b/src/components/ListModal/ListModal.tsx
new file mode 100644
index 0000000..9b5477b
--- /dev/null
+++ b/src/components/ListModal/ListModal.tsx
@@ -0,0 +1,50 @@
+import List from '@mui/material/List';
+import ListItem from '@mui/material/ListItem';
+import ListItemButton from '@mui/material/ListItemButton';
+import ListItemText from '@mui/material/ListItemText';
+import Checkbox from '@mui/material/Checkbox';
+import { useState } from 'react';
+
+
+
+const ListModal = () =>{
+
+ let myList: string[] = ["jeden", "dwa", "trzy"];
+
+ const [checked, setChecked] = useState([1]);
+
+ const handleToggle = (value: string) => () => {
+ const newChecked = [...checked];
+
+ setChecked(newChecked);
+ };
+
+ return (
+
+ {myList.map((value) => {
+ const labelId = `checkbox-list-secondary-label-${value}`;
+ return (
+
+
+
+ );
+ })}
+
+ );
+
+}
+
+export default ListModal
\ No newline at end of file
diff --git a/src/components/ListModal/index.ts b/src/components/ListModal/index.ts
new file mode 100644
index 0000000..dc08be1
--- /dev/null
+++ b/src/components/ListModal/index.ts
@@ -0,0 +1 @@
+export { default } from './ListModal';
diff --git a/src/components/SendPresents/SendPresents.tsx b/src/components/SendPresents/SendPresents.tsx
new file mode 100644
index 0000000..4477646
--- /dev/null
+++ b/src/components/SendPresents/SendPresents.tsx
@@ -0,0 +1,99 @@
+import React from "react";
+import { Box, Button, Card, CardContent, Grid, makeStyles, Modal, Paper, styled, Typography } from "@mui/material";
+import StarIcon from '@mui/icons-material/Star';
+import CloseIcon from '@mui/icons-material/Close';
+import ListModal from "../ListModal";
+
+
+const SendPresents = () =>{
+
+ const [open, setOpen] = React.useState(false);
+ const handleOpen = () => setOpen(true);
+ const handleClose = () => setOpen(false);
+
+ const style = {
+ position: 'absolute',
+ top: '50%',
+ left: '50%',
+ transform: 'translate(-50%, -50%)',
+ width: 650,
+ bgcolor: 'background.paper',
+ borderRadius: '12px',
+ boxShadow: 24,
+ p: 4,
+ display: 'flex',
+ padding: '0',
+ flexDirection: 'column',
+ };
+
+
+ return (<>
+ Open modal
+
+
+
+
+
+
+ Imię: Nazwisko: Wiek: Grzeczność: Kraj: Miasto: Ulica:
+
+
+
+
+
+
+
+
+ ID x
+
+
+
+
+ category
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default SendPresents
\ No newline at end of file
diff --git a/src/components/SendPresents/index.ts b/src/components/SendPresents/index.ts
new file mode 100644
index 0000000..fa02911
--- /dev/null
+++ b/src/components/SendPresents/index.ts
@@ -0,0 +1 @@
+export { default as SendPresents } from './SendPresents';
\ No newline at end of file
diff --git a/src/components/TablePackages/PackageTableRow.tsx b/src/components/TablePackages/PackageTableRow.tsx
index 446d42c..cfd5b8e 100644
--- a/src/components/TablePackages/PackageTableRow.tsx
+++ b/src/components/TablePackages/PackageTableRow.tsx
@@ -4,7 +4,8 @@ import PackagingStatus from "../PackagingStatus";
import { Packages } from "./types";
import CreationDate from "../CreationDate";
import Name from "../../components/Name/Name"
-import Country from '../../components/Name/Country'
+import Country from '../../components/Name/Country';
+import { SendPresents } from "../SendPresents";
const PackageTableRow = ({ id, kindness, createdAt, status, ...rest }: Packages) => {
return (
@@ -12,6 +13,7 @@ const PackageTableRow = ({ id, kindness, createdAt, status, ...rest }: Packages)
+
{id}
@@ -28,6 +30,10 @@ const PackageTableRow = ({ id, kindness, createdAt, status, ...rest }: Packages)
{rest.city}
+
+
+
);
};
diff --git a/src/paths/pages/Distribution.tsx b/src/paths/pages/Distribution.tsx
index 72400ce..aa2f722 100644
--- a/src/paths/pages/Distribution.tsx
+++ b/src/paths/pages/Distribution.tsx
@@ -1,6 +1,6 @@
import Topbar from "../../components/Topbar";
import Box from "@mui/system/Box";
-
+import ListModal from "../../components/ListModal";
const Distribution = () => {
return (
@@ -11,6 +11,7 @@ const Distribution = () => {
flexGrow: 1
}}>
+
)
}
From 1749962f918e963cd781b0c19897c797834b8e7e Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 16:21:28 +0100
Subject: [PATCH 35/37] Finished task 26
---
.../VerifyLetterModal/VerifyLetter.tsx | 63 ++++++++++++++-----
src/paths/pages/Letters.jsx | 40 ++++++------
src/paths/pages/Letters.tsx | 17 -----
3 files changed, 67 insertions(+), 53 deletions(-)
delete mode 100644 src/paths/pages/Letters.tsx
diff --git a/src/components/VerifyLetterModal/VerifyLetter.tsx b/src/components/VerifyLetterModal/VerifyLetter.tsx
index af1ea78..9546bc6 100644
--- a/src/components/VerifyLetterModal/VerifyLetter.tsx
+++ b/src/components/VerifyLetterModal/VerifyLetter.tsx
@@ -1,14 +1,25 @@
import React from "react";
-import { Box, Button, Card, CardContent, Grid, makeStyles, Modal, Paper, styled, Typography } from "@mui/material";
+import { Box, Button, Grid, Modal, Typography, CircularProgress } from "@mui/material";
import StarIcon from '@mui/icons-material/Star';
import CloseIcon from '@mui/icons-material/Close';
-export default function () {
+export default function ({ ID }: { ID: number }) {
const [open, setOpen] = React.useState(false);
const handleOpen = () => setOpen(true);
const handleClose = () => setOpen(false);
+ const [letterData, setLetterData] = React.useState<{
+ id: number,
+ name: string,
+ age: number,
+ country: string,
+ city: string,
+ postCode: string,
+ address: string,
+ createdAt: string,
+ items: string[]
+ } | undefined>(undefined);
const style = {
position: 'absolute',
@@ -25,7 +36,18 @@ export default function () {
flexDirection: 'column',
};
-
+ React.useEffect(() => {
+ const fetchData = async () => {
+ const response = await fetch(`https://santa.deployed.space/api/wishlists/${ID}`, { method: "GET" });
+ if (response.ok) {
+ setLetterData(await response.json());
+ }
+ };
+ fetchData();
+ }, [])
+ if (letterData === undefined) {
+ return Open modal
Imię: Nazwisko: Wiek: Grzeczność: Kraj: Miasto: Ulica: Kod pocztowy: Ulica i numer domu:
@@ -62,10 +84,12 @@ export default function () {
-
- ID x
+
+ ID {letterData.id}
+
+ calendar {new Date(letterData.createdAt).toLocaleString()}
+
@@ -83,9 +107,14 @@ export default function () {
+ {letterData.items.map((item) => (
+ <>
+ AKCEPTUJ I WYŚLIJ
ODRZUĆ I DAJ RÓZGĘ
diff --git a/src/paths/pages/Letters.jsx b/src/paths/pages/Letters.jsx
index 3a46550..fa180b1 100644
--- a/src/paths/pages/Letters.jsx
+++ b/src/paths/pages/Letters.jsx
@@ -7,16 +7,17 @@ import TableContainer from "@mui/material/TableContainer"
import Table from "@mui/material/Table"
import Paper from "@mui/material/Paper"
import Checkbox from "@mui/material/Checkbox"
+import VerifyLetter from "../../components/VerifyLetterModal/VerifyLetter"
const Letters = () => {
const [list, setList] = useState([])
- useEffect(()=> {
+ useEffect(() => {
fetch('https://santa.deployed.space/api/wishlists/')
.then((response) => response.json())
- .then((data) => {setList(data)})
- },[])
-
+ .then((data) => { setList(data) })
+ }, [])
+
return (
<>
Listy
@@ -24,7 +25,7 @@ const Letters = () => {
backgroundColor: "#E7DCD5",
flexGrow: 1
}}>
-
+
@@ -38,20 +39,21 @@ const Letters = () => {
Data nadesłania
-
-
- {list.map((item) => (
-
-
-
- Przyklad
-
- ))}
-
-
-
+
+
+ {list.map((item) => (
+
+
+
+ Przyklad
+
+ ))}
+
+
+
)
diff --git a/src/paths/pages/Letters.tsx b/src/paths/pages/Letters.tsx
deleted file mode 100644
index c7c5182..0000000
--- a/src/paths/pages/Letters.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import Topbar from "../../components/Topbar"
-import Box from "@mui/system/Box"
-import VerifyLetter from "../../components/VerifyLetterModal/VerifyLetter"
-const Letters = () => {
- return (
- <>
- Letters topbar
- Letters
-
- )
-}
-
-export default Letters
\ No newline at end of file
From 4308febc9f2a4ca5156d2e24c33d26d0dcc812cc Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <92885222+piotrkowalczyk53@users.noreply.github.com>
Date: Sat, 17 Dec 2022 16:32:40 +0100
Subject: [PATCH 36/37] Add accept & reject buttons
---
src/components/VerifyLetterModal/VerifyLetter.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/VerifyLetterModal/VerifyLetter.tsx b/src/components/VerifyLetterModal/VerifyLetter.tsx
index 9546bc6..a7e18f7 100644
--- a/src/components/VerifyLetterModal/VerifyLetter.tsx
+++ b/src/components/VerifyLetterModal/VerifyLetter.tsx
@@ -115,8 +115,8 @@ export default function ({ ID }: { ID: number }) {
))}
Lista:AKCEPTUJ I WYŚLIJ
- ODRZUĆ I DAJ RÓZGĘ
+ { fetch(`https://santa.deployed.space/api/wishlists/${ID}/accept/`, { method: "POST", body: "" }) }} sx={{ margin: 3, marginLeft: 0, borderRadius: 50, width: 200 }}>AKCEPTUJ I WYŚLIJ
+ { fetch(`https://santa.deployed.space/api/wishlists/${ID}/reject/`, { method: "POST", body: "" }) }} sx={{ margin: 3, marginLeft: 0, marginTop: 0, borderRadius: 50, width: 200 }}>ODRZUĆ I DAJ RÓZGĘ
From 20e4fa3c01353aef58802652058d8e31c6a0cf5a Mon Sep 17 00:00:00 2001
From: Karolina Zielonka
Date: Sat, 17 Dec 2022 16:37:03 +0100
Subject: [PATCH 37/37] distribution view
---
src/components/ProgressBar/ProgressBar.tsx | 42 +++++++++++++---------
src/paths/pages/Distribution.tsx | 39 ++++++++++++++------
2 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/src/components/ProgressBar/ProgressBar.tsx b/src/components/ProgressBar/ProgressBar.tsx
index c9dc939..fb3419c 100644
--- a/src/components/ProgressBar/ProgressBar.tsx
+++ b/src/components/ProgressBar/ProgressBar.tsx
@@ -1,27 +1,37 @@
import { LinearProgress, Typography } from "@mui/material";
import Box from "@mui/system/Box";
import { useEffect, useState } from "react";
-import {ProgressBarProps, PackageDistribution} from './types';
+import { PackageDistribution } from "./types";
-const ProgressBar = ({children}: ProgressBarProps) => {
-
- const fetchData=async()=>{
- const data = await fetch('https://santa.deployed.space/api/distribution/');
- const distribution : PackageDistribution[]= await data.json();
+const ProgressBar = () => {
+ const fetchData = async () => {
+ const data = await fetch("https://santa.deployed.space/api/distribution/");
+ const distribution: PackageDistribution[] = await data.json();
setVal(distribution.length);
- }
+ };
const [val, setVal] = useState(0);
- useEffect(()=>{
+ useEffect(() => {
fetchData();
- },[])
+ }, []);
return (
-
- Obłożenie sań:
- {Math.floor(val*100/15)}%
-
+
+ {" "}
+ Obłożenie sań:{" "}
+
+ {Math.floor((val * 100) / 15)}%
+
+
- )
-}
+ );
+};
-export default ProgressBar;
\ No newline at end of file
+export default ProgressBar;
diff --git a/src/paths/pages/Distribution.tsx b/src/paths/pages/Distribution.tsx
index 0a2707e..f3cdda1 100644
--- a/src/paths/pages/Distribution.tsx
+++ b/src/paths/pages/Distribution.tsx
@@ -1,19 +1,36 @@
import Topbar from "../../components/Topbar";
import Box from "@mui/system/Box";
import PackagesList from "../../components/PackagesList";
+import ProgressBar from "../../components/ProgressBar";
+import Timer from "../../components/Timer";
+import { Grid } from "@mui/material";
const Distribution = () => {
return (
- <>
- Distribution Topbar
-
-
-
- )
-}
+ flexGrow: 1,
+ }}
+ >
+
+
+
+
+
+
+
+
+
+ );
+};
-export default Distribution
\ No newline at end of file
+export default Distribution;
-