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

DocConnect v1 FrontEnd PR #19

Merged
merged 145 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from 129 commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
a59cf72
setting up create react app and dependencies
misalazeem Sep 22, 2023
6b00b26
Setup Linters & Github Flow
Atril33 Sep 22, 2023
f9b170a
Setup tailwind
andrianarivo Sep 22, 2023
9e00ca5
Setup basic routes
lordksix Sep 22, 2023
00781d7
Setup Redux & Update Readme.md File
Atril33 Sep 22, 2023
1f43226
Merge pull request #1 from Atril33/project-setup
Atril33 Sep 22, 2023
6f8801b
creating home page
misalazeem Sep 22, 2023
5e4650c
implementing the sidebar and mobile menu for other pages
misalazeem Sep 25, 2023
44b07c6
Merge pull request #2 from Atril33/feature/home-main-page
misalazeem Sep 26, 2023
8cf9959
adding fixes
misalazeem Sep 26, 2023
b3e9d4d
fixing
misalazeem Sep 26, 2023
1e9a881
removing react query
misalazeem Sep 26, 2023
972737c
removing unnecessary comment
misalazeem Sep 26, 2023
668991c
Idea files updates
andrianarivo Sep 26, 2023
614f259
Update ESLint to accept props spreading
andrianarivo Sep 26, 2023
f067488
Add react-toaster
andrianarivo Sep 26, 2023
8f94c42
Global axios config
andrianarivo Sep 26, 2023
0e10f3f
Implement redux for user Login/SignUp
andrianarivo Sep 26, 2023
1ad2e0a
Login/Signup scallfolds
andrianarivo Sep 26, 2023
bf4076e
making corrections
misalazeem Sep 26, 2023
74f0eed
Update session logic
andrianarivo Sep 26, 2023
9ed1f55
adding create appointment route and required components
misalazeem Sep 26, 2023
72626b9
fixing linter
misalazeem Sep 26, 2023
ac6eb4b
Merge pull request #3 from Atril33/login_signup_scaffold
andrianarivo Sep 27, 2023
0f7035f
fixing conflicts
misalazeem Sep 27, 2023
7edd27b
fixing imports
misalazeem Sep 27, 2023
e0ee36e
fixing liner
misalazeem Sep 27, 2023
87a6b7e
Merge pull request #4 from Atril33/feature/appointmnet-list
misalazeem Sep 27, 2023
0267c09
Fetch Data From API
Atril33 Sep 27, 2023
f4e9835
feature: Applying current user to reservation booking and appointment…
misalazeem Sep 27, 2023
8a688b7
making some logical changes
misalazeem Sep 27, 2023
b455917
made some gui hotfixes and changes to appointment-list views
misalazeem Sep 27, 2023
15398b6
small change in gui
misalazeem Sep 27, 2023
ea996db
Complete All Doctor Page
Atril33 Sep 28, 2023
8d75625
Implement Nav panel
lordksix Sep 28, 2023
4b8053e
Implement not matched URL page
lordksix Sep 28, 2023
336756f
Implement new routes and create placeholder components
lordksix Sep 28, 2023
2325e2e
Merge pull request #5 from Atril33/feature/applying-current-user-to-a…
misalazeem Sep 28, 2023
4c6e796
Fix Z-index Issue & Linter Issues
Atril33 Sep 28, 2023
03cfeaf
Build user input
andrianarivo Sep 27, 2023
928df53
Implement Login design
andrianarivo Sep 27, 2023
eddcbc9
Implement Signup design
andrianarivo Sep 27, 2023
76079cf
Refactor
andrianarivo Sep 27, 2023
e3245df
Update package.json for linters
andrianarivo Sep 27, 2023
d94f927
Added form Validation
andrianarivo Sep 28, 2023
b680a44
Merge branch 'dev' into feature/nav-panel
lordksix Sep 28, 2023
2a3ee62
Add YUP and @hookform/resolver dependencies
andrianarivo Sep 28, 2023
5fe343f
Implement form validations
andrianarivo Sep 28, 2023
e887ebf
Implement mobile version links and hide scrollbar
lordksix Sep 28, 2023
888a4b9
Add Doctor Detail Page
Atril33 Sep 28, 2023
662fd87
Add Left Image Section In Doctor Detaile Page
Atril33 Sep 28, 2023
8fe21ff
Correct implementation of extra tailwind utilities
lordksix Sep 29, 2023
c0f2164
Add Details Section
Atril33 Sep 29, 2023
40a3eec
Complete Doctor Detail Page
Atril33 Sep 29, 2023
f415063
Make Doctor Detail Page Responsive
Atril33 Sep 29, 2023
2ba1f95
Fix Linter Errors
Atril33 Sep 29, 2023
1d93729
Add Create Appointment Link
Atril33 Sep 29, 2023
c69d452
Merge pull request #6 from Atril33/pretty_login_signup
andrianarivo Sep 29, 2023
a3405d8
Merge branch 'dev' into feature/nav-panel
lordksix Sep 29, 2023
aa48956
Merge pull request #7 from Atril33/feature/nav-panel
lordksix Sep 29, 2023
83d8926
Merge branch 'dev' into doctor-detail
Atril33 Sep 29, 2023
3674d4e
Fix package scripts
lordksix Sep 29, 2023
562fb4d
Setup env variables
lordksix Sep 29, 2023
21be50a
Implement env variable to auth slice
lordksix Sep 29, 2023
77dcab0
Change URL endpoints to env variables
lordksix Sep 29, 2023
3209052
Fixed Issues
Atril33 Sep 29, 2023
458e043
Fix Linters Issue
Atril33 Sep 29, 2023
dd8041c
Update style.css
Atril33 Sep 29, 2023
0152dc1
Merge pull request #8 from Atril33/doctor-detail
Atril33 Sep 29, 2023
e56cfac
Change Splash Screen layout
lordksix Sep 29, 2023
ddfbaf4
Implement log out page and add it to sidebar
lordksix Sep 29, 2023
9156b76
Add Doctor Delete Styling
Atril33 Sep 29, 2023
a997012
Hot fix logout page
lordksix Sep 30, 2023
e484730
Improve sidebar layout
lordksix Sep 30, 2023
b987b3c
Improve mobile responsiveness of side bar
lordksix Sep 30, 2023
5323145
Hotfix selectors layout and add label
lordksix Sep 30, 2023
0f96ae3
Implement create appointment and list them
lordksix Sep 30, 2023
90b2c92
Hotfix routes
lordksix Sep 30, 2023
94f2823
Implement delete appointment
lordksix Sep 30, 2023
493eb67
Add time range picker dependency
andrianarivo Sep 29, 2023
5e024e1
Refactor
andrianarivo Sep 29, 2023
ef12b89
Add component select, textarea
andrianarivo Sep 29, 2023
b485864
Add Specialization Redux
andrianarivo Sep 29, 2023
7f7185e
Implement add doctor feature
andrianarivo Sep 29, 2023
e546673
Setup
andrianarivo Sep 30, 2023
560a755
Adding form validation for create doctor
andrianarivo Sep 30, 2023
d51cdbc
Implement route update appointment
lordksix Sep 30, 2023
7d3a4ac
Implement update fetching
lordksix Sep 30, 2023
1ebb886
Add Delete Functionality
Atril33 Sep 30, 2023
01cf086
Hotfix UPDATE appointment
lordksix Sep 30, 2023
dccc7ec
Merge branch 'dev' into feature/reserve-appointment-more
lordksix Sep 30, 2023
edb43dd
Delete .env
lordksix Sep 30, 2023
3c25a63
Merge pull request #10 from Atril33/feature/reserve-appointment-more
lordksix Sep 30, 2023
51ced63
Merge branch 'dev' into create_doctor
andrianarivo Sep 30, 2023
73969e3
Remove .env file
andrianarivo Sep 30, 2023
7838286
Added dotenv dependency
andrianarivo Sep 30, 2023
35598c0
Merge pull request #9 from Atril33/create_doctor
andrianarivo Sep 30, 2023
e8e0a83
Return initialState after logout
andrianarivo Sep 30, 2023
9b027c8
Merge pull request #11 from Atril33/bugfix/logout
andrianarivo Sep 30, 2023
d37b5ea
Minor Fixes
misalazeem Sep 30, 2023
30ec419
adding doctor specialization in the select box for ease of use
misalazeem Sep 30, 2023
2d9f285
Update doctor-delete branch with dev
Atril33 Oct 1, 2023
49afde9
Add Delete Doctor Function
Atril33 Oct 1, 2023
1be3963
Fix Linter Issues
Atril33 Oct 1, 2023
c4e31f0
Add Styling In All Doctor Page
Atril33 Oct 1, 2023
544aa6d
Merge pull request #14 from Atril33/doctor-delete
Atril33 Oct 1, 2023
39d8e08
Fetch Photo For Doctor Page
Atril33 Oct 1, 2023
6750081
fixing merge conflicts
misalazeem Oct 1, 2023
f4b925a
Merge pull request #12 from Atril33/minor-fixes
misalazeem Oct 1, 2023
693c840
Finish Doctor Detail Page Styling
Atril33 Oct 1, 2023
ae2567c
Fix Linters Issue
Atril33 Oct 1, 2023
87c1029
Protect route according to role
lordksix Oct 1, 2023
afbe283
Implement selective rendering on side bar
lordksix Oct 1, 2023
4dca92f
Using react query for cache
andrianarivo Oct 1, 2023
c82916e
Refactor
andrianarivo Oct 1, 2023
acb8004
Merge pull request #16 from Atril33/feature/filter-access-add-delete-…
lordksix Oct 1, 2023
46addb3
Update AppointmentUpdate.jsx
lordksix Oct 1, 2023
ac885e7
Merge pull request #17 from Atril33/hotfix/updateappointment
misalazeem Oct 1, 2023
e4645e3
Add Styling In Detail Page
Atril33 Oct 2, 2023
b80bff6
Finished Styling
Atril33 Oct 2, 2023
7f14da1
Add Slider Function
Atril33 Oct 2, 2023
b4dd543
Merge pull request #15 from Atril33/final-doctor-styling
lordksix Oct 2, 2023
cf3a145
Implement hook to check screen size
lordksix Oct 2, 2023
8d286df
Implement Doctors List slider
lordksix Oct 2, 2023
eb26fc8
Fix linter issues
lordksix Oct 2, 2023
0cd42e8
fixing linters and slight gui issues
misalazeem Oct 2, 2023
2a96d24
Merge branch 'Fix/slider-styling' of https://github.com/Atril33/DocCo…
misalazeem Oct 2, 2023
d55edd4
Merge pull request #18 from Atril33/Fix/slider-styling
lordksix Oct 2, 2023
6f25a30
Add serve
andrianarivo Oct 2, 2023
757609d
Update README.md
andrianarivo Oct 2, 2023
30628c7
fixing the error showing up when the user logs in
misalazeem Oct 2, 2023
ada4845
changing App component into arrow function
misalazeem Oct 2, 2023
262c0f7
converting all functions to ES6 arrow function format
misalazeem Oct 2, 2023
e254e96
Merge pull request #20 from Atril33/requested-changes
misalazeem Oct 2, 2023
9686b18
Merge pull request #21 from Atril33/requested-changes
misalazeem Oct 2, 2023
c95a4c5
Merge pull request #22 from Atril33/ci
misalazeem Oct 2, 2023
e75441c
Adding dependencies for tests and added test for Home
misalazeem Oct 3, 2023
c844a85
writing tests for the following routes Login, Logout, Signup
misalazeem Oct 3, 2023
4d8e053
adding remaining tests
misalazeem Oct 3, 2023
cb58d87
updating readme
misalazeem Oct 3, 2023
2e0abf0
displaying actual doctor image
misalazeem Oct 3, 2023
e804f86
Update links in Sidebar
andrianarivo Oct 3, 2023
f10539a
Fix linter issues
andrianarivo Oct 3, 2023
58ca51e
Merge remote-tracking branch 'origin/requested-changes-v2' into dev
andrianarivo Oct 3, 2023
7cbe0e2
Fix linters issue
andrianarivo Oct 3, 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
6 changes: 6 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"presets": [
"@babel/preset-react"
],
"plugins": ["@babel/plugin-syntax-jsx"]
}
8 changes: 8 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
REACT_APP_RAILS_BASE_URL=https://docconnect-afnq.onrender.com
REACT_APP_RAILS_DOCTOR_ENDPOINT=/api/v1/doctors
REACT_APP_RAILS_LOGIN=/login
REACT_APP_RAILS_SIGNUP=/signup
REACT_APP_RAILS_LOGOUT=/logout
REACT_APP_RAILS_CURRENT_USER=/api/v1/current_user
REACT_APP_RAILS_APPOINTMENT_ENDPOINT=/api/v1/appointments

