From 2d803399e381aa38a2151877f7b0812c3a58fa1b Mon Sep 17 00:00:00 2001 From: h4yleysh4rpe Date: Tue, 27 Aug 2024 22:01:43 +1200 Subject: [PATCH 01/13] :bricks: create timeline component, test page, add basic line element --- next/app/test/projects_timeline/page.tsx | 7 +++++++ next/components/projects/Timeline.tsx | 10 ++++++++++ strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 17 insertions(+) create mode 100644 next/app/test/projects_timeline/page.tsx create mode 100644 next/components/projects/Timeline.tsx diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx new file mode 100644 index 0000000..c43e2f7 --- /dev/null +++ b/next/app/test/projects_timeline/page.tsx @@ -0,0 +1,7 @@ +import Timeline from "@/components/projects/Timeline"; +import styles from "./styles.module.css"; + + +export default async function TestPage() { + return ; +} diff --git a/next/components/projects/Timeline.tsx b/next/components/projects/Timeline.tsx new file mode 100644 index 0000000..8a435d1 --- /dev/null +++ b/next/components/projects/Timeline.tsx @@ -0,0 +1,10 @@ +const Timeline = ({}) => { + return ( +
+
+
+
+ ); +}; + +export default Timeline; diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 1832b5257c7168c610388a6f8029380c33225396..ff9270768da336feb927c9fce56e4b6ba83a5d8e 100644 GIT binary patch delta 173 zcmZoT;LvcuVS*Hsw82CfCm`9Fur+~kg1x|GS5F?s2?wIuv=}FX*liAsZ4OLr4$N&1 zENu>~Z4PX04(x3X9BmGqZ4O**4%}@HJlh<2c^w$1Z|7^^HR5KB+V0rR8_vR}%)wyZ zC^~(9Kd-idsfmKAxq^{_f))@OD(NWYBo>#1r>17-RE8F$B$lKqSs9uenV6XwnVFjy Um>RVI?B@kyzU@Ez`PnA`03U%fKL7v# delta 173 zcmZoT;LvcuVS*Hs6w5>zCm`9Fur+~kg1vxtNwhlSgac7+T8tAx>^29+HV39Q2j(^h zmNp00HV3vg2lh4xjy4C*HV3XY2ktfpo^1}iybg>rw(~Xc8gVm5Z+GnG4QF9bQ|4eW zZxo(Bub)?2-_TUST*1&>K??|tm2{MH5{pa1Q&Y2ZDnkoW5=&B*tPIVKj13HcgsFj{ SN&C-!ULfY%{ Date: Mon, 2 Sep 2024 19:51:24 +1200 Subject: [PATCH 02/13] :sparkles: create date blobs --- next/app/test/projects_timeline/page.tsx | 9 +++++++-- next/components/projects/DateBlob.tsx | 11 +++++++++++ strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 next/components/projects/DateBlob.tsx diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index c43e2f7..27e69c3 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -1,7 +1,12 @@ import Timeline from "@/components/projects/Timeline"; +import DateBlob from "@/components/projects/DateBlob"; import styles from "./styles.module.css"; - export default async function TestPage() { - return ; + return ( +
+ + +
+ ); } diff --git a/next/components/projects/DateBlob.tsx b/next/components/projects/DateBlob.tsx new file mode 100644 index 0000000..4bf637a --- /dev/null +++ b/next/components/projects/DateBlob.tsx @@ -0,0 +1,11 @@ +const DateBlob = ({}) => { + return ( +
+
+
23 May, 2023
+
+
+ ); +}; + +export default DateBlob; diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index ff9270768da336feb927c9fce56e4b6ba83a5d8e..a615c2935190c767458a3fc49dc00d89db41ae33 100644 GIT binary patch delta 85 zcmZoT;LvcuVS+T{!ih4@j0+nRwk9x6uou|4?QkFCgac7+T8tAx>^29+HV39Q2j(^h nmNp00HV3vg2lh4xjy4C*HV3XY2ktfpo;C;GHV3|C4*U-QerFyf delta 85 zcmZoT;LvcuVS+TH!9*EnMuWzLtqF`1>;)#fdh#$%I1tsQ#W)efZgXI4b6{$7U~Y3@ mX>(w0b6{(8U~hBaXmj9fbKq)o;BIpOs^M*O;9KUv{{R4%dm1eO From 454d1c1e13454da8b04d4ddfaafce1d04145be3b Mon Sep 17 00:00:00 2001 From: h4yleysh4rpe Date: Mon, 2 Sep 2024 20:24:06 +1200 Subject: [PATCH 03/13] :memo: get blobs to show up as many times as input data --- next/app/test/projects_timeline/page.tsx | 10 +++++++++- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index 27e69c3..2d57efb 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -3,10 +3,18 @@ import DateBlob from "@/components/projects/DateBlob"; import styles from "./styles.module.css"; export default async function TestPage() { + var timelineData = [ + { date: "May 23 2023" }, + { date: "June 25 2023" }, + { date: "July 18 2023" }, + ]; + return (
- + {timelineData.map((data, idx) => ( + + ))}
); } diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index a615c2935190c767458a3fc49dc00d89db41ae33..d8aae9b79e62d5cbfae3d7ceee8136864ccc4693 100644 GIT binary patch delta 84 zcmZoT;LvcuVS+T{hlw)Ij2{{kwk9x6wCBI<>BczWKvbI+$1AChTN1Fp@n*&#y19zJPPn!d8n*-l62mS{DGQu3l delta 84 zcmZoT;LvcuVS+T{!ih4@j0+nRwk9x6wCCS;xQ}tdfv7eu#)%t&>^29+HV39Q2j(^h nmNp00HV3vg2lh4xjy4C*HV3XY2ktfpo;C;GHV3|C4*U-QO4S{7 From a4ff3a0d9a2ff3ed9e2810a8230bbc01ea8a3f80 Mon Sep 17 00:00:00 2001 From: h4yleysh4rpe Date: Mon, 2 Sep 2024 20:43:07 +1200 Subject: [PATCH 04/13] :lipstick: added line components --- next/app/test/projects_timeline/page.tsx | 9 +++++++-- next/components/projects/DateBlob.module.css | 10 ++++++++++ strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 next/components/projects/DateBlob.module.css diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index 2d57efb..ebd49bc 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -10,11 +10,16 @@ export default async function TestPage() { ]; return ( -
+
+
{timelineData.map((data, idx) => ( - +
+
+ +
))} +
); } diff --git a/next/components/projects/DateBlob.module.css b/next/components/projects/DateBlob.module.css new file mode 100644 index 0000000..4f9ae7b --- /dev/null +++ b/next/components/projects/DateBlob.module.css @@ -0,0 +1,10 @@ +.dateblob { + display: flex; + justify-content: flex-end; + position: relative; +} + +.dateblob:nth-child(odd) { + align-self: flex-end; + justify-content: flex-start; +} diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index d8aae9b79e62d5cbfae3d7ceee8136864ccc4693..074d7a0853a55a5013104134ca811b3c12c8a4f2 100644 GIT binary patch delta 86 zcmWN@yAeP@07cQ+_5bHa1sV{#V^kqh3dxIY6LNukGi@k^ Date: Wed, 4 Sep 2024 17:45:55 +1200 Subject: [PATCH 05/13] :lipstick: connected date blobs to timeline with line --- next/app/test/projects_timeline/page.tsx | 39 ++++++++++++++--------- next/components/projects/DateBlob.tsx | 7 ++-- next/components/projects/Timeline.tsx | 6 ++-- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index ebd49bc..4439b81 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -1,6 +1,5 @@ -import Timeline from "@/components/projects/Timeline"; import DateBlob from "@/components/projects/DateBlob"; -import styles from "./styles.module.css"; +import Timeline from "@/components/projects/Timeline"; export default async function TestPage() { var timelineData = [ @@ -9,17 +8,27 @@ export default async function TestPage() { { date: "July 18 2023" }, ]; - return ( -
- -
- {timelineData.map((data, idx) => ( -
-
- -
- ))} -
-
- ); +// return ( +//
+// +//
+// {timelineData.map((data, idx) => ( +//
+//
+// +//
+// ))} +//
+//
+// ); +// } + +return ( +
+ +
+ +
+
+) } diff --git a/next/components/projects/DateBlob.tsx b/next/components/projects/DateBlob.tsx index 4bf637a..9bf2296 100644 --- a/next/components/projects/DateBlob.tsx +++ b/next/components/projects/DateBlob.tsx @@ -1,8 +1,9 @@ const DateBlob = ({}) => { return ( -
-
-
23 May, 2023
+
+
+
+ 23 May, 2023
); diff --git a/next/components/projects/Timeline.tsx b/next/components/projects/Timeline.tsx index 8a435d1..cb9ac5e 100644 --- a/next/components/projects/Timeline.tsx +++ b/next/components/projects/Timeline.tsx @@ -1,8 +1,8 @@ const Timeline = ({}) => { return ( -
-
-
+
+
+
); }; diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 074d7a0853a55a5013104134ca811b3c12c8a4f2..6ac121fa63c621d96698022859c09b9411c0201a 100644 GIT binary patch delta 185 zcmZoT;LvcuVS*Hs?30NyPC&9TVQT{8Jv)KzhLr}46J5T%kY}6-Vz>L*GXgOa5HkZY z3lOscF&hxG12G2>a{@6J5OV`D&vrk1-u(`YGq>|K@EUP5#%y=&=8a%sPgUk%FmDu` zKChowThCI#Ou@)NK??|tlysDG5{pa1Q&Y2ZDnkoW5=&B*tPIVKOpQ$q%*`wf49(hq P_VWTU-}ayV{Ol6|?FKsE delta 185 zcmZoT;LvcuVS*HsjLSqBCm`9Fur-14o}GXzxA1bti7sDW$TLm^vD^LZ8G)Dyh?#+y z1&CRJm<@>8ftUk`If0l9h`E87XS<(0?|uiy>D&1lc#XIjqqaMC^G2|+axj=TicVk9 z&#P@ Date: Wed, 11 Sep 2024 14:23:39 +1200 Subject: [PATCH 06/13] :lipstick: put timeline dots on end of line, add mapping, date formatting --- next/app/test/projects_timeline/page.tsx | 59 +++++++++++++---------- next/components/projects/DateBlob.tsx | 16 +++++- next/components/projects/Timeline.tsx | 3 +- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 4 files changed, 49 insertions(+), 29 deletions(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index 4439b81..c6a43ce 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -2,33 +2,40 @@ import DateBlob from "@/components/projects/DateBlob"; import Timeline from "@/components/projects/Timeline"; export default async function TestPage() { - var timelineData = [ - { date: "May 23 2023" }, - { date: "June 25 2023" }, - { date: "July 18 2023" }, + var timelineElements = [ + { date: new Date("2023-12-25") }, + { date: new Date("2023-10-27") }, + { date: new Date("2023-11-30") }, ]; -// return ( -//
-// -//
-// {timelineData.map((data, idx) => ( -//
-//
-// -//
-// ))} -//
-//
-// ); -// } + // return ( + //
+ // + //
+ // {timelineData.map((data, idx) => ( + //
+ //
+ // + //
+ // ))} + //
+ //
+ // ); + // } -return ( -
- -
- -
-
-) + return ( +
+ +
+ {timelineElements.map( + ( + timelineElement, + idx, // check if index is even or not, and pass in length prop depending + ) => ( + + ), + )} +
+
+ ); } diff --git a/next/components/projects/DateBlob.tsx b/next/components/projects/DateBlob.tsx index 9bf2296..e87ab4f 100644 --- a/next/components/projects/DateBlob.tsx +++ b/next/components/projects/DateBlob.tsx @@ -1,9 +1,21 @@ -const DateBlob = ({}) => { +import { TimelineElement } from "@/schemas/single/AboutPage"; + +type DateBlobProps = { + timelineElement: { date: Date }; +}; + +const options = { + year: "numeric", + month: "long", + day: "numeric", +}; + +const DateBlob = ({ timelineElement }: DateBlobProps) => { return (
- 23 May, 2023 + {timelineElement.date.toLocaleDateString()}
); diff --git a/next/components/projects/Timeline.tsx b/next/components/projects/Timeline.tsx index cb9ac5e..a77725b 100644 --- a/next/components/projects/Timeline.tsx +++ b/next/components/projects/Timeline.tsx @@ -1,8 +1,9 @@ const Timeline = ({}) => { return ( -
+
+
); }; diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 6ac121fa63c621d96698022859c09b9411c0201a..1aab70f3b995ecde3e9480134c3f42f43a3ea41c 100644 GIT binary patch delta 172 zcmZoT;LvcuVS*HsT;)U=Cm`9Fur+~kg1x}KhsQTEPB;+Nro}iB#BOt7Y;$00b6{?B zU}{6eLG(RuMsz6)ON>i-Ut>}4hHi^ z(di5Nd9@8p%oL2x6%36Pw1Ci9Nk=IsvA85WH8ne@GPEEiu_RT=%Fx`%%)rpX%*@Qd T#I*fqKQ9pTZU5QN&prVFkQX=3 delta 172 zcmZoT;LvcuVS*Hs?30NyPC&9TVQT{81bcyv500BNPB;+Nro}iB#BOt7Y;$00b6{?B zU}{6b30!HuMsz6%y!3a-Ut@ Date: Wed, 11 Sep 2024 14:38:43 +1200 Subject: [PATCH 07/13] :lipstick: have lines alternate in length --- next/app/test/projects_timeline/page.tsx | 6 ++++-- next/components/projects/DateBlob.tsx | 8 +++++--- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index c6a43ce..ed7da34 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -8,6 +8,8 @@ export default async function TestPage() { { date: new Date("2023-11-30") }, ]; + + // return ( //
// @@ -30,9 +32,9 @@ export default async function TestPage() { {timelineElements.map( ( timelineElement, - idx, // check if index is even or not, and pass in length prop depending + index // check if index is even or not, and pass in length prop depending ) => ( - + ), )}
diff --git a/next/components/projects/DateBlob.tsx b/next/components/projects/DateBlob.tsx index e87ab4f..bc71e08 100644 --- a/next/components/projects/DateBlob.tsx +++ b/next/components/projects/DateBlob.tsx @@ -1,19 +1,21 @@ import { TimelineElement } from "@/schemas/single/AboutPage"; type DateBlobProps = { - timelineElement: { date: Date }; + date: Date; }; + + const options = { year: "numeric", month: "long", day: "numeric", }; -const DateBlob = ({ timelineElement }: DateBlobProps) => { +const DateBlob = ({timelineElement, isEven} : {timelineElement:DateBlobProps, isEven:boolean}) => { return (
-
+
{timelineElement.date.toLocaleDateString()}
diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 1aab70f3b995ecde3e9480134c3f42f43a3ea41c..60bf3140faf979055e450ce46efb726062c6fc3a 100644 GIT binary patch delta 84 zcmZoT;LvcuVS+T{!-+D^j1L$1AChTN1Fp@n*&#y19zJPPn!d8n*-l62mS{DO^F>< delta 84 zcmZoT;LvcuVS+Sc&QotqF`1?fD-b-^e)OKvbI+$1AChTN1Fp@n*&#y19zJPPn!d8n*-l62mS{DU!NWI From 8d6b7cde88c16f3db814805569a3be65a4e52f03 Mon Sep 17 00:00:00 2001 From: h4yleysh4rpe Date: Sun, 15 Sep 2024 20:24:59 +1200 Subject: [PATCH 08/13] :lipstick: make timeline length dynamic --- next/app/test/projects_timeline/page.tsx | 18 ++++++++++++------ next/components/projects/DateBlob.tsx | 9 ++++++--- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index ed7da34..ddd7557 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -6,10 +6,12 @@ export default async function TestPage() { { date: new Date("2023-12-25") }, { date: new Date("2023-10-27") }, { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, ]; - - // return ( //
// @@ -26,18 +28,22 @@ export default async function TestPage() { // } return ( -
- +
+
{timelineElements.map( ( timelineElement, - index // check if index is even or not, and pass in length prop depending + index, // check if index is even or not, and pass in length prop depending ) => ( - + ), )}
+
); } diff --git a/next/components/projects/DateBlob.tsx b/next/components/projects/DateBlob.tsx index bc71e08..fec16d1 100644 --- a/next/components/projects/DateBlob.tsx +++ b/next/components/projects/DateBlob.tsx @@ -13,12 +13,15 @@ const options = { }; const DateBlob = ({timelineElement, isEven} : {timelineElement:DateBlobProps, isEven:boolean}) => { - return ( -
-
+ return ( // change outer height element to allow for photo height etc +
+
+
+
{timelineElement.date.toLocaleDateString()}
+
); }; diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 60bf3140faf979055e450ce46efb726062c6fc3a..da736382b4f181c087bf98214133bf65ea7f5a51 100644 GIT binary patch delta 87 zcmZoT;LvcuVS*HsqU=N&Cm`9Fur+~kg1x|(@5Cme`s(_)+mVz)UkwmC4hIWV_5 ou(Ua_wmGo1Ik2}maI`sawmERMIdHc*@U%JbwmI-EbKrjf0H;45ZvX%Q From 3b6ab46c1c87eebcb87993dc52cf4514998f2b0a Mon Sep 17 00:00:00 2001 From: h4yleysh4rpe Date: Sun, 15 Sep 2024 20:43:46 +1200 Subject: [PATCH 09/13] :memo: remove comments, simplify tailwind --- next/app/test/projects_timeline/page.tsx | 31 +++---------------- next/components/projects/DateBlob.module.css | 10 ------ next/components/projects/DateBlob.tsx | 4 --- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 4 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 next/components/projects/DateBlob.module.css diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index ddd7557..96fee12 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -12,36 +12,13 @@ export default async function TestPage() { { date: new Date("2023-11-30") }, ]; - // return ( - //
- // - //
- // {timelineData.map((data, idx) => ( - //
- //
- // - //
- // ))} - //
- //
- // ); - // } - return ( -
+
- {timelineElements.map( - ( - timelineElement, - index, // check if index is even or not, and pass in length prop depending - ) => ( - - ), - )} + {timelineElements.map((timelineElement, index) => ( + + ))}
diff --git a/next/components/projects/DateBlob.module.css b/next/components/projects/DateBlob.module.css deleted file mode 100644 index 4f9ae7b..0000000 --- a/next/components/projects/DateBlob.module.css +++ /dev/null @@ -1,10 +0,0 @@ -.dateblob { - display: flex; - justify-content: flex-end; - position: relative; -} - -.dateblob:nth-child(odd) { - align-self: flex-end; - justify-content: flex-start; -} diff --git a/next/components/projects/DateBlob.tsx b/next/components/projects/DateBlob.tsx index fec16d1..08dbd82 100644 --- a/next/components/projects/DateBlob.tsx +++ b/next/components/projects/DateBlob.tsx @@ -1,11 +1,7 @@ -import { TimelineElement } from "@/schemas/single/AboutPage"; - type DateBlobProps = { date: Date; }; - - const options = { year: "numeric", month: "long", diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index da736382b4f181c087bf98214133bf65ea7f5a51..e3472dff5ab8ba18ad42923179c98ccb84cd9809 100644 GIT binary patch delta 84 zcmZoT;LvcuVS+ScmEmtqF`1?fGv;=rB$=5Y?u|IPnXR-R8j9=D^hEz})7* n(&oV0=D^nGz~1J-(dNL}=D^kFz}@D+)8@e2=D@eif&T#j=w=(! delta 84 zcmZoT;LvcuVS+TH>_i!7M%l)MtqF`1?fH+3US*tcAgWD^apD&syUl^I&4H=Sfw|3r nrOko0&4I1WfxXRvqs@V{&4H`UfxFFtr_F)4&4F*31OEd6=wuuN From 1eb5e4a690628b4a25abe99ce3cf373253924876 Mon Sep 17 00:00:00 2001 From: eilecn Date: Mon, 16 Sep 2024 12:24:59 +1200 Subject: [PATCH 10/13] :lipstick: changed date blobs to match figma design --- next/app/test/projects_timeline/page.tsx | 2 +- next/components/projects/DateBlob.tsx | 2 +- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index 96fee12..99749c2 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -13,7 +13,7 @@ export default async function TestPage() { ]; return ( -
+
{timelineElements.map((timelineElement, index) => ( diff --git a/next/components/projects/DateBlob.tsx b/next/components/projects/DateBlob.tsx index 08dbd82..85359f0 100644 --- a/next/components/projects/DateBlob.tsx +++ b/next/components/projects/DateBlob.tsx @@ -14,7 +14,7 @@ const DateBlob = ({timelineElement, isEven} : {timelineElement:DateBlobProps, is
-
+
{timelineElement.date.toLocaleDateString()}
diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index e3472dff5ab8ba18ad42923179c98ccb84cd9809..42b330947a0d1bbd3c5f98c3a2070ae57b679188 100644 GIT binary patch delta 101 zcmZoT;LvcuVS+Sc&qNt##-7H6tqF|x>;!(8r4%tvbouf^o^c|G-R@`42*gZ4%nZaV kK+FonY(UHo#2i4(3B+7L%nigmK+FroeB1r(`8PcP09S${ssI20 delta 101 zcmZoT;LvcuVS+ScmEmtqF|x>;$$ORvIu)bouf^o^c|G-R@`42*gZ4%nZaV kK+FonY(UHo#2i4(3B+7L%nigmK+FroeB1r(`8PcP0Q6iTUH||9 From 847eb326f7d902e0a0f465b28462299da2b1d1ff Mon Sep 17 00:00:00 2001 From: h4yleysh4rpe Date: Mon, 16 Sep 2024 21:18:41 +1200 Subject: [PATCH 11/13] :art: move timeline elements into timeline component --- next/app/test/projects_timeline/page.tsx | 29 +++++++++++++---------- next/components/projects/Timeline.tsx | 19 ++++++++++++--- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index 99749c2..8c26c74 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -1,26 +1,29 @@ import DateBlob from "@/components/projects/DateBlob"; import Timeline from "@/components/projects/Timeline"; + +const timelineElements = [ + { date: new Date("2023-12-25") }, + { date: new Date("2023-10-27") }, + { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, + { date: new Date("2023-11-30") }, +]; + export default async function TestPage() { - var timelineElements = [ - { date: new Date("2023-12-25") }, - { date: new Date("2023-10-27") }, - { date: new Date("2023-11-30") }, - { date: new Date("2023-11-30") }, - { date: new Date("2023-11-30") }, - { date: new Date("2023-11-30") }, - { date: new Date("2023-11-30") }, - ]; return ( -
-
+ //
+ + /*
{timelineElements.map((timelineElement, index) => ( ))}
-
-
+
*/ + //
); } diff --git a/next/components/projects/Timeline.tsx b/next/components/projects/Timeline.tsx index a77725b..ff99b16 100644 --- a/next/components/projects/Timeline.tsx +++ b/next/components/projects/Timeline.tsx @@ -1,10 +1,23 @@ -const Timeline = ({}) => { +import DateBlob from "@/components/projects/DateBlob"; + + +const Timeline = ({timelineElements} : { timelineElements: { date: Date }[] }) => { + console.log(timelineElements); return ( -
+
-
+
+ {timelineElements.map((timelineElement, index) => ( + + ))} +
+ /*
+
+
+
+
*/ ); }; diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 42b330947a0d1bbd3c5f98c3a2070ae57b679188..6d41b989764c4d8ccc050d96c4b09ff1134ed188 100644 GIT binary patch delta 85 zcmZoT;LvcuVS+T{@`*CejLRDnwk9x6uow6xd#s&t!hxtZEyjr;cAEoZn*&pu19O`L nOPd30n*&>$1AChTN1Fp@n*&#y19zJPPn!d8n*-l62mS{DUTGbP delta 85 zcmZoT;LvcuVS+Sc&qNt##-7H6tqF`1>;=BujL>16a3HEpi*X`|-R8j9=D^hEz})7* n(&oV0=D^nGz~1J-(dNL}=D^kFz}@D+)8@e2=D@eif&T#jNctTu From 7957bdc65ee369bca29c098519ab1e4582e89fe2 Mon Sep 17 00:00:00 2001 From: h4yleysh4rpe Date: Mon, 16 Sep 2024 21:20:36 +1200 Subject: [PATCH 12/13] :memo: remove unnecessary code and comments, tidy --- next/app/test/projects_timeline/page.tsx | 9 --------- next/components/projects/Timeline.tsx | 5 ----- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 3 files changed, 14 deletions(-) diff --git a/next/app/test/projects_timeline/page.tsx b/next/app/test/projects_timeline/page.tsx index 8c26c74..e864c92 100644 --- a/next/app/test/projects_timeline/page.tsx +++ b/next/app/test/projects_timeline/page.tsx @@ -15,15 +15,6 @@ const timelineElements = [ export default async function TestPage() { return ( - //
- /*
-
- {timelineElements.map((timelineElement, index) => ( - - ))} -
-
*/ - //
); } diff --git a/next/components/projects/Timeline.tsx b/next/components/projects/Timeline.tsx index ff99b16..f7e8063 100644 --- a/next/components/projects/Timeline.tsx +++ b/next/components/projects/Timeline.tsx @@ -13,11 +13,6 @@ const Timeline = ({timelineElements} : { timelineElements: { date: Date }[] }) =
- /*
-
-
-
-
*/ ); }; diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 6d41b989764c4d8ccc050d96c4b09ff1134ed188..97791ae075965095e0386952170485c6fb474edc 100644 GIT binary patch delta 84 zcmZoT;LvcuVS+T{%84@0j4K-xwk9x6wC7h?>clwVKvbI+$1AChTN1Fp@n*&#y19zJPPn!d8n*-l62mS{D@cbLi delta 84 zcmZoT;LvcuVS+T{@`*CejLRDnwk9x6wC9&S*3LNLKvbI+$1AChTN1Fp@n*&#y19zJPPn!d8n*-l62mS{D866yt From 8c4baa2581cf3c32e6602638e2743e330b860688 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 16 Sep 2024 22:12:26 +1200 Subject: [PATCH 13/13] commit data.db file --- strapi/.tmp/data.db | Bin 1056768 -> 1056768 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/strapi/.tmp/data.db b/strapi/.tmp/data.db index 97791ae075965095e0386952170485c6fb474edc..847f9c3550cdf554ea5c0fd541a207b2f78197a8 100644 GIT binary patch delta 15264 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 delta 15191 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