Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
230 commits
Select commit Hold shift + click to select a range
fb9f1f3
added profile layout
Aug 1, 2023
29dd830
added styles for reviews
Aug 2, 2023
b1cf571
added LevelLanguage
Aug 2, 2023
4456e15
Fix добавил активацию второго языка и уровня
SASMUS12 Aug 2, 2023
babeb2a
Fix: Получил список языков
SASMUS12 Aug 2, 2023
00c2113
Список языковдобавлен
SASMUS12 Aug 2, 2023
1ff350d
Выбор уровня несколько + добавил иконку
SASMUS12 Aug 2, 2023
b553128
fix: renamed Signup and Signin Page
BerezinaMariya Aug 3, 2023
1cf3d73
Fix: изменил красный значек на зеленый фильтра
SASMUS12 Aug 3, 2023
0f5a876
Сбор обновления с GitHab Merge branch 'develop' into sasmus12
SASMUS12 Aug 3, 2023
ddf4b54
fix: categories fetch
BerezinaMariya Aug 3, 2023
6028b4b
fix: categories ordering fetch
BerezinaMariya Aug 3, 2023
f6790f6
Обновление с develop Merge branch 'develop' into sasmus12
SASMUS12 Aug 3, 2023
1b0bbd4
Merge branch 'develop' into UserProfile
Aug 3, 2023
a84fb5e
Fix: Добавил параграф Фильтр+настроил позиционирование
SASMUS12 Aug 3, 2023
c02555f
fix: modal component
BerezinaMariya Aug 3, 2023
720c9d1
fix: modal and main components
BerezinaMariya Aug 3, 2023
ae20f3b
fix: modal close button
BerezinaMariya Aug 3, 2023
a55a370
fix: ModalOverlay component
BerezinaMariya Aug 3, 2023
7843a8c
fix: delete modal and sort popups from start MainPage
BerezinaMariya Aug 3, 2023
3e02061
added media
Aug 4, 2023
7757b7d
Fix: sort cantry
SASMUS12 Aug 4, 2023
80d2973
Merge branch 'develop' into sasmus12
SASMUS12 Aug 4, 2023
230dd40
Забрал изменения с develop
SASMUS12 Aug 4, 2023
e521585
added the ability to edit components
Aug 4, 2023
027fd93
Merge branch 'develop' into UserProfile
Aug 4, 2023
5c46223
Востоновление после мержа
SASMUS12 Aug 4, 2023
7945d83
Merge pull request #35 from Conversation-Exchange/UserProfile
KetiRudneva Aug 4, 2023
23d2776
fix: header and footer styles, add loggedIn Header
krokodila888 Aug 4, 2023
bb6e7b4
after solving conflicts
krokodila888 Aug 4, 2023
e474663
Merge pull request #36 from Conversation-Exchange/krokodila888
krokodila888 Aug 4, 2023
33ff953
Update Routing.tsx
krokodila888 Aug 4, 2023
684d1c7
Merge pull request #37 from Conversation-Exchange/krokodila888
krokodila888 Aug 4, 2023
f14f847
Fix: Доработал тег выбора страны
SASMUS12 Aug 4, 2023
9231665
Merge branch 'develop' into sasmus12
SASMUS12 Aug 4, 2023
4ea1911
fix: Update package.json for gh-pages deploy
krokodila888 Aug 4, 2023
af6229c
Fix: перебор в поле ввода
SASMUS12 Aug 4, 2023
73718ab
fix: new FAQ styles
krokodila888 Aug 5, 2023
b6d5fab
Merge branch 'develop' of github.com:Conversation-Exchange/frontend i…
krokodila888 Aug 5, 2023
5ec602b
fix: FAQ styles
krokodila888 Aug 5, 2023
d115967
Merge pull request #40 from Conversation-Exchange/krokodila888
krokodila888 Aug 5, 2023
35b1278
Fix: сделал дефолтное состояние окна Выпадающая подсказка при выборес…
SASMUS12 Aug 5, 2023
a53051b
Сбор обновлений Merge branch 'develop' into sasmus12
SASMUS12 Aug 5, 2023
d33ba31
fix: some styles
krokodila888 Aug 5, 2023
4d87747
Merge branch 'develop' of github.com:Conversation-Exchange/frontend i…
krokodila888 Aug 5, 2023
79ea2b9
Merge pull request #44 from Conversation-Exchange/krokodila888
krokodila888 Aug 5, 2023
bf13262
FIX: styles in Main, Login and Sort
krokodila888 Aug 6, 2023
75afd88
Merge branch 'develop' of github.com:Conversation-Exchange/frontend i…
krokodila888 Aug 6, 2023
5f7865f
Merge pull request #46 from Conversation-Exchange/krokodila888
krokodila888 Aug 6, 2023
524f609
Merge branch 'develop' into sasmus12
SASMUS12 Aug 6, 2023
4be6fa5
Merge pull request #45 from Conversation-Exchange/sasmus12
BerezinaMariya Aug 7, 2023
695c455
fix: clean code
BerezinaMariya Aug 7, 2023
2f6aba6
fix: Signin, continuing button in MainPage
BerezinaMariya Aug 7, 2023
7b1d42c
Merge pull request #47 from Conversation-Exchange/berezina
BerezinaMariya Aug 7, 2023
79d707b
Filter
SASMUS12 Aug 8, 2023
fbe7ecd
united event handlers
Aug 8, 2023
da0bcdc
FEAT: access token
krokodila888 Aug 8, 2023
dc13948
Merge pull request #49 from Conversation-Exchange/krokodila888
krokodila888 Aug 8, 2023
b95c687
Merge branch 'develop' into UserProfile
Aug 9, 2023
48f6539
Fix: Доработал ф-ию отправки сорт на серв
SASMUS12 Aug 9, 2023
9463963
Сбор обновлений с develop Merge branch 'develop' into sasmus12
SASMUS12 Aug 9, 2023
9e9992c
fix: fixing openApi
krokodila888 Aug 9, 2023
96c950a
Merge branch 'develop' of github.com:Conversation-Exchange/frontend
krokodila888 Aug 9, 2023
47a4a57
Fix: Доработал ф-ию отправки сорт на серв компонент LanguageLevel
SASMUS12 Aug 9, 2023
92b3b89
fix: working getUser/me and getAllUsers
krokodila888 Aug 9, 2023
f7136e8
Merge pull request #50 from Conversation-Exchange/krokodila888
krokodila888 Aug 9, 2023
4181694
Merge branch 'develop' into sasmus12
SASMUS12 Aug 9, 2023
63f22e0
fix: modal, mixins, add cards button
BerezinaMariya Aug 9, 2023
7f07b22
fix: auth
BerezinaMariya Aug 9, 2023
a93bd11
fix: card, model, openapi
BerezinaMariya Aug 9, 2023
40eb56a
Merge pull request #51 from Conversation-Exchange/berezina
BerezinaMariya Aug 9, 2023
2ee941d
fix: gitignore and cardAvatars
BerezinaMariya Aug 9, 2023
f02c273
fix: remove .idea
BerezinaMariya Aug 9, 2023
867c078
Update package.json to try deploy
krokodila888 Aug 9, 2023
5143d32
fix: try to fix deploy
krokodila888 Aug 9, 2023
6f1132b
Merge branch 'develop' of github.com:Conversation-Exchange/frontend i…
krokodila888 Aug 9, 2023
306853a
Merge pull request #53 from Conversation-Exchange/krokodila888
krokodila888 Aug 9, 2023
ac646af
fix: still fixing deploy
krokodila888 Aug 9, 2023
663b242
fix: deploy
krokodila888 Aug 9, 2023
b0e92f1
Merge pull request #54 from Conversation-Exchange/krokodila888
krokodila888 Aug 9, 2023
596c48a
Revert "Krokodila888"
krokodila888 Aug 9, 2023
5e3665d
Merge pull request #55 from Conversation-Exchange/revert-54-krokodila888
krokodila888 Aug 9, 2023
98d4cea
Fix?: Изменил LanguageLevel
SASMUS12 Aug 9, 2023
a852615
Merge branch 'develop' into sasmus12
SASMUS12 Aug 9, 2023
b07a21b
fixing deploy
krokodila888 Aug 9, 2023
035ef37
i
krokodila888 Aug 9, 2023
6486993
Merge branch 'develop' into UserProfile
Aug 10, 2023
050bf20
fix: gitignore
BerezinaMariya Aug 10, 2023
5b2d4af
fix доделал компонент язык уровень
SASMUS12 Aug 10, 2023
66ca306
fixing deploy
krokodila888 Aug 10, 2023
1f20c23
fixing deploy
krokodila888 Aug 10, 2023
b498896
fix полу жива сортировка
SASMUS12 Aug 10, 2023
1343b45
fix: deploy, some styles
krokodila888 Aug 10, 2023
355807e
Merge pull request #57 from Conversation-Exchange/krokodila888
krokodila888 Aug 10, 2023
dfe0a15
Merge branch 'develop' of github.com:Conversation-Exchange/frontend i…
BerezinaMariya Aug 10, 2023
5d9b21f
Merge branch 'develop' into sasmus12
SASMUS12 Aug 10, 2023
adae642
Merge pull request #58 from Conversation-Exchange/sasmus12
SASMUS12 Aug 10, 2023
d537a21
fix sotr 10 популярных
SASMUS12 Aug 11, 2023
7ac3008
added buttons
Aug 14, 2023
93bcabb
Merge branch 'develop' into UserProfile
Aug 14, 2023
a35e29a
Fix: Корректировка стилей привод к scss
SASMUS12 Aug 14, 2023
86f6022
fix: adding access-token
krokodila888 Aug 14, 2023
6d215f7
fix: token in signin model
krokodila888 Aug 14, 2023
22acac1
Merge pull request #59 from Conversation-Exchange/krokodila888
krokodila888 Aug 14, 2023
9814a24
Fix: Фильтр Корректировка стилей привод к scss
SASMUS12 Aug 14, 2023
3cf1c12
Merge branch 'develop' into sasmus12
SASMUS12 Aug 14, 2023
f68d174
Fix: Фильтр + категория Корректировка стилей привод к scss
SASMUS12 Aug 14, 2023
62217c0
Merge branch 'develop' into UserProfile
Aug 15, 2023
b7af706
fix Отступ поправит фильтра от карточек
SASMUS12 Aug 15, 2023
97ae4c0
fix кнопки
SASMUS12 Aug 15, 2023
a0b9d36
fix: handleValue function in signIn model
BerezinaMariya Aug 15, 2023
8d32e65
fix: delete Header/model.ts
BerezinaMariya Aug 15, 2023
b1d340c
Merge pull request #60 from Conversation-Exchange/berezina
BerezinaMariya Aug 15, 2023
0a95599
fix Соглосование очистки фильтра
SASMUS12 Aug 15, 2023
a518f3c
Merge branch 'develop' into sasmus12
SASMUS12 Aug 15, 2023
c01ea51
fix Страну в фильтре переделал в scss осталось вставить прокрутку и о…
SASMUS12 Aug 15, 2023
c2f83d6
Merge pull request #62 from Conversation-Exchange/sasmus12
SASMUS12 Aug 16, 2023
1783f80
Merge branch 'develop' into UserProfile
Aug 17, 2023
5bc6494
fix: loggedIn
krokodila888 Aug 17, 2023
3b5c6b9
fix: loggedIn
krokodila888 Aug 17, 2023
0ffbe8b
Merge pull request #63 from Conversation-Exchange/krokodila888
krokodila888 Aug 17, 2023
5955586
fix: navigate to Main after logout
krokodila888 Aug 17, 2023
f0a265a
Merge branch 'develop' of github.com:Conversation-Exchange/frontend i…
krokodila888 Aug 17, 2023
b84f003
Merge pull request #64 from Conversation-Exchange/krokodila888
krokodila888 Aug 17, 2023
92a4b15
feat: some styles changes
krokodila888 Aug 17, 2023
2242664
Merge branch 'develop' of github.com:Conversation-Exchange/frontend i…
krokodila888 Aug 17, 2023
f366234
Merge pull request #65 from Conversation-Exchange/krokodila888
krokodila888 Aug 17, 2023
1b31f79
Fix error cantry
SASMUS12 Aug 17, 2023
ad9d75e
Merge branch 'develop' into sasmus12
SASMUS12 Aug 17, 2023
18ecf4f
added get request
Aug 19, 2023
dc54b28
Merge branch 'develop' into UserProfile
Aug 19, 2023
2cb37aa
Fix Языки и уровни сделал через react-select
SASMUS12 Aug 19, 2023
8117b54
Fix Переделан Languagelevel
SASMUS12 Aug 20, 2023
81c8201
Fix Переделан Languagelevel+
SASMUS12 Aug 20, 2023
74cd4d3
Fix Переделан Language на 80%
SASMUS12 Aug 21, 2023
2e8fdb3
Fix Переделан Language на 80%++
SASMUS12 Aug 21, 2023
145668a
feat: add question pages 1 and 2
BerezinaMariya Aug 21, 2023
18b7921
fix: changes from develop
BerezinaMariya Aug 21, 2023
30702d9
fix: loggedIn
BerezinaMariya Aug 21, 2023
05fc977
fix: remove console.log from loggedIn
BerezinaMariya Aug 21, 2023
1419a29
fix: LoggedIn name, ProgressLine
BerezinaMariya Aug 21, 2023
e7edfcd
fix: Input and Select styles
BerezinaMariya Aug 21, 2023
d944874
fix: Select styles
BerezinaMariya Aug 21, 2023
d8003f8
Fix Выделен компонент CountrySelection
SASMUS12 Aug 21, 2023
600da8e
fix: CountrySelection, Sort, LanguageLevel components
BerezinaMariya Aug 22, 2023
428cc90
Merge pull request #66 from Conversation-Exchange/berezina
BerezinaMariya Aug 22, 2023
f9608b6
fix: CountrySelection component
BerezinaMariya Aug 22, 2023
5972056
feat: eslint/prettier is added in project
AntonAduisky Aug 22, 2023
3d1174c
feat: test alias for eslint/prettier
AntonAduisky Aug 22, 2023
857e9b1
Fix Выделен компонент CountrySelection+
SASMUS12 Aug 22, 2023
fae4944
fix: CountrySelection component
BerezinaMariya Aug 22, 2023
da739bb
Revert "feat: test alias for eslint/prettier"
AntonAduisky Aug 23, 2023
7682a45
Merge branch 'develop' into aduiskiy
AntonAduisky Aug 23, 2023
d276cd6
Merge pull request #69 from Conversation-Exchange/aduiskiy
AntonAduisky Aug 23, 2023
88d1212
refactoring: package.json small fixes
AntonAduisky Aug 23, 2023
72803c5
feat: refactoring with linter rules
AntonAduisky Aug 23, 2023
ffe4b7e
fix: CountrySelection, LanguageModule and QuestionPage2 components
BerezinaMariya Aug 23, 2023
d4a2699
Fix add CountrySelection LanguageLevel LanguageModule
SASMUS12 Aug 23, 2023
3450c19
Merge branch 'develop' into sasmus12
SASMUS12 Aug 23, 2023
7a52c69
Fix add CountrySelection LanguageLevel LanguageModule+
SASMUS12 Aug 24, 2023
2355171
added some changes
Aug 24, 2023
d91a584
fix: CountrySelection, LanguageModule and QuestionPage2 components
BerezinaMariya Aug 24, 2023
f09c87b
Fix Выделен компонент CountrySelection+++++рабоч вариант
SASMUS12 Aug 24, 2023
eb9afc6
Fix подогнал верстку компонента Sort
SASMUS12 Aug 24, 2023
f8800e1
fix: CountrySelection, LanguageModule and QuestionPage2 components
BerezinaMariya Aug 24, 2023
d669743
Fix Доработан компонент LanguageLevelModal для варианта Sort и подогн…
SASMUS12 Aug 24, 2023
9c54aad
fix: LanguageModule component
BerezinaMariya Aug 25, 2023
4de6398
Fix Супер доработан компонент LanguageLevelModal
SASMUS12 Aug 25, 2023
45c97b7
Fix организована очистка фильтра только --- страны не удаляет
SASMUS12 Aug 27, 2023
da04926
fix update
SASMUS12 Aug 27, 2023
a6674b7
fix update red
SASMUS12 Aug 27, 2023
318c67e
fix: fillOutPages
BerezinaMariya Aug 28, 2023
aa04bfa
fix: fillOutPages
BerezinaMariya Aug 28, 2023
9cf1a28
fix: rests
BerezinaMariya Aug 28, 2023
4ea04db
fix: develop
BerezinaMariya Aug 28, 2023
3d3235a
fix коррекция после претитор + еслинт
SASMUS12 Aug 28, 2023
36379ca
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 28, 2023
4f97769
Слил свою ветку с Мфрией
SASMUS12 Aug 28, 2023
493460c
fix: prettier
BerezinaMariya Aug 28, 2023
35453f3
fix
SASMUS12 Aug 28, 2023
70a8d4f
fix: prettier
BerezinaMariya Aug 28, 2023
6de5f2e
fix: getInterests
BerezinaMariya Aug 28, 2023
c33c608
fix: prettier
BerezinaMariya Aug 28, 2023
6c1b0f6
fix update1
SASMUS12 Aug 28, 2023
1a44907
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 28, 2023
aa8da27
fix в рабочем состоянии
SASMUS12 Aug 28, 2023
b5d3eaf
added TS
Aug 29, 2023
5b68d99
Merge branch 'develop' into UserProfile
Aug 29, 2023
0afab75
fix: prettier
BerezinaMariya Aug 29, 2023
b2b7591
upd settings
Aug 29, 2023
41efb51
fix: prettier
BerezinaMariya Aug 29, 2023
41fc646
fixed two errors
Aug 29, 2023
1e68e10
hot fixed (five errors saved)
Aug 29, 2023
a05f909
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 29, 2023
018e002
fix: mobx
BerezinaMariya Aug 29, 2023
c5ef084
fix в рабочем состоянии Sort запускается.
SASMUS12 Aug 29, 2023
c7d0c52
fix: mobx
BerezinaMariya Aug 29, 2023
63cab3b
fix в рабочем состоянии Sort запускается+.
SASMUS12 Aug 29, 2023
0233271
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 29, 2023
2fab3fa
fix: mobx fillOut
BerezinaMariya Aug 29, 2023
df6a342
fix в рабочем состоянии Sort запускается++9+.
SASMUS12 Aug 29, 2023
ec5dabe
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 29, 2023
69c7c18
attempt to fix TS's problems
Aug 30, 2023
9ec167a
fix: mobx fillOut
BerezinaMariya Aug 30, 2023
d30c342
fix: UserProfile
BerezinaMariya Aug 30, 2023
56ee061
fix в рабочем состоянии Sort запускается++9++.
SASMUS12 Aug 30, 2023
bb267c3
fix коррекция после претитор + еслинт+
SASMUS12 Aug 30, 2023
b05df35
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 30, 2023
2912b5f
fix: before fill-out
BerezinaMariya Aug 30, 2023
b89a3ca
fix: UserProfile
BerezinaMariya Aug 30, 2023
15d18fb
fix: UserProfile
BerezinaMariya Aug 30, 2023
1166db2
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 30, 2023
85261c4
fix: different
BerezinaMariya Aug 31, 2023
5f5742a
fix правки форматирования для обновления с девелоп.
SASMUS12 Aug 31, 2023
f376026
Merge branch 'berezina' into sasmus12
SASMUS12 Aug 31, 2023
236a27b
fix: different
BerezinaMariya Aug 31, 2023
c75a059
fix: avatar Base64
BerezinaMariya Aug 31, 2023
6695504
fix: openapi
BerezinaMariya Aug 31, 2023
cf9cc04
fix: final
BerezinaMariya Sep 1, 2023
ede9dfd
fix: final
BerezinaMariya Sep 1, 2023
a26e07c
fix: final
BerezinaMariya Sep 1, 2023
6c4b4b8
fix: final
BerezinaMariya Sep 1, 2023
1083f0f
fix: final
BerezinaMariya Sep 1, 2023
76eeb07
fix update
SASMUS12 Sep 4, 2023
7921cab
fix: prettier, "singleQuote": true
BerezinaMariya Sep 4, 2023
3b59fe0
Merge branch 'berezina' into sasmus12
SASMUS12 Sep 4, 2023
d76f790
fix add merge berezina
SASMUS12 Sep 4, 2023
5bda2c9
fix Устранил конфликты слил с ветки березеной
SASMUS12 Sep 4, 2023
7c7120f
fix верстка поправлена
SASMUS12 Sep 4, 2023
b7e77a9
fix поправил верстку обновил openapi
SASMUS12 Sep 7, 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
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 120
tab_width = 4
trim_trailing_whitespace = true
7 changes: 0 additions & 7 deletions .eslintrc.cjs

This file was deleted.

37 changes: 37 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"extends": [
"react-app",
"react-app/jest",
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"plugin:prettier/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json"
},
"plugins": [
"@typescript-eslint",
"prettier"
],
"root": true,
"rules": {
"prettier/prettier": "error",
"react/prop-types": "off",
"react/react-in-jsx-scope": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"import/no-unresolved": ["error",
{ "ignore": [".*\\.png$",
".*\\.svg$"]
}]
},
"settings": {
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
}
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.idea
5 changes: 0 additions & 5 deletions .idea/.gitignore

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/conversation-exchange-frontend.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/watcherTasks.xml

This file was deleted.

13 changes: 13 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"semi": true,
"trailingComma": "all",
"singleQuote": true,
"printWidth": 80,
"tabWidth": 2,

"parser": "typescript",
"useTabs": false,

"jsxSingleQuote": true,
"arrowParens": "always"
}
Loading