Skip to content
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.

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

view css #39

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
40fe51c
Delete tests directory
retr0717 Nov 7, 2023
6893188
initial setup done
retr0717 Nov 7, 2023
235eb3f
Update README.md
retr0717 Nov 7, 2023
5efbda1
Update README.md
retr0717 Nov 7, 2023
8e9b3c9
Update README.md
retr0717 Nov 7, 2023
61d348a
initial server settings
retr0717 Nov 7, 2023
2536ef4
routes,helpers,model
retr0717 Nov 7, 2023
02ec193
Merge branch 'master' of https://github.com/AKA717/retr0-stackup
retr0717 Nov 7, 2023
01d4846
server.js update
retr0717 Nov 7, 2023
ec79ea1
added server.js updated
retr0717 Nov 7, 2023
1695483
add contact route done
retr0717 Nov 8, 2023
03480d7
add-contact route done
retr0717 Nov 8, 2023
cb195b2
model.js
retr0717 Nov 8, 2023
826fbd4
get-contacts route done
retr0717 Nov 8, 2023
0259c36
delete route done
retr0717 Nov 8, 2023
520bfe3
contact update route done
retr0717 Nov 8, 2023
f8504ab
route
retr0717 Nov 8, 2023
728060a
branch 'back-end'
retr0717 Nov 8, 2023
992b127
merge mistake in user-route
retr0717 Nov 8, 2023
8b0c172
model.js merge mistake
retr0717 Nov 8, 2023
c2d8fd2
user router js merge mistake
retr0717 Nov 8, 2023
90b3964
server.js merge mistake
retr0717 Nov 8, 2023
f9beb24
back-end branch merge mistakes resolved
retr0717 Nov 8, 2023
5357886
initial redux store setup done
retr0717 Nov 8, 2023
ba8bd9c
Merge branch 'front-end'
retr0717 Nov 8, 2023
ef5d4c5
user router merge mistake
retr0717 Nov 8, 2023
95762f8
login component created
melo-maniac-29 Nov 8, 2023
f14c4e1
login component created
melo-maniac-29 Nov 8, 2023
224d670
Update README.md
melo-maniac-29 Nov 8, 2023
169f0f4
register component
melo-maniac-29 Nov 8, 2023
9935104
login register functionality works
retr0717 Nov 8, 2023
6c6e9fe
Merge branch 'master' of https://github.com/AKA717/retr0-stackup
retr0717 Nov 8, 2023
6739950
saga middlwares and actions
retr0717 Nov 8, 2023
486942a
login ,register, home view,add contact features added
retr0717 Nov 9, 2023
be07b53
added route to user view after add contact
retr0717 Nov 9, 2023
8b02153
delete feature added
retr0717 Nov 9, 2023
3193eb0
edit feature added
retr0717 Nov 10, 2023
129bde0
changed to mdn style
retr0717 Nov 10, 2023
28a5561
view style updated
Akh1l51j1 Nov 10, 2023
bc323ea
view search bar position over card
Akh1l51j1 Nov 10, 2023
6b3d3fa
search bar box shadow removed and add contact place below the search bar
Akh1l51j1 Nov 10, 2023
3c025b2
Navbar Logo changed and Contact Manage font change
MhdRayanBinSN Nov 10, 2023
4c651e4
User icon changed and Some edits in card.css and card.jsx
MhdRayanBinSN Nov 10, 2023
b385936
search feature addded
retr0717 Nov 10, 2023
11af2f3
changed navbar design
retr0717 Nov 10, 2023
a8d172e
changed view style
retr0717 Nov 10, 2023
2a9116a
changed icons
retr0717 Nov 10, 2023
45f01c9
Merge branch 'final'
retr0717 Nov 10, 2023
9711925
merge with final
retr0717 Nov 10, 2023
7eaa519
changed view style container margin top
retr0717 Nov 10, 2023
9471437
changes icons of add contact,search bar ,btn styling
retr0717 Nov 10, 2023
50aeab0
Update README.md
retr0717 Nov 11, 2023
8daeb34
added username display in navabar
retr0717 Nov 11, 2023
529ac0d
Merge branch 'master' of https://github.com/AKA717/retr0-stackup
retr0717 Nov 11, 2023
608dd8f
Update README.md
retr0717 Nov 11, 2023
2ba60c6
Update README.md
retr0717 Nov 11, 2023
9f2a10d
removed console logs
retr0717 Nov 13, 2023
15b8341
Merge branch 'master' of https://github.com/AKA717/retr0-stackup
retr0717 Nov 13, 2023
a2b7b69
added sagamiddleware
retr0717 Nov 13, 2023
187c64d
production settings
retr0717 Nov 13, 2023
7fde94d
console.log removal
retr0717 Nov 14, 2023
6c41f60
env and main api subdomain added
retr0717 Nov 14, 2023
91feb60
Update README.md
retr0717 Aug 10, 2024
f7624b0
Update README.md
retr0717 Aug 10, 2024
62c80f0
Update README.md
retr0717 Sep 1, 2024
e995c7a
Update README.md
retr0717 Sep 1, 2024
e1406df
Update README.md
retr0717 Sep 1, 2024
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
Prev Previous commit
Next Next commit
Navbar Logo changed and Contact Manage font change
  • Loading branch information
MhdRayanBinSN committed Nov 10, 2023
commit 3c025b290abbe32cf674b318d2533ed5c80ee7ad
21 changes: 21 additions & 0 deletions back-end/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions back-end/package.json
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
"express": "^4.18.2",
"mongoose": "^7.3.1",
"multer": "^1.4.5-lts.1",
"node": "^21.1.0",
"nodemon": "^3.0.1"
}
}
4 changes: 3 additions & 1 deletion front-end/index.html
Original file line number Diff line number Diff line change
@@ -5,12 +5,14 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React</title>
<title>Contact Manager</title>
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" rel="stylesheet" />
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
<!-- MDB -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/6.4.0/mdb.min.css" rel="stylesheet" />
<!--Box icons-->>
<link href='https://unpkg.com/boxicons@2.1.4/css/boxicons.min.css' rel='stylesheet'>
</head>

<body>
2 changes: 1 addition & 1 deletion front-end/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion front-end/package.json
Original file line number Diff line number Diff line change
@@ -33,6 +33,6 @@
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.5"
"vite": "^4.5.0"
}
}
3 changes: 3 additions & 0 deletions front-end/src/components/navbar/navbar.css
Original file line number Diff line number Diff line change
@@ -8,4 +8,7 @@

.profile-pic{
border-radius: 300px;
}
.text-ContactManager{
font-family: Poppins;
}
9 changes: 2 additions & 7 deletions front-end/src/components/navbar/navbar.jsx
Original file line number Diff line number Diff line change
@@ -25,14 +25,9 @@ const Navbar = ({user,logOut}) => {

<div className="collapse navbar-collapse" id="navbarSupportedContent">
<Link className="navbar-brand mt-2 mt-lg-0" href="/">
<img
src="https://img.freepik.com/free-vector/illustration-graduation-hat_53876-5920.jpg?size=626&ext=jpg&ga=GA1.2.844804808.1682452210&semt=ais"
height="45"
alt="MDB Logo"
loading="lazy"
/>
<i className='bx bxs-contact bx-md'></i>
</Link>
<h3 className="mt-2">Contact Manager</h3>
<h3 className="text-ContactManager mt-2">Contact Manager</h3>
</div>

{