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

Final Capstone- Code Buddy V1 #18

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
effc92c
create new react-redux project
ahzia Jan 23, 2022
4f1c73e
add linters config
ahzia Jan 23, 2022
c06fe9b
directory setup
ahzia Jan 28, 2022
bcf23be
install MUI and MUI-icon
ahzia Jan 28, 2022
88e6a31
install eslint and stylint
ahzia Jan 28, 2022
de79ddd
fix linters issue
ahzia Jan 28, 2022
7eb0958
fix linters issue
ahzia Jan 28, 2022
db2fef6
Merge pull request #12 from ahzia/project-setup
ahzia Jan 28, 2022
044719e
Create common folder and header file
Donard97 Jan 28, 2022
1f5a634
Create header
Donard97 Jan 28, 2022
048dbf4
Add header to header file
Donard97 Jan 28, 2022
bab3044
Add header to app file
Donard97 Jan 28, 2022
e923ec0
Add icons to menu
Donard97 Jan 28, 2022
11f3cb5
Change color of header and icons
Donard97 Jan 28, 2022
8c65c81
Delete unnecessary file
Donard97 Jan 28, 2022
14561bb
Add avatar profile avatar
Donard97 Jan 28, 2022
9587ace
Merge pull request #13 from ahzia/header
Donard97 Jan 30, 2022
1d76446
Create meeting card folder and file
Donard97 Jan 30, 2022
8021899
work on loginOrRegister functionality
ahzia Jan 30, 2022
27453db
Create meeting card and add basic style to it
Donard97 Jan 30, 2022
3ed9846
Add meeting card on the main box
Donard97 Jan 30, 2022
4484cf4
Add style to card
Donard97 Jan 31, 2022
dcdddd9
Add shadow to box
Donard97 Jan 31, 2022
f652492
Add style to meeting card
Donard97 Jan 31, 2022
f21118d
Create modal form for meeting
Donard97 Jan 31, 2022
0eaa460
Add style of form to seperate file
Donard97 Feb 1, 2022
bacab1c
Add style of card to a seperate file
Donard97 Feb 1, 2022
3aa1d7b
Work User Slice
ahzia Feb 1, 2022
0d4acdf
write UI and redux slice for snackbar
ahzia Feb 1, 2022
ea8d496
finalize function to login and register throw API
ahzia Feb 1, 2022
59db6c0
write code for UI design of Login
ahzia Feb 1, 2022
5c67dea
add user stat to redux store
ahzia Feb 1, 2022
2b4968e
Add grid to cards
Donard97 Feb 1, 2022
bf38006
Fix grid of cards and bugs
Donard97 Feb 2, 2022
823edaa
write API request to get user meetings
ahzia Feb 2, 2022
07fcfd2
add redux slice for usermeetins
ahzia Feb 2, 2022
0e2c97c
Add media queries for cards and form
Donard97 Feb 2, 2022
57e91e8
Add style to meeting form
Donard97 Feb 2, 2022
01f788f
write API request for user reservations
ahzia Feb 2, 2022
ef61f77
add redux slice for user reserved meetings
ahzia Feb 2, 2022
fb29913
Write API request for user reservations
ahzia Feb 3, 2022
8e1b18a
write slice for reservation
ahzia Feb 3, 2022
3dc67fe
finish works with api get requests and redux
ahzia Feb 3, 2022
802ab1e
Merge branch 'develop' into user
ahzia Feb 3, 2022
00168fb
fix linters issue
ahzia Feb 3, 2022
844acfd
add meetingReduser to Redux store
ahzia Feb 3, 2022
e874fcc
install react-router-dom
ahzia Feb 3, 2022
9f1848c
configure react router
ahzia Feb 3, 2022
4216205
export iser_name state
ahzia Feb 3, 2022
b58df36
Add handlers for api
Donard97 Feb 3, 2022
e4f03dd
Fix bugs
Donard97 Feb 3, 2022
1876263
Merge pull request #15 from ahzia/meetings
ahzia Feb 3, 2022
aa3e4b0
Merge branch 'develop' into user
ahzia Feb 3, 2022
99f4f48
configure redux store for sliode bar
ahzia Feb 3, 2022
7549cf3
fix conflicts
ahzia Feb 3, 2022
7d4a5ae
install redux-logger
ahzia Feb 3, 2022
5286579
work on sidebar redux slice
ahzia Feb 3, 2022
9c9104e
implement sidebar redux state to sidebar component
ahzia Feb 3, 2022
630acc5
setup sidebar and Main in app
ahzia Feb 3, 2022
0eb79cf
render header based on user loggedin status
ahzia Feb 4, 2022
336ce38
add sigout to user reduser
ahzia Feb 4, 2022
ac14715
handle signout in header
ahzia Feb 4, 2022
73a150b
move routes to seprate file and work on condational routing
ahzia Feb 4, 2022
905c881
fix linters issue
ahzia Feb 4, 2022
850501e
fix linters issue
ahzia Feb 4, 2022
09a60be
Merge pull request #16 from ahzia/user
ahzia Feb 4, 2022
49fff4b
fix issues in MeetingCard
ahzia Feb 4, 2022
e8a5898
write API request for geting all meetings
ahzia Feb 4, 2022
a490920
fix issues in allMeeting redux
ahzia Feb 4, 2022
50098d1
fix issues in allMeeting redux
ahzia Feb 4, 2022
0f05083
show data based on meetng object in redux store
ahzia Feb 4, 2022
afb4780
show all meetings from redux store
ahzia Feb 4, 2022
19d9e36
write API opst request to create meeting
ahzia Feb 4, 2022
ce2abf0
work meetingType Redux slice and create meeting reducer
ahzia Feb 4, 2022
779700d
create reservation component
ahzia Feb 4, 2022
8e88283
fix issues and remove uneeded codes
ahzia Feb 4, 2022
39ccced
Add redux functions
Donard97 Feb 5, 2022
8c36641
Add functions and content to meetings
Donard97 Feb 5, 2022
fadb33f
Fix routes
Donard97 Feb 5, 2022
b987cf2
Add links to navs
Donard97 Feb 5, 2022
3497c6e
Add style to components
Donard97 Feb 5, 2022
8e52308
work on protecting routes that requires login
ahzia Feb 5, 2022
a67971b
fix issues in protected route
ahzia Feb 5, 2022
b360ad4
fix issues in meetings page
ahzia Feb 5, 2022
65a742d
fix issues in Reservation component
ahzia Feb 5, 2022
f8e532d
Add details of the project on readme file
Donard97 Feb 5, 2022
707cc0e
Update README.md
Donard97 Feb 5, 2022
696ea32
Update readme file
Donard97 Feb 5, 2022
03492c8
Merge pull request #17 from ahzia/finalize-ui
Donard97 Feb 5, 2022
b4b2760
Update README.md
ahzia Feb 9, 2022
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"]
}
28 changes: 28 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"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",
"no-param-reassign": ["error", { "props": true, "ignorePropertyModificationsFor": ["state"] }]
},
"ignorePatterns": [
"dist/",
"build/"
]
}
37 changes: 37 additions & 0 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
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}"
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.local
.env.development.local
.env.test.local
.env.production.local

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

