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

Moz-Services App #31

Merged
merged 152 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
c28ca1d
Create a React App using Vite
deniodev Apr 16, 2024
f09bef3
Add Tailwind CSS
deniodev Apr 16, 2024
535d1d9
Merge pull request #1 from deniodev/project-setup
deniodev Apr 16, 2024
2a06bae
Add Pages
deniodev Apr 16, 2024
c400649
Install react router dom
deniodev Apr 16, 2024
bdf0d91
Add Routes
deniodev Apr 16, 2024
824e58f
Merge pull request #2 from deniodev/features
deniodev Apr 16, 2024
0d1cef7
Add Header Component
deniodev Apr 16, 2024
ab33bb8
Add Header Component
deniodev Apr 16, 2024
9861a07
Merge pull request #3 from deniodev/features
deniodev Apr 16, 2024
862f278
Install express
deniodev Apr 16, 2024
7dcd389
Install nodemon
deniodev Apr 16, 2024
b94d5d2
Merge pull request #4 from deniodev/features
deniodev Apr 16, 2024
2d59fae
Install Mongoose
deniodev Apr 16, 2024
cd83b64
Connect to MongoDB
deniodev Apr 16, 2024
ed4230a
Merge pull request #5 from deniodev/features
deniodev Apr 16, 2024
d14b237
Delete .env
deniodev Apr 16, 2024
54528ad
Delete .env
deniodev Apr 16, 2024
a514472
Merge pull request #6 from deniodev/features
deniodev Apr 16, 2024
e50bbdc
Add User model
deniodev Apr 16, 2024
868538e
Add test route
deniodev Apr 16, 2024
f867239
Add Signup route
deniodev Apr 16, 2024
34afeb2
Add Middleware
deniodev Apr 16, 2024
d75dd7f
Add Ui to Signup page
deniodev Apr 16, 2024
6936bdb
Add functionality to SignUp Page
deniodev Apr 16, 2024
9556e08
Add Signin Route
deniodev Apr 16, 2024
06f7495
Add functionality to Signin Page
deniodev Apr 16, 2024
671d254
Merge pull request #7 from deniodev/features
deniodev Apr 17, 2024
04114ea
Add Redux Toolkit
deniodev Apr 17, 2024
4174980
Add Redux Persist
deniodev Apr 17, 2024
5839eeb
Merge pull request #8 from deniodev/features
deniodev Apr 17, 2024
f06a8b7
Add Google OAuth to client
deniodev Apr 17, 2024
460ec2a
Add Google OAuth to server
deniodev Apr 17, 2024
c337eef
Merge pull request #9 from deniodev/features
deniodev Apr 17, 2024
591c18a
Add Profile Picture to Header
deniodev Apr 17, 2024
285eea5
Make the Profile page private
deniodev Apr 17, 2024
4417dcc
Add Ui to Profile Page
deniodev Apr 17, 2024
0b4ba8b
Add Image Profile Upload Functionality
deniodev Apr 17, 2024
7e70792
Add Update user api route
deniodev Apr 17, 2024
e094498
Add Update user functionality
deniodev Apr 17, 2024
322a83f
Add delete user functionality
deniodev Apr 17, 2024
c24a213
Add Sign out user functionality
deniodev Apr 18, 2024
8aafd4f
Merge pull request #10 from deniodev/features
deniodev Apr 18, 2024
5a3c898
Add Create Pro api route
deniodev Apr 18, 2024
2a91309
Change Pro route to Service route
deniodev Apr 18, 2024
31c768c
Add CreateService Page
deniodev Apr 18, 2024
e53122a
Add Upload img functionality to create service page
deniodev Apr 18, 2024
1b8eb2e
Add Create Service page functionality
deniodev Apr 18, 2024
976df76
Add get user services api route
deniodev Apr 18, 2024
235ed3a
Add show user services functionality
deniodev Apr 18, 2024
3894939
Merge pull request #11 from deniodev/features
deniodev Apr 18, 2024
6b6d1d9
Add functionality to delete user services
deniodev Apr 19, 2024
ef23859
Add Update Services Api Route
deniodev Apr 19, 2024
752ccf3
Add functionality to update user service
deniodev Apr 19, 2024
1787818
Add Slider to the service page
deniodev Apr 19, 2024
6edd311
Complete the Ui of Service Page
deniodev Apr 19, 2024
c982155
Add Book Appontment functionality
deniodev Apr 19, 2024
a5b8f92
Merge pull request #12 from deniodev/features
deniodev Apr 19, 2024
c97a29d
Add Search api route
deniodev Apr 19, 2024
8971054
Add Header search form functionality
deniodev Apr 19, 2024
0f71a49
Add Search page ui
deniodev Apr 19, 2024
daa94f3
Add onChange and on Submit functionality to the search page
deniodev Apr 19, 2024
0d2de39
Add Service item component
deniodev Apr 19, 2024
2e41fbc
Merge pull request #13 from deniodev/features
deniodev Apr 19, 2024
f0cc792
Add Home Page Ui
deniodev Apr 20, 2024
2999948
Update Service Item coer photo
deniodev Apr 21, 2024
5e97d86
Merge pull request #14 from deniodev/features
deniodev Apr 21, 2024
16f08ca
Add Review Routes, Schema and Controller
deniodev Apr 22, 2024
aa4d2d7
Add Service User Image
deniodev Apr 22, 2024
d3b6cf7
Add Whatsapp link to contact
deniodev Apr 22, 2024
002158a
Add phone number input
deniodev Apr 22, 2024
9f03831
Setup Shadcn UI
deniodev Apr 22, 2024
51190e8
Update SignIn Page UI
deniodev Apr 22, 2024
9fe436a
Add react hot toast
deniodev Apr 22, 2024
311a7e9
Update SingUp page UI
deniodev Apr 23, 2024
299f01f
Add Dark Mode
deniodev Apr 23, 2024
13afba8
Update Header UI
deniodev Apr 23, 2024
66a9e6f
Update Profile Page UI
deniodev Apr 23, 2024
ec9947c
Merge pull request #16 from deniodev/shadcn
deniodev Apr 23, 2024
14a7c64
Add Translation Icon
deniodev Apr 24, 2024
996cfea
Update the Create Service Page UI
deniodev Apr 25, 2024
9aa2f56
Update UpdateService page UI
deniodev Apr 25, 2024
d72e4b2
Update Service page UI
deniodev Apr 25, 2024
1106803
Update Service Item card UI
deniodev Apr 25, 2024
4bb80ca
Merge pull request #17 from deniodev/shadcn
deniodev Apr 25, 2024
e275a76
Add Reviews Page UI
deniodev Apr 26, 2024
2f0094a
Add Footer
deniodev Apr 27, 2024
aad6e27
Add dark mode to the logo
deniodev Apr 27, 2024
cf863e7
Merge pull request #18 from deniodev/shadcn
deniodev Apr 27, 2024
6745ea6
Add FAQ page
deniodev Apr 28, 2024
68f3327
Add Contact page
deniodev Apr 28, 2024
0bc048c
Add Review Functionality
deniodev Apr 29, 2024
3a4a1f2
Update Review Controller
deniodev Apr 29, 2024
72d15d3
Add the Review Service UI
deniodev Apr 30, 2024
e99621b
Merge pull request #19 from deniodev/shadcn
deniodev Apr 30, 2024
06bf7be
Add Service Categories
deniodev May 1, 2024
66fc340
Add Fiters to Service Controoler
deniodev May 1, 2024
f9b0e1f
Update the Search Page UI
deniodev May 1, 2024
b0dbbe9
Merge pull request #20 from deniodev/shadcn
deniodev May 1, 2024
933c260
Update the HomePage UI
deniodev May 1, 2024
0e6dba0
Add Hover effect to darkmode
deniodev May 2, 2024
f960a3a
Update the Hero Section UI
deniodev May 2, 2024
2f2088e
Merge pull request #21 from deniodev/shadcn
deniodev May 2, 2024
ec24999
Setup the i18n Translations
deniodev May 3, 2024
22f42c2
Add Translations to the Header
deniodev May 3, 2024
542e41d
Add Translations to the Hero Section
deniodev May 3, 2024
34e0b8c
Add Translations to the Home Page
deniodev May 3, 2024
dad2e0f
Add Translations to the Search Page
deniodev May 3, 2024
0aa7749
Add Translations to the About Page
deniodev May 3, 2024
02b5564
Add Translations to the Contact Page
deniodev May 3, 2024
6025e6a
Add Translations to Create Service Page
deniodev May 3, 2024
84d04cb
Add Translations to the Profile Page
deniodev May 3, 2024
5524b04
Add Translations to the Update Service Page
deniodev May 4, 2024
d621a2e
Add Translations to the SigUp Page
deniodev May 4, 2024
9221087
Add Translations to the SignIn Page
deniodev May 4, 2024
70a4669
Add Translations to the Service page
deniodev May 4, 2024
affe306
Merge pull request #22 from deniodev/dual-language
deniodev May 4, 2024
f255b47
Update README.md
deniodev May 5, 2024
dda2172
Add SheetClose to the Sidebar Header
deniodev May 6, 2024
1b5951d
Add Headroom to the Header Component
deniodev May 6, 2024
6c89588
Add Toast Notification
deniodev May 6, 2024
d274cc4
Change Delete and Signout button type
deniodev May 6, 2024
8ad61ab
Add Translations to the Booking page
deniodev May 6, 2024
a510673
Add Functionality to hide the Booking btn when is clicked
deniodev May 6, 2024
2f6549c
Hide the SVG in mobile dark mode
deniodev May 7, 2024
dff93e4
Add IsApproved to the service page
deniodev May 7, 2024
76ed3ad
Sutup Linters
deniodev May 8, 2024
7270da5
Merge pull request #23 from deniodev/tests
deniodev May 8, 2024
33813bb
Fix Linters Errors
deniodev May 9, 2024
2ff879e
Fix Stylelint errors
deniodev May 9, 2024
0e1efd5
Merge pull request #24 from deniodev/tests
deniodev May 9, 2024
bb906fc
Setup files for demo deploy
deniodev May 10, 2024
840c8a5
Merge pull request #25 from deniodev/render-demo
deniodev May 11, 2024
ab9d653
Setup Vitest
deniodev May 12, 2024
ad4cdf9
Merge pull request #26 from deniodev/tests
deniodev May 12, 2024
168a330
Add Loading State to Show Services Button
deniodev May 13, 2024
b11106f
Add Test for App.jsx
deniodev May 13, 2024
a67265d
Add Loading State to Send Message Button
deniodev May 13, 2024
5849f79
Update tests
deniodev May 13, 2024
0e67bf6
Merge pull request #27 from deniodev/tests
deniodev May 13, 2024
86151af
Add License
deniodev May 14, 2024
890a9e3
Update the Readme File
deniodev May 14, 2024
53fa980
Add ServiceItem Test
deniodev May 14, 2024
6a3439d
Merge branch 'dev' into tests
deniodev May 14, 2024
49ec8e3
Merge pull request #29 from deniodev/tests
deniodev May 14, 2024
c3c13ef
Update README.md
deniodev May 15, 2024
d14ae65
Add App Screenshot
deniodev May 15, 2024
ca53275
Add Logo
deniodev May 15, 2024
9be87fe
Update the App test
deniodev May 15, 2024
ce73b67
Update the App Name
deniodev May 15, 2024
0ffa275
Merge pull request #30 from deniodev/tests
deniodev May 15, 2024
7deb93e
Update App Screenshot
deniodev May 16, 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
Add Header Component
  • Loading branch information
