Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aastu.web.g2.mahfouz.cards backend #2268

Open
wants to merge 622 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
622 commits
Select commit Hold shift + click to select a range
2c8faa0
finalized on dashboard
young-anakin Aug 22, 2024
19b8f0a
finalized on dashboard
young-anakin Aug 22, 2024
df81f1c
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 22, 2024
04a787d
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 22, 2024
c4ee057
Merge pull request #1439 from RealEskalate/aastu.web.g2.miheret.desig…
rebumatadele Aug 22, 2024
88379fb
Merge pull request #1439 from RealEskalate/aastu.web.g2.miheret.desig…
rebumatadele Aug 22, 2024
968c0aa
sign in and loaders issue fixed
rebumatadele Aug 22, 2024
6332029
sign in and loaders issue fixed
rebumatadele Aug 22, 2024
66293e8
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 22, 2024
6f551ed
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 22, 2024
e4c325f
done with the loaders
rebumatadele Aug 22, 2024
6796ac6
done with the loaders
rebumatadele Aug 22, 2024
06c10bc
finalized on dashboard
young-anakin Aug 22, 2024
25b5832
finalized on dashboard
young-anakin Aug 22, 2024
d5709b1
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 22, 2024
feb86b1
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 22, 2024
a68ec1e
saving
rebumatadele Aug 22, 2024
613d95e
saving
rebumatadele Aug 22, 2024
89f7c50
Merge pull request #1590 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 22, 2024
2b2753d
Merge pull request #1590 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 22, 2024
e7bdd02
Modified Credit Cards Page
MTA2002 Aug 22, 2024
b568860
Modified Credit Cards Page
MTA2002 Aug 22, 2024
6cb6fce
made changes to the edit profile
rebumatadele Aug 22, 2024
bc3ff75
made changes to the edit profile
rebumatadele Aug 22, 2024
253001c
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 22, 2024
51cebff
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 22, 2024
89c797c
Modified Credit Cards Page
MTA2002 Aug 22, 2024
80cc6b7
Modified Credit Cards Page
MTA2002 Aug 22, 2024
fd93b29
Merge pull request #1622 from RealEskalate/aastu.web.g2.mahfouz.cards…
rebumatadele Aug 22, 2024
b8d51b1
Merge pull request #1622 from RealEskalate/aastu.web.g2.mahfouz.cards…
rebumatadele Aug 22, 2024
e54c6d2
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 22, 2024
883f3ab
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 22, 2024
28766de
fixed search bar
rebumatadele Aug 22, 2024
5040ad0
fixed search bar
rebumatadele Aug 22, 2024
87fe056
pull
Miheret-Girmachew Aug 22, 2024
f44ea70
pull
Miheret-Girmachew Aug 22, 2024
86a646f
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 22, 2024
cc6fd52
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 22, 2024
251a3c4
finalize settings
Miheret-Girmachew Aug 22, 2024
390b9e9
finalize settings
Miheret-Girmachew Aug 22, 2024
688460c
my changes
Miheret-Girmachew Aug 22, 2024
463f295
my changes
Miheret-Girmachew Aug 22, 2024
75ae313
update on settings
Miheret-Girmachew Aug 23, 2024
10506c1
update on settings
Miheret-Girmachew Aug 23, 2024
0e689e0
update on setting page
Miheret-Girmachew Aug 23, 2024
c89803f
update on setting page
Miheret-Girmachew Aug 23, 2024
fd54d5e
middleware implimented
rebumatadele Aug 23, 2024
489102c
middleware implimented
rebumatadele Aug 23, 2024
e3afb2a
fixed the middleware build issue
rebumatadele Aug 23, 2024
7938ab4
fixed the middleware build issue
rebumatadele Aug 23, 2024
33666db
Merge pull request #1692 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 23, 2024
4d97f52
Merge pull request #1692 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 23, 2024
5ca4777
Modified Credit Cards
MTA2002 Aug 23, 2024
6ecad96
Modified Credit Cards
MTA2002 Aug 23, 2024
37c9141
Modied URL
MTA2002 Aug 23, 2024
a098c25
Modied URL
MTA2002 Aug 23, 2024
38c2c1b
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 23, 2024
34156ce
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 23, 2024
6e6d9eb
updates on API pushed
young-anakin Aug 23, 2024
3455779
updates on API pushed
young-anakin Aug 23, 2024
5ea3d7a
Merge pull request #1705 from RealEskalate/aastu.web.g2.mahfouz.cards…
rebumatadele Aug 23, 2024
ccf84b9
Merge pull request #1705 from RealEskalate/aastu.web.g2.mahfouz.cards…
rebumatadele Aug 23, 2024
4b78438
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
9b307f6
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
902ff28
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
e5ecd07
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
39766be
shmer
Samuels5 Aug 23, 2024
62cd13e
shmer
Samuels5 Aug 23, 2024
8b6f2c9
Merge pull request #1715 from RealEskalate/aastu.web.g2.samuel.loans
rebumatadele Aug 23, 2024
9126654
Merge pull request #1715 from RealEskalate/aastu.web.g2.samuel.loans
rebumatadele Aug 23, 2024
3d59fcb
Added Dark Mode
MTA2002 Aug 23, 2024
538ea56
Added Dark Mode
MTA2002 Aug 23, 2024
592e86b
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 23, 2024
a5da9b9
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 23, 2024
3f0d4e0
loans
Samuels5 Aug 23, 2024
c20401e
loans
Samuels5 Aug 23, 2024
55f122e
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 23, 2024
dba9052
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 23, 2024
748740e
Merge pull request #1762 from RealEskalate/aastu.web.g2.samuel.loans
MTA2002 Aug 23, 2024
d29c92c
Merge pull request #1762 from RealEskalate/aastu.web.g2.samuel.loans
MTA2002 Aug 23, 2024
cca2597
Added Dark Mode
MTA2002 Aug 23, 2024
2f60328
Added Dark Mode
MTA2002 Aug 23, 2024
5e68a04
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 23, 2024
85fab83
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 23, 2024
2534751
Merge pull request #1768 from RealEskalate/aastu.web.g2.mahfouz.cards…
young-anakin Aug 23, 2024
c1c125c
Merge pull request #1768 from RealEskalate/aastu.web.g2.mahfouz.cards…
young-anakin Aug 23, 2024
2e5bcc6
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
173e179
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
c50f24b
resolving merge comnflict
young-anakin Aug 23, 2024
70df434
resolving merge comnflict
young-anakin Aug 23, 2024
7e2cd4e
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mike.quick_transfer
young-anakin Aug 23, 2024
22799b3
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mike.quick_transfer
young-anakin Aug 23, 2024
211b4cd
Merge pull request #1728 from RealEskalate/aastu.web.g2.mike.quick_tr…
young-anakin Aug 23, 2024
2b18e0d
Merge pull request #1728 from RealEskalate/aastu.web.g2.mike.quick_tr…
young-anakin Aug 23, 2024
d2583b4
logout and progress bar implimented
rebumatadele Aug 23, 2024
b9faadc
logout and progress bar implimented
rebumatadele Aug 23, 2024
c8b7cbd
push
rebumatadele Aug 23, 2024
30d7260
push
rebumatadele Aug 23, 2024
fe52ec9
Merge pull request #1810 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 23, 2024
2fd7ecc
Merge pull request #1810 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 23, 2024
8e40d1c
fix on quick transfer
young-anakin Aug 23, 2024
f0b19be
fix on quick transfer
young-anakin Aug 23, 2024
9622274
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
9dceb5b
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 23, 2024
94555ab
shimer of investment
Samuels5 Aug 23, 2024
fe9c713
shimer of investment
Samuels5 Aug 23, 2024
774df35
Merge pull request #1826 from RealEskalate/aastu.web.g2.mike.quick_tr…
MTA2002 Aug 23, 2024
5163a83
Merge pull request #1826 from RealEskalate/aastu.web.g2.mike.quick_tr…
MTA2002 Aug 23, 2024
742c054
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 23, 2024
5c739e8
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 23, 2024
281b92d
conflicting push
rebumatadele Aug 23, 2024
9d80f1e
conflicting push
rebumatadele Aug 23, 2024
d1f4b17
Merge pull request #1855 from RealEskalate/aastu.web.g2.rebuma.api_in…
Miheret-Girmachew Aug 23, 2024
9430902
Merge pull request #1855 from RealEskalate/aastu.web.g2.rebuma.api_in…
Miheret-Girmachew Aug 23, 2024
5bfd4e7
adding
Samuels5 Aug 23, 2024
9a6d671
adding
Samuels5 Aug 23, 2024
d6ae65c
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 23, 2024
7cb9c9f
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 23, 2024
66c506c
adding shimer
Samuels5 Aug 23, 2024
3bae1b1
adding shimer
Samuels5 Aug 23, 2024
00d44be
global.css edited
rebumatadele Aug 23, 2024
a3327a6
global.css edited
rebumatadele Aug 23, 2024
0d541d9
Merge pull request #1883 from RealEskalate/aastu.web.g2.samuel.loans
MTA2002 Aug 23, 2024
66e2d0e
Merge pull request #1883 from RealEskalate/aastu.web.g2.samuel.loans
MTA2002 Aug 23, 2024
9c31f29
Merge pull request #1887 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 23, 2024
a0da441
Merge pull request #1887 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 23, 2024
338482b
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 23, 2024
6a969e7
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 23, 2024
bf3e809
my changes
Miheret-Girmachew Aug 23, 2024
726566d
my changes
Miheret-Girmachew Aug 23, 2024
212da1b
finalize setting
Miheret-Girmachew Aug 23, 2024
03543f5
finalize setting
Miheret-Girmachew Aug 23, 2024
6cfeaed
Nothing changed
Miheret-Girmachew Aug 23, 2024
ab5853d
Nothing changed
Miheret-Girmachew Aug 23, 2024
fc7cc12
i dont even know what this is
Miheret-Girmachew Aug 23, 2024
bff2e81
Merge pull request #1620 from RealEskalate/aastu.web.g2.miheret.desig…
rebumatadele Aug 23, 2024
cf19ccd
i dont even know what this is
Miheret-Girmachew Aug 23, 2024
d649731
Merge pull request #1620 from RealEskalate/aastu.web.g2.miheret.desig…
rebumatadele Aug 23, 2024
a559fd4
edited the url links
rebumatadele Aug 24, 2024
3f34597
edited the url links
rebumatadele Aug 24, 2024
6b587ae
Merge pull request #1931 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 24, 2024
1fc2ced
Merge pull request #1931 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 24, 2024
cc888d5
Merge pull request #1945 from RealEskalate/aastu.web.g2.miheret.trans…
rebumatadele Aug 24, 2024
da0e538
commiting my changes
rebumatadele Aug 24, 2024
68b6304
commiting my changes
rebumatadele Aug 24, 2024
f7a91f9
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 24, 2024
3cccb3c
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 24, 2024
7d9798d
Modeified Cards
MTA2002 Aug 24, 2024
6a2993c
Modeified Cards
MTA2002 Aug 24, 2024
4354528
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 24, 2024
f36882e
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 24, 2024
19641f3
Merge pull request #1987 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 24, 2024
90e87a0
Merge pull request #1987 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 24, 2024
24c9732
changed url
Samuels5 Aug 24, 2024
469a701
changed url
Samuels5 Aug 24, 2024
f840ff9
Merge pull request #1992 from RealEskalate/aastu.web.g2.samuel.loans
rebumatadele Aug 24, 2024
5166d1e
Merge pull request #1992 from RealEskalate/aastu.web.g2.samuel.loans
rebumatadele Aug 24, 2024
a7f3fca
made changes to the Refresh Token
rebumatadele Aug 24, 2024
e967860
made changes to the Refresh Token
rebumatadele Aug 24, 2024
36e9518
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 24, 2024
d5682b1
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 24, 2024
f61c56b
Merge pull request #1996 from RealEskalate/aastu.web.g2.rebuma.api_in…
Samuels5 Aug 24, 2024
41e6cb9
Merge pull request #1996 from RealEskalate/aastu.web.g2.rebuma.api_in…
Samuels5 Aug 24, 2024
27fcc5f
pagination
Samuels5 Aug 24, 2024
ee30411
pagination
Samuels5 Aug 24, 2024
fda8365
pagnation
Samuels5 Aug 24, 2024
adbd691
pagnation
Samuels5 Aug 24, 2024
ed59bda
pagning
Samuels5 Aug 24, 2024
04663e8
pagning
Samuels5 Aug 24, 2024
2ba0ce0
Merge pull request #2045 from RealEskalate/aastu.web.g2.samuel.loans
MTA2002 Aug 24, 2024
ec83b7b
Merge pull request #2045 from RealEskalate/aastu.web.g2.samuel.loans
MTA2002 Aug 24, 2024
50753bc
pull
Miheret-Girmachew Aug 24, 2024
76681a6
pull
Miheret-Girmachew Aug 24, 2024
3ed88dd
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 24, 2024
f2794ac
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 24, 2024
8a22c13
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 24, 2024
8fbad0b
Merge pull request #1945 from RealEskalate/aastu.web.g2.miheret.trans…
rebumatadele Aug 24, 2024
79b0234
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 24, 2024
629af7a
pulling
Miheret-Girmachew Aug 25, 2024
09978e8
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 25, 2024
0489e6e
complited working on edit profile
rebumatadele Aug 25, 2024
c897792
complited working on edit profile
rebumatadele Aug 25, 2024
e7e11e0
done working on my pages
rebumatadele Aug 25, 2024
37df5c3
done working on my pages
rebumatadele Aug 25, 2024
d0de2ea
I am done working on my pages and the profile including dynamically f…
rebumatadele Aug 25, 2024
0f30466
I am done working on my pages and the profile including dynamically f…
rebumatadele Aug 25, 2024
cc8ce0b
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 25, 2024
35cf447
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 25, 2024
6f53029
I am done working on my pages and the profile including dynamically f…
rebumatadele Aug 25, 2024
a11bf69
I am done working on my pages and the profile including dynamically f…
rebumatadele Aug 25, 2024
cf1704d
Merge pull request #2110 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 25, 2024
b5cfe9b
Merge pull request #2110 from RealEskalate/aastu.web.g2.rebuma.api_in…
MTA2002 Aug 25, 2024
559c423
pull required
young-anakin Aug 25, 2024
4176867
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 25, 2024
68a9e3c
Merge branch 'aastu.web.g2.main' into aastu.web.g2.mahfouz.cards_backend
MTA2002 Aug 25, 2024
b054547
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 25, 2024
d24191d
functionality
Samuels5 Aug 25, 2024
86281b3
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 25, 2024
1bb1290
Finalized Credit Cards and Settings Page
MTA2002 Aug 25, 2024
82d0251
Finalized Credit Cards and Settings Page
MTA2002 Aug 25, 2024
fdedb4c
Finalized Credit Cards and Settings Page
MTA2002 Aug 25, 2024
07d7186
Finalized Credit Cards and Settings Page
MTA2002 Aug 25, 2024
0745068
push
Miheret-Girmachew Aug 26, 2024
df4092a
done with signup page
rebumatadele Aug 26, 2024
1b0564c
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 26, 2024
abdc88f
Merge branch 'aastu.web.g2.rebuma.api_integration' of https://github.…
rebumatadele Aug 26, 2024
1261502
Merge pull request #2197 from RealEskalate/aastu.web.g2.rebuma.api_in…
Samuels5 Aug 26, 2024
c946ae8
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 26, 2024
245ed08
my message
rebumatadele Aug 26, 2024
2212466
Merge pull request #2202 from RealEskalate/aastu.web.g2.samuel.loans
Miheret-Girmachew Aug 26, 2024
014ea77
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 26, 2024
da1640d
adding functionality
Samuels5 Aug 26, 2024
d974fe4
Merge pull request #2208 from RealEskalate/aastu.web.g2.samuel.loans
rebumatadele Aug 26, 2024
726e72c
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 26, 2024
73e83a2
Merge pull request #2215 from RealEskalate/aastu.web.g2.miheret.trans…
rebumatadele Aug 26, 2024
d2f4034
Merge branch 'aastu.web.g2.main' into aastu.web.g2.rebuma.api_integra…
rebumatadele Aug 26, 2024
fe156e6
final update
young-anakin Aug 26, 2024
4b88f2d
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 26, 2024
ee2ac1e
adding
Samuels5 Aug 26, 2024
b8c6147
pushing
rebumatadele Aug 26, 2024
90e3c86
Merge pull request #2233 from RealEskalate/aastu.web.g2.rebuma.api_in…
young-anakin Aug 26, 2024
6a56941
final updates
young-anakin Aug 26, 2024
eb46682
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 26, 2024
819f91d
final updates
young-anakin Aug 26, 2024
9c13abb
adding
Samuels5 Aug 26, 2024
cef200d
Merge pull request #2235 from RealEskalate/aastu.web.g2.miheret.trans…
rebumatadele Aug 26, 2024
4e10d52
Merge branch 'aastu.web.g2.main' into aastu.web.g2.samuel.loans
Samuels5 Aug 26, 2024
6038b87
my changes
Samuels5 Aug 26, 2024
4084837
Merge pull request #2236 from RealEskalate/aastu.web.g2.samuel.loans
rebumatadele Aug 26, 2024
45c437a
yes
young-anakin Aug 26, 2024
f445353
new update
young-anakin Aug 26, 2024
3898a04
final update
young-anakin Aug 26, 2024
d3c7778
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
MTA2002 Aug 26, 2024
ebef9a7
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
young-anakin Aug 26, 2024
b2c9994
Merge branch 'aastu.web.g2.mahfouz.cards_backend' of https://github.c…
MTA2002 Aug 26, 2024
2573537
Merge pull request #2238 from RealEskalate/aastu.web.g2.mike.quick_tr…
rebumatadele Aug 26, 2024
357a3b7
Resolved
MTA2002 Aug 26, 2024
0da812c
pull
Miheret-Girmachew Aug 26, 2024
6c06741
pull
Miheret-Girmachew Aug 26, 2024
0da569c
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 26, 2024
e348347
pushing last code
Miheret-Girmachew Aug 26, 2024
5501eeb
pulling
Miheret-Girmachew Aug 26, 2024
9217e58
Merge branch 'aastu.web.g2.main' of https://github.com/RealEskalate/a…
Miheret-Girmachew Aug 26, 2024
11f0001
accept
Miheret-Girmachew Aug 26, 2024
afd64de
done with the transaction and bank settings
Miheret-Girmachew Aug 26, 2024
7a29e4a
pushing
Miheret-Girmachew Aug 26, 2024
ae92447
Merge branch 'aastu.web.g2.main' into aastu.web.g2.miheret.transactions
Miheret-Girmachew Aug 26, 2024
480d985
last push
Miheret-Girmachew Aug 26, 2024
4d1bb61
Merge branch 'aastu.web.g2.main' into aastu.web.g2.miheret.transactions
Miheret-Girmachew Aug 26, 2024
9a480d9
Merge pull request #2254 from RealEskalate/aastu.web.g2.miheret.trans…
rebumatadele Aug 26, 2024
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
3 changes: 3 additions & 0 deletions web/AASTU-web-group-2/a2sv-banking-system/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "next/core-web-vitals"
}
36 changes: 36 additions & 0 deletions web/AASTU-web-group-2/a2sv-banking-system/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
36 changes: 36 additions & 0 deletions web/AASTU-web-group-2/a2sv-banking-system/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).