44 changes: 44 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"extends": [
"airbnb",
"plugin:react/recommended",
"plugin:react-hooks/recommended"
],
"plugins": [
"react"
],
"rules": {
"react/jsx-filename-extension": [
"warn",
{
"extensions": [
".js",
".jsx"
]
}
],
"react/react-in-jsx-scope": "off",
"import/no-unresolved": "off",
"no-shadow": "off",
"react/jsx-props-no-spreading": "off",
"jsx-a11y/label-has-associated-control": "off"
},
"ignorePatterns": [
"dist/",
"build/",
"node_modules/"
]
}
45 changes: 45 additions & 0 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Linters

on: pull_request

env:
FORCE_COLOR: 1

jobs:
eslint:
name: ESLint
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "18.x"
- name: Setup ESLint
run: |
npm install --save-dev eslint@7.x eslint-config-airbnb@18.x eslint-plugin-import@2.x eslint-plugin-jsx-a11y@6.x eslint-plugin-react@7.x eslint-plugin-react-hooks@4.x @babel/eslint-parser@7.x @babel/core@7.x @babel/plugin-syntax-jsx@7.x @babel/preset-env@7.x @babel/preset-react@7.x
[ -f .eslintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/react-redux/.eslintrc.json
[ -f .babelrc ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/react-redux/.babelrc
- name: ESLint Report
run: npx eslint "**/*.{js,jsx}"
stylelint:
name: Stylelint
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "18.x"
- name: Setup Stylelint
run: |
npm install --save-dev stylelint@13.x stylelint-scss@3.x stylelint-config-standard@21.x stylelint-csstree-validator@1.x
[ -f .stylelintrc.json ] || wget https://raw.githubusercontent.com/microverseinc/linters-config/master/react-redux/.stylelintrc.json
- name: Stylelint Report
run: npx stylelint "**/*.{css,scss}"
nodechecker:
name: node_modules checker
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Check node_modules existence
run: |
if [ -d "node_modules/" ]; then echo -e "\e[1;31mThe node_modules/ folder was pushed to the repo. Please remove it from the GitHub repository and try again."; echo -e "\e[1;32mYou can set up a .gitignore file with this folder included on it to prevent this from happening in the future." && exit 1; fi
26 changes: 26 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 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
.env.local
.env.development.local
.env.test.local
.env.production.local

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

.env
12 changes: 12 additions & 0 deletions .idea/DocConnect-Frontend.iml

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

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

6 changes: 6 additions & 0 deletions .idea/jsLinters/eslint.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

91 changes: 91 additions & 0 deletions .idea/workspace.xml

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

20 changes: 20 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
"rules": {
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"scss/at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"csstree/validator": true
},
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css", "**/*.js", "**/*.jsx", "node_modules/**"]
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Syed Atril
Copyright (c) 2023 Syed Atril, Misal Azeem, David Andrianarivo & Wladimir Pasquel

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading