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

Development #15

Open
wants to merge 193 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
3a80d14
Create empty react app
wuletawwonte Aug 22, 2022
2c9adc4
Install sass package
wuletawwonte Aug 22, 2022
969441b
Remove unnecessary files
wuletawwonte Aug 22, 2022
f8c12ec
Add primary color variable
wuletawwonte Aug 22, 2022
5531e1f
Add breakpoints for responsive web design
wuletawwonte Aug 22, 2022
8a31d23
Add global styling properties
wuletawwonte Aug 22, 2022
82007d0
Add linter configuration files
wuletawwonte Aug 22, 2022
b729b65
Update README.md
wuletawwonte Aug 22, 2022
49227cd
Install react-router--dom
wuletawwonte Aug 22, 2022
4f0481b
Import and load BrowserRouter
wuletawwonte Aug 22, 2022
0e9f8eb
Add root path and element
wuletawwonte Aug 22, 2022
e23f171
Add homepage
wuletawwonte Aug 22, 2022
94ed8fb
Fix stylelint and eslint errors using autofixer
wuletawwonte Aug 22, 2022
3e8693a
Add navbar component
wuletawwonte Aug 22, 2022
197ed00
Install redux
wuletawwonte Aug 22, 2022
177c785
Fix linter errors
wuletawwonte Aug 22, 2022
a0bdbb4
Merge pull request #1 from zmekonnen251/setup-project
wuletawwonte Aug 22, 2022
e25f2cf
Run npm uninstall sass
wuletawwonte Aug 24, 2022
92ebe54
Remove sass files
wuletawwonte Aug 24, 2022
66a82d8
Add navbar link with styling
wuletawwonte Aug 24, 2022
17c43da
Add sidebar section and style it with pure css
wuletawwonte Aug 24, 2022
ab623cc
Install react-icons libarary for icons
wuletawwonte Aug 24, 2022
9486277
Add Navbar component with its styling
wuletawwonte Aug 24, 2022
392b941
Add footer styling for the navbar component
wuletawwonte Aug 24, 2022
7e7dfa9
Add sidebar media query to hide it
wuletawwonte Aug 24, 2022
e3127ee
Add hamburger menu button
wuletawwonte Aug 24, 2022
3988308
Add menu toggle button with the proper position
wuletawwonte Aug 24, 2022
a387061
Add sidebar and toggle in the mobile version as well
wuletawwonte Aug 24, 2022
25a863a
Change folder structure of the project by adding layouts folder
wuletawwonte Aug 24, 2022
c8be825
Load mentors from a mock api
wuletawwonte Aug 25, 2022
d2c4800
Mentors scroll next button implementation
wuletawwonte Aug 25, 2022
a31b2f9
Next button disappear when no more elements remain
wuletawwonte Aug 25, 2022
f08b4cb
Add previous button
wuletawwonte Aug 25, 2022
ab4c43c
Change left button styling
wuletawwonte Aug 25, 2022
5f4c83b
Remove duplicate styling code from Homepage style module
wuletawwonte Aug 25, 2022
ebff86c
Add shadow styling for each mentor
wuletawwonte Aug 25, 2022
deca237
Add loading icons before mentors data
wuletawwonte Aug 25, 2022
7f6d394
Fix linter errors using styleling
wuletawwonte Aug 25, 2022
8047bfc
Merge pull request #3 from zmekonnen251/pure-css
wuletawwonte Aug 25, 2022
8eb0e1c
Create auth reducer for handling authentication actions
zmekonnen251 Aug 24, 2022
57b058b
Create UserAuth component for user authentication,which has auth form…
zmekonnen251 Aug 24, 2022
e65a7a0
Create MentorAuth component for mentors authentication,which has auth…
zmekonnen251 Aug 24, 2022
1322865
Create actions for authentication
zmekonnen251 Aug 24, 2022
f725c09
Create action types for user and mentor auth
zmekonnen251 Aug 24, 2022
92d0e89
Fix merge conflict
zmekonnen251 Aug 26, 2022
dcbed62
fix merge conflict
zmekonnen251 Aug 26, 2022
128b5ee
Update auth actions to handle mentor auth actions
zmekonnen251 Aug 25, 2022
a36ac27
Update userAuth component with avatar file upload functionality
zmekonnen251 Aug 25, 2022
7710148
Update mentorAuth component with avatar file upload functionality
zmekonnen251 Aug 25, 2022
14ad850
update mentor and user authentication to hanlde avatar upload
zmekonnen251 Aug 25, 2022
7dc2906
integrate authentication with the rest of app
zmekonnen251 Aug 26, 2022
811aaaa
Integrate authentication and add some styles to it
zmekonnen251 Aug 26, 2022
fa7b80e
Fix stylelint error
zmekonnen251 Aug 26, 2022
7756996
Merge pull request #4 from zmekonnen251/authentication_updated
wuletawwonte Aug 26, 2022
e8b3aa6
Remove console statements
wuletawwonte Aug 26, 2022
94fa829
Add all mentors inside a clickable link
wuletawwonte Aug 26, 2022
f66dd9a
Load mentor data from api
wuletawwonte Aug 26, 2022
bf27532
Add shadow styling for the avatar of the mentor
wuletawwonte Aug 26, 2022
aed6f4d
Add stripe view for the details section
wuletawwonte Aug 26, 2022
e482687
Change flex direction for mobile viewport size
wuletawwonte Aug 26, 2022
1a2af23
Fix style lint error
wuletawwonte Aug 26, 2022
42753f1
Merge pull request #5 from zmekonnen251/mentor-details
wuletawwonte Aug 26, 2022
65bf965
Add the user profile page
zieeco Aug 26, 2022
a44985d
Add profile html structure
zieeco Aug 26, 2022
62df0b6
Add some basic styling
zieeco Aug 26, 2022
2ef7601
Add styling for the user details update form
wuletawwonte Aug 26, 2022
1b0b5c8
Change current year from the footer of the sidebar
wuletawwonte Aug 26, 2022
c188a43
Implement reserve page
ismailakinkunmi Aug 28, 2022
42227a6
Off quotes rulein eslintrc.json
ismailakinkunmi Aug 28, 2022
aead2f5
Run npx eslint --fix . to fix eslint errors
ismailakinkunmi Aug 28, 2022
d2f8f44
Fix linter error
zieeco Aug 29, 2022
a4b791c
Update the user image
zieeco Aug 29, 2022
9f6c113
Add user name and email
zieeco Aug 29, 2022
a4522fe
Import useDispatch, useNavigate and signOutUser
zieeco Aug 29, 2022
beb2b06
Implement navigate, dispatch and logout action
zieeco Aug 29, 2022
bdf2435
Dispatch logout action in the click event
zieeco Aug 29, 2022
aef9ebe
User user name and email
zieeco Aug 29, 2022
23169ee
Add the react fragment and Navlink to Profile
zieeco Aug 29, 2022
105e588
Add the name class and update styles
zieeco Aug 29, 2022
b0c0cec
Remove flex end property
zieeco Aug 29, 2022
1cc0f30
Create my reservations page and add title and discription of the page
wuletawwonte Aug 29, 2022
12eb1cf
add api for admin dashboard
Alfredbis29 Aug 29, 2022
f5b5c15
add action types for mentors
Alfredbis29 Aug 29, 2022
f5a890d
created mentors action ban ,remove ,approval ,mentor
Alfredbis29 Aug 29, 2022
a37c7bc
create mentor reducers
Alfredbis29 Aug 29, 2022
dbb2855
create mentor reducers
Alfredbis29 Aug 29, 2022
769d335
add route for pending mentor and mentor list for admin
Alfredbis29 Aug 29, 2022
54585b5
create peding mentors
Alfredbis29 Aug 29, 2022
5f59297
create peding mentors
Alfredbis29 Aug 29, 2022
05c6ffa
create mentor list
Alfredbis29 Aug 29, 2022
908ec00
Rename table columns
wuletawwonte Aug 30, 2022
3ce966c
fix
Alfredbis29 Aug 30, 2022
e0f8466
Style my reservations table
wuletawwonte Aug 30, 2022
759e1f4
Fix style lint errors
wuletawwonte Aug 30, 2022
1788d7f
Fix no-descending-specificity error
wuletawwonte Aug 30, 2022
eae74f5
Merge pull request #8 from zmekonnen251/admin-dashboard
zmekonnen251 Aug 30, 2022
08ec3fd
Merge branch 'development' into profile-page
zmekonnen251 Aug 30, 2022
49d0124
Merge pull request #7 from zmekonnen251/profile-page
zmekonnen251 Aug 30, 2022
9c129c1
Merge branch 'development' into reserve-page
zmekonnen251 Aug 30, 2022
58f2cef
Merge branch 'development' into my-reservations
zmekonnen251 Aug 30, 2022
0bec980
Merge pull request #9 from zmekonnen251/my-reservations
zmekonnen251 Aug 30, 2022
b2eda54
Merge branch 'development' into reserve-page
zmekonnen251 Aug 30, 2022
1b1a196
Merge pull request #6 from zmekonnen251/reserve-page
zmekonnen251 Aug 30, 2022
27661ea
fix merge conflict
zmekonnen251 Aug 30, 2022
1ec8226
fix
Alfredbis29 Aug 30, 2022
528db30
fixx
Alfredbis29 Aug 30, 2022
80f41b7
Make changes to profile page
zmekonnen251 Aug 30, 2022
5ec42a6
Merge pull request #10 from zmekonnen251/admin-dashboard
Alfredbis29 Aug 30, 2022
71b1de5
Make changes to fetchmentors and signout users
zmekonnen251 Aug 30, 2022
a6da8e2
Change the placeholder data with the real mentors data from api
zmekonnen251 Aug 30, 2022
2e25a3e
create functions for api to handle reservatin of mentors , and add ac…
zmekonnen251 Aug 30, 2022
857d196
Implement the reserveData
zieeco Aug 30, 2022
d01c512
Implement mentorReservation
zieeco Aug 30, 2022
29922a7
Implement the user reservation
zieeco Aug 31, 2022
4f97e6e
Implement and dispatch the fetchReservation
zieeco Aug 31, 2022
778285a
Fix linter error
zieeco Aug 31, 2022
690a476
Update to user the original data
zieeco Aug 31, 2022
34aa972
Add the mentorReservation reducer
zieeco Aug 31, 2022
5bb44b4
Add the mentor reducer
zieeco Aug 31, 2022
ca42f94
Update the mentor Reservation
zieeco Aug 31, 2022
55b1170
Update the mentors action
zieeco Aug 31, 2022
c340bc3
Rearrange and add the wrapper class
zieeco Aug 31, 2022
a89a963
Fix stylelint error
zieeco Aug 31, 2022
4107dd6
Add a date class
zieeco Aug 31, 2022
10131d7
Add stylings to the mentor input fields
zieeco Aug 31, 2022
6033442
Add styling for the date class
zieeco Aug 31, 2022
7303d09
Refactor UserAuth,MentorAuth and navbar
zmekonnen251 Sep 1, 2022
266bb5a
Implement cancel reservation and make changes to the revervation page
zmekonnen251 Sep 1, 2022
81ed384
Implement booking a mentor from reserve link from navbar
zmekonnen251 Sep 1, 2022
5859ce3
Fix linter error
zieeco Sep 1, 2022
bb75d35
Merge pull request #11 from zmekonnen251/reservation_and_mentorlike
ismailakinkunmi Sep 1, 2022
597713c
Change the localhost to the deployed back-end app
zmekonnen251 Sep 1, 2022
0290c81
Install react testing library
wuletawwonte Sep 1, 2022
0611d6b
Fix avatar upload problem on signup
zmekonnen251 Sep 1, 2022
3c275d5
Write unit tests for some of the pages of the app
wuletawwonte Sep 1, 2022
f551a8e
Add render test for components
wuletawwonte Sep 1, 2022
f9a4b54
Make an adimin not to show in mentorlists
zmekonnen251 Sep 1, 2022
cd9537f
Update the mobile responsiveness styles
zieeco Sep 1, 2022
9fc4848
Add mobile reponsiveness
zieeco Sep 2, 2022
97de95b
Implement the hamburger togger action and reducer
zmekonnen251 Sep 2, 2022
aebd8f8
Test fetching mentors state from store
wuletawwonte Sep 2, 2022
0b722ed
Fix eslint errors
wuletawwonte Sep 2, 2022
b1a4ef0
Remove console statements from the app
wuletawwonte Sep 2, 2022
22ddf59
Merge pull request #12 from zmekonnen251/unit-tests
zieeco Sep 2, 2022
a01d8a6
Style the mentor details page
wuletawwonte Sep 2, 2022
af3b5f8
Fix responsiveness problems of some pages
wuletawwonte Sep 2, 2022
eab483b
Fix Linter errors
wuletawwonte Sep 2, 2022
996922c
Fix eslint error and overflow problems
wuletawwonte Sep 2, 2022
3eeffa5
Increate the size of the avatar of the current user
wuletawwonte Sep 2, 2022
807f083
Resolve merge conflict
zmekonnen251 Sep 2, 2022
6a56a6c
Merge pull request #13 from zmekonnen251/add_fixes
zmekonnen251 Sep 2, 2022
9c5d661
Change page title
zmekonnen251 Sep 2, 2022
eabdd34
Remove react icon
zmekonnen251 Sep 2, 2022
e0daa49
Remove react icon
zmekonnen251 Sep 2, 2022
f27b39a
Fix image covering problem
wuletawwonte Sep 2, 2022
a71b3cd
Merge branch 'add_fixes' of https://github.com/zmekonnen251/mentor-bo…
wuletawwonte Sep 2, 2022
510980a
Merge pull request #14 from zmekonnen251/add_fixes
zmekonnen251 Sep 2, 2022
7a22743
Update README.md
Alfredbis29 Sep 2, 2022
5d36688
Merge pull request #16 from zmekonnen251/add_fixes
Alfredbis29 Sep 2, 2022
b9b9c41
Update password error message
zieeco Sep 2, 2022
31076ff
Fix linter error
zieeco Sep 2, 2022
2100491
Update snapshots by pressing u
wuletawwonte Sep 2, 2022
e711485
Fix eslint errors
wuletawwonte Sep 2, 2022
dbae3b3
Add exceptions in Details and MyReservations pages
wuletawwonte Sep 2, 2022
c094fa5
Replace user and mentor avatar upload with img_url input field
zmekonnen251 Sep 20, 2022
21bc7fb
add loading spinner to mentor request form submission
zmekonnen251 Sep 22, 2022
12c290d
Change mentor sign up and sign_in to only mentor request form
zmekonnen251 Sep 22, 2022
fb770a2
Fix linter errors
zmekonnen251 Sep 22, 2022
465a168
Fix stylelint error
zmekonnen251 Sep 22, 2022
6496006
Merge pull request #17 from zmekonnen251/refactor
zmekonnen251 Sep 22, 2022
3b8c5ed
Change localhost to heroku deployed url
zmekonnen251 Sep 22, 2022
37d597a
Change localhost to heroku deployed url
zmekonnen251 Sep 22, 2022
dab4467
Merge pull request #18 from zmekonnen251/refactor2
zmekonnen251 Sep 22, 2022
fd70266
Fix merge conflict in api.js file
zmekonnen251 Sep 22, 2022
cd187bd
Change baseUrl in api.js to deployed api
zmekonnen251 Sep 22, 2022
87cac6f
Changed default react logo to ours logo
zmekonnen251 Sep 22, 2022
71a39a8
Fix redirecting url after signup redux auth action
zmekonnen251 Sep 22, 2022
0a185de
Remove userAuthRequest component
zmekonnen251 Sep 22, 2022
40daaec
Change backend url from localhost to heroku
zmekonnen251 Oct 5, 2022
9fed551
Fix linter errors
zmekonnen251 Oct 5, 2022
bbe62cc
Fix stylelint errors
zmekonnen251 Oct 5, 2022
5ff40ed
Merge pull request #19 from zmekonnen251/refactor
zmekonnen251 Oct 5, 2022
115a23a
Change localhost to heroku deployed url
zmekonnen251 Sep 22, 2022
ac2bb1a
Fix errors in mentorRequest form component
zmekonnen251 Oct 5, 2022
c95589c
Fix merge conflict
zmekonnen251 Oct 5, 2022
d92638d
Fix linter errors
zmekonnen251 Oct 5, 2022
a45673c
Fix route error in api.js
zmekonnen251 Oct 6, 2022
9a26bad
Fix routes error in api.js
zmekonnen251 Oct 6, 2022
64cc01e
Fix typo error in mentorRequest form avatar instead of img_url
zmekonnen251 Oct 6, 2022
7d31868
Add 'Add Mentor' link to admin dashboard
zmekonnen251 Oct 6, 2022
c89c461
Change baseUrl to heroku
zmekonnen251 Oct 6, 2022
0fccec5
Change backend url to fly.io deployed api
zmekonnen251 Jan 11, 2023
c9210d7
Fix linter error and refactor mentor-request.js
zmekonnen251 Jan 11, 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"]
}
25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"env": {
"browser": true,
"es6": true,
"jest": true
},
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"extends": ["airbnb", "plugin:react/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",
"quotes": "off"
},
"ignorePatterns": ["dist/", "build/"]
}
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-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
- name: Setup ESLint
run: |
npm install --save-dev [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @babel/[email protected] @babel/[email protected] @babel/[email protected] @babel/[email protected] @babel/[email protected]
[ -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 .
stylelint:
name: Stylelint
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: "12.x"
- name: Setup Stylelint
run: |
npm install --save-dev [email protected] [email protected] [email protected] [email protected]
[ -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-18.04
steps:
- uses: actions/checkout@v2
- 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
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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*
15 changes: 15 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
"rules": {
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
}
],
"csstree/validator": true
},
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css", "**/*.js", "**/*.jsx"]
}
82 changes: 82 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# Mentor-booking-App-Frontend

