Admin drink page #87
Open
Admin drink page #87
+0
−0
Conversation
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
fmaachadoo
approved these changes
Jan 30, 2023
Sabanai104
requested changes
Feb 2, 2023
| @@ -1,4 +1,4 @@ | |||
| import { ReactNode } from "react"; | |||
|
|
|||
| export type IconsTypes = ReactNode & 'block' | 'sports_bar' | 'lock_open' | 'info' | 'schedule' | 'school' | 'flag' | 'logout' ; | |||
| export type IconsTypes = ReactNode & 'block' | 'sports_bar' | 'lock_open' | 'info' | 'schedule' | 'school' | 'flag' | 'logout' | 'expand_more' | 'segment' | 'filter_list' | 'search' | '❤' ; | |||
There was a problem hiding this comment.
Não passa um emoji como type pfv
| height: 70px; | ||
| min-height: 70px; |
There was a problem hiding this comment.
Literalmente não teve pq fazer isso...
There was a problem hiding this comment.
o ideal é voltar, só utilizar min-height em casos de usar % no height. Se for para definir um height padrão, só use a propriedade height.
Comment on lines
1
to
83
| import styled from "styled-components"; | ||
| import User from "../../models/UserModel"; | ||
| import Card from "./Card"; | ||
| import {useState} from "react"; | ||
| import {createPortal} from "react-dom"; | ||
| import UserManagementModal from "../organisms/UserManagementModal"; | ||
|
|
||
|
|
||
| interface ListUsersInterface { | ||
| listUsers: Array<User>; | ||
| } | ||
|
|
||
| const ModalWrapper = styled.div` | ||
| background-color: rgba(0, 0, 0, 0.5); | ||
| position: fixed; | ||
| top: 0; | ||
| left: 0; | ||
| width: 100%; | ||
| height: 100%; | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| `; | ||
|
|
||
| const ListUsersStyle = styled.div` | ||
| display: grid; | ||
| grid-template-columns: repeat(4, 1fr); | ||
| grid-auto-rows: minmax(100px, auto); | ||
| column-gap: 56px; | ||
| row-gap: 36px; | ||
| padding-top: 360px; | ||
| `; | ||
|
|
||
| const ListUsers = ({ listUsers }: ListUsersInterface) => { | ||
|
|
||
| const ActionModal = (userEmail: string, action: string, setShowModal: any) => { | ||
| console.log(action); | ||
| return ( | ||
| <ModalWrapper> | ||
| <UserManagementModal | ||
| userEmail={userEmail} | ||
| action={action} | ||
| setShowModal={setShowModal} | ||
| /> | ||
| </ModalWrapper> | ||
| ); | ||
| }; | ||
|
|
||
| const [showModal, setShowModal] = useState(false); | ||
| const [modalContent, setModalContent] = useState<React.ReactElement | null>(null); | ||
|
|
||
| return ( | ||
| <ListUsersStyle> | ||
| { | ||
| listUsers.map(function (user: User) { | ||
| return ( | ||
| <Card | ||
| cardTitle={user.email!} | ||
| cardType="user" | ||
| userIndicationQuantity={3} | ||
| height="291px" | ||
| width="227px" | ||
| backgroundImage="https://viciados.net/wp-content/uploads/2022/11/Naruto-Shippuden-Boruto-2023.webp" | ||
| userBlock={false} | ||
| onBlockUser={ () => { | ||
| setModalContent(ActionModal(user.email!, 'block', setShowModal)); | ||
| setShowModal(true); | ||
| } } | ||
| onDrinkRecommendation={() => { }} | ||
| onUnlockUser={ () => { | ||
| setModalContent(ActionModal(user.email!, 'unlock', setShowModal)); | ||
| setShowModal(true); | ||
| } } | ||
| /> | ||
| ); | ||
| }) | ||
| } | ||
|
|
||
| {showModal && createPortal(modalContent, document.body)} | ||
| </ListUsersStyle > | ||
| ) | ||
| } | ||
|
|
There was a problem hiding this comment.
Esse componente tb vai ser usar na lista de drinks pq não troca ro nome dele e das variaveis?
There was a problem hiding this comment.
Inclusive o Modal foi oq eu falei, da pra deixar sendo tanto pra usuário como pra drink
Comment on lines
136
to
139
| //useEffect(() => { | ||
| //console.log(categoryQuery); // replace with back end req | ||
| //}, [categoryQuery]); | ||
|
|
Comment on lines
127
to
131
|
|
||
|
|
||
|
|
||
|
|
||
|
|
Comment on lines
19
to
24
| const ListUserTemplate = () => { | ||
| let maxCount = 0; | ||
| const [listUsersData, setlistUsersData] = useState<Array<User>>([]); | ||
| const [isLoading, setIsLoading] = useState<boolean>(false); | ||
|
|
||
| const showMoreUsers = async () => { |
There was a problem hiding this comment.
Pq krls isso existe se n ta usando em nenhum lugar?
| const ListUsers = ({ listUsers }: ListUsersInterface) => { | ||
|
|
||
| const ActionModal = (userEmail: string, action: string, setShowModal: any) => { | ||
| console.log(action); |
| ` | ||
|
|
||
| const pass = () => { | ||
| console.log('aaa') |
Comment on lines
186
to
213
| <ControlsContainer> | ||
| {(type==="drink")&&( | ||
| <Dropdown | ||
| label={categoryQuery} | ||
| icon={'segment'} | ||
| options={categories} | ||
| width='238px' | ||
| onSelect={(category) => setCategoryQuery(category)} | ||
| /> | ||
| )} | ||
| <StringInput | ||
| value={nameQuery} | ||
| onChange={(event) => setNameQuery(event.target.value)} | ||
| height='58px' | ||
| width='499px' | ||
| borderRadius='8px' | ||
| hasSearchButton | ||
| onSearch={() => { }} // replace with back end req | ||
| /> | ||
| {(type==="drink")&&( | ||
| <Dropdown | ||
| label={'Filtrar'} | ||
| icon={'filter_list'} | ||
| options={[]} | ||
| onSelect={(option) => { }} | ||
| /> | ||
| )} | ||
| </ControlsContainer> |
There was a problem hiding this comment.
Transforma isso num componente Search lá nos organismos
…nto feature/admin-drink-page
…nto feature/admin-drink-page
…nto feature/admin-drink-page
PhRezende-eng
approved these changes
Feb 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
Types of changes
What types of changes does your code introduce to <repo_name>?
Put an
xin the boxes that applyChecklist
Put an
xin the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.Further comments
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...