## Getting Started

First, run the development server:

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.

## Learn More

To learn more about Next.js, take a look at the following resources:

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
"use client";
import { Bar, BarChart, CartesianGrid, Legend, XAxis } from "recharts";

import { Card, CardContent } from "@/components/ui/card";
import {
ChartConfig,
ChartContainer,
ChartTooltip,
ChartTooltipContent,
} from "@/components/ui/chart";
const chartData = [
{ day: "Monday", debit: 186, credit: 80 },
{ day: "Tuesday", debit: 305, credit: 200 },
{ day: "Wednesday", debit: 237, credit: 120 },
{ day: "Thursday", debit: 73, credit: 190 },
{ day: "Friday", debit: 209, credit: 130 },
{ day: "Saturday", debit: 214, credit: 140 },
{ day: "Sunday", debit: 214, credit: 140 },
];

const chartConfig = {
debit: {
label: "Debit",
color: "#1814F3", // Debit color
},
credit: {
label: "Credit",
color: "#FC7900", // Credit color
},
} satisfies ChartConfig;

const CustomLegend = (props: any) => {
const { payload } = props;

return (
<ul className="flex justify-center gap-4">
{payload.map((entry: any, index: number) => (
<li key={`item-${index}`} className="flex items-center gap-2">
<div
style={{ backgroundColor: entry.color }}
className="w-4 h-4 rounded-sm"
/>
<span className="text-sm font-medium text-[#718EBF]">
{entry.value.charAt(0).toUpperCase() + entry.value.slice(1)}
</span>
</li>
))}
</ul>
);
};