This app is aim to connect mentor and mentee from around the world, to make software development journey easier for the newbies developer by getting tips, ideas and guide from experience software developer (mentor).

## Built With

- React
- Ruby on Rails (v7.0.3.1)
- postgresql
- postman


## Get Started

```
To get a clone of the project, run `git clone https://github.com/zmekonnen251/Mentor-Booking-App-Frontend.git`

```

```
cd `Mentor-booking-App-Frontend`
```

### Available Scripts

In the project directory, you can run:

**`npm install`** to install require tools for the project to run

**`npm start`**

**`http://localhost:3000/`**


## Authors

👤 **Adekunle Ismail**

- GitHub: [@ismailakinkunmi](https://github.com/ismailakinkunmi)
- LinkedIn: [Adekunle Ismail](https://www.linkedin.com/in/adismail4/)

👤 **Zelalem Mekonnen**

- GitHub: [@zmekonnen251](https://github.com/zmekonnen251)
- LinkedIn: [Zelalem Getachew](https://www.linkedin.com/in/zelalem-getachew/)
- Twitter: [Zelalem Getachew](https://twitter.com/mek_zela)

👤 **Alfred Bisimwa**

- GitHub: [@Alfredbis29](https://github.com/Alfredbis29)
- Twitter: [Alfred Bisimwa](https://twitter.com/AlfredBisimwa1)
- LinkedIn: [Alfred Bisimwa](https://www.linkedin.com/in/alfred-bisimwa-0501a81a8/)

👤 **zieeco**

- GitHub: [@zieeco](https://github.com/zieeco)
- Twitter [@zieecodes](https://twitter.com/zieecodes)
- LinkedIn: [Isaac Imaobong Samuel](https://www.linkedin.com/in/isaac-imaobong-samuel)

👤 **Wuletaw Wonte**

- GitHub: [@wuletawwonte](https://github.com/wuletawwonte)
- Twitter: [Wuletaw Wonte](https://twitter.com/wuletaww)

## 🤝 Contributing

Contributions, issues, and feature requests are welcome!

Feel free to check the [issues page](../../issues/).

## Show your support

Give a ⭐️ if you like this project!

## Acknowledgments

- Hat tip to microverse for their support
- Thanks to minimal for the awesome [design](https://www.behance.net/muratk).

## 📝 License

- This project is [MIT](./LICENSE) licensed.
Loading