#databaseConfiguation
config/database.yml
10 changes: 10 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-scss", "stylelint-csstree-validator"],
"rules": {
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": true,
"csstree/validator": true
},
"ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css", "**/*.js", "**/*.jsx"]
}
76 changes: 75 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,75 @@
# code-buddy-frontend
![](https://img.shields.io/badge/Microverse-blueviolet)

# CODE BUDDY FRONTEND

> This is a react app which will serve as the front end app for Code Buddy Platfrom, the project is still under development, but some of the functionalites are finalized in the backend & front end, Which you can check it out.

# Demo Link

Click [here](https://ahzia.github.io/code-buddy-frontend/) to see live demo.

<br>

## The learning objective of this project are

- Create react front end app
- Connect react front end app to rails back end
- Use API end point to get data
- Fetch data from the API

## Built With

- React
- Redux
- Materia UI

## Getting Started

To get a local copy up and running follow these simple example steps.

### Prerequisites

- [React](https://reactjs.org/tutorial/tutorial.html#prerequisites)

### Setup

- ```git clone [email protected]:ahzia/code-buddy-frontend.git```

- ```cd code-buddy-frontend```

### Running The App Locally

- Run `npm install`

- Make sure to run our [Rails backend application](https://github.com/medaminedev66/lunar-hotel-backend) first before running the React app so that it takes up the `port 3000`. This is very important as our rails API end point must run on `port 3000` for the API to work.
- Once the back end is runing on `port 3000` then start the react app and you will be prompted to run the server on another port like `port 3001`. You will receive a message in your terminal like this `Would you like to run the app on another port instead? Β» (Y/n)`. Please enter `y` so that the react app will start on `port 3001`.

## Authors

πŸ‘€ Donard Golaj

Github : [@Donard97](https://github.com/Donard97)<br>
Twitter: [@donardgolaj](https://twitter.com/donardgolaj)<br>
LinkdIn : [@donard-golaj](https://www.linkedin.com/in/donard-golaj/)<br>

πŸ‘€ Ahmad Zia Yousufi

Github : [@ahzia](https://github.com/ahzia) <br>
Twitter: [@ZiaYousofi](https://twitter.com/ZiaYousofi)<br>
LinkedIn : [@ah-ziayosfi](https://www.linkedin.com/in/ah-ziayosfi/)

## 🀝 Contributing

Contributions, issues, and feature requests are welcome!

Feel free to check the [issues page](https://github.com/ahzia/code-buddy-frontend/issues).

## Show your support

Give a ⭐️ if you like this project!

## Acknowledgments

- Hats off to [Murat Korkmaz](https://www.behance.net/muratk) for designing the awesome template that was used. ✨
- Microverse for giving us this chance
- The amazing code reviewers for making us improve every day πŸ‘
Loading