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

feat:registration page #26

Merged
merged 6 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
1,274 changes: 642 additions & 632 deletions .pnp.cjs

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion app/entrypoints/renderer/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"users-modal.title": "Команда Atlantis",
"users-modal.subTitle": "Участники",
"users-modal.button-remove": "Удалить",
"users-title.title": "Команда"
"users-title.title": "Команда",
"registration-page.login-button": "Войти с помощью GitHub"
}
4 changes: 0 additions & 4 deletions app/entrypoints/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
},
"devDependencies": {
"@emotion/react": "11.11.4",
"@fragments/add-member-modal": "workspace:*",
"@fragments/add-member-to-organization-modal": "workspace:*",
"@fragments/organization-card": "workspace:*",
"@fragments/organization-card-grid": "workspace:*",
"@types/node": "20.12.12",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
Expand Down
Binary file added app/entrypoints/renderer/src/public/Bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions app/fragments/app-registration/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "@app/registration",
"version": "0.0.1",
"type": "module",
"private": true,
"main": "src/index.ts",
"exports": {
".": "./src/index.ts"
},
"dependencies": {
"@app/main-logo": "workspace:*",
"@ui/background": "workspace:*",
"@ui/button": "workspace:*",
"@ui/icons": "workspace:*",
"@ui/layout": "workspace:*",
"@ui/text": "workspace:*",
"@ui/theme": "workspace:*"
},
"peerDependencies": {
"@emotion/react": "*",
"react": "*",
"react-dom": "*"
},
"devDependencies": {
"@emotion/react": "11.11.4",
"@types/react": "^18.3.3",
"@types/react-dom": "18.3.0",
"react-intl": "6.6.8"
}
}
1 change: 1 addition & 0 deletions app/fragments/app-registration/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './registration.component.js'
37 changes: 37 additions & 0 deletions app/fragments/app-registration/src/registration.component.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { Background } from '@ui/background'
import { useTheme } from '@emotion/react'

import React from 'react'
import { useIntl } from 'react-intl'

import { MainLogo } from '@app/main-logo'
import { Button } from '@ui/button'
import { GitHubIcon } from '@ui/icons'
import { Box } from '@ui/layout'
import { Text } from '@ui/text'
import { ThemeType } from '@ui/theme'

const Registration: React.FC = () => {
const theme = useTheme() as ThemeType
const { formatMessage } = useIntl()
return (
<Background>
<Box flexDirection='column' margin={theme.spaces.tb180lra}>
<MainLogo />
<Box justifyContent='center'>
<Button variant='blackBackgroundButton' shape='rectangle' size='bigRoundedPadding'>
<GitHubIcon width={theme.spaces.bigDecreased} height={theme.spaces.bigDecreased} />
<Text
fontSize={theme.fontSizes.normal.semiIncreased}
fontWeight={theme.fontWeights.medium}
>
{formatMessage({ id: 'registration-page.login-button' })}
</Text>
</Button>
</Box>
</Box>
</Background>
)
}

export { Registration }
24 changes: 24 additions & 0 deletions app/pages/registration-page/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "@app/registration-page",
"version": "0.0.1",
"type": "module",
"private": true,
"main": "src/index.ts",
"exports": {
".": "./src/index.ts"
},
"peerDependencies": {
"@emotion/react": "*",
"react": "*",
"react-dom": "*"
},
"devDependencies": {
"@emotion/react": "11.11.4",
"@types/react": "^18.3.3",
"@types/react-dom": "18.3.0",
"react-intl": "6.6.8"
},
"dependencies": {
"@app/registration": "workspace:*"
}
}
1 change: 1 addition & 0 deletions app/pages/registration-page/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './registration.page.js'
7 changes: 7 additions & 0 deletions app/pages/registration-page/src/registration.page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Registration } from '@app/registration'

import React from 'react'

const RegistrationPage: React.FC = () => <Registration />

export default RegistrationPage
28 changes: 28 additions & 0 deletions ui/background/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"name": "@ui/background",
"version": "0.0.1",
"license": "BSD-3-Clause",
"type": "module",
"exports": {
".": "./src/index.ts"
},
"main": "src/index.ts",
"dependencies": {
"@ui/layout": "workspace:*",
"@ui/theme": "workspace:*"
},
"devDependencies": {
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"react": "18.3.1",
"react-dom": "18.3.1"
},
"peerDependencies": {
"@emotion/react": "*",
"@emotion/styled": "*",
"react": "*",
"react-dom": "*"
}
}
23 changes: 23 additions & 0 deletions ui/background/src/background.components.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { useTheme } from '@emotion/react'

