From 82c2e03e5895d6b133b0c5c0e0791056568425a5 Mon Sep 17 00:00:00 2001 From: liran26 Date: Sun, 23 Jul 2023 18:41:44 +0300 Subject: [PATCH 1/6] login and register features --- 04-Typescript/22-git/login/login.html | 12 ++++++++++++ 04-Typescript/22-git/login/register.html | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 04-Typescript/22-git/login/login.html create mode 100644 04-Typescript/22-git/login/register.html diff --git a/04-Typescript/22-git/login/login.html b/04-Typescript/22-git/login/login.html new file mode 100644 index 000000000..d37bea8d3 --- /dev/null +++ b/04-Typescript/22-git/login/login.html @@ -0,0 +1,12 @@ + + + + + + Document + + + +

Login

+ + \ No newline at end of file diff --git a/04-Typescript/22-git/login/register.html b/04-Typescript/22-git/login/register.html new file mode 100644 index 000000000..9bf844342 --- /dev/null +++ b/04-Typescript/22-git/login/register.html @@ -0,0 +1,12 @@ + + + + + + Document + + + +

Register

+ + \ No newline at end of file From 6456b6f622dfbd6149fd6a6eba1033c23803a022 Mon Sep 17 00:00:00 2001 From: liran26 Date: Sun, 23 Jul 2023 18:49:20 +0300 Subject: [PATCH 2/6] invnetory feature --- 04-Typescript/22-git/inventory/dist/invnetory.css | 0 04-Typescript/22-git/inventory/inventory.html | 13 +++++++++++++ 04-Typescript/22-git/inventory/invnetory.scss | 0 3 files changed, 13 insertions(+) create mode 100644 04-Typescript/22-git/inventory/dist/invnetory.css create mode 100644 04-Typescript/22-git/inventory/inventory.html create mode 100644 04-Typescript/22-git/inventory/invnetory.scss diff --git a/04-Typescript/22-git/inventory/dist/invnetory.css b/04-Typescript/22-git/inventory/dist/invnetory.css new file mode 100644 index 000000000..e69de29bb diff --git a/04-Typescript/22-git/inventory/inventory.html b/04-Typescript/22-git/inventory/inventory.html new file mode 100644 index 000000000..928a7b981 --- /dev/null +++ b/04-Typescript/22-git/inventory/inventory.html @@ -0,0 +1,13 @@ + + + + + + Document + + + + +

Inventory Feature

