-
Notifications
You must be signed in to change notification settings - Fork 1
Pull Request for Space Travelers' Hub App #44
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
ClaudiaRojasSoto
wants to merge
85
commits into
master
Choose a base branch
from
develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
85 commits
Select commit
Hold shift + click to select a range
c27bd4b
Initial configuration wit h CRA on command line and adding linter con…
ClaudiaRojasSoto 6a20647
Create the images folder and add inside it the planet.png file that w…
ClaudiaRojasSoto 8fc0a44
Create a folder called components and add inside ir the Rockets.js, M…
ClaudiaRojasSoto 089787a
Create the folder redux and inside it the folder rockets with the fil…
ClaudiaRojasSoto a8a2246
Modify the App.js file importing the components, the BrowserRoute and…
ClaudiaRojasSoto a0eadb4
Merge pull request #26 from ClaudiaRojasSoto/feature/config-and-basic…
ClaudiaRojasSoto f7aa380
Add routes to the import
ClaudiaRojasSoto 33aaf7e
Add content to prove the component
ClaudiaRojasSoto d3f3065
Add content to prove the component
ClaudiaRojasSoto 66cf70f
Add content to prove the component
ClaudiaRojasSoto a3e1d10
Upload the json packages adding bootstrap by command
ClaudiaRojasSoto a607d8c
Merge pull request #27 from ClaudiaRojasSoto/feature/setup-nav-links-…
ClaudiaRojasSoto 856a39c
Add logo and title to the header
CesarHerr f76f778
Add Styles to the header
CesarHerr 0d2ab8e
Updated header styles
CesarHerr 1f15723
Add readme file
CesarHerr 8d6c411
Update MyProfile file
CesarHerr 97b7255
Add LICENSE
CesarHerr b4b841d
Merge pull request #28 from ClaudiaRojasSoto/feature/header-setup
CesarHerr ba3a530
Create the file store.js adding inside ir the importations of configu…
ClaudiaRojasSoto f34f9b7
Modify the app file deleting the exact from navLink because its alrea…
ClaudiaRojasSoto 011774f
Define the redux slice to handle the state of the rockets, set the in…
ClaudiaRojasSoto 6e94654
Delete commits
ClaudiaRojasSoto 7c20a7b
Create an asynchronous actions using fetchRocketsData function (thunk…
ClaudiaRojasSoto 44f510d
Create the React component that display the rocket data in the user i…
ClaudiaRojasSoto 2d20a2d
Upload the json packages adding axios and redux-thunk
ClaudiaRojasSoto 4bff5ed
Modify the div to show the rockets images
ClaudiaRojasSoto cd138f6
Modify the rocketsSlice.js file with the right properties to show on …
ClaudiaRojasSoto ce617da
Merge pull request #29 from ClaudiaRojasSoto/feature/fetch-data-rockets
ClaudiaRojasSoto c062fc2
Modify the structure of rockets to render simplifying it and adding c…
ClaudiaRojasSoto 47b2b4b
Fix the consol errors changing the activeclassname instead activeClas…
ClaudiaRojasSoto c150ef8
Creates the Rockets.css file on styles folder, adding the styles to r…
ClaudiaRojasSoto 71904ae
Modify the App.css file adding a class namenav-item to fix a superpos…
ClaudiaRojasSoto af72ea1
Add fetch missions info
CesarHerr 6e6ae38
Add mission component setup
CesarHerr eaf9238
Add missionList component.
CesarHerr e5610e0
Merge branch 'develop' into feature/fetch-missions
CesarHerr dd720f5
Merge pull request #30 from ClaudiaRojasSoto/feature/display-and-rend…
ClaudiaRojasSoto bf5efad
Update store.js fix linter errors
CesarHerr 66e327a
Update store.js and fix linter error
CesarHerr d8467f9
Merge pull request #31 from ClaudiaRojasSoto/feature/fetch-missions
CesarHerr 11b2e57
Create two new reducers called reserveRocket and cancelRocket to hand…
ClaudiaRojasSoto 92e89cb
Add the const reserveRocket to handle the logic action of this functi…
ClaudiaRojasSoto d54fbb7
Import the actions reserveRocket and cancelRocket from rocketsSlice.j…
ClaudiaRojasSoto 826f971
Add mission List
CesarHerr 7e27022
Add Styles to mission List
CesarHerr 8783341
Update styles files
CesarHerr 0b49f9a
Fix linter errors
CesarHerr 71bc127
Merge pull request #32 from ClaudiaRojasSoto/feature/display-render-m…
CesarHerr c832e0c
Add styles for the span tag reserved and for the buttons reserved roc…
ClaudiaRojasSoto dae72b8
Merge pull request #33 from ClaudiaRojasSoto/feature/rocket-booking-a…
ClaudiaRojasSoto c1543bd
Add the dependencie localforage to hand the persistense on the nav. O…
ClaudiaRojasSoto 65eebc6
Add the code necesary to persist on the data on the logic reserve and…
ClaudiaRojasSoto 270ecce
Upload the file with the changes on slice and action from redux
ClaudiaRojasSoto c80ac78
Use useSelector to obtain rocketsData from redux state, use filter o…
ClaudiaRojasSoto b5d250d
Upload the json packages including the localforage from the terminal
ClaudiaRojasSoto 30bc5c9
Change the border color on item-rockets class
ClaudiaRojasSoto 84cee9a
Merge pull request #34 from ClaudiaRojasSoto/feature/display-reserved…
ClaudiaRojasSoto a4bbef7
Add joining mission feature
CesarHerr f1b9896
Add leaving mission feature
CesarHerr e7f3adc
Add active member actions to the missions
CesarHerr 364ea76
Add styles to the missions section
CesarHerr 72ca47f
Merge branch 'feature/joining-action' into feature/display-joined-mis…
CesarHerr 41c5621
Display joined missions on myProfile
CesarHerr ea1c286
update myProfiles styles
CesarHerr a2d8b7b
Merge pull request #35 from ClaudiaRojasSoto/feature/joining-action
CesarHerr 6c9eedc
Merge pull request #36 from ClaudiaRojasSoto/feature/display-joined-m…
CesarHerr 01800ca
Add missions test
CesarHerr 3a2baa8
add fetch test
CesarHerr 3216682
Add update test file
CesarHerr 2eff378
Creates the Rockets.test.js file for components testing
ClaudiaRojasSoto 89e306e
Upload the json packages
ClaudiaRojasSoto bd6a800
Delete the App.test file
ClaudiaRojasSoto bc5236c
Creates the logic for the functions on rocketsSlice.js file
ClaudiaRojasSoto 3f898ef
Creates the rocketsActions.test.js file to test that functions
ClaudiaRojasSoto 9d59034
Upload the json packages
ClaudiaRojasSoto c8de9e5
Fix linter errors
ClaudiaRojasSoto 1e79041
Fix linter error
ClaudiaRojasSoto 5bffa15
Merge pull request #41 from ClaudiaRojasSoto/feature/testing-rockets
ClaudiaRojasSoto 97046be
Add MyProfile tests
CesarHerr a6a7fd5
Merge branch 'develop' into features/testing-missions
CesarHerr ecc0bf1
Merge pull request #42 from ClaudiaRojasSoto/features/testing-missions
CesarHerr 2a203db
Update README.md
CesarHerr 23289c6
Update README.md
ClaudiaRojasSoto ba5e389
Merge pull request #43 from ClaudiaRojasSoto/details/updateReadme
ClaudiaRojasSoto File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"presets": [ | ||
"@babel/preset-react" | ||
], | ||
"plugins": ["@babel/plugin-syntax-jsx"] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"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" | ||
}, | ||
"overrides": [ | ||
{ | ||
// feel free to replace with your preferred file pattern - eg. 'src/**/*Slice.js' or 'redux/**/*Slice.js' | ||
"files": ["src/**/*Slice.js"], | ||
// avoid state param assignment | ||
"rules": { "no-param-reassign": ["error", { "props": false }] } | ||
} | ||
], | ||
"ignorePatterns": [ | ||
"dist/", | ||
"build/" | ||
] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 [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 "**/*.{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 [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-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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
MIT License | ||
|
||
Copyright (c) 2023 Claudia Rojas | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,193 @@ | ||
<h1>Space Traveler's Hub</h1> | ||
|
||
<a name="readme-top"></a> | ||
|
||
<!-- TABLE OF CONTENTS --> | ||
|
||
# 📗 Table of Contents | ||
|
||
- [📗 Table of Contents](#-table-of-contents) | ||
- [📖 space-travelers-capstone](#-space-travelers-capstone) | ||
- [🛠 Built With ](#-built-with-) | ||
- [Tech Stack ](#tech-stack-) | ||
- [Key Features ](#key-features-) | ||
- [🚀 Live Demo ](#-live-demo-) | ||
- [💻 Getting Started ](#-getting-started-) | ||
- [Prerequisites](#prerequisites) | ||
- [Setup](#setup) | ||
- [Install](#install) | ||
- [Usage](#usage) | ||
- [Run tests](#run-tests) | ||
- [Deployment](#deployment) | ||
- [👥 Author ](#-author-) | ||
- [🔭 Future Features ](#-future-features-) | ||
- [Walkthrough ](#walkthrough-) | ||
- [🤝 Contributing ](#-contributing-) | ||
- [⭐️ Show your support ](#️-show-your-support-) | ||
- [🙏 Acknowledgments ](#-acknowledgments-) | ||
- [📝 License ](#-license-) | ||
|
||
<!-- PROJECT DESCRIPTION --> | ||
|
||
# 📖 Space Traveler's Hub<a name="about-project"></a> | ||
|
||
The space-travelers-capstone is a Web application for a company that provides commercial and scientific space travel services. The application will allow users to book rockets and join selected space missions. | ||
|
||
|
||
## 🛠 Built With <a name="built-with"></a> | ||
|
||
### Tech Stack <a name="tech-stack"></a> | ||
|
||
- HTML | ||
- JS | ||
- CSS | ||
- React | ||
- Redux Toolkit (RTK) | ||
|
||
<details> | ||
<summary>Client</summary> | ||
- HTML<br> | ||
- JS<br> | ||
- CSS<br> | ||
- React | ||
</details> | ||
|
||
<details> | ||
<summary>Server</summary> | ||
- Null | ||
</details> | ||
|
||
<details> | ||
<summary>Database</summary> | ||
- Null | ||
</details> | ||
|
||
### Key Features <a name="key-features"></a> | ||
|
||
- **Space Travelers Capstone using React** | ||
- **Client-side routing using React Router V6** | ||
- **Gitflow is used correctly** | ||
- **Work is documented in a professional manner** | ||
- **Following best practices for HTML, CSS, JS** | ||
|
||
<!-- LIVE DEMO --> | ||
|
||
|
||
|
||
|
||
[SpaceTravelers.webm](https://github.com/ClaudiaRojasSoto/Space_Travelers/assets/111262493/c6a3917d-a45b-4818-9d94-191a8192c06c) | ||
## 🚀 Live Demo <a name="live-demo"></a> | ||
|
||
> You can see the live demo of this project: [click here](https://space-travelers-z8vp.onrender.com) | ||
|
||
|
||
|
||
<p align="right">(<a href="#readme-top">back to top</a>)</p> | ||
|
||
<!-- GETTING STARTED --> | ||
|
||
## 💻 Getting Started <a name="getting-started"></a> | ||
|
||
To get a local copy up and running, follow these steps. | ||
|
||
### Prerequisites | ||
|
||
- A web browser | ||
- A code editor | ||
- A terminal | ||
|
||
### Setup | ||
|
||
Clone this repository to your desired folder: | ||
|
||
```sh | ||
git clone https://github.com/ClaudiaRojasSoto/Space_Travelers.git | ||
``` | ||
|
||
### Install | ||
|
||
Install this project with: | ||
|
||
```sh | ||
cd space-travelers-capstone | ||
npm install | ||
``` | ||
|
||
### Usage | ||
|
||
To run the project on the webpack dev server, execute the following command: | ||
|
||
```sh | ||
npm start | ||
``` | ||
|
||
### Run tests | ||
|
||
To run tests, run the following command: | ||
|
||
|
||
```sh | ||
npm test | ||
``` | ||
|
||
### Deployment | ||
|
||
```sh | ||
npm run deploy | ||
``` | ||
|
||
<p align="right">(<a href="#readme-top">back to top</a>)</p> | ||
|
||
<!-- AUTHORS --> | ||
|
||
## 👥 Author <a name="authors"></a> | ||
|
||
👤 Claudia Rojas | ||
|
||
- GitHub: [@ClaudiaRojasSoto](https://github.com/ClaudiaRojasSoto) | ||
- LinkedIn: [claudia-rojas-soto](https://www.linkedin.com/in/claudia-rojas-soto) | ||
|
||
👤 César Herrera | ||
|
||
- GitHub: [@cesarherr](https://github.com/Cesarherr) | ||
- Twitter: [@cesarherr2](https://twitter.com/cesarherr2) | ||
- LinkedIn: [cesarherr](https://www.linkedin.com/in/cesarherr/) | ||
|
||
## 🔭 Future Features <a name="future-features"></a> | ||
|
||
- Add dragons Section | ||
|
||
## Walkthrough <a name="walkthrough"></a> | ||
|
||
In this project, we will be copying a given web design using React, Redux, and API handling. The design will serve as a reference for implementing the user interface and interactions. | ||
Please see the above sections if you want to copy and setup this project on your pc. | ||
|
||
<!-- CONTRIBUTING --> | ||
|
||
## 🤝 Contributing <a name="contributing"></a> | ||
|
||
Contributions, issues, and feature requests are welcome! | ||
|
||
<p align="right">(<a href="#readme-top">back to top</a>)</p> | ||
|
||
<!-- SUPPORT --> | ||
|
||
## ⭐️ Show your support <a name="support"></a> | ||
|
||
If you like this project, give it a ⭐️! | ||
|
||
<p align="right">(<a href="#readme-top">back to top</a>)</p> | ||
|
||
## 🙏 Acknowledgments <a name="acknowledgements"></a> | ||
|
||
We would like to thank Microverse for giving us the opportunity to learn and grow as developers and also we like to thank our families, they are all our support. 🌟 | ||
|
||
<p align="right">(<a href="#readme-top">back to top</a>)</p> | ||
|
||
<!-- LICENSE --> | ||
|
||
## 📝 License <a name="license"></a> | ||
|
||
This project is [MIT](./LICENSE) licensed. | ||
|
||
<p align="right">(<a href="#readme-top">back to top</a>)</p> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome that you deployed your project 🏄