From 585ed0b2934a598d0a5040971cfdf2b6eff9e37e Mon Sep 17 00:00:00 2001 From: Murtadha Date: Fri, 12 Jul 2024 01:43:06 -0400 Subject: [PATCH 01/10] Fixed ci setup conflicts --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 36c6951..539382a 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 36c6951684a9ba3b4ef6c4f8ce7903f7aa1a6d04 +Subproject commit 539382aa4fef16f2452c8bcbd6c0fc8c35d0d779 From 0ee1f36f0edd32edd945c51e809262e514fd8d8a Mon Sep 17 00:00:00 2001 From: Murtadha Date: Fri, 12 Jul 2024 11:47:02 -0400 Subject: [PATCH 02/10] Update backend url in gitmodules --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 7014bec..d1f50f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,3 +3,4 @@ url = ssh://git@git.nisyif.com:2121/mnisyif/mnisyif_frontend.git [submodule "backend"] path = backend + url = ssh://git@git.nisyif.com:2121/mnisyif/mnisyif_backend.git From bff5baf0483d002f741d11034a60cc66732a6947 Mon Sep 17 00:00:00 2001 From: Murtadha Date: Fri, 12 Jul 2024 11:49:12 -0400 Subject: [PATCH 03/10] portfolio is up to date with frontend master branch --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 539382a..433a4f7 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 539382aa4fef16f2452c8bcbd6c0fc8c35d0d779 +Subproject commit 433a4f76fd84c1d43e0bad31770f47281fc40034 From 1d8e22ec8259dd80afebf2e5b953baee2204639f Mon Sep 17 00:00:00 2001 From: Murtadha Date: Fri, 12 Jul 2024 14:08:46 -0400 Subject: [PATCH 04/10] Minor details update --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 433a4f7..6ca96b1 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 433a4f76fd84c1d43e0bad31770f47281fc40034 +Subproject commit 6ca96b1c1dc2f9569316b7ecf48f197e86b1365f From e6673c711c7e314c8565afbb7bad29ce9d9a1cde Mon Sep 17 00:00:00 2001 From: Murtadha Date: Fri, 12 Jul 2024 19:32:23 -0400 Subject: [PATCH 05/10] Update frontend --- frontend | 2 +- package-lock.json | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/frontend b/frontend index 6ca96b1..a87e591 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 6ca96b1c1dc2f9569316b7ecf48f197e86b1365f +Subproject commit a87e591c50ed75c2958b522d4777921f345b3392 diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..0d6fc8c --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "my_porfolio", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} From 9a21481f609dbbf0f4eda7a3ec0de29d390c114a Mon Sep 17 00:00:00 2001 From: Murtadha Date: Mon, 15 Jul 2024 11:48:08 -0400 Subject: [PATCH 06/10] Refactor wookdpecker pipeline script, add new projects section --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index a87e591..c705684 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit a87e591c50ed75c2958b522d4777921f345b3392 +Subproject commit c7056841a2765a7b53a848b01386bf00ec6e3827 From f88691e304b2bf75bd9660abbf5a9885bf292971 Mon Sep 17 00:00:00 2001 From: Murtadha Date: Mon, 15 Jul 2024 15:44:15 -0400 Subject: [PATCH 07/10] Sync with frontend:v0.8.1 --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index c705684..addb8ce 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit c7056841a2765a7b53a848b01386bf00ec6e3827 +Subproject commit addb8cef926b34f282e127c79eb98eca2b53905a From 18f1a9f896616e4afa9bd41a567570871d54b85a Mon Sep 17 00:00:00 2001 From: Murtadha Date: Tue, 16 Jul 2024 19:33:11 -0400 Subject: [PATCH 08/10] Sync with frontend:0.8.2 --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index addb8ce..f6342ab 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit addb8cef926b34f282e127c79eb98eca2b53905a +Subproject commit f6342abfaae07bc40628e81b089940a454702d48 From 1022dcec8be0749592009d18de436b4679e79e88 Mon Sep 17 00:00:00 2001 From: Murtadha Date: Sat, 20 Jul 2024 11:14:33 -0400 Subject: [PATCH 09/10] Merge with frontend v0.11.1 --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index f6342ab..935b813 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit f6342abfaae07bc40628e81b089940a454702d48 +Subproject commit 935b81351c47dce91a8316236d8f2153f8266120 From 27c1bf762fa27a71427db86be767791049058dff Mon Sep 17 00:00:00 2001 From: Murtadha Date: Tue, 15 Oct 2024 23:57:44 -0400 Subject: [PATCH 10/10] Sync backend@0.1.1 with project --- .gitignore | 2 ++ backend | 2 +- frontend | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c6bba59..9b165e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +**/.DS_Store + # Logs logs *.log diff --git a/backend b/backend index 8a21179..e402a8a 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 8a2117946ac3fb1f5730fbed4b621f8110c3fd52 +Subproject commit e402a8abfe6e2062d6354339ef0019bafb11456a diff --git a/frontend b/frontend index 935b813..dd23697 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 935b81351c47dce91a8316236d8f2153f8266120 +Subproject commit dd236970275d9fec2f8e578b0c837ae634f71994