-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from alexlee-dev/v0.6.0
📦 v0.6.0
- Loading branch information
Showing
25 changed files
with
1,124 additions
and
65 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
| @@ -1,28 +1,69 @@ | ||
| import * as React from "react"; | ||
|
|
||
| const BeerDisplayer = ({ beers }) => ( | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <th className="column1">ABV</th> | ||
| <th>Brewer</th> | ||
| <th>Description</th> | ||
| <th>Name</th> | ||
| <th className="column5">Type</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {beers.map((beer) => ( | ||
| <tr key={beer._id}> | ||
| <td className="column1">{beer.abv}</td> | ||
| <td>{beer.brewer}</td> | ||
| <td>{beer.description}</td> | ||
| <td>{beer.name}</td> | ||
| <td className="column5">{beer.type}</td> | ||
| </tr> | ||
| ))} | ||
| </tbody> | ||
| </table> | ||
| ); | ||
| const BeerDisplayer = ({ | ||
| beers, | ||
| setCurrentBeer, | ||
| setIsModalOpen, | ||
| setModalContent, | ||
| }) => { | ||
| return ( | ||
| <div> | ||
| <div id="beer-table-heading"> | ||
| <h2>Beer List</h2> | ||
| <button | ||
| onClick={() => { | ||
| setModalContent("newBeerForm"); | ||
| setIsModalOpen(true); | ||
| }} | ||
| > | ||
| Add | ||
| </button> | ||
| </div> | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <th className="column1">ABV</th> | ||
| <th>Brewer</th> | ||
| <th>Description</th> | ||
| <th>Name</th> | ||
| <th>Type</th> | ||
| <th className="column6">Actions</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {beers.map((beer) => ( | ||
| <tr key={beer._id}> | ||
| <td className="column1">{beer.abv}</td> | ||
| <td>{beer.brewer}</td> | ||
| <td>{beer.description}</td> | ||
| <td>{beer.name}</td> | ||
| <td>{beer.type}</td> | ||
| <td className="column6 action-column"> | ||
| <button | ||
| onClick={() => { | ||
| setModalContent("editBeerForm"); | ||
| setCurrentBeer(beer); | ||
| setIsModalOpen(true); | ||
| }} | ||
| > | ||
| Edit | ||
| </button> | ||
| <button | ||
| onClick={() => { | ||
| setModalContent("deleteBeerForm"); | ||
| setCurrentBeer(beer); | ||
| setIsModalOpen(true); | ||
| }} | ||
| > | ||
| Delete | ||
| </button> | ||
| </td> | ||
| </tr> | ||
| ))} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default BeerDisplayer; |
This file contains 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,66 @@ | ||
| import * as React from "react"; | ||
| import DeleteBeerForm from "./forms/DeleteBeerForm"; | ||
| import EditBeerForm from "./forms/EditBeerForm"; | ||
| import NewBeerForm from "./forms/NewBeerForm"; | ||
|
|
||
| const Modal = ({ | ||
| currentBeer, | ||
| isModalOpen, | ||
| modalContent, | ||
| refreshBeers, | ||
| setCurrentBeer, | ||
| setIsModalOpen, | ||
| setModalContent, | ||
| }) => { | ||
| return ( | ||
| <> | ||
| <div | ||
| className={!isModalOpen ? "hidden" : undefined} | ||
| id="shade" | ||
| onClick={() => { | ||
| if (isModalOpen) setIsModalOpen(false); | ||
| }} | ||
| /> | ||
| <div className={!isModalOpen ? "hidden" : undefined} id="modal"> | ||
| <div id="modal-close-container"> | ||
| <button | ||
| id="modal-close" | ||
| onClick={() => { | ||
| setIsModalOpen(false); | ||
| setModalContent(null); | ||
| }} | ||
| > | ||
| x | ||
| </button> | ||
| </div> | ||
| {modalContent === "newBeerForm" && ( | ||
| <NewBeerForm | ||
| refreshBeers={refreshBeers} | ||
| setIsModalOpen={setIsModalOpen} | ||
| setModalContent={setModalContent} | ||
| /> | ||
| )} | ||
| {modalContent === "deleteBeerForm" && ( | ||
| <DeleteBeerForm | ||
| currentBeer={currentBeer} | ||
| refreshBeers={refreshBeers} | ||
| setCurrentBeer={setCurrentBeer} | ||
| setIsModalOpen={setIsModalOpen} | ||
| setModalContent={setModalContent} | ||
| /> | ||
| )} | ||
| {modalContent === "editBeerForm" && ( | ||
| <EditBeerForm | ||
| currentBeer={currentBeer} | ||
| refreshBeers={refreshBeers} | ||
| setCurrentBeer={setCurrentBeer} | ||
| setIsModalOpen={setIsModalOpen} | ||
| setModalContent={setModalContent} | ||
| /> | ||
| )} | ||
| </div> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default Modal; |
41 changes: 41 additions & 0 deletions
41
src/template/js/src/client/components/forms/DeleteBeerForm.js
This file contains 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,41 @@ | ||
| import * as React from "react"; | ||
| import { deleteBeer } from "../../api/beer"; | ||
|
|
||
| const DeleteBeerForm = ({ | ||
| currentBeer, | ||
| refreshBeers, | ||
| setCurrentBeer, | ||
| setIsModalOpen, | ||
| setModalContent, | ||
| }) => { | ||
| return ( | ||
| <form | ||
| className="form" | ||
| id="delete-beer-form" | ||
| onSubmit={async (e) => { | ||
| e.preventDefault(); | ||
| await deleteBeer(currentBeer._id); | ||
| setIsModalOpen(false); | ||
| setModalContent(null); | ||
| refreshBeers(); | ||
| setCurrentBeer(null); | ||
| }} | ||
| > | ||
| <h3>Delete Beer</h3> | ||
| <p>Are you sure you want to delete this beer?</p> | ||
| <label htmlFor="abv">ABV</label> | ||
| <input disabled id="abv" value={currentBeer.abv} /> | ||
| <label htmlFor="brewer">Brewer</label> | ||
| <input disabled id="brewer" value={currentBeer.brewer} /> | ||
| <label htmlFor="description">Description</label> | ||
| <input disabled id="description" value={currentBeer.description} /> | ||
| <label htmlFor="name">Name</label> | ||
| <input disabled id="name" value={currentBeer.name} /> | ||
| <label htmlFor="type">Type</label> | ||
| <input disabled id="type" value={currentBeer.type} /> | ||
| <button type="submit">Delete</button> | ||
| </form> | ||
| ); | ||
| }; | ||
|
|
||
| export default DeleteBeerForm; |
Oops, something went wrong.