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

Join Group Screen #3

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
105 changes: 61 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/base": "^5.0.0-beta.40",
"@mui/material": "^5.4.0",
"@mui/icons-material": "^5.16.2",
"@mui/material": "^5.16.2",
"@mui/styled-engine": "^5.4.0",
"commitlint": "^19.5.0",
"react": "^18.3.1",
Expand Down
10 changes: 9 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import React from 'react';
import JoinGroup from './screens/JoinGroupScreen/JoinGroupScreen';
import { CssBaseline } from '@mui/material';
const App = () => {
return <h1>Univent Planner</h1>;
return (
<>
<CssBaseline />
<JoinGroup />
</>
);
};

export default App;
10 changes: 10 additions & 0 deletions src/assets/svg/UnieventFont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/UnieventLogoSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions src/screens/JoinGroupScreen/JoinGroupScreen.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { Typography } from '@mui/material';
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import { Wrapper, Content, GroupCodeInput, GroupCodeField, JoinButton, CreateGroupButton, BackButton, SvgContainer, Logo, StyledTypography } from './JoinGroupScreenStyles';

const JoinGroup = () => {
return (
<Wrapper>
<BackButton>
<ArrowBackIcon />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

back button jest nie w poprawnym miejscu
image

</BackButton>
<SvgContainer>
<Logo src="src/assets/svg/UnieventFont.svg" />
<Logo src="src/assets/svg/UnieventLogoSmall.svg" />
</SvgContainer>
<Content>
<Typography variant="h4" sx={{ fontWeight: 'bold', marginTop: '20px' }}>Witaj, Jan Kowalski!</Typography>
<Typography variant="h5" gutterBottom>
Podaj kod grupy, do której chcesz dołączyć
</Typography>
<GroupCodeInput>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podczas wpisywania kodu powinno automatycznie przy wpisaniu przenieść do następnego pola.
można na przykład użyć onChange

<GroupCodeField inputProps={{ maxLength: 1 }} />
<GroupCodeField inputProps={{ maxLength: 1 }} />
<GroupCodeField inputProps={{ maxLength: 1 }} />
<GroupCodeField inputProps={{ maxLength: 1 }} />
<GroupCodeField inputProps={{ maxLength: 1 }} />
<GroupCodeField inputProps={{ maxLength: 1 }} />
</GroupCodeInput>
<StyledTypography variant="body1" gutterBottom>
Czym jest kod grupy?
</StyledTypography>
<JoinButton variant="contained">Dołącz do grupy</JoinButton>
<StyledTypography variant="body1" >lub</StyledTypography>
<CreateGroupButton variant="outlined">Utwórz grupę</CreateGroupButton>
</Content>
</Wrapper>
);
};

export default JoinGroup;
Loading
Loading