Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

feature(layout): ✨ sidebar #57

Closed
wants to merge 713 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
713 commits
Select commit Hold shift + click to select a range
06ca1b2
Final fixes
nmashchenko May 23, 2023
199cb6e
Merge pull request #42 from exortme1ster/hotfix/frontend-cleaning
nmashchenko May 23, 2023
ed22931
Merge branch 'dev' into feature/teams-
nmashchenko May 23, 2023
554f084
Initial fixes
nmashchenko May 23, 2023
15a9fad
Fixes part2
nmashchenko May 24, 2023
8455470
add range functionality in component, add some styles
May 24, 2023
743db8f
Redesign reset-password
Aman710-hub May 25, 2023
96889f3
resolve conflict
Aman710-hub May 25, 2023
e03b9e2
Fixes part3
nmashchenko May 26, 2023
1a57ddd
Fixes part4
nmashchenko May 26, 2023
00ea713
Fixes part 5
nmashchenko May 27, 2023
420a388
fix range value in slice
May 28, 2023
0246d4a
fix SearchByRange component
May 28, 2023
dadd216
add tags for SearchPanel
May 28, 2023
691431b
define initial state of FilterSlice
May 28, 2023
5e34529
Fixes part6
nmashchenko May 29, 2023
cbc56f8
Fixes part 7
nmashchenko May 29, 2023
8fd482c
Added backdrops
nmashchenko May 29, 2023
c18989f
Finished logic
nmashchenko May 30, 2023
07b5c7e
Fixes part 8
nmashchenko May 30, 2023
9ead9d2
Small updates
nmashchenko May 30, 2023
6e3f2b0
Merge branch 'dev' into feature/redesign-search-panel
nmashchenko May 30, 2023
f085c4c
Small fixes + initial page setup
nmashchenko May 30, 2023
b60b294
Small fixes
nmashchenko May 30, 2023
4ee3fcf
Merge branch 'feature/redesign-search-panel' into feature/teams-
nmashchenko May 30, 2023
06c32bc
Filters setup
nmashchenko May 30, 2023
b07b6c2
add toast notification
Aman710-hub May 31, 2023
648206b
redesing email comfirmation page
Aman710-hub Jun 1, 2023
d99593c
add shared navbar for reset password pages
Aman710-hub Jun 1, 2023
5564e70
Added S3 support + throttler
nmashchenko Jun 4, 2023
94b5207
Disabled throttler on other modules for now
nmashchenko Jun 4, 2023
588feef
Allow throttling for /beta route
nmashchenko Jun 4, 2023
8d8a5ec
Updates to throttler
nmashchenko Jun 4, 2023
b80eebf
Update file.service.ts
nmashchenko Jun 4, 2023
79f0d22
add grid for select
Jun 4, 2023
e7b17b4
Switched images storing to S3
nmashchenko Jun 6, 2023
94d01da
Merge branch 'dev' into feature/teams-
nmashchenko Jun 6, 2023
c6cb95e
Small updates
nmashchenko Jun 6, 2023
8caa26f
Implemented logic
nmashchenko Jun 8, 2023
ddc9512
Update github-actions-demo.yml
nmashchenko Jun 8, 2023
b2e323a
initialized inifiteLoading approach for teams
nmashchenko Jun 10, 2023
2f9ecf9
Merge branch 'feature/redesign-search-panel' into feature/teams-
nmashchenko Jun 10, 2023
b505641
Updates to the main page UI
nmashchenko Jun 13, 2023
0db1f63
Main page major fixes
nmashchenko Jun 14, 2023
e22b315
Refactoring
nmashchenko Jun 15, 2023
a4f9589
fix for items of SearchByChecks
Jun 16, 2023
ef55202
Merge branch 'dev' into feature/redesign-search-panel
Jun 17, 2023
e62cfc3
isolate SearchPanel components
Jun 17, 2023
3bb19a3
add mobile filters draft functionality
Jun 17, 2023
d17348f
Merge branch 'feature/teams-' into feature/redesign-search-panel
Jun 18, 2023
b3d8120
fix SearchPanel, add bottom buttons
Jun 18, 2023
4cbae98
add tags for modal
Jun 18, 2023
58dd85c
add SearchPanel component
Jun 18, 2023
66f9d72
Fixes
nmashchenko Jun 19, 2023
c5f57f4
Fixes part2
nmashchenko Jun 19, 2023
236ec54
Made teams adaptive & bug fixes
nmashchenko Jun 20, 2023
fb3b483
Made infinite scroll for teams / adaptive fixes
nmashchenko Jun 21, 2023
dd70849
Notification modal & team modals & fixes
nmashchenko Jun 21, 2023
e7b10e2
Upload image fix
nmashchenko Jun 22, 2023
92c65ea
Finished ticket
nmashchenko Jun 22, 2023
0a23e73
Merge pull request #39 from exortme1ster/feature/teams-
nmashchenko Jun 22, 2023
159ee66
Initial websocket refactoring
nmashchenko Jun 25, 2023
f3622e5
Implement desing of new password creation page.
Aman710-hub Jun 25, 2023
460061d
Sockets fix
nmashchenko Jun 25, 2023
95281d1
Rewrote Profile, fixed bugs
nmashchenko Jun 27, 2023
176aa82
Made all buttons clickable & Modal animations
nmashchenko Jun 28, 2023
ba00359
Added Education&Work
nmashchenko Jun 28, 2023
1bb6e62
Updates & bug fixes
nmashchenko Jun 29, 2023
215bb14
Bug fixes & new component
nmashchenko Jun 30, 2023
5d70127
Improvements & fixes
nmashchenko Jun 30, 2023
2fa694a
Finished profile
nmashchenko Jun 30, 2023
f441e0e
Added hover
nmashchenko Jul 1, 2023
d8531d6
Update maintenance.service.ts
nmashchenko Jul 1, 2023
6e73d56
Small bugs fixes
nmashchenko Jul 1, 2023
05412ec
Merge pull request #44 from exortme1ster/websockets-fix
nmashchenko Jul 1, 2023
c8fdee6
Updated registration
nmashchenko Jul 2, 2023
8ea0860
implement desing of creating new password
Aman710-hub Jul 2, 2023
81019ef
Updated bucket policies for AWS_S3
nmashchenko Jul 3, 2023
75da224
Fixed images && adaptive for registration
nmashchenko Jul 3, 2023
2ea2add
Small fixes
nmashchenko Jul 3, 2023
f23d67a
Merge branch 'dev' into hotfix/bug-fixes
nmashchenko Jul 3, 2023
209e85b
Update github-actions-demo.yml
nmashchenko Jul 3, 2023
1bcdf38
Added heartbeat
nmashchenko Jul 3, 2023
b8b1111
Merge pull request #46 from exortme1ster/hotfix/bug-fixes
nmashchenko Jul 3, 2023
23a1ff1
Finished logic for updating
nmashchenko Jul 5, 2023
87350ef
final fixes
nmashchenko Jul 5, 2023
757c7aa
Merge pull request #48 from exortme1ster/hotfix/refactoring
nmashchenko Jul 5, 2023
0e70fe4
fix: refactorred code
nmashchenko Jul 8, 2023
726e8c6
Revert "fix: refactorred code"
nmashchenko Jul 8, 2023
7ebcfa3
fix: images & preloader
nmashchenko Jul 8, 2023
ff8aed5
fix: animations, image loaders, crown
nmashchenko Jul 9, 2023
b46aefc
feat: added new skelton loaders
nmashchenko Jul 9, 2023
3f773b1
fix: fixed jumping layouts
nmashchenko Jul 10, 2023
7f106b3
Merge pull request #49 from exortme1ster/hotfix/bugs
nmashchenko Jul 10, 2023
4b78eba
Merge branch 'dev' into feature/redesign-reset-password
nmashchenko Jul 10, 2023
bf01434
fix: fixed pull request issues
nmashchenko Jul 10, 2023
bd965f5
feat: changed meta, added not found states
nmashchenko Jul 10, 2023
f6b0124
fix: netlify error
nmashchenko Jul 10, 2023
961e391
fix: link tag
nmashchenko Jul 10, 2023
7521e5a
Merge pull request #45 from exortme1ster/feature/redesign-reset-password
nmashchenko Jul 10, 2023
7749f6a
Update index.html
nmashchenko Jul 10, 2023
9627f09
add: new loader
nmashchenko Jul 10, 2023
826635e
refactor: removed all client folder
nmashchenko Aug 6, 2023
4ad1e45
docs: added breaking changes
nmashchenko Aug 6, 2023
f9002f6
docs: added fsd info
nmashchenko Aug 6, 2023
10588e6
feat: added nextjs and forced yarn
nmashchenko Aug 7, 2023
ef45465
feat: prettier and eslint setup
nmashchenko Aug 7, 2023
8383ebd
ci: implement husky
nmashchenko Aug 7, 2023
6dfb9cb
ci: updated the push file
nmashchenko Aug 7, 2023
abc3db9
fix: moved pre-commit & pre-push to client
nmashchenko Aug 7, 2023
3b88d3f
ci: enable commitlint
nmashchenko Aug 7, 2023
cbae4b9
feat: added storybook
nmashchenko Aug 8, 2023
083cf0a
feat: added shared folder, setup module scss, improved tsconfig
nmashchenko Aug 9, 2023
ffb6c72
fix: fixed shared styles error
nmashchenko Aug 10, 2023
fe42138
feat: added fields/checkbox
nmashchenko Aug 11, 2023
121be8f
feat: added input(password/default)
nmashchenko Aug 11, 2023
92dda7c
feat: added all types of Input: Date, Password, Link
nmashchenko Aug 11, 2023
b356a67
feat: added textarea
nmashchenko Aug 13, 2023
cccecd7
feat: added single select
nmashchenko Aug 16, 2023
3fabdc6
feat: added multiple select
nmashchenko Aug 18, 2023
a634df3
feat: added checkbox select
nmashchenko Aug 19, 2023
099a2b1
ci: added vercel.json
nmashchenko Aug 19, 2023
43ad744
docs: fixed README.md
nmashchenko Aug 19, 2023
d458b9e
fix: fixed vercel.json
nmashchenko Aug 19, 2023
fdbb904
fix: fixed installCommand in vercel.json
nmashchenko Aug 19, 2023
e6014bc
fix: removed vercel.json
nmashchenko Aug 19, 2023
9ed5ca1
BadgeFramework component was added.
vberezhnev Aug 23, 2023
727a24e
feat: added tabs component
nmashchenko Aug 23, 2023
d597a20
BadgeLanguage component was added.
vberezhnev Aug 23, 2023
e2ce93b
BadgeFrameworkContainer component was added & Update props for BadgeF…
vberezhnev Aug 25, 2023
8da99a2
Background for unknown tech was added
vberezhnev Aug 25, 2023
bd3da48
BadgeLanguageContainer component was added & Update props in BadgeLan…
vberezhnev Aug 25, 2023
ffbcd8a
Update style in BadgeLanguage component
vberezhnev Aug 25, 2023
8953966
cleaned up values in BadgeFramework component
vberezhnev Aug 25, 2023
76f8020
change: 🦧 prettier
velenyx Aug 25, 2023
1ebb7d4
Merge pull request #53 from exortme1ster/change/prettier-next
nmashchenko Aug 25, 2023
ba66734
Update types for frameworkColors & frameworkTextColors
vberezhnev Aug 25, 2023
641f3c8
feat: added auth pages, readme, props for svg elements
nmashchenko Aug 27, 2023
b769ce3
chore: upgrade yarn to stable
nmashchenko Aug 28, 2023
4f5b341
docs: updated readme
nmashchenko Aug 28, 2023
6cf280e
Resolve arguments problem in BadgeFramework component
vberezhnev Sep 1, 2023
63e9358
Resolve formating for scss file
vberezhnev Sep 1, 2023
72c4c56
feat: tanstack installed
dmtrack Sep 3, 2023
1705839
docs: added note
dmtrack Sep 3, 2023
4b852ff
Update component type of whole LanguageLogos
vberezhnev Sep 4, 2023
014f40b
BadgeFramework (single) component was added to storybook
vberezhnev Sep 4, 2023
eac12f0
feat: rquery installed and initialized
dmtrack Sep 4, 2023
660a5fe
chore: rquery version updated to beta-v5
dmtrack Sep 4, 2023
94fc193
chore: query revalidate default params added
dmtrack Sep 4, 2023
27850e4
BadgeLanguage (single) component was added to storybook & update .map…
vberezhnev Sep 5, 2023
078fc61
fix: fixed components to better match fsd
nmashchenko Sep 5, 2023
b48f709
Merge branch 'dev-nextjs' into feature/badge-badge-language&framework
nmashchenko Sep 5, 2023
78c7919
fix: fixed issues to merge branch
nmashchenko Sep 5, 2023
31974e9
fix: fixed imports
nmashchenko Sep 5, 2023
d3f2925
fix: fix env-file name
dmtrack Sep 5, 2023
9701e1e
fix: added ignorecase for git
nmashchenko Sep 5, 2023
9250638
fix: deleted old Button folder
nmashchenko Sep 5, 2023
15baac3
fix: deleted old Tabs folder
nmashchenko Sep 5, 2023
7800ccd
fix: deleted old Typography folder
nmashchenko Sep 5, 2023
69a2749
fix: deleted old Button folder
nmashchenko Sep 5, 2023
038298e
fix: deleted old Typography folder
nmashchenko Sep 5, 2023
1426200
fix: deleted old Tabs folder
nmashchenko Sep 5, 2023
08631f6
fix: fixed casing
nmashchenko Sep 5, 2023
e16bb1a
Merge pull request #54 from exortme1ster/feature/badge-badge-language…
nmashchenko Sep 5, 2023
56153f4
fix: fixed icons placement
nmashchenko Sep 5, 2023
2b6babd
fix: removed old ui directory
nmashchenko Sep 5, 2023
8590746
chore: merged latest dev
nmashchenko Sep 5, 2023
b991a33
fix: change naming
nmashchenko Sep 5, 2023
fa15aff
fix: fixed naming, import
nmashchenko Sep 5, 2023
cb62f28
Merge branch 'dev-nextjs' into feature/tanstack_RQ-nextjs
nmashchenko Sep 5, 2023
c49bfcc
chore: react-query has been moved to lib
dmtrack Sep 5, 2023
d565b2f
refactor: rq replaced
dmtrack Sep 5, 2023
0bd9988
feat: added toaster setup
nmashchenko Sep 5, 2023
074137f
Merge pull request #56 from exortme1ster/feature/tanstack_RQ-nextjs
nmashchenko Sep 6, 2023
19cf118
feat: reusable modal (#55)
merankori Sep 9, 2023
da4f630
ci: disable auto deploy vercel (#58)
velenyx Sep 9, 2023
9c7ecab
fix(ci): :green_heart: fix run PR worker in renovate
velenyx Sep 9, 2023
064ca3e
Merge pull request #71 from exortme1ster/hotfix/renovate-pr-worker
nmashchenko Sep 9, 2023
4f16ed6
fix: 🩹 work ci on renovate[bot] (#73)
velenyx Sep 9, 2023
8b905d1
fix(renovate): :adhesive_bandage: wrong config file (#74)
velenyx Sep 9, 2023
7b6d657
сhore: 🧑‍💻 add editor file and git attributes (#78)
velenyx Sep 10, 2023
0793468
ci: :construction_worker: remove bundle analyzer (#79)
velenyx Sep 10, 2023
4dfcaeb
feat: added new screens, updates (#77)
nmashchenko Sep 11, 2023
d279683
refactor: :art: change prettier config to airbnb style-guide (#85)
velenyx Sep 11, 2023
7c9e512
docs: updated notion link
nmashchenko Sep 12, 2023
27955a7
refactor: ♻️ rename files (#87)
velenyx Sep 14, 2023
eaea3ea
feat: cookie component added (#90)
LanselonX Sep 19, 2023
08bd44b
refactor: ♻️ absolute paths (#98)
velenyx Sep 23, 2023
20d7818
Merge branch 'master' into dev-nextjs
nmashchenko Sep 24, 2023
5d1922a
fix: delete .idea directory
nmashchenko Sep 24, 2023
652fadb
refactor: removed all server
nmashchenko Sep 24, 2023
bc15ff1
docs: update README.md
nmashchenko Sep 24, 2023
14ff002
docs: update README.md
nmashchenko Sep 24, 2023
9ba18c2
feat(layout): add sidebar item
velenyx Sep 8, 2023
03f6157
feat(layout): add sidebar profile
velenyx Sep 8, 2023
454ceb9
fix: rebase conflicts
velenyx Sep 24, 2023
2274bf6
fix: save changes
velenyx Sep 15, 2023
fa34f7d
fix: save changes
velenyx Sep 15, 2023
c943342
feat(layout): add useOutsideClick
velenyx Sep 8, 2023
497e196
fix: :adhesive_bandage:fix lint and type errors
velenyx Sep 8, 2023
b3e2735
feat: add notifications
velenyx Sep 16, 2023
5224d34
fix: git stash
velenyx Sep 16, 2023
d0f111e
feat: create user type
velenyx Sep 16, 2023
e08c65e
test: teest
velenyx Sep 16, 2023
c76c998
test: teest
velenyx Sep 16, 2023
1cdfb22
test: :ambulance: fix build problems
velenyx Sep 16, 2023
f94073a
test: :ambulance: fix build problems
velenyx Sep 16, 2023
b91fc68
test: :ambulance: fix build problems
velenyx Sep 16, 2023
f284e9b
test: :ambulance: fix build problems
velenyx Sep 16, 2023
bc9824b
test: :ambulance: fix build problems
velenyx Sep 16, 2023
4d0330e
test: :ambulance: fix build problems
velenyx Sep 16, 2023
8d85422
test: :ambulance: fix build problems
velenyx Sep 16, 2023
4fa993d
test: :ambulance: fix build problems
velenyx Sep 17, 2023
0b52e78
test: :ambulance: fix build problems
velenyx Sep 17, 2023
b65b62b
test: :ambulance: fix build problems
velenyx Sep 17, 2023
c22468a
test: :ambulance: fix build problems
velenyx Sep 17, 2023
e30e423
test: :ambulance: fix build problems
velenyx Sep 17, 2023
8a2af80
test: :ambulance: fix build problems
velenyx Sep 17, 2023
0454efa
fix: fix icons
velenyx Sep 17, 2023
f2e45e1
fix: 2
velenyx Sep 17, 2023
f1c7699
fix: 2
velenyx Sep 17, 2023
326e661
refactor: ♻️ refactor notification-modal
velenyx Sep 23, 2023
06ee012
refactor: ♻️ refactor notification-modal
velenyx Sep 23, 2023
7e073f0
refactor: ♻️ refactor notification-content
velenyx Sep 23, 2023
592a4c8
refactor: ♻️ refactor notification-item and get-past-time func
velenyx Sep 23, 2023
6d46de1
refactor: ♻️ refactor notification-item
velenyx Sep 23, 2023
45d9898
refactor: ♻️ refactor sidebar-profile
velenyx Sep 23, 2023
b286d1f
refactor: ♻️ refactor sidebar-item
velenyx Sep 23, 2023
ea8e931
refactor: ♻️ refactor sidebar-item
velenyx Sep 23, 2023
46cb962
refactor: ♻️ refactor sidebar
velenyx Sep 23, 2023
4a94496
refactor: ♻️ refactor
velenyx Sep 23, 2023
d041135
refactor: ♻️ change Sidebar -> sidebar component folder
velenyx Sep 23, 2023
6476d66
test: :white_check_mark: add jest config for tests
velenyx Sep 23, 2023
fb06f0a
docs: :memo: add storybook story for sidebar-item and docs
velenyx Sep 23, 2023
c335a87
docs: :memo: add storybook story for sidebar-profile and docs
velenyx Sep 23, 2023
ebbf4ad
fix: :adhesive_bandage: fix storybook view
velenyx Sep 23, 2023
aed4ba9
docs: :memo: add iconography storybook story
velenyx Sep 23, 2023
5565c60
docs: :memo: add colors, loading to storybook
velenyx Sep 23, 2023
c0998ed
fix: :rotating_light: fix lint warnings
velenyx Sep 23, 2023
83fcb3c
fix: :bug: fix sidebar-profile image
velenyx Sep 23, 2023
205bd05
fix: merge conflicts
velenyx Sep 23, 2023
0555f65
feat: transferred new dev into master (#99)
nmashchenko Sep 24, 2023
f8479bb
docs: update README.md
nmashchenko Sep 24, 2023
1df5fe2
docs: update README.md
nmashchenko Sep 24, 2023
3c2177b
Merge remote-tracking branch 'origin/master' into feature/sidebar
velenyx Sep 24, 2023
0603c14
refactor: ♻️ folder "Sidebar" -> "sidebar"
velenyx Sep 24, 2023
dc39fd9
fix: folder name
velenyx Sep 24, 2023
e5d82df
fix: folder name
velenyx Sep 24, 2023
cd27e0e
test: test
velenyx Sep 24, 2023
a1742ed
test: test
velenyx Sep 24, 2023
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
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# 🚀 Teameights

Refer to following link to find all info you need!

🔗 [Notion](https://teameights.notion.site/ad80d7c691ba47a09be954dc992752ec?v=cffe6ca69a8d4c4b91675b35cfd733ad)

![Logo T8S (8)](https://github.com/nmashchenko/teameights/assets/52038455/b1898e79-8515-4d50-a9ab-8b3d0cf5d042)
7 changes: 7 additions & 0 deletions client/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"root": true,
"env": {
"browser": true,
"node": true,
"jest": true,
"es2021": true
},
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"],
"extends": [
Expand Down
2 changes: 1 addition & 1 deletion client/.husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

cd ./client && yarn lint
cd ./client && yarn lint
2 changes: 1 addition & 1 deletion client/.husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

cd ./client && yarn build
cd ./client && yarn build
7 changes: 5 additions & 2 deletions client/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import type { StorybookConfig } from '@storybook/nextjs';
import path from 'path';

const config: StorybookConfig = {
stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
stories: [
'../src/**/*.stories.@(js|jsx|mjs|ts|tsx|mdx)',
'../docs/**/*.stories.@(js|jsx|mjs|ts|tsx|mdx)',
],
staticDirs: ['../public'],
addons: [
'@storybook/addon-links',
Expand All @@ -25,7 +28,7 @@ const config: StorybookConfig = {
},
},
docs: {
autodocs: 'tag',
autodocs: true,
},
core: {
builder: '@storybook/builder-webpack5',
Expand Down
85 changes: 85 additions & 0 deletions client/.storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import type { StoryFn } from '@storybook/react';
import '../src/app/styles/globals.scss';
import './font.scss';

export const parameters = {
actions: { argTypesRegex: '^on[A-Z].*' },
viewMode: 'docs',
previewTabs: {
canvas: {
title: 'Story',
},
},
controls: {
matchers: {
color: /(background|color)$/i,
},
},

backgrounds: {
default: 'main',
values: [
{
name: 'main',
value: '#26292b',
},
{
name: 'white',
value: '#fff',
},
{
name: 'additional white',
value: '#fafafa',
},
],
},
viewport: {
viewports: {
'360': {
name: '360',
styles: {
width: '360px',
height: '780px',
},
},
'768': {
name: '768',
styles: {
width: '768px',
height: '1664px',
},
},
'1024': {
name: '1024',
styles: {
width: '1024px',
height: '576px',
},
},
'1600+': {
name: '1600+',
styles: {
width: '1600px',
height: '900px',
},
},
},
},
};

export const decorators = [
(Story: StoryFn) => (
<div
style={{
margin: 10,
display: 'flex',
justifyContent: 'start',
alignItems: 'start',
flexDirection: 'column',
gap: '20px',
}}
>
<Story />
</div>
),
];
134 changes: 134 additions & 0 deletions client/docs/colors.stories.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
import { ColorItem, ColorPalette, Meta } from '@storybook/blocks';

<Meta title='global/Colors' />

<ColorPalette>
<ColorItem
title='Base'
subtitle='asdasd'
colors={{
'Black color': 'var(--black-color)',
'White colors': 'var(--white-color)',
'Card color': 'var(--cards-color)',
'BG color': 'var(--bg-color)',
}}
/>
<ColorItem
title='Green'
subtitle='asdasd'
colors={{
'Dark color': 'var(--green-dark-color)',
'Normal color': 'var(--green-normal-color)',
'Active color': 'var(--green-active-color)',
'Bright color': 'var(--green-bright-color)',
}}
/>
<ColorItem
title='Grey'
subtitle='asdasd'
colors={{
'Dark color': 'var(--grey-dark-color)',
'Normal color': 'var(--grey-normal-color)',
'Medium color': 'var(--grey-medium-color)',
'Light color': 'var(--grey-light-color)',
}}
/>
<ColorItem
title='Red'
subtitle='asdasdasd'
colors={{
'Dark color': 'var(--red-dark-color)',
'Normal color': 'var(--red-normal-color)',
'Light color': 'var(--red-light-color)',
'Error color': 'var(--red-error-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Red'
colors={{
'Dark/Red': 'var(--additional-dark-red-color)',
'Normal/Red': 'var(--additional-normal-red-color)',
'Light/Red': 'var(--additional-light-red-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Orage'
colors={{
'Dark/Orange': 'var(--additional-dark-orange-color)',
'Normal/Orange': 'var(--additional-normal-orange-color)',
'Light/Orange': 'var(--additional-light-orange-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Yellow'
colors={{
'Dark/Yellow': 'var(--additional-dark-yellow-color)',
'Normal/Yellow': 'var(--additional-normal-yellow-color)',
'Light/Yellow': 'var(--additional-light-yellow-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Lime'
colors={{
'Dark/Lime': 'var(--additional-dark-lime-color)',
'Normal/Lime': 'var(--additional-normal-lime-color)',
'Light/Lime': 'var(--additional-light-lime-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Green'
colors={{
'Dark/Green': 'var(--additional-dark-green-color)',
'Normal/Green': 'var(--additional-normal-green-color)',
'Light/Green': 'var(--additional-light-green-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Sky'
colors={{
'Dark/Sky': 'var(--additional-dark-cyan-color)',
'Normal/Sky': 'var(--additional-normal-cyan-color)',
'Light/Sky': 'var(--additional-light-cyan-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Blue'
colors={{
'Dark/Blue': 'var(--additional-dark-blue-color)',
'Normal/Blue': 'var(--additional-normal-blue-color)',
'Light/Blue': 'var(--additional-light-blue-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Violet'
colors={{
'Dark/Violet': 'var(--additional-dark-violet-color)',
'Normal/Violet': 'var(--additional-normal-violet-color)',
'Light/Violet': 'var(--additional-light-violet-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='Pink'
colors={{
'Dark/Pink': 'var(--additional-dark-pink-color)',
'Normal/Pink': 'var(--additional-normal-pink-color)',
'Light/Pink': 'var(--additional-light-pink-color)',
}}
/>
<ColorItem
title='Additional'
subtitle='White'
colors={{
'Additional/White color': 'var(--additional-white-color)',
}}
/>
</ColorPalette>
14 changes: 14 additions & 0 deletions client/docs/loading.stories.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { ColorItem, ColorPalette, Meta } from '@storybook/blocks';

<Meta title='global/Loading' />

<ColorPalette>
<ColorItem
title='Loading'
subtitle='asdasd'
colors={{
'Base color': 'var(--loading-base-color)',
'Highlight color': 'var(--loading-highlight-color)',
}}
/>
</ColorPalette>
25 changes: 25 additions & 0 deletions client/jest.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import nextJest from 'next/jest.js'

const createJestConfig = nextJest({
// Provide the path to your Next.js app to load next.config.js and .env files in your test environment
dir: './',
})

// Add any custom config to be passed to Jest
/** @type {import('jest').Config} */
const config = {
moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json', 'node'],
testMatch: ['<rootDir>/src/**/*(*.)@(test).[tj]s?(x)'],
moduleDirectories: ['node_modules', '<rootDir>/'],
clearMocks: true,
collectCoverage: true,
coverageDirectory: 'coverage',
moduleNameMapper: {
'^~/(.*)$': '<rootDir>/src/$1',
},
setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
testEnvironment: 'jest-environment-jsdom',
}

// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
export default createJestConfig(config)
1 change: 1 addition & 0 deletions client/jest.setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import '@testing-library/jest-dom';
5 changes: 2 additions & 3 deletions client/next.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/** @type {import('next').NextConfig} */
const path = require('path');

module.exports = {
sassOptions: {
includePaths: [path.join(__dirname, 'styles')],
images: {
domains: ['teameights-production.s3.amazonaws.com', 'localhost'],
},
};
11 changes: 9 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"lint:ts:fix": "npx eslint \"**/*.{ts,tsx}\" --fix",
"prettier:check": "prettier --check \"**/*.{js,ts,tsx,css,mdx}\"",
"prettier:fix": "prettier --write \"**/*.{js,ts,tsx,css,mdx}\"",
"test:unit": "jest",
"prepare": "cd .. && husky install ./client/.husky",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
Expand Down Expand Up @@ -51,16 +52,22 @@
"@storybook/addon-essentials": "7.2.1",
"@storybook/addon-interactions": "7.2.1",
"@storybook/addon-links": "7.2.1",
"@storybook/addon-onboarding": "1.0.8",
"@storybook/blocks": "7.2.1",
"@storybook/addon-mdx-gfm": "^7.4.4",
"@storybook/addon-onboarding": "^1.0.8",
"@storybook/blocks": "^7.4.4",
"@storybook/nextjs": "7.2.1",
"@storybook/react": "7.2.1",
"@storybook/testing-library": "0.2.0",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^14.0.0",
"@types/jest": "^29.5.5",
"@types/react-modal": "^3.16.0",
"@typescript-eslint/eslint-plugin": "^6.3.0",
"@typescript-eslint/parser": "^6.3.0",
"eslint-plugin-storybook": "^0.6.13",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"prettier": "^3.0.1",
"storybook": "7.2.1"
},
Expand Down
Binary file added client/public/Images/user/unregistered.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions client/src/app/(main)/Layout.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.container {
height: 100dvh;
width: 100%;
padding: 48px 55px;

@media (width <= 1120px) {
padding: 48px 24px;
}

@media (width <= 580px) {
padding: 24px;
}
}

.children {
width: 100%;
min-height: 100%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
11 changes: 11 additions & 0 deletions client/src/app/(main)/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import styles from './Layout.module.scss';
import { Sidebar } from '@/widgets/sidebar';

export default function AuthLayout({ children }: { children: React.ReactNode }) {
return (
<div className={styles.container}>
<Sidebar />
<div className={styles.children}>{children}</div>
</div>
);
}
Loading
Loading