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

Fix/search bar #144

Merged
merged 8 commits into from
Mar 9, 2024
Merged

Fix/search bar #144

merged 8 commits into from
Mar 9, 2024

Conversation

merankori
Copy link
Collaborator

@merankori merankori commented Feb 4, 2024

πŸ›  Notion tickets

  • Resolves

✨ Overview

  • This PR includes database changes

πŸ“ Checklist

  • Tagged issue # above
  • Checked features against requirements in ticket
  • Merge the latest main into PR branch
  • Locally Tested
  • Updated docs and changelog for new or breaking API changes
  • Completed Peer Demo (if necessary)

πŸ“ Notes

@merankori merankori changed the base branch from master to develop February 4, 2024 09:11
Copy link
Owner

@nmashchenko nmashchenko left a comment

Choose a reason for hiding this comment

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

ΠΊΠΈΠ½ΡƒΠ» Π² Ρ‚Π³ ΠΏΡ€ΠΎΠ±Π»Π΅ΠΌΡ‹

Copy link

github-actions bot commented Feb 23, 2024

Deploy preview for teameights ready!

βœ… Preview
https://teameights-ibud63ukx-exortme1ster.vercel.app

Built with commit 3c8345b.
This pull request is being automatically deployed with vercel-action

Copy link

github-actions bot commented Feb 23, 2024

Deploy preview for teameights-storybook ready!

βœ… Preview
https://teameights-storybook-lo56e2smy-exortme1ster.vercel.app

Built with commit 3c8345b.
This pull request is being automatically deployed with vercel-action

@nmashchenko nmashchenko merged commit a19255b into develop Mar 9, 2024
2 checks passed
@nmashchenko nmashchenko deleted the fix/search-bar branch March 9, 2024 21:26
@nmashchenko
Copy link
Owner

note: Π΄ΠΎΠ±Π°Π²ΠΈΡ‚ΡŒ фикс ΡˆΠΈΡ€ΠΈΠ½Ρ‹ ΠΎΠ±Ρ‰Π΅Π³ΠΎ Π»Π΅ΠΉΠ°ΡƒΡ‚Π° ΠΏΠΎΠ΄ ΠΊΠ°ΠΆΠ΄Ρ‹ΠΉ ΠΏΠΎΠΈΠ½Ρ‚

