Skip to content

Cart new #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DorielShacham wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Cart new #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
82c2e03
login and register features
liran26 Jul 23, 2023
6456b6f
invnetory feature
liran26 Jul 23, 2023
558039b
int admin
navered Jul 23, 2023
6ba8469
Merge pull request #10 from talyaron/admin2
inalexa81 Jul 23, 2023
142bfc2
Merge pull request #7 from talyaron/invnetory
talyaron Jul 23, 2023
2c49f94
Merge pull request #6 from talyaron/login
talyaron Jul 23, 2023
e339145
Merge branch 'pre-prod' into Group6
DorielShacham Jul 23, 2023
4ea3a87
fisrt sprint
talyaron Jul 23, 2023
ce5cd67
Merge branch 'pre-prod' of https://github.com/talyaron/fullstack-feb2…
talyaron Jul 23, 2023
e211697
cart import
DorielShacham Jul 23, 2023
2d48acb
merge conflict
DorielShacham Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions 04-Typescript/22-git/dist/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "./features/inventory/dist/invnetory.css";
@import "./features/Cart/dist/style.css"
h1 {
background-color: yellow;
}
0 04-Typescript/22-git/Group6/dist/style.css → ...cript/22-git/features/Cart/dist/style.css
View file
Open in desktop
File renamed without changes.
0 ...2-git/Group6/features/cart/dist/Cart.html → ...eatures/Cart/features/cart/dist/Cart.html
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...2-git/Group6/features/cart/dist/Cart.scss → ...eatures/Cart/features/cart/dist/Cart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import "/04-Typescript/22-git/features/Cart/dist/style.css";
dialog{
background-color: red;
width: 200px;
Expand Down
1 change: 1 addition & 0 deletions ...t/Group6/features/cart/dist/dist/Cart.css → ...res/Cart/features/cart/dist/dist/Cart.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import "/04-Typescript/22-git/features/Cart/dist/style.css";
dialog {
background-color: red;
width: 200px;
Expand Down
Empty file added 04-Typescript/22-git/features/admin/admin.html
View file
Open in desktop
Empty file.
Empty file added 04-Typescript/22-git/features/admin/admin.ts
View file
Open in desktop
Empty file.
Empty file added 04-Typescript/22-git/features/admin/dist/admin.js
View file
Open in desktop
Empty file.
Empty file added 04-Typescript/22-git/features/inventory/dist/invnetory.css
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions 04-Typescript/22-git/features/inventory/inventory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="../dist/style.css">
<link rel="stylesheet" href="./dist/invnetory.css">
</head>
<body>
<h1>Inventory Feature</h1>
</body>
</html>
Empty file added 04-Typescript/22-git/features/inventory/invnetory.scss
View file
Open in desktop
Empty file.
12 changes: 12 additions & 0 deletions 04-Typescript/22-git/features/login/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="../dist/style.css">
</head>
<body>
<h1>Login </h1>
</body>
</html>
12 changes: 12 additions & 0 deletions 04-Typescript/22-git/features/login/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="../dist/style.css">
</head>
<body>
<h1>Register</h1>
</body>
</html>
2 changes: 2 additions & 0 deletions 04-Typescript/22-git/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "./features/inventory/dist/invnetory.css";

h1{
background-color: yellow;
}