Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
d8d9b79
init: start task RS-Clone
Buffik Jan 30, 2023
50340f9
Environment setup (#1)
Buffik Jan 30, 2023
76c0347
feat: add 404 page (#2)
Buffik Jan 30, 2023
7665326
feat: add static data (#3)
Buffik Feb 1, 2023
0038553
Data fix (#4)
Buffik Feb 1, 2023
fb97924
feat: authorization form
olegpl1993 Feb 1, 2023
11ad3ac
feat: validation mail and pass
olegpl1993 Feb 1, 2023
a749783
feat: install icon libraty and add visibility icon to pasword
olegpl1993 Feb 2, 2023
c503ad6
feat: improve update state funcrtions
olegpl1993 Feb 2, 2023
69a01d2
fix: correct validatuin input
olegpl1993 Feb 2, 2023
ff019d3
Merge branch 'develop' of https://github.com/Buffik/rs-clone into aut…
olegpl1993 Feb 3, 2023
dd24ae6
feat: create global user state
olegpl1993 Feb 4, 2023
596f685
feat: choice language
olegpl1993 Feb 4, 2023
2b6cfaa
feat: fixed margin for incorrect line
olegpl1993 Feb 4, 2023
5f9bfc9
Merge pull request #5 from Buffik/aut-page
olegpl1993 Feb 4, 2023
30883e8
feat: use nullstyle
olegpl1993 Feb 5, 2023
95df6a7
feat: layout wrapper for sidebar
olegpl1993 Feb 5, 2023
ee246f1
feat: create pages
olegpl1993 Feb 5, 2023
5932866
feat: sidebar icons
olegpl1993 Feb 5, 2023
6d8cc99
feat: second lang sidebar
olegpl1993 Feb 5, 2023
d861d33
feat: search panel
olegpl1993 Feb 5, 2023
1375ddd
feat: add axios (#7)
Buffik Feb 5, 2023
faf76d2
feat: switch lang
olegpl1993 Feb 5, 2023
465bdcc
feat: ru lang in search component
olegpl1993 Feb 6, 2023
7ad39cc
Merge pull request #6 from Buffik/sidebar
olegpl1993 Feb 6, 2023
b48d94b
feat: block layout
olegpl1993 Feb 6, 2023
9c51afb
feat: made a footer
olegpl1993 Feb 6, 2023
6556920
feat: select month week
olegpl1993 Feb 7, 2023
ea62dd3
feat: create calendar table
olegpl1993 Feb 8, 2023
a45608a
feat change month
olegpl1993 Feb 8, 2023
7f55e7e
feat: selct year month
olegpl1993 Feb 8, 2023
5c6a8fc
feat: get response TaskData
olegpl1993 Feb 9, 2023
1b55570
feat: day cell task
olegpl1993 Feb 9, 2023
7abd0e8
feat: separate functions to calendarHelper
olegpl1993 Feb 11, 2023
97a6e83
feat: select lang in calendar page
olegpl1993 Feb 11, 2023
3e30582
feat: create calendar week component
olegpl1993 Feb 12, 2023
6622a3e
feat: week layout
olegpl1993 Feb 12, 2023
6065d34
feat: week layout
olegpl1993 Feb 12, 2023
c35655c
Draggable item (#8)
Buffik Feb 13, 2023
4846f21
feat: function getWeek
olegpl1993 Feb 13, 2023
073d6c1
Merge branch 'develop' of https://github.com/Buffik/rs-clone into cal…
olegpl1993 Feb 14, 2023
6e0704a
feat: select week button
olegpl1993 Feb 14, 2023
fac4fea
feat: selected week and day of week
olegpl1993 Feb 14, 2023
18b4ca2
feat: add auth and users (partially) services
dinara-n Feb 15, 2023
c4734a8
feat: add user authentification
dinara-n Feb 15, 2023
e03e1ad
feat: map tasks for render card
olegpl1993 Feb 15, 2023
1726e6c
fix: fetch correct date
olegpl1993 Feb 15, 2023
a1b4f77
feat: render percent complit task
olegpl1993 Feb 15, 2023
74f1f00
feat: moved fonction to calendar week helper
olegpl1993 Feb 15, 2023
a14827b
feat: helper for calendar
olegpl1993 Feb 15, 2023
9a9195a
feat: add services and types for server interaction
dinara-n Feb 16, 2023
c59ad79
feat: add fetching users and contacts
dinara-n Feb 16, 2023
ab5101c
fix: fix the code according to teammates' comments
dinara-n Feb 16, 2023
38864ff
feat: add TodoTypes enum
dinara-n Feb 16, 2023
5f91838
Merge pull request #9 from Buffik/api-and-authentification
dinara-n Feb 16, 2023
ad23206
feat: change local server to deployed
olegpl1993 Feb 16, 2023
87e1c2d
feat: calendar select lang
olegpl1993 Feb 16, 2023
56d7972
feat: fix fetchTodosByDay return type
olegpl1993 Feb 16, 2023
b013729
feat: rus noTasks
olegpl1993 Feb 16, 2023
2f4e11c
Update src/api/api.ts
olegpl1993 Feb 17, 2023
23df7a2
fix: all reviewed request
olegpl1993 Feb 17, 2023
08be58d
Merge pull request #10 from Buffik/calendar
olegpl1993 Feb 17, 2023
c3b5068
feat: add downloading most data on login and getting updates from ser…
dinara-n Feb 18, 2023
887e7a6
Todos logic (#11)
Buffik Feb 19, 2023
ae8ef55
Merge branch 'develop' into event-source
dinara-n Feb 19, 2023
a2af980
fix: drag logic after showing modal, bug with modal render (#12)
Buffik Feb 19, 2023
204b7b8
fix: make minor edits
dinara-n Feb 19, 2023
7f372cf
fix: change server url from local
dinara-n Feb 19, 2023
f114aff
fix: make minor edit
dinara-n Feb 19, 2023
a9c7afe
fix: remove code in comments
dinara-n Feb 19, 2023
09a7fa2
Merge pull request #13 from Buffik/event-source
dinara-n Feb 19, 2023
d836171
refactor: refactor subscribe function, api and dataReducer
dinara-n Feb 19, 2023
4f1b06f
refactor: add getting companies for todos modal from state and remove…
dinara-n Feb 19, 2023
b9ae26d
feat: create layout contact page
olegpl1993 Feb 19, 2023
99a0093
feat: row dividers
olegpl1993 Feb 19, 2023
76abe2e
Merge pull request #14 from Buffik/event-source
dinara-n Feb 19, 2023
251c63b
feat: create open modal windows
olegpl1993 Feb 19, 2023
c887b47
feat: addContact modal component
olegpl1993 Feb 19, 2023
1ac9b8d
feat: name validation
olegpl1993 Feb 19, 2023
e7ddf20
Merge branch 'develop' of https://github.com/Buffik/rs-clone into con…
olegpl1993 Feb 19, 2023
01f60fe
fix: random key
olegpl1993 Feb 19, 2023
6429c9f
fix: mui modal ref error
olegpl1993 Feb 19, 2023
e18577f
feat: Surname and Patronymic inputs
olegpl1993 Feb 19, 2023
d04d525
feat: phone to modal
olegpl1993 Feb 20, 2023
eafd57e
feat: datePicker
olegpl1993 Feb 20, 2023
c51592a
feat: company drop list
olegpl1993 Feb 20, 2023
16f2cf4
feat: complit modalAddContact
olegpl1993 Feb 21, 2023
e2e18d2
fix: error naming AddContactReques interface
olegpl1993 Feb 21, 2023
c706f3a
feat: create Edit COntact Modal
olegpl1993 Feb 21, 2023
56886e4
feat: close modal on click Btn
olegpl1993 Feb 21, 2023
6aceab0
feat: add ru lang to contactList
olegpl1993 Feb 22, 2023
7f1cda2
Merge pull request #16 from Buffik/contacts
olegpl1993 Feb 23, 2023
75581ce
feat: create function onClikDay
olegpl1993 Feb 23, 2023
45184cf
feat: create date slice and link to task page
olegpl1993 Feb 23, 2023
8ed05ec
Todos dragdrop resize (#15)
Buffik Feb 24, 2023
336c6a7
Merge pull request #17 from Buffik/select-day
olegpl1993 Feb 24, 2023
9c6badc
feat: create Clients List Page
olegpl1993 Feb 24, 2023
c289cd5
feat: add todos to calendar (#18)
Buffik Feb 25, 2023
353af22
Merge branch 'develop' of https://github.com/Buffik/rs-clone into cli…
olegpl1993 Feb 25, 2023
b521da4
feat: Add and Edit client modals
olegpl1993 Feb 25, 2023
095e5b3
refactor: delite console.log
olegpl1993 Feb 25, 2023
175730a
feat: add styles to task page (#19)
Buffik Feb 25, 2023
f53f447
feat: add scrolling todos to the workday starting hour
dinara-n Feb 25, 2023
c9b9c61
fix: remove extra function call
dinara-n Feb 25, 2023
70a816c
feat: add inn/adress to addClientModule
olegpl1993 Feb 25, 2023
b26b707
Merge pull request #21 from Buffik/todos-scrolling
dinara-n Feb 26, 2023
fe6af1f
Merge branch 'develop' of https://github.com/Buffik/rs-clone into cli…
olegpl1993 Feb 26, 2023
00b253b
add btn delite to client edit modal
olegpl1993 Feb 26, 2023
90eeab5
feat: inn to validation client
olegpl1993 Feb 26, 2023
58022e4
feat: add fetching one todo by id
dinara-n Feb 26, 2023
3df07c6
fix: temporarily remove language enum
dinara-n Feb 26, 2023
fa61867
Merge pull request #23 from Buffik/fetching-one-todo
dinara-n Feb 26, 2023
d2cd3c3
Merge branch 'develop' of https://github.com/Buffik/rs-clone into cli…
olegpl1993 Feb 26, 2023
a690ccb
feat: search in client list
olegpl1993 Feb 26, 2023
81a8985
feat: serch by mail\adress on clients list page
olegpl1993 Feb 26, 2023
a1004b4
feat: search on contact list
olegpl1993 Feb 26, 2023
1fed20c
Merge pull request #22 from Buffik/clients-list
olegpl1993 Feb 26, 2023
0658c04
feat: create users list page layout
olegpl1993 Feb 26, 2023
ccd2fa8
feat modal add user
olegpl1993 Feb 26, 2023
bf46684
fix: bug update render state
olegpl1993 Feb 26, 2023
9b022a3
feat: edit user modal
olegpl1993 Feb 26, 2023
1eab604
Merge pull request #24 from Buffik/users
olegpl1993 Feb 26, 2023
009b954
State reset and language (#25)
dinara-n Feb 27, 2023
d4d0fdc
Calendar page new feature (#26)
Buffik Feb 27, 2023
7ef3b93
fix: fixing redirects at netlify deploy (#27)
Buffik Feb 27, 2023
21f9919
User roles handling (#28)
Buffik Feb 27, 2023
8f9c6ed
fix: fix reconnection on connect reset
dinara-n Feb 27, 2023
beb89ab
feat: add fetching todos of a specific user
dinara-n Feb 27, 2023
2879e8d
feat: make separate component for language slider
dinara-n Feb 27, 2023
e18e9fb
Show delete data (#29)
Buffik Feb 27, 2023
914b0a5
Refactor todos page (#30)
Buffik Feb 27, 2023
f593ab2
fix: changing language in all components (#31)
Buffik Feb 27, 2023
0c9debd
fix: make some changes on auth page and nav bar
dinara-n Feb 27, 2023
0404381
Merge branch 'develop' into auth-page
dinara-n Feb 27, 2023
4b5b4d1
fix: fix formatting in AddUserModal
dinara-n Feb 27, 2023
9dafccb
Merge pull request #32 from Buffik/auth-page
dinara-n Feb 27, 2023
40c0f06
feat: add col sellers
olegpl1993 Feb 27, 2023
63da629
feat: add error delete if user has companys
olegpl1993 Feb 27, 2023
c3504b0
fix: conflict
olegpl1993 Feb 27, 2023
78fdc0b
Merge pull request #33 from Buffik/salesman-company
olegpl1993 Feb 27, 2023
0a3b63b
fix: searching logic at Clients and Employees deleted data page (#34)
Buffik Feb 27, 2023
25cf479
feat: add modal to update profile data
dinara-n Feb 27, 2023
46b5c5c
fix: adjust styles
dinara-n Feb 27, 2023
33f94cf
Merge pull request #35 from Buffik/user-profile
dinara-n Feb 27, 2023
5d4b7d3
fix: make minor fixes
dinara-n Feb 27, 2023
e685ce6
Merge pull request #36 from Buffik/fixes
dinara-n Feb 27, 2023
84a642b
Fix date resize (#37)
Buffik Mar 3, 2023
38bcd08
fix: fix profile updating
dinara-n Mar 3, 2023
d704bc0
fix: update favicon
dinara-n Mar 3, 2023
d477189
fix: update bg-color
dinara-n Mar 3, 2023
ce84be5
fix: change wording
dinara-n Mar 3, 2023
e918ad4
refactor: remove console.logs
dinara-n Mar 3, 2023
cb87fb4
fix: change api url back to deploy
dinara-n Mar 3, 2023
9edb9f5
fix: fix languages mix-up
dinara-n Mar 3, 2023
ef73a11
Merge pull request #38 from Buffik/fix-profile-etc
dinara-n Mar 4, 2023
4009f80
Update api.ts
Buffik Apr 6, 2023
8278627
Update README.md
Buffik Apr 9, 2023
cfb6ef1
Update README.md
Buffik Apr 9, 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
49 changes: 49 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"env": {
"browser": true,
"es2021": true,
"jest": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"airbnb"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2022,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"import/extensions": [
1,
"ignorePackages",
{
"ts": "never",
"tsx": "never"
}
],
"react/react-in-jsx-scope": "off",
"react/jsx-filename-extension": [
1,
{ "extensions": [".js", ".jsx", "ts", "tsx"] }
],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
"react/jsx-one-expression-per-line": "off",
"no-shadow": "off",
"@typescript-eslint/no-shadow": "error"
},
"settings": {
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
}
}
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,26 @@ dist

# TernJS port file
.tern-port
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 80,
"endOfLine": "auto",
"bracketSpacing": true
}
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# RS-Clone
## RS-clone
### [Подробное описание](https://github.com/Buffik/rs-clone/pull/39)

#### Для входа: b@gmail.com - менеджер, d@gmail.com - продавец. Пароли у всех 123321123
Loading