Skip to content

Adding navitation bar #62

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

Open
wants to merge 182 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
36301a0
Create .gitignore
TaoLyn838 Oct 21, 2024
a96fc68
Updated && with Milestone 1 required.
TaoLyn838 Oct 23, 2024
b3d276d
Update milestone1.md
drakenevadie19 Oct 23, 2024
dcf1d86
Update milestone1.md
drakenevadie19 Oct 23, 2024
7cbe7f1
Update milestone2.md
parthskansara Oct 30, 2024
44292bf
Update milestone2.md
parthskansara Oct 30, 2024
55868c1
Updated ER diagrams
TaoLyn838 Oct 30, 2024
2170d15
Update wireframes.md
drakenevadie19 Oct 30, 2024
e4d5135
Update wireframes.md
drakenevadie19 Oct 30, 2024
4f23026
Update wireframes.md
drakenevadie19 Oct 30, 2024
75d4e67
Update wireframes.md
drakenevadie19 Oct 30, 2024
c75fa49
Update wireframes.md
drakenevadie19 Oct 30, 2024
158fd80
Update wireframes.md
drakenevadie19 Oct 31, 2024
afd1290
Update wireframes.md
drakenevadie19 Oct 31, 2024
99b39d2
Update milestone3.md
TaoLyn838 Nov 5, 2024
7c358c5
Update milestone3.md
TaoLyn838 Nov 5, 2024
fe83ee3
Update README.md
drakenevadie19 Nov 5, 2024
76670cd
Update README.md
drakenevadie19 Nov 5, 2024
0bcfbd6
Update README.md
drakenevadie19 Nov 5, 2024
16a5d71
New Change: adding codebase
drakenevadie19 Nov 6, 2024
5d4bd76
Merge pull request #14 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 6, 2024
78bd282
New Change: Adding components, css, data, pages and services folders;…
drakenevadie19 Nov 6, 2024
deb9334
Merge pull request #15 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 6, 2024
92ce199
Create server.js
TaoLyn838 Nov 6, 2024
84561db
Create .gitignore
TaoLyn838 Nov 6, 2024
7e39726
Merge pull request #16 from Web103-BookEZ/setup/base-folder-for-book-ez
drakenevadie19 Nov 6, 2024
5874905
New Change: Addding navigation bar
drakenevadie19 Nov 6, 2024
a4018ed
New Change: Navabar is good, only need authentication for login and s…
drakenevadie19 Nov 6, 2024
fe0f594
Merge pull request #17 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 6, 2024
3f7b0cf
New Change: Successfully design login page
drakenevadie19 Nov 6, 2024
b5d3395
Merge pull request #18 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 6, 2024
bcd8a0c
New Change: Beautify the login page
drakenevadie19 Nov 6, 2024
0ec8707
New Change: Adding forgot password pages including email and new pass…
drakenevadie19 Nov 7, 2024
4fdefd7
Merge pull request #19 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 7, 2024
795f1b2
Transfer `frond-end` files into `client` foder
TaoLyn838 Nov 7, 2024
2174300
Created: Mock data
TaoLyn838 Nov 7, 2024
1b51464
Merge pull request #20 from Web103-BookEZ/setup/database
drakenevadie19 Nov 7, 2024
e3c0d16
New Change: Base frame for home page
drakenevadie19 Nov 7, 2024
61a5415
Completed: test db by using mock data
TaoLyn838 Nov 7, 2024
a5c4faa
Merge pull request #21 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 7, 2024
bf9d388
Update milestone3.md
parthskansara Nov 7, 2024
6c0ec05
Merge pull request #22 from Web103-BookEZ/test/insert-data-to-db
parthskansara Nov 7, 2024
226d36f
Create db_walkthrough.gif
TaoLyn838 Nov 7, 2024
8cd23b9
Update README.md
TaoLyn838 Nov 7, 2024
2a9578e
Update README.md
TaoLyn838 Nov 7, 2024
2770758
Update README.md
TaoLyn838 Nov 7, 2024
e58160f
Update README.md
TaoLyn838 Nov 7, 2024
1f38655
Update README.md
drakenevadie19 Nov 7, 2024
66d534f
Update README.md
drakenevadie19 Nov 7, 2024
6618804
Update milestone3.md
parthskansara Nov 7, 2024
88f80ae
Added SalonController, SalonRouter
parthskansara Nov 10, 2024
2ae80e2
Refined SELECT query
parthskansara Nov 10, 2024
3cc724c
Added EmployeeController, EmployeeRouter
parthskansara Nov 10, 2024
faddff0
New Change: Finish the design of homepage
drakenevadie19 Nov 11, 2024
d43c125
Merge pull request #27 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 11, 2024
57ca9ef
New Change: Adding salon page
drakenevadie19 Nov 11, 2024
816ae61
Merge pull request #28 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 11, 2024
9e42436
New Change: Added full details of each salon page
drakenevadie19 Nov 11, 2024
7bef8c9
New Change: Added full details of each salon page
drakenevadie19 Nov 11, 2024
e3b36c9
Merge pull request #29 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 11, 2024
55cd68a
New Change: Added full page for appointment reservation
drakenevadie19 Nov 11, 2024
58a0148
Merge pull request #30 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 11, 2024
cb021b6
Added TimeslotController, TimeslotRouter
parthskansara Nov 11, 2024
bd119d6
Merge pull request #31 from Web103-BookEZ/server/timeslots
parthskansara Nov 11, 2024
b142bab
Merge branch 'main' into server/list-all-salons
parthskansara Nov 11, 2024
0c4325f
Merge pull request #25 from Web103-BookEZ/server/list-all-salons
parthskansara Nov 11, 2024
f3afacd
Updated references
parthskansara Nov 11, 2024
ab1a025
Added BookingController, BookingRouter
parthskansara Nov 11, 2024
58889f1
Merge pull request #32 from Web103-BookEZ/server/bookings
parthskansara Nov 12, 2024
148a0b0
Added UserController, UserRouter
parthskansara Nov 12, 2024
186cba9
Merge pull request #33 from Web103-BookEZ/server/users
parthskansara Nov 12, 2024
ee3c79c
New Change: Added added search from homepage
drakenevadie19 Nov 12, 2024
9cf4568
Merge pull request #34 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 12, 2024
6642f8b
New Change: Connected Salon list to Home Page
drakenevadie19 Nov 12, 2024
c5a9390
Merge pull request #35 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 12, 2024
8b66c79
New Change: Connected Salon by detail and employee by salonid to Salo…
drakenevadie19 Nov 12, 2024
fddc046
Merge pull request #36 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 12, 2024
381c606
New Change: added connection to endpoints to get an employee and fetc…
drakenevadie19 Nov 12, 2024
13c0881
Merge pull request #37 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 13, 2024
2708eff
New Change: added connection to Booking endpoint => reservation is no…
drakenevadie19 Nov 13, 2024
2cc43cf
Merge pull request #38 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 13, 2024
9bb1833
Backend: Authentication implemented
TaoLyn838 Nov 13, 2024
1e8376b
New Change: added basic pages for profile page
drakenevadie19 Nov 13, 2024
0dba8d3
Merge pull request #39 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 13, 2024
51e812b
New Change: Move front-end folder to BookEZ
drakenevadie19 Nov 13, 2024
516aeb3
Merge pull request #41 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 13, 2024
a2e4ca2
Merge pull request #40 from Web103-BookEZ/server/auth
TaoLyn838 Nov 13, 2024
2018b64
New Change: Connected endpoint to load booking to time_slot database
drakenevadie19 Nov 13, 2024
419ab24
Merge pull request #42 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 13, 2024
8c0df9b
Update milestone4.md
TaoLyn838 Nov 13, 2024
9acd89d
New Change: Connect endpoints for GET and UPDATE user info details
drakenevadie19 Nov 14, 2024
9855719
New Change: connect endpoint to get elements of appointment in profil…
drakenevadie19 Nov 14, 2024
36d3163
Merge pull request #43 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 14, 2024
2eb0e70
Update README.md
drakenevadie19 Nov 14, 2024
12fd9e1
Update README.md
drakenevadie19 Nov 14, 2024
f5ad167
Update README.md
drakenevadie19 Nov 14, 2024
e6aeace
added sign in function
TaoLyn838 Nov 15, 2024
a17ccc4
added sign alert
TaoLyn838 Nov 15, 2024
2916f89
Merge pull request #45 from Web103-BookEZ/connect-to-frontend
parthskansara Nov 15, 2024
da882b5
added login function
TaoLyn838 Nov 15, 2024
bdfff07
Merge pull request #46 from Web103-BookEZ/connect-to-frontend
parthskansara Nov 15, 2024
be71173
Added email functionality
parthskansara Nov 16, 2024
76f33ad
Merge branch 'main' of https://github.com/Web103-BookEZ/web103_finalp…
parthskansara Nov 16, 2024
148e623
Added tracking for current user and email confirmations
parthskansara Nov 16, 2024
8202a94
new Change: Beautify nav bar and add hidden side tab
drakenevadie19 Nov 16, 2024
ea0284d
Merge pull request #48 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 16, 2024
4df6067
Merge pull request #47 from Web103-BookEZ/email-confirmation
drakenevadie19 Nov 16, 2024
ffd99f0
new Change: Beautify home page list of salons, and adding list of sta…
drakenevadie19 Nov 16, 2024
95b52aa
Merge pull request #49 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 16, 2024
f526ee1
new Change: Allow users to search for name of salons
drakenevadie19 Nov 16, 2024
6824f2a
Merge pull request #50 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 16, 2024
2258634
new Change: Adjust mockdata in database
drakenevadie19 Nov 16, 2024
52c4193
Merge pull request #51 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 16, 2024
269c15b
new Change: User now can cancel appointment (delete from bookings tab…
drakenevadie19 Nov 16, 2024
d14e7a1
Merge pull request #52 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 16, 2024
823a4e6
new Change: Dynamically update the list of upcoming appointment
drakenevadie19 Nov 16, 2024
605a68a
Merge pull request #53 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 16, 2024
e63906f
new Change: Dynamically update the list of upcoming appointment
drakenevadie19 Nov 17, 2024
afc74d6
Merge pull request #54 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 17, 2024
c5882ba
new Change: Adding comments for each API calling
drakenevadie19 Nov 17, 2024
a125ae0
new Change: Adding confirmation box when cancel appointment, and addi…
drakenevadie19 Nov 17, 2024
f75acb5
Merge pull request #55 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 17, 2024
70701ee
new Change: Adding icons to page and add more timeslot for each employee
drakenevadie19 Nov 17, 2024
65505e9
Merge pull request #56 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 17, 2024
e95c00c
New Change: Finished homepage beautify
drakenevadie19 Nov 19, 2024
81d84a6
Merge pull request #57 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 19, 2024
0abeb67
New Change: Customize icons, adding finding location on calendar
drakenevadie19 Nov 19, 2024
a2e99d3
New Change: Added appointment page, plugin date picker and add endpoi…
drakenevadie19 Nov 19, 2024
1fcd98c
New Change: Beautify list of incoming appointments
drakenevadie19 Nov 19, 2024
aa9774e
Merge pull request #58 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 19, 2024
9903052
add password hash function
TaoLyn838 Nov 20, 2024
1385501
add app logo
TaoLyn838 Nov 20, 2024
051f9e6
Update milestone5.md
TaoLyn838 Nov 20, 2024
37a8bd1
New Change: Beautify list of incoming appointments
drakenevadie19 Nov 20, 2024
a339ae6
Merge pull request #60 from Web103-BookEZ/drakedo-front-end
TaoLyn838 Nov 20, 2024
90a8c2d
Merge branch 'main' of https://github.com/Web103-BookEZ/web103_finalp…
TaoLyn838 Nov 20, 2024
3494c89
Update login-page.jsx
TaoLyn838 Nov 20, 2024
86dc107
Fixed: WARNING in [eslint] src/components/nav-bar.jsx Line 39:10: …
TaoLyn838 Nov 20, 2024
1ad3c41
Update AuthRouter.js
TaoLyn838 Nov 20, 2024
0b0a57b
Fixed a warning caused by using an `<a>` tag with an invalid or empty…
TaoLyn838 Nov 20, 2024
0a9a29c
Merge pull request #59 from Web103-BookEZ/login-page
parthskansara Nov 20, 2024
afd41ab
New Change: Adding password validation for signing up
drakenevadie19 Nov 21, 2024
5fe4233
Merge branch 'main' into drakedo-front-end
drakenevadie19 Nov 21, 2024
15e6ef0
Merge pull request #61 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 21, 2024
5b01f9f
New Change: Adding loading for loging in
drakenevadie19 Nov 21, 2024
ec1a3d3
Merge pull request #62 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 21, 2024
de09e2e
Update milestone5.md
parthskansara Nov 21, 2024
274d576
`start` script missing fix
TaoLyn838 Nov 21, 2024
98cfa30
Updated logging
parthskansara Nov 21, 2024
6f348f1
New Change: Adding location to get back to page before log in
drakenevadie19 Nov 21, 2024
67f81ee
Merge pull request #63 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 21, 2024
bc9a13f
move `GGLOCATIONAPIKEY` from `key.js` to `.env`
TaoLyn838 Nov 21, 2024
5d727a9
New Change: Adding location to get back to page before log in. Also r…
drakenevadie19 Nov 21, 2024
8abf177
Merge pull request #64 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 21, 2024
9c699d4
Updated: dependency
TaoLyn838 Nov 21, 2024
2d4d9a3
Merge branch 'main' of https://github.com/Web103-BookEZ/web103_finalp…
TaoLyn838 Nov 21, 2024
24f4513
Fixed Missing Plugin
TaoLyn838 Nov 21, 2024
d439fb8
New Change: Fixxing babel error, and remove client folder
drakenevadie19 Nov 21, 2024
d93c450
Merge branch 'main' into drakedo-front-end
drakenevadie19 Nov 21, 2024
b057390
Merge pull request #65 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 21, 2024
df1b900
Update package-lock.json
TaoLyn838 Nov 21, 2024
af55c27
Fixed `useEffect()` not included in the dependency array error
TaoLyn838 Nov 21, 2024
bc3ad32
handle heap memory issue
TaoLyn838 Nov 21, 2024
2db4cfb
Update package-lock.json
TaoLyn838 Nov 21, 2024
b43f721
Update milestone5.md
parthskansara Nov 21, 2024
392a709
Update README.md
parthskansara Nov 21, 2024
145b146
Final Demo gif
parthskansara Nov 21, 2024
c13829b
Update milestone5.md
drakenevadie19 Nov 21, 2024
310d251
Update package.json
TaoLyn838 Nov 21, 2024
55a0406
Update milestone5.md
TaoLyn838 Nov 21, 2024
845f06f
Update README.md
TaoLyn838 Nov 21, 2024
2df95eb
Update README.md
TaoLyn838 Nov 21, 2024
60576fa
Update README.md
TaoLyn838 Nov 21, 2024
bc510d9
Update README.md
TaoLyn838 Nov 21, 2024
8812646
Update README.md
TaoLyn838 Nov 21, 2024
483f95b
Update README.md
TaoLyn838 Nov 21, 2024
2333331
Update README.md
TaoLyn838 Nov 21, 2024
29df899
New Change: adding loading animations
drakenevadie19 Nov 21, 2024
5434bde
Merge branch 'main' into drakedo-front-end
drakenevadie19 Nov 21, 2024
2a86638
Merge pull request #66 from Web103-BookEZ/drakedo-front-end
drakenevadie19 Nov 21, 2024
eaec0ee
New Change: rechange the local
drakenevadie19 Nov 21, 2024
6cd00a1
New Change: Beautify home page
drakenevadie19 Nov 21, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.DS_Store
24 changes: 24 additions & 0 deletions BookEZ/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules/
.pnp*
.pnp.js*

# testing
coverage/

# production
build/

# misc
.DS_Store*
.env.local*
.env.development.local*
.env.test.local*
.env.production.local*
.env*

npm-debug.log*
yarn-debug.log*
yarn-error.log*
25 changes: 25 additions & 0 deletions BookEZ/front-end/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

/src/key.js
70 changes: 70 additions & 0 deletions BookEZ/front-end/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Getting Started with Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.

The page will reload when you make changes.\
You may also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can't go back!**

If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.

You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)

### Analyzing the Bundle Size

This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)

### Making a Progressive Web App

This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)

### Advanced Configuration

This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)

### Deployment

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)

### `npm run build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
Loading