import React from 'react'
import { PropsWithChildren } from 'react'
import { FC } from 'react'

import { Box } from '@ui/layout'
import { ThemeType } from '@ui/theme'

export const Background: FC<PropsWithChildren> = ({ children }) => {
const theme = useTheme() as ThemeType
return (
<Box
background='url(/Bg.png)'
height={theme.spaces.fullVh}
width={theme.spaces.fullWidth}
backgroundSize='cover'
justifyContent='center'
>
{children}
</Box>
)
}
9 changes: 9 additions & 0 deletions ui/background/src/background.interfaces.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export interface CardProps {
boxShadow?: Record<string, string> | string | undefined
width: Record<string, number> | number | undefined
height: Record<string, number> | number | undefined
borderRadius?: Record<string, number> | number
backgroundColor?: string | Record<string, string>
alignItems?: string
justifyContent?: string
}
1 change: 1 addition & 0 deletions ui/background/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './background.components.js'
1 change: 0 additions & 1 deletion ui/button/src/button.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export const Button: FC<PropsWithChildren<ButtonProps>> = forwardRef((
) => {
const [hover, hoverProps] = useHover()
const [pressed, setPressed] = useState<boolean>(false)

if (props.horizontalLocation === 'right') {
return (
<ButtonElement
Expand Down
10 changes: 8 additions & 2 deletions ui/theme/src/global.styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ import React from 'react'
export const GlobalStyles = () => (
<Global
styles={css`
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400&display=swap');
`}
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400&display=swap');
body {
margin: 0;
padding: 0;
height: 100%;
max-width: 100vw;
}
`}
/>
)
6 changes: 3 additions & 3 deletions ui/theme/src/theme/colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,17 +238,17 @@ const colors = {
border: 'transparent',
},
hover: {
background: 'rgba(23, 24, 28, 0.9)',
background: 'rgba(54, 54, 54, 1)',
font: 'rgb(255,255,255,1)',
border: 'transparent',
},
pressed: {
background: 'rgba(23, 24, 28, 0.9)',
background: 'rgba(67, 67, 67, 1)',
font: 'rgb(255,255,255,1)',
border: 'transparent',
},
disabled: {
background: 'rgba(23, 24, 28, 0.9)',
background: 'rgba(228, 228, 228, 1)',
font: 'rgb(242,242,242)',
border: 'transparent',
},
Expand Down
2 changes: 2 additions & 0 deletions ui/theme/src/theme/spaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export const spaces = {
s2: 2,
paddingsNormal: '12px 24px',
fullWidth: '100%',
fullVh: '100vh',
fullWidthWithPaddingNormal: 'calc(100% - 24px)',
semiTiny: 3,
s4: 4,
Expand Down Expand Up @@ -98,6 +99,7 @@ export const spaces = {
t2l0b23r0: '2px 0 0 23.5px',
tlb0r11: '0 0 0 11px',
t0r6lb0: '0 6px 0 0',
tb180lra: '180px auto',

mediumDefault: 50,
mediumIncreased: 80,
Expand Down
72 changes: 63 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ __metadata:
languageName: unknown
linkType: soft

"@app/main-logo@workspace:app/fragments/app-main-logo":
"@app/main-logo@workspace:*, @app/main-logo@workspace:app/fragments/app-main-logo":
version: 0.0.0-use.local
resolution: "@app/main-logo@workspace:app/fragments/app-main-logo"
dependencies:
Expand Down Expand Up @@ -251,15 +251,49 @@ __metadata:
languageName: unknown
linkType: soft

"@app/registration-page@workspace:app/pages/registration-page":
version: 0.0.0-use.local
resolution: "@app/registration-page@workspace:app/pages/registration-page"
dependencies:
"@app/registration": "workspace:*"
"@emotion/react": "npm:11.11.4"
"@types/react": "npm:^18.3.3"
"@types/react-dom": "npm:18.3.0"
react-intl: "npm:6.6.8"
peerDependencies:
"@emotion/react": "*"
react: "*"
react-dom: "*"
languageName: unknown
linkType: soft

"@app/registration@workspace:*, @app/registration@workspace:app/fragments/app-registration":
version: 0.0.0-use.local
resolution: "@app/registration@workspace:app/fragments/app-registration"
dependencies:
"@app/main-logo": "workspace:*"
"@emotion/react": "npm:11.11.4"
"@types/react": "npm:^18.3.3"
"@types/react-dom": "npm:18.3.0"
"@ui/background": "workspace:*"
"@ui/button": "workspace:*"
"@ui/icons": "workspace:*"
"@ui/layout": "workspace:*"
"@ui/text": "workspace:*"
"@ui/theme": "workspace:*"
react-intl: "npm:6.6.8"
peerDependencies:
"@emotion/react": "*"
react: "*"
react-dom: "*"
languageName: unknown
linkType: soft

"@app/renderer-entrypoint@workspace:app/entrypoints/renderer":
version: 0.0.0-use.local
resolution: "@app/renderer-entrypoint@workspace:app/entrypoints/renderer"
dependencies:
"@emotion/react": "npm:11.11.4"
"@fragments/add-member-modal": "workspace:*"
"@fragments/add-member-to-organization-modal": "workspace:*"
"@fragments/organization-card": "workspace:*"
"@fragments/organization-card-grid": "workspace:*"
"@types/node": "npm:20.12.12"
"@types/react": "npm:18.3.3"
"@types/react-dom": "npm:18.3.0"
Expand Down Expand Up @@ -1587,7 +1621,7 @@ __metadata:
languageName: node
linkType: hard

"@fragments/add-member-modal@workspace:*, @fragments/add-member-modal@workspace:app/fragments/add-member-modal":
"@fragments/add-member-modal@workspace:app/fragments/add-member-modal":
version: 0.0.0-use.local
resolution: "@fragments/add-member-modal@workspace:app/fragments/add-member-modal"
dependencies:
Expand Down Expand Up @@ -1616,7 +1650,7 @@ __metadata:
languageName: unknown
linkType: soft

"@fragments/add-member-to-organization-modal@workspace:*, @fragments/add-member-to-organization-modal@workspace:app/fragments/add-member-to-organization-modal":
"@fragments/add-member-to-organization-modal@workspace:app/fragments/add-member-to-organization-modal":
version: 0.0.0-use.local
resolution: "@fragments/add-member-to-organization-modal@workspace:app/fragments/add-member-to-organization-modal"
dependencies:
Expand All @@ -1640,7 +1674,7 @@ __metadata:
languageName: unknown
linkType: soft

"@fragments/organization-card-grid@workspace:*, @fragments/organization-card-grid@workspace:app/fragments/organization-card-grid":
"@fragments/organization-card-grid@workspace:app/fragments/organization-card-grid":
version: 0.0.0-use.local
resolution: "@fragments/organization-card-grid@workspace:app/fragments/organization-card-grid"
dependencies:
Expand All @@ -1660,7 +1694,7 @@ __metadata:
languageName: unknown
linkType: soft

"@fragments/organization-card@workspace:*, @fragments/organization-card@workspace:app/fragments/organization-card":
"@fragments/organization-card@workspace:app/fragments/organization-card":
version: 0.0.0-use.local
resolution: "@fragments/organization-card@workspace:app/fragments/organization-card"
dependencies:
Expand Down Expand Up @@ -3026,6 +3060,26 @@ __metadata:
languageName: unknown
linkType: soft

"@ui/background@workspace:*, @ui/background@workspace:ui/background":
version: 0.0.0-use.local
resolution: "@ui/background@workspace:ui/background"
dependencies:
"@emotion/react": "npm:11.11.4"
"@emotion/styled": "npm:11.11.5"
"@types/react": "npm:18.3.3"
"@types/react-dom": "npm:18.3.0"
"@ui/layout": "workspace:*"
"@ui/theme": "workspace:*"
react: "npm:18.3.1"
react-dom: "npm:18.3.1"
peerDependencies:
"@emotion/react": "*"
"@emotion/styled": "*"
react: "*"
react-dom: "*"
languageName: unknown
linkType: soft

"@ui/button@workspace:*, @ui/button@workspace:ui/button":
version: 0.0.0-use.local
resolution: "@ui/button@workspace:ui/button"
Expand Down