export default function BarChartForAccounts() {
return (
<Card>
<CardContent>
<ChartContainer config={chartConfig}>
<BarChart accessibilityLayer data={chartData}>
<Legend
verticalAlign="top"
align="center"
wrapperStyle={{ paddingBottom: "20px" }}
content={<CustomLegend />}
/>
<CartesianGrid vertical={false} />
<XAxis
dataKey="day"
tickLine={false}
tickMargin={10}
axisLine={false}
tickFormatter={(value) => value.slice(0, 3)}
/>
<ChartTooltip
cursor={false}
content={<ChartTooltipContent indicator="dashed" />}
/>
<Bar dataKey="debit" fill="var(--color-debit)" radius={4} />
<Bar dataKey="credit" fill="var(--color-credit)" radius={4} />
</BarChart>
</ChartContainer>
</CardContent>
</Card>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import React from "react";
import { IconType } from "react-icons";
type DataItem = {
heading: string;
text: string;
headingStyle: string;
dataStyle: string;
};

type Column = {
icon: IconType;
iconStyle: string;
data: DataItem[]; // Updated to an array of DataItem objects
};

interface Props {
column: Column;
width: string;
darkMode: string
}

const ListCard = ({ column, width, darkMode }: Props) => {
return (
<div
className={`flex gap-3 items-center rounded-2xl px-5 py-4 bg-white ${width} dark:bg-[#020817] ${darkMode}`}
>
<div className={`text-3xl px-2 py-2 rounded-full ${column.iconStyle}`}>
<column.icon />
</div>
<div className="flex justify-between w-full">
{column.data.map((item, index) => (
<div key={index}>
<div className={`${item.headingStyle} dark:text-[#9faaeb]`}>{item.heading}</div>
<div className={item.dataStyle}>{item.text}</div>
</div>
))}
</div>
</div>
);
};

export const ListCardLoading = () => {
return (
<div className="flex gap-3 items-center rounded-2xl px-5 py-4 bg-white dark:bg-[#020817] w-[48%] md:w-[23%] animate-pulse">
<div className="text-3xl px-2 py-2 rounded-xl bg-gray-200 dark:bg-[#333B69]">
<div className="w-8 h-8 bg-gray-300 dark:bg-[#555B85] rounded-full"></div>
</div>
<div className="flex justify-between w-full flex-col">
<div>
<div className="h-4 bg-gray-300 dark:bg-[#555B85] rounded w-full mb-2"></div>
<div className="h-4 bg-gray-300 dark:bg-[#555B85] rounded w-full"></div>
</div>
</div>
</div>
);
};

export default ListCard;
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import React from "react";
import { ListCardLoading } from "./ListCard";
const Loading = () => {
return (
<>
<div className="flex flex-col h-full bg-[#F5F7FA] px-3 py-3 gap-5">
<div className="flex flex-wrap gap-2">
<ListCardLoading></ListCardLoading>
<ListCardLoading></ListCardLoading>
<ListCardLoading></ListCardLoading>
<ListCardLoading></ListCardLoading>
</div>

<div className="flex flex-col md:flex-row gap-5">
<div className="flex flex-col gap-5 md:w-1/2">
<span className="text-xl bg-gray-300 font-semibold w-24 h-5 rounded-lg"></span>
<div className="bg-white flex flex-col justify-between rounded-2xl animate-pulse p-4">
<div className="w-full h-10 bg-gray-200 rounded mb-4"></div>
<div className="w-full h-10 bg-gray-200 rounded mb-4"></div>
<div className="w-full h-10 bg-gray-200 rounded mb-4"></div>
<div className="w-full h-10 bg-gray-200 rounded"></div>
</div>
</div>

<div className="md:w-1/2 gap-1 flex flex-col">
<div className="flex justify-between mr-2">
<span className="text-xl bg-gray-300 font-semibold w-24 h-5 rounded-lg"></span>
<span className="text-xl bg-gray-300 font-semibold w-10 h-5 rounded-lg"></span>
</div>
<div className="border rounded-3xl my-4 mx-2 animate-pulse">
<div className="relative w-full bg-gradient-to-b from-gray-200 to-gray-300 text-transparent rounded-3xl shadow-md h-[230px] min-w-[350px]">
<div className="flex justify-between items-start px-6 pt-6">
<div>
<p className="text-xs font-semibold bg-gray-300 rounded w-16 h-4 mb-2"></p>
<p className="text-xl font-medium bg-gray-300 rounded w-24 h-6"></p>
</div>
<div className="w-8 h-8 bg-gray-300 rounded-full"></div>
</div>

<div className="flex justify-between gap-12 mt-4 px-6">
<div>
<p className="text-xs font-medium bg-gray-300 rounded w-16 h-4 mb-2"></p>
<p className="font-medium text-base bg-gray-300 rounded w-24 h-6"></p>
</div>
<div className="pr-8">
<p className="text-xs font-medium bg-gray-300 rounded w-16 h-4 mb-2"></p>
<p className="font-medium text-base md:text-lg bg-gray-300 rounded w-24 h-6"></p>
</div>
</div>

<div className="relative mt-8 flex justify-between py-4 items-center">
<div className="absolute inset-0 w-full h-full bg-gradient-to-b from-white/20 to-transparent z-0"></div>
<div className="ml-4 relative z-10 text-base font-medium px-6 bg-gray-300 rounded w-40 h-6"></div>
<div className="flex justify-end relative z-10 px-6">
<div className="w-10 h-10 bg-gray-300 rounded-full "></div>
</div>
</div>
</div>
</div>
</div>
</div>

<div className="flex flex-col md:flex-row gap-5">
<div className="flex flex-col gap-5 md:w-1/2">
<span className="text-xl bg-gray-300 font-semibold w-24 h-5 rounded-lg"></span>
<div className="w-full h-64 bg-gray-200 rounded-2xl animate-pulse"></div>
</div>
<div className="flex flex-col gap-5 md:w-1/2">
<span className="text-xl bg-gray-300 font-semibold w-24 h-5 rounded-lg"></span>
<div className="bg-white flex flex-col justify-between rounded-2xl animate-pulse p-4">
<div className="w-full h-10 bg-gray-200 rounded mb-4"></div>
<div className="w-full h-10 bg-gray-200 rounded mb-4"></div>
<div className="w-full h-10 bg-gray-200 rounded mb-4"></div>
<div className="w-full h-10 bg-gray-200 rounded"></div>
</div>
</div>
</div>
</div>
</>
);
};

export default Loading;
Loading