Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
3387556
➕ Add ant design package
north23 Apr 12, 2021
952e1ff
✨ Create vehicle page
north23 Apr 12, 2021
13b09df
✨ Implement a customized column search
north23 Apr 12, 2021
1700ad3
🔇 Remove console log
north23 Apr 12, 2021
8420c1d
🔧 Update prettier rule
north23 Apr 15, 2021
1776d88
💄 Create booking page
north23 Apr 15, 2021
27553bc
Register Integration Fixed
north23 Apr 25, 2021
56562ad
Merge pull request #2 from ProgrammingProject1-2021/feature/booking
north23 Apr 29, 2021
725ce0f
🔧 Update api endpoints
north23 Apr 29, 2021
b5bd29a
➕ Add google map library
north23 Apr 29, 2021
35f1643
🎉 Show google maps on browser
north23 Apr 29, 2021
b572675
basic main.page
dev-minjin-chou May 3, 2021
de95fd9
finalised main page
dev-minjin-chou May 3, 2021
fa7d4ce
Merge pull request #4 from ProgrammingProject1-2021/main-page
north23 May 5, 2021
4feac80
🐛 Fix tables not showing data
north23 May 5, 2021
34dcab4
Merge pull request #5 from ProgrammingProject1-2021/feature/car-map
dev-minjin-chou May 5, 2021
3cc70c7
✨ Show cars of selected location marker
north23 May 5, 2021
5c943b6
added booking hour page
s3596302 May 10, 2021
da4050e
updated css and returing car page with card components
dev-minjin-chou May 10, 2021
a27a54d
✨ Show available cars in table on marker clicked
north23 May 10, 2021
d26d7b8
finished return vehicle, end booking page is in progress. Appending u…
dev-minjin-chou May 11, 2021
e232290
fixed loggin in & redirect to booking page
north23 May 11, 2021
7afc1ee
finished return vehicle dashboard
dev-minjin-chou May 11, 2021
cc092d2
🥅 Handle API error response
north23 May 11, 2021
0cf3716
➕ Add nprogress library
north23 May 11, 2021
ecd56d9
💄 Add booking button
north23 May 11, 2021
3fc755e
🚸 Close modal on submit
north23 May 11, 2021
3c94cb2
Merge branch 'features/return-cars-page' into feature/car-map
north23 May 11, 2021
3425ff6
📌 Update yarn.lock
north23 May 11, 2021
414ed04
🎨 Format code
north23 May 11, 2021
cf93b90
✨ Get vehicles of current customer
north23 May 11, 2021
73cb176
🎨 Format code
north23 May 11, 2021
1f38431
Merge branch 'develop' into feature/car-map
north23 May 11, 2021
d181b3f
Merge pull request #6 from ProgrammingProject1-2021/feature/car-map
north23 May 11, 2021
4478b16
Correct route
north23 May 11, 2021
bef3c16
Merge pull request #7 from ProgrammingProject1-2021/fix/route
dev-minjin-chou May 11, 2021
0a3eda8
♻️ Move navigation bar to react component
north23 May 11, 2021
631c0ca
minor fixed for location
north23 May 12, 2021
c173469
update bookinghourpage
s3596302 May 16, 2021
9cb5a44
cors error test
s3596302 May 18, 2021
88329df
🚧 Working on editing vehicle table
dev-minjin-chou May 18, 2021
e33fdac
🐛 Fix editing
dev-minjin-chou May 18, 2021
cca1f6d
💄 Show current row data before editing
dev-minjin-chou May 18, 2021
644a7be
✨ Send API edit request
dev-minjin-chou May 18, 2021
cb09b8a
🐛 Correct api request method
dev-minjin-chou May 18, 2021
a85bde1
✨ Save admin flag in local storage
dev-minjin-chou May 18, 2021
219af9c
💄 Show error notification on bottom right corner
dev-minjin-chou May 18, 2021
4ebaf74
fixed cors error
s3596302 May 23, 2021
3a0a1c4
started dashboard
s3596302 May 23, 2021
ca94933
commit changes
s3596302 May 24, 2021
e018546
minor changes
s3596302 May 24, 2021
3952b7c
link book page with bookinghourpage
s3596302 May 24, 2021
ec68c4e
Merge pull request #8 from ProgrammingProject1-2021/feature/admin-mod…
north23 May 25, 2021
8443755
🎨 Format code
dev-minjin-chou May 25, 2021
5728cc0
🎨 Convert to camel case
dev-minjin-chou May 25, 2021
3164d54
Use pascal case for type
dev-minjin-chou May 25, 2021
358c165
remove unused code
dev-minjin-chou May 25, 2021
dee5f16
add uuid package
dev-minjin-chou May 25, 2021
3f242b2
add dayjs package
dev-minjin-chou May 25, 2021
859efaf
get registration from url param
dev-minjin-chou May 25, 2021
192e1c0
Merge branch 'develop' into bookinghourpage
dev-minjin-chou May 25, 2021
d1736e7
filter vehicles
dev-minjin-chou May 25, 2021
2d5e103
update current customer of vehicle
dev-minjin-chou May 25, 2021
8e16323
Basic edit profile page
dev-minjin-chou May 29, 2021
a956bfb
pay page
dev-minjin-chou May 30, 2021
05cdaab
Update README.md
dev-minjin-chou May 30, 2021
2cfa2fa
Merge pull request #10 from ProgrammingProject1-2021/features/edit-pr…
dev-minjin-chou May 30, 2021
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
21 changes: 21 additions & 0 deletions .ebignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# dependencies
node_modules/
# repository/project stuff
.idea/
.git/
.gitlab-ci.yml
README.md
# misc
.DS_Store
# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# local env files
.env.local
.env.development.local
.env.test.local
.env.production.local
# non prod env files
.env.development
.env.test
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
unsafe-perm=true
1 change: 1 addition & 0 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ semi: false
bracketSpacing: true
jsxBracketSameLine: true
resolveGlobalModules: false
printWidth: 120
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Programming Project - Frontend

url link for github: https://github.com/ProgrammingProject1-2021/Frontend
url link for deployed project: http://frontend-dev22.ap-southeast-2.elasticbeanstalk.com/
Loading