deniodev committed Apr 16, 2024
commit 0d1cef7f24fef9cf4e129835ac690fb4ce23f3e9
9 changes: 9 additions & 0 deletions client/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 client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^5.1.0",
"react-router-dom": "^6.22.3"
},
"devDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import SignIn from "./pages/SignIn";
import SignUp from "./pages/SignUp";
import About from "./pages/About";
import Profile from "./pages/Profile";
import Header from "./components/Header";

const App = () => {
return (
<BrowserRouter>
<Header />
<Routes>
<Route path="/" element={<Home />} />
<Route path="/sign-in" element={<SignIn />} />
Expand Down
28 changes: 28 additions & 0 deletions client/src/components/Header.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { FaSearch } from 'react-icons/fa';
import { Link } from 'react-router-dom';

const Header = () => {
return (
<header className="bg-slate-200 shadow-md">
<div className="flex justify-between items-center max-w-6xl mx-auto p-3">
<Link to='/'>
<h1 className="font-bold text-sm sm:text-xl flex flex-wrap">
<span className="text-slate-500">Home</span>
<span className="text-slate-700">Services</span>
</h1>
</Link>
<form className="bg-slate-100 p-3 rounded-lg flex items-center">
<input type="text" placeholder="Search" className="bg-transparent focus:outline-none w-24 sm:w-64" />
<FaSearch className='text-slate-600'/>
</form>
<ul className='flex gap-4'>
<Link to='/'><li className='hidden sm:inline text-slate-700 hover:underline cursor-pointer'>Home</li></Link>
<Link to='/about'><li className='hidden sm:inline text-slate-700 hover:underline cursor-pointer'>About</li></Link>
<Link to='/sign-in'><li className='text-slate-700 hover:underline cursor-pointer'>Sign In</li></Link>
</ul>
</div>
</header>
);
};

export default Header;