nmashchenko added a commit that referenced this pull request Mar 23, 2024
* fix: πŸš‘ ci (#102)

* docs: update README.md

* docs: update README.md

* fix: πŸš‘ fix ci don't work in develop and master branches

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* feature: ✨ storybook pallete icons docs (#106)

* feat: add colors story

* feat: add loading story

* feat: add iconography stories and change stories settings

* feat: ✨ shared flex icon wrapper (#107)

* feat: ✨ add flex component

* feat: ✨ add flex component and docs

* docs: πŸ“ add docs for Flex component

* fix: in flex width auto -> 100%

* fix: in flex width auto -> 100% in storybook

* docs: πŸ“ add .md doc for how to use storybook (#108)

* feature: ✨ add util - get-elapsed-time (#111)

* feature: ✨ add util - get-past-time

* refactor: ♻️ rename get-past-time => get-elapsed-time. And add docs

* feat: ✨ add useGetScreenWidth hook (#112)

* feature: ✨ add useGetScreenWidth hook

* fix: πŸ› get window width in server-side

* test: βœ… init jest, and add 1 test, add to ci (#113)

* test: init jest, and add 1 test, add to ci

* test: init jest, and add 1 test, add to ci

* fix: tests for get elapsed time

* feat: ✨ add skeleton (#117)

* feat: ✨ add skeleton

* docs: πŸ“ add docs for skeleton

* docs: πŸ“ add more story cases for storybook

* fix: 🩹 fix tests for get elapsed time

* fix: shared components

* docs: updated skeleton

* feat: added teameights-types

* feat: added loader

* feat: added drawer, sonner

* feat: settings are added (#123)

* feat: settings are added

* fix: props are renamed

* feat: added select-autocomplete & debounce

* feat: new badge component and updated iconwrapper (#125)

* feat: new badge component and updated iconwrapper

* fix: stories

* fix: badge type added

* fix: styles/logic

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* refactor: added new backend (#101)

* feat: added new server version

* refactor: remove client

* ci: added ci for backend

* feat: added github auth / removed others

* refactor: ♻️ absolute paths (#98)

* refactor: ♻️ rename absolute paths

* fix: πŸš‘ fix storybook alias paths

* fix: delete .idea directory

* refactor: removed all server

* docs: update core info

* docs: fixed auth

* fix: gtihub return entity

* ci: fixed tests

* ci: added api in docker

* ci: fixed backend tests

* fix: crlf disabled

* ci: disabled api for local

* feat: extended user schema, tests, dtos, etc

* ci: fixed tests runner

* feature: backend architecture (#120)

* fix: refactor arch signature for actual Module struct

* fix: connect docker & upload container structs

* upload: reload references by migration

* upd: fix docker

* upload: production docker without nodeEnd, should fix it

* feature: docker works

* fix docs

* ci: added backend branch

* ci: fix branch name

* fix: tests command

* fix: added .env copying step

* fix: doc & docker reference

* fix: tests & docs

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* fix: issues, password, username updates

* fix: tests, ci, env-example

* ci: temporary yarnpath fix for tests

* feat: added universityData

* fix: linter

* fix: fixed docs & nested validation

* feat: added all required relations for base user

* feature: backend api docker (#122)

* fix: autobuild project gun

* fix: docs & workflow

* fix: gitflow

* fix: test gitflow

* fix: test gitflow

* fix: test gitflow

* fix: test gitflow

* fix: test gitflow

* fix: logs

* fix: sed

* fix: sed

* fix: compose postgres

* v3.6.3

* v3.6.4

* fix: yarn

* fix: postgres volumes

* fix: production condinion toggle

* docs: fixed descriptions

* feat: merged refactor/backend

* docs: fixed local setup

* fix: removed old files

* fix: merge test

* fix: docker-compose dev virtual volume

* fix: default starter prepare

* fix: db-prepare env point

* fix: sed checker

* fix: docs & code

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* feat: added filters query for users

---------

Co-authored-by: Nikita Mashchenko <[email protected]>
Co-authored-by: Pikj [JReydman] Reyderman <[email protected]>

* fix: port for server

* feat: updated auth based on new design

* fix: design issues

* feat: updated experience type

* feat: added @teameights/types

* feature: reusable modals (#121)

* feat: added initial info-modal

* fix: cleanup & useless styles

* fix: fixed some styles, returned action modal

* fix: changed the approach to using styles

* fix: flex issue

* fix: test version teameights-types

* fix: types

* fix: added type

* fix: lib issues, reusability

* fix: added new modal window

* fix: badges and modals

* fix: added logic for mobile user

* fix: added new phone action modal

* fix: added new phone action modal

* fix: code issues

* fix: changed folder location

* fix: some styles

* fix: added storybook for modal

* fix: added storybook for modal

* Revert "fix: added storybook for modal"

This reverts commit c5e7773.

* fix: added for test new function

* fix: added new modal for a test

* fix: changed mock data

* fix: changed mock data

* fix: fixed new error

* fix: previous issues and code

* fix: namings

* fix: namings

* fix: added new modal that fixes freezes

* feat: added image loader, fix issues with modals

* feat: added flags & fixed issues

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* fix: add events for flex component (#128)

Co-authored-by: β€œmerankori” <[email protected]>

* fix: πŸ› flex (#130)

* fix: add events for flex component

* fix: add rest props for Flex component

---------

Co-authored-by: β€œmerankori” <[email protected]>

* refactor(mocks): ✨ enhance user mock data generation with notificatfications (#129)

* refactor(mocks): ✨  enhance user mock data generation with notifications and team

* refactor(mocks): ♻️ convert functions to arrow functions

* test

* fix(eslint)

* save changes

* fix: refactor

* fix: date type

* fix: upgrade types

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* feat: new search bar (#133) 🀟🏻

* feat: add border disable for ui select

* feat: add filter-select draft functionality

* fix: closing select menu and codestyle

* fix: conflicts with develop

* fix: removed server actions

* fix: imports

* fix: select and input border

* fix: filter-select

* fix: some fixes for select

* fix: interfaces of searchbar

* feat: add draft search-input functionality

* fix: filter type in filter select

* fix: some fixes for selects

* feat: add draft functionality for tags-list

* feat: add placeholders and tags-list for searchbar

* feat: add outside click closing for multiple-tag

* fix: fix text-filter clearing

* fix: some tag fixes

* feat: add clear all button in tags list

* fix: change file structure

* feat: add select indicator toggle

* fix: fix search-bar styles

* feat: add api request handler for search-input

* fix: move tag in entities

* fix: move tag in features

* feat: add some filters for search-bar on page

* fix: tags-list filtersArr typization

* feat: replace react hook form functionality from search bar with native react

* fix: checkbox-list functionality typization

* fix: codestyle fixes

* feat: add query string functionality for search-bar

* fix: replace flex divs with Flex component

* feat: add search-bar in storybook

* feat: add multiple value filter functionality

* fix: add multiple filter in stories / fix timer of search-bar

* fix: codestyle fix in tag-menu

* fix: destructurize fix

* fix: state changing in search-bar

* feat: add custom styles support in shared select

* fix: margins and paddings of search-bar

* fix: design fixes

* fix: class naming fixes

* fix: menu columns in search-bar input-select

* fix: style fixes

* fix: clear logs and fix naming of callbacks

* fix: codereview fixes

---------

Co-authored-by: Nikita Mashchenko <[email protected]>
Co-authored-by: skiselev <[email protected]>

* feat: added new icons/skills (#132)

* feat: added new icons/files

* feat: changed concentration to speciality

* feat: added support for specialities

* fix: import

* fix: server support for updates

* fix: docker

* fix: prettier

* feat: added isActive for badge

* fix: added todos for backend

* fix: final adjustments

* fix: mocks, user entity, etc

* fix: fallback

* feat: transfer old react-query hooks (#109)

* feat: added initial setup

* fix: style

* feat: added auth queries

* feat: added password reset hooks

* feat: folders refactor

* fix: added server fixes

* fix: removed bugged test

* feat: changed hooks, consts & logout

* fix: error handling

* feat: fix merge issues

* fix: deployment issue

* fix: other issues

* docs: update pull_request_template.md

* fix: server cleanup (#136)

* feat: new filters approach

* fix: old issues

* feat: new jwt approach to hash

* fix: small issues on frontend

* fix: lint errors

* feat: added base layout for registration; refactored and added some s… (#134)

* feat: added base layout for registration; refactored and added some shared component

* fix: resolved tsc issue

* fix: revert

* fix: resolved conflicts

* Revert "fix: revert"

This reverts commit a2f4c00.

* fix: inline styles

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* fix: icons cleanup (#137)

* fix: added new branch

* fix: arrows

* fix: cleaned up the icons on the new branch

* fix: new names for icons and illustrations

* Revert "fix: new names for icons and illustrations"

This reverts commit 4464738.

* fix: changed the names of icons and illustrations

* fix: some small issues

* fix: lint

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* feature: transfer user card functionality (#110)

* feat(user-card): move user-card component from previuos branch

* fix(docs): change .MD to .md

* feat(and-more): add new component

* feat(and-more): add counter

* feat(and-more): {finaly} add counting of languages

* fix(user-card): names of files

* fix(user-card & and-more): delete comments

* fix(user-card): move inline styles to separate file

* fix(user-card): change props using + minor changes

* feat(user-card): move 'and-more' feature to badge-framework component

* feat(user-card): move 'and-more' feature to badge-languages component

* fix(user-card): and-more button size in badge-framework component

* fix(user-card): displaying of 2 languages

* fix(and-more): delete unused component

* fix(user-card): use css variables

* fix(user-card): delete inline styles and move to scss file

* fix(badge-framework): replace img tag with Image

* refactor(user-card): new polymorphic function to use render badges

* fix(user-card): all problems

* fix(user-card): delete unused part of code

* fix(user-card): linter

* fix(user-card): fix placement of elements

* feat(user-card): crown for leaders

* feat: add new logic for render langs and frameworks

* refactor: refactor

* refactor: refactor

* refactor: refactor

* refactor: refactor

* refactor: refactor scss

* refactor: refactor

* refactor: refactor

* feat: ✨ add animation for crown

* feat: ✨ add animation for card

* feat: ✨ add types

* feat: ✨ add types

* feat: ✨ add @teameights/types

* Delete node_modules directory

* fix: save changes

* fix: fix css

* refactor: refactor

* refactor: refactor

* fix(user-card): crown

* feat(user-card): hover effect

* feat(user-card): use entities instead of widgets

* feat(user-card): add controller for storybook

* feat(user-card): storybook params

* feat(user-card): add onClick param for useCallback hooks

* save changes

* feat(user-card): adjust badgeFrameworkLayoutConfig and Image component in card module

* feat(user-card): add hover effect and cursor pointer to user card component

* feat(user-card): add hover effect and cursor pointer to user card component

* feat(user-card): update UserCard component to display user's date of birth and role name

* feat(user-card): use generateMockUser function for default user in UserCardPreview story

* feat(user-card): update generateMockFileEntity to include random query parameter for image path πŸš€

* feat(user-card): calculate and display user's age in UserCard component πŸŽ‚

* feat(user-card): add new mock data generation functions and update Home component to use them πŸš€

* feat(user-card): update file paths and import styles to use consistent naming convention πŸ”„πŸ“¦

* feat(user-card): add new logic for render langs and frameworks 🌐✨

* fix

* fix

* feat(user-card): restyle badge-language

* fix: adjust code to changes from merge

* fix(user-card): update user for storybook to match user type

* feat(user-card): add country flag icon

---------

Co-authored-by: Berezhnev Vladimir <[email protected]>
Co-authored-by: Sivritkin Dmitriy <[email protected]>
Co-authored-by: Romas Bitinas <[email protected]>

* feat: mobile search (#139)

* feat: add context for search-bar props

* feat: add draft functionality of mobile-search

* fix: refactor

* feat: add portaling for search select

* fix: icons naming

* fix: style fixes

* feat: add useGetUsers hook

* feat: add drawer in modal and optimize modal button

* fix: getting data and modal button fixes

* fix: drawer class types

* fix: codestyle fixes

* feat: move search-bar in shared

* fix: refactor and codestyle fixes

* fix: small issue

* fix: use client

---------

Co-authored-by: β€œmerankori” <[email protected]>
Co-authored-by: Nikita Mashchenko <[email protected]>

* feat: added server notifications (#140)

* feat: added notifications

* fix: previous issues with notifications

* fix: lint issues

* feat: added ws support

* fix: lint

* feat: ✨ create sidebar (#114)

* add: 🍱 add unregistered user image to public

* add: 🍱 icons

* fix: git stash

* feat: ✨ add types for user, team, role, notification

* git stash

* git stash

* feat: ✨ add sidebar

* fix: 🩹 fix build

* fix: 🩹 fix build

* docs: πŸ“ add storybook for notification-item and notification-content

* docs: πŸ“ JSDoc for notification-content

* docs: πŸ“ JSDoc for notification-list, add stories, add tests for sort-notifications

* fix: save changes

* refactor: with new types `notification-item`

* refactor: with new types `notification-list`

* refactor: with new types `notification-modal`

* refactor: with new types `sidebar`

* refactor: with new types `sidebar-profile`

* fix save

* refactor(sidebar): πŸ“¦β™»οΈ update typings to use `@teameights/types`

* refactor code

* save changes

* refactor: ♻️ replace hardcoded mock data with generateMockUser and other mock data generators in sidebar and notification components

* refactor(sidebar): 🎨 update styles and typography in sidebar components

* feat(icons): ✨ update burger-clo se icon in shared assets

* feat(sidebar): ✨ add user state and image loading skeleton in sidebar-profile

* feat(sidebar-profile): ✨ replace Image with ImageLoader in sidebar-profile component

* feat: merged develop

* fix: storybook

* feat: added server

* fix: linter

* fix: reading notifications issues

* fix: small issues

* feat: added websocket

* fix: socket issue

* fix: linter issue

* fix: sockets / timings issues

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

* feat: added main page and connected everything (#141)

* feat: added initial implementation

* Revert "feat: added initial implementation"

This reverts commit 83f6152.

* feat: added initial screen with issues

* feat: added server loading & filters, etc

* feat: final touches before merging

* feat: added multi-step signup (#138)

* feat: added new registration step - Account-Type

* feat: added new step

* fix: small fixes in styles

* fix: removed inline styles

* fix: added new step

* fix: added new step

* feat: added icons and updated the input-link

* fix: some fixes with icons

* feat: added new step Specialty

* feat: add step 4 of onboarding

* fix: minor lang selection update

* fix: minor issues & reusability

* fix: disable select if no empty cells

* feat: add recommended languages

* feat: add search to languages

* wip: implement form

* feat: bind speciality step to the form

* fix: update effect dependencies list

* feat: update next step logics

* feat: update select-fields layout

* refactor: apply Prettier

* fix: speciality to occupation conversion

* typo: update language label

* feat: add selected field component

* fix: remove step 1 recommendations on step 2

* feat: new approach wip

* feat: wip (need to fix errors)

* fix: handle key prop error

* fix: final client cleanup

* feat: add responsiveness to ActionSection

* feat: add responsiveness to AccountType

* feat: restyle Options

* feat: add responsiveness to steps

* fix: change recommended_icons height

* feat: refactor + illustrations

* fix: server stuff to support registration

* fix: minor issues

* feat: everything working now

* fix: mocks

* fix: lint issues

* fix: backend lint

* feat: add illustration resizing

* feat: add illustration resizing

* fix: update icons size

* fix: rename Javascript to JavaScript

* fix: styles

* feat: last touches

* fix: lint

* fix: lint part 2

* fix: seeds

* fix: small updates

* fix: remove console log

* fix: removed broken tests

---------

Co-authored-by: Romas Bitinas <[email protected]>
Co-authored-by: Nikita Mashchenko <[email protected]>

* fix: heroku procfile

* fix: disable npm for heroku

* Feature/friends (#143)

* feat: create friendship system

* test: add e2e tests for friendship functionality

* wip: add basic profile layout

* feat: add profile list icons

* feat: add icons

* feat: add icons

* feat: add social links

* feat: add logo

* fix: layout behind aside menu

* feat: add back button

* feat: add age

* fix: add migration

* fix: remove profile id at the button link

* fix: toggle leader icon based on fetch data

* feat: add empty placeholder for about section

* update: add check friendship status

* feat: add [username] to the path

* Revert "feat: add [username] to the path"

This reverts commit 5027de5.

* fix: change route to the profile page

* feat: add empty state

* update: reworked notification update

* update: updated friendship delete

* fix: incorrect image reference

* fix: case when links are missing

* fix: minor ui changes

* refactor: run prettier

* feat: add skills (except projects & tournaments)

* feat: add friends button logics

* refactor: remove eslint errors

* fix: back icon position

* refactor: run Prettier

* fix: specialty field to match updated type

* fix: skills to match updated structure

* fix: replace useGetMe with useGetUser

* feat: add Friendship seed

* fix: remove nav placeholder shrinking

* fix: profile nav button path

* fix: full navbar size

* wip: add list of friends

* feat: add friends modal

* feat: add responsiveness

* refactor: move logics to page.tsx

* feat: add friend removal

* refactor: remove unused import

* fix: end -> flex-end

* refactor: split ui to folders

* fix: remove icon overlay

* fix: back icon position

* fix: small updates

* fix: prettier

* fix: backend lint

* update: added username check

* update: added username check

* update: updated username check

* feat: friend button states

* fix: display correct skills

* refactor: apply prettier

* feat: add friend button (at user modal)

* feat: add friend notification

* feat: add profile link to user modal

* refactor: add friend notification interface

* feat: add width prop to friend btn

* feat: add friend button to infoModal

* feat:

* fix: fixed friendship status receiving

* fix: cleanup

* fix: generation

---------

Co-authored-by: Romas Bitinas <[email protected]>
Co-authored-by: Nikita Mashchenko <[email protected]>

* Fix/search bar (#144)

* fix: some search bar style fixes

* feat: add reducer and timer disabling for searchbar

* fix: fix bad setState inside render

* fix: style fixes for mobile filters

* fix: add portal for drawer

* fix: fixes for tags

* fix: filter opening

---------

Co-authored-by: Nikita Mashchenko <[email protected]>

---------

Co-authored-by: Sivritkin Dmitriy <[email protected]>
Co-authored-by: dmtrack <[email protected]>
Co-authored-by: Nikita Mashchenko <[email protected]>
Co-authored-by: Pikj [JReydman] Reyderman <[email protected]>
Co-authored-by: LanselonX <[email protected]>
Co-authored-by: MelancholicCode <[email protected]>
Co-authored-by: β€œmerankori” <[email protected]>
Co-authored-by: Michael Maliar <[email protected]>
Co-authored-by: Berezhnev Vladimir <[email protected]>
Co-authored-by: Sivritkin Dmitriy <[email protected]>
Co-authored-by: Romas Bitinas <[email protected]>
Co-authored-by: merankori <[email protected]>
Co-authored-by: Ivan Sai <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants