Skip to content
Merged

Dev #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
f1b6607
delete README.md
capti May 6, 2025
763ffb6
сreate README.md
capti May 6, 2025
75dc1d8
Merge pull request #4 from capti/main
capti May 6, 2025
24554a4
Merge pull request #5 from capti/main
capti May 12, 2025
d30a2aa
Merge pull request #8 from capti/main
capti May 13, 2025
bc16c5e
FCCX-90 add card_model, update api_service
birbik May 16, 2025
f4886ef
FCCX-73 add shop_model
birbik May 16, 2025
1638081
FCCX-91 update profile_screen
birbik May 16, 2025
52119ef
FCCX-92 update settings_screen
birbik May 16, 2025
8424915
FCCX-92 add icon achievement
birbik May 16, 2025
ccfcd02
FCCX-70 update page switching
birbik May 16, 2025
298d2f9
FCCX-93 update user search
birbik May 16, 2025
481f161
FCCX-110 add achievements
dobrayAnika May 17, 2025
1f32fb9
FCCX-110 update achievements_screen
dobrayAnika May 17, 2025
61f981e
FCCX-111 update news_datail_screen
dobrayAnika May 17, 2025
e3eb316
FCCX-112 add profile_image_dialog
dobrayAnika May 17, 2025
db25c10
FCCX-115 add shop and exchanges screens
danil13231212341 May 18, 2025
67dcf0d
FCCX-116 update quests_screen
birbik May 18, 2025
2673933
FCCX-115 add create exchange
danil13231212341 May 18, 2025
6beb139
FCCX-115 add exchange details
danil13231212341 May 19, 2025
5949fc9
FCCX-117 add profile other user, report screen
birbik May 19, 2025
bc43689
FCCX-119 add inventory other user
birbik May 19, 2025
da04e6b
FCCX-120 add detailed viewing of another user's card
birbik May 19, 2025
850b9ea
FCCX-120 update card detail screen
birbik May 19, 2025
52c8567
FCCX-119 update inventory screen, update tabbar in shop and exchanges…
birbik May 20, 2025
7a46fe8
FCCX-121 Speeding up Docker image builds
capti May 21, 2025
6e55304
FCCX-125 update screens
birbik May 21, 2025
600f86d
FCCX-126 add exchange proposal screen
birbik May 21, 2025
ba81b3f
FCCX-127 add authorization dialog
birbik May 21, 2025
db7f2ef
FCCX-128 add notifications screen
birbik May 22, 2025
b8c48af
FCCX-129 add ability to swap cards from inventory
birbik May 22, 2025
40545a7
FCCX-130 update fonts and colors
birbik May 22, 2025
022dbaa
FCCX-131 add ability to view collections from “Home”
birbik May 22, 2025
c852d9d
FCCX-132 update exchange creation from inventory
birbik May 23, 2025
6ec37dc
FCCX-135 update displaying favorite cards in the profile
birbik May 24, 2025
d64d2ef
FCCX-136 update displaying text in the detailed view of the exchange
birbik May 24, 2025
b6f42d0
FCCX-138 update location of tooltips and color in the settings
birbik May 24, 2025
663839c
FCCX-139 update logic of the navbar
birbik May 24, 2025
a066844
FCCX-140 update store logic
birbik May 24, 2025
d7598a7
FCCX-141 remove profile, search and notification icons
birbik May 24, 2025
5cd6ccd
init commit
birbik May 31, 2025
75f179a
FCCX-145 update structure and yet others updates
capti Jun 1, 2025
7f22a5e
Merge pull request #10 from capti/dev3
capti Jun 2, 2025
75349c1
FCCX-149 connect backend and frontend(registration)
birbik Jun 2, 2025
a9004d5
FCCX-150 Rewrite auth
capti Jun 3, 2025
fd47241
Merge pull request #11 from capti/dev3
capti Jun 3, 2025
c36fc1b
FCCX-151 fix frontend
birbik Jun 3, 2025
a69d8c7
FCCX-153 add yandex appmetrica and some fixes
capti Jun 3, 2025
6e615cc
FCCX-153 add yandex appmetrica
capti Jun 3, 2025
a193709
delete .DS_Store
capti Jun 3, 2025
09f3962
FCCX-153 add metrics
capti Jun 3, 2025
f5b24c5
Merge branch 'dev2' of https://github.com/capti/Cardly into dev2
capti Jun 3, 2025
4ed85de
FCCX-153 add some metrics for future
capti Jun 3, 2025
1b3a4d9
FCCX-80 Created adminpanel
capti Jun 4, 2025
7c7fb95
Merge pull request #12 from capti/dev3
capti Jun 4, 2025
aa2949c
fixing some mistakes
capti Jun 4, 2025
e744f4b
Merge pull request #13 from capti/dev2
capti Jun 4, 2025
bbf651d
FCCX-94 add trades
capti Jun 4, 2025
7d30c72
some fixes
capti Jun 4, 2025
2c8678e
add inventory more implementations
capti Jun 4, 2025
39e3a79
Merge pull request #14 from capti/dev3
capti Jun 4, 2025
308861e
revert changes InventoryController
capti Jun 4, 2025
4656e95
Merge pull request #15 from capti/dev3
capti Jun 4, 2025
eb44e7f
update README
capti Jun 4, 2025
b6bf0b6
Merge pull request #16 from capti/dev2
capti Jun 4, 2025
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
Binary file removed .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vscode/
Loading
Loading