Scipaper/front-end
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
156 Commits 1 Branch 0 Tags
Commit Graph

156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximus
29c5ec0f3e Merge branch 'fix/unnecessary-files' into myCheck/working-develop 2022-08-20 10:35:49 +03:00
Maximus
3421670619 Merge branch 'fix/base-layout-schema' into myCheck/working-develop 2022-08-20 10:35:18 +03:00
Maximus
f7ce6f0a07 delete unnecessary logotype 2022-08-20 10:34:08 +03:00
Maximus
8d2036207e Merge branch 'fix/return-app' into develop 2022-08-20 10:19:13 +03:00
Maximus
adf23f3b8f fix errors with import footer 2022-08-19 22:56:31 +03:00
Denis Gorbunov
c7af2deb9c Merge pull request 'added new icons, remove repetable icons, modified icon-factory' (#93) from fix/icon-factory into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/93
 2022-08-19 19:02:24 +00:00
Denis Gorbunov
b6ba21be7d Merge pull request 'fix/base-layout-schema' (#91) from fix/base-layout-schema into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/91
 2022-08-19 19:02:16 +00:00
Maximus
4c44a1ba2d Merge branch 'fix/icon-factory' into fix/return-app 2022-08-19 19:55:49 +03:00
Maximus
fba6faecd2 Merge branch 'fix/base-layout-schema' into fix/return-app 2022-08-19 19:55:38 +03:00
Maximus
4b9ce789f7 return of App.tsx 2022-08-19 19:49:34 +03:00
maximus
79f89fac3f Merge branch 'develop' into fix/base-layout-schema 2022-08-19 16:29:36 +00:00
Maximus
44de4f1195 added new icons, remove repetable icons, modified icon-factory 2022-08-19 19:24:59 +03:00
Maximus
dec8bce3e3 exactly added Footer and Header to base layout 2022-08-19 17:17:59 +03:00
Denis Gorbunov
a314782acb Merge pull request 'feature/add-featured-articles-section' (#87) from feature/add-featured-articles-section into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/87
 2022-08-19 14:09:00 +00:00
decamel
79f015c5b0 Merge branch 'develop' into feature/add-featured-articles-section 2022-08-19 17:08:47 +03:00
Maximus
d38f76c38f added Footer and Header to base layout 2022-08-19 17:08:02 +03:00
Denis Gorbunov
2dcdfda4bf Merge pull request 'added possibility to turn off paddings of button' (#89) from fix/button-component into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/89
 2022-08-19 14:07:37 +00:00
Denis Gorbunov
f3b757937b Merge pull request 'feature/all-card-components' (#86) from feature/all-card-components into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/86
 2022-08-19 14:07:06 +00:00
Denis Gorbunov
9abdabf66b Merge pull request 'feature/header' (#85) from feature/header into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/85
 2022-08-19 14:06:21 +00:00
Maximus
246aa98a73 added possibility to turn off paddings of button 2022-08-19 17:01:05 +03:00
Maximus
037fa4e92b added featured categories section 2022-08-19 16:49:46 +03:00
Maximus
965892818e added category card component 2022-08-19 13:29:05 +03:00
“Salar
4dd580c53f Other unwanted files have been removed from header branch 2022-08-18 14:23:36 +03:00
“Salar
41726d47ac Photos have been removed from the header branch 2022-08-18 14:13:15 +03:00
“Salar
dafbb444be Header with the navbar files - without additional files 2022-08-18 14:03:08 +03:00
Maximus
977da92786 modified icons factory added new icons 2022-08-18 13:19:37 +03:00
“Salar
3671d3d5bc Merge branch 'develop' into feature/header 2022-08-18 13:13:45 +03:00
Denis Gorbunov
eb7205025c Merge pull request 'Dropdown has been modified - Button converted to Link' (#84) from fix/dropdown into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/84
 2022-08-18 09:53:36 +00:00
Denis Gorbunov
13cbdfd46d Merge pull request 'added RouterLink component setup route system' (#81) from feature/add-routes into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/81
 2022-08-18 09:53:18 +00:00
Denis Gorbunov
68cfb61a1d Merge pull request 'Create footer' (#83) from feature/footer into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/83
 2022-08-18 09:53:09 +00:00
“Salar
e8f8777fa8 Unimportant comments have been removed 2022-08-18 12:22:41 +03:00
Maximus
f1cbc0bae7 Merge branch 'feature/add-routes' into feature/add-featured-articles-section 2022-08-18 12:01:56 +03:00
Maximus
f56ae41235 modified footer add router and default link 2022-08-18 11:39:50 +03:00
Maximus
b82eb8290b modified router link 2022-08-18 11:34:36 +03:00
Maximus
d21ed03508 closed issue #82 - add information pages mention in footer and routes to them 2022-08-18 11:32:18 +03:00
“Salar
f39f7ab4cd Dropdown has been modified - Button converted to Link 2022-08-17 20:29:00 +03:00
Maximus
414e7e62d8 closed #62 Created footer 2022-08-17 18:53:07 +03:00
Maximus
fd3ef3fb9c added RouterLink component setup route system 2022-08-17 16:56:37 +03:00
“Salar
f082b4ce47 Merge branch 'develop' into feature/header 2022-08-17 13:01:17 +03:00
“Salar
02d7781ca7 header App.tsx 2022-08-17 12:56:34 +03:00
“Salar
2e5e57550c header without dropdown 2022-08-17 12:55:39 +03:00
Denis Gorbunov
43163a19b2 Merge pull request 'DropDownMenu without Storybook' (#74) from DropDownMenu into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/74
 2022-08-16 19:52:32 +00:00
Denis Gorbunov
5c793cd813 Merge pull request 'Closed issue #65 Implemented Modal BottomSheetBar' (#75) from feature/modal-bottom-sheet-bar into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/75
 2022-08-16 19:25:02 +00:00
decamel
044739fd31 Merge branch 'develop' of http://85.143.176.51:3000/free-land/front-end into feature/modal-bottom-sheet-bar 2022-08-16 22:24:40 +03:00
Denis Gorbunov
218220d672 Merge pull request 'Change favicon' (#76) from Change-favicon into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/76
 2022-08-16 19:21:11 +00:00
Denis Gorbunov
a4a554fa69 Merge pull request 'added inter fonts from design' (#78) from feature/add-fonts into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/78
 2022-08-16 19:20:08 +00:00
Denis Gorbunov
bf76f9b7e0 Merge pull request 'Input group - Add a new style' (#79) from feature/Input-group into develop 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/79
 2022-08-16 19:19:44 +00:00
“Salar
bdb87d715a Merge branch 'develop' of http://85.143.176.51:3000/free-land/front-end into feature/checkbox 2022-08-16 13:20:08 +03:00
“Salar
ca39dc42bf Input group - Add a new style 2022-08-16 13:06:20 +03:00
Maximus
211b7230ab added inter fonts from design 2022-08-16 12:28:56 +03:00