+ + \ No newline at end of file diff --git a/04-Typescript/22-git/inventory/invnetory.scss b/04-Typescript/22-git/inventory/invnetory.scss new file mode 100644 index 000000000..e69de29bb From 558039b8af32dfd64f66bacb3239eadb0adaeaad Mon Sep 17 00:00:00 2001 From: navered <128045047+navered@users.noreply.github.com> Date: Sun, 23 Jul 2023 19:00:27 +0300 Subject: [PATCH 3/6] int admin --- 04-Typescript/22-git/admin/admin.html | 0 04-Typescript/22-git/admin/admin.ts | 0 04-Typescript/22-git/admin/dist/admin.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 04-Typescript/22-git/admin/admin.html create mode 100644 04-Typescript/22-git/admin/admin.ts create mode 100644 04-Typescript/22-git/admin/dist/admin.js diff --git a/04-Typescript/22-git/admin/admin.html b/04-Typescript/22-git/admin/admin.html new file mode 100644 index 000000000..e69de29bb diff --git a/04-Typescript/22-git/admin/admin.ts b/04-Typescript/22-git/admin/admin.ts new file mode 100644 index 000000000..e69de29bb diff --git a/04-Typescript/22-git/admin/dist/admin.js b/04-Typescript/22-git/admin/dist/admin.js new file mode 100644 index 000000000..e69de29bb From 4ea3a872648e4e91e6dceb360364eab4fda8f5a2 Mon Sep 17 00:00:00 2001 From: Tal Date: Sun, 23 Jul 2023 19:15:44 +0300 Subject: [PATCH 4/6] fisrt sprint --- 04-Typescript/22-git/dist/style.css | 1 + 04-Typescript/22-git/{ => features}/admin/admin.html | 0 04-Typescript/22-git/{ => features}/admin/admin.ts | 0 04-Typescript/22-git/{ => features}/admin/dist/admin.js | 0 .../22-git/{ => features}/inventory/dist/invnetory.css | 0 04-Typescript/22-git/{ => features}/inventory/inventory.html | 0 04-Typescript/22-git/{ => features}/inventory/invnetory.scss | 0 04-Typescript/22-git/{ => features}/login/login.html | 0 04-Typescript/22-git/{ => features}/login/register.html | 0 04-Typescript/22-git/style.scss | 2 ++ 10 files changed, 3 insertions(+) rename 04-Typescript/22-git/{ => features}/admin/admin.html (100%) rename 04-Typescript/22-git/{ => features}/admin/admin.ts (100%) rename 04-Typescript/22-git/{ => features}/admin/dist/admin.js (100%) rename 04-Typescript/22-git/{ => features}/inventory/dist/invnetory.css (100%) rename 04-Typescript/22-git/{ => features}/inventory/inventory.html (100%) rename 04-Typescript/22-git/{ => features}/inventory/invnetory.scss (100%) rename 04-Typescript/22-git/{ => features}/login/login.html (100%) rename 04-Typescript/22-git/{ => features}/login/register.html (100%) diff --git a/04-Typescript/22-git/dist/style.css b/04-Typescript/22-git/dist/style.css index be262b369..40c808cd2 100644 --- a/04-Typescript/22-git/dist/style.css +++ b/04-Typescript/22-git/dist/style.css @@ -1,3 +1,4 @@ +@import "./features/inventory/dist/invnetory.css"; h1 { background-color: yellow; } \ No newline at end of file diff --git a/04-Typescript/22-git/admin/admin.html b/04-Typescript/22-git/features/admin/admin.html similarity index 100% rename from 04-Typescript/22-git/admin/admin.html rename to 04-Typescript/22-git/features/admin/admin.html diff --git a/04-Typescript/22-git/admin/admin.ts b/04-Typescript/22-git/features/admin/admin.ts similarity index 100% rename from 04-Typescript/22-git/admin/admin.ts rename to 04-Typescript/22-git/features/admin/admin.ts diff --git a/04-Typescript/22-git/admin/dist/admin.js b/04-Typescript/22-git/features/admin/dist/admin.js similarity index 100% rename from 04-Typescript/22-git/admin/dist/admin.js rename to 04-Typescript/22-git/features/admin/dist/admin.js diff --git a/04-Typescript/22-git/inventory/dist/invnetory.css b/04-Typescript/22-git/features/inventory/dist/invnetory.css similarity index 100% rename from 04-Typescript/22-git/inventory/dist/invnetory.css rename to 04-Typescript/22-git/features/inventory/dist/invnetory.css diff --git a/04-Typescript/22-git/inventory/inventory.html b/04-Typescript/22-git/features/inventory/inventory.html similarity index 100% rename from 04-Typescript/22-git/inventory/inventory.html rename to 04-Typescript/22-git/features/inventory/inventory.html diff --git a/04-Typescript/22-git/inventory/invnetory.scss b/04-Typescript/22-git/features/inventory/invnetory.scss similarity index 100% rename from 04-Typescript/22-git/inventory/invnetory.scss rename to 04-Typescript/22-git/features/inventory/invnetory.scss diff --git a/04-Typescript/22-git/login/login.html b/04-Typescript/22-git/features/login/login.html similarity index 100% rename from 04-Typescript/22-git/login/login.html rename to 04-Typescript/22-git/features/login/login.html diff --git a/04-Typescript/22-git/login/register.html b/04-Typescript/22-git/features/login/register.html similarity index 100% rename from 04-Typescript/22-git/login/register.html rename to 04-Typescript/22-git/features/login/register.html diff --git a/04-Typescript/22-git/style.scss b/04-Typescript/22-git/style.scss index d429315b6..23f8aaf65 100644 --- a/04-Typescript/22-git/style.scss +++ b/04-Typescript/22-git/style.scss @@ -1,3 +1,5 @@ +@import "./features/inventory/dist/invnetory.css"; + h1{ background-color: yellow; } \ No newline at end of file From e211697ff90951c22c87a6afc0c389eb5152f2db Mon Sep 17 00:00:00 2001 From: Doriel Shacham Date: Sun, 23 Jul 2023 19:26:28 +0300 Subject: [PATCH 5/6] cart import this import is on our css?? --- 04-Typescript/22-git/{Group6 => features/Cart}/dist/style.css | 0 .../{Group6 => features/Cart}/features/cart/dist/Cart.html | 0 .../{Group6 => features/Cart}/features/cart/dist/Cart.scss | 1 + .../{Group6 => features/Cart}/features/cart/dist/dist/Cart.css | 1 + 4 files changed, 2 insertions(+) rename 04-Typescript/22-git/{Group6 => features/Cart}/dist/style.css (100%) rename 04-Typescript/22-git/{Group6 => features/Cart}/features/cart/dist/Cart.html (100%) rename 04-Typescript/22-git/{Group6 => features/Cart}/features/cart/dist/Cart.scss (54%) rename 04-Typescript/22-git/{Group6 => features/Cart}/features/cart/dist/dist/Cart.css (52%) diff --git a/04-Typescript/22-git/Group6/dist/style.css b/04-Typescript/22-git/features/Cart/dist/style.css similarity index 100% rename from 04-Typescript/22-git/Group6/dist/style.css rename to 04-Typescript/22-git/features/Cart/dist/style.css diff --git a/04-Typescript/22-git/Group6/features/cart/dist/Cart.html b/04-Typescript/22-git/features/Cart/features/cart/dist/Cart.html similarity index 100% rename from 04-Typescript/22-git/Group6/features/cart/dist/Cart.html rename to 04-Typescript/22-git/features/Cart/features/cart/dist/Cart.html diff --git a/04-Typescript/22-git/Group6/features/cart/dist/Cart.scss b/04-Typescript/22-git/features/Cart/features/cart/dist/Cart.scss similarity index 54% rename from 04-Typescript/22-git/Group6/features/cart/dist/Cart.scss rename to 04-Typescript/22-git/features/Cart/features/cart/dist/Cart.scss index 90b88f010..1056bb736 100644 --- a/04-Typescript/22-git/Group6/features/cart/dist/Cart.scss +++ b/04-Typescript/22-git/features/Cart/features/cart/dist/Cart.scss @@ -1,3 +1,4 @@ +@import "/04-Typescript/22-git/features/Cart/dist/style.css"; dialog{ background-color: red; width: 200px; diff --git a/04-Typescript/22-git/Group6/features/cart/dist/dist/Cart.css b/04-Typescript/22-git/features/Cart/features/cart/dist/dist/Cart.css similarity index 52% rename from 04-Typescript/22-git/Group6/features/cart/dist/dist/Cart.css rename to 04-Typescript/22-git/features/Cart/features/cart/dist/dist/Cart.css index 74018d3e5..d5e030dac 100644 --- a/04-Typescript/22-git/Group6/features/cart/dist/dist/Cart.css +++ b/04-Typescript/22-git/features/Cart/features/cart/dist/dist/Cart.css @@ -1,3 +1,4 @@ +@import "/04-Typescript/22-git/features/Cart/dist/style.css"; dialog { background-color: red; width: 200px; From 2d48acb12f37ded9d5be15eeb7110aabe16d4c36 Mon Sep 17 00:00:00 2001 From: Doriel Shacham Date: Sun, 23 Jul 2023 19:30:32 +0300 Subject: [PATCH 6/6] merge conflict --- 04-Typescript/22-git/dist/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/04-Typescript/22-git/dist/style.css b/04-Typescript/22-git/dist/style.css index 40c808cd2..a9cb2be4e 100644 --- a/04-Typescript/22-git/dist/style.css +++ b/04-Typescript/22-git/dist/style.css @@ -1,4 +1,5 @@ @import "./features/inventory/dist/invnetory.css"; +@import "./features/Cart/dist/style.css" h1 { background-color: yellow; } \ No newline at end of file