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

Merge Final to development #30

Open
wants to merge 156 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
a3ff6e5
JSAEM2-10 UI design
KatyTao Dec 17, 2019
eb79630
JSAEM2-10 Set UI design
KatyTao Dec 17, 2019
266c773
JSAEM2-10 update: add redux and install fecth mock
KatyTao Dec 19, 2019
944865e
JSAEM2-10 fix: resolve conflict
KatyTao Dec 19, 2019
a6e725d
JSAEM2-10 update: set backup function with redux
KatyTao Dec 19, 2019
ee48ccd
JSAEM2-10 update: add environment variable
KatyTao Dec 20, 2019
68f2528
JSAEM2-10 fixed: fix lint error
KatyTao Dec 20, 2019
cda3d61
JSAEM2-10 update: connect to user store
KatyTao Dec 20, 2019
55ecb49
JSAEM2-10 update: add state in case further use
KatyTao Dec 23, 2019
1fd880d
JSAEM2-10 update: add state in case further use
KatyTao Dec 23, 2019
14e7630
JSAEM2-10 update: restyle the format
KatyTao Dec 23, 2019
3e2201e
JSAEM2-10 fixed: fix lint error
KatyTao Dec 23, 2019
6272d64
JSAEM2-10 update: update default page
KatyTao Dec 25, 2019
08bffa1
JSAEM2-10 update: update person icon for me page
KatyTao Dec 25, 2019
1dfc371
JSAEM2-10 fix: update backup reducer
KatyTao Dec 25, 2019
697a04e
JSAEM2-10 fix: fix initial display on message
KatyTao Dec 25, 2019
8e2be8e
JSAEM2-10 update: add accessToken
KatyTao Dec 31, 2019
da06a22
update: update display
KatyTao Dec 31, 2019
39636b1
update: split DateOverlay component
KatyTao Jan 2, 2020
0a21189
update: create Stats page
KatyTao Jan 2, 2020
aa86b1c
update: install chartKit and react-native-svg
KatyTao Jan 2, 2020
8951ee3
update: chart display
KatyTao Jan 2, 2020
098cfa4
update: make the value start from zero
KatyTao Jan 2, 2020
e5e7630
update
KatyTao Jan 6, 2020
b1676a2
add accessToken
KatyTao Jan 6, 2020
772bad3
update: fix body data format
KatyTao Jan 6, 2020
6281850
update: add restore function
KatyTao Jan 8, 2020
88ca276
JSAEM2-7,basic form.
aaabbbcc1995 Dec 25, 2019
35a087d
JSAEM2-7,change password rule changed to 8-16 characters with at leas…
aaabbbcc1995 Dec 26, 2019
6ca5ef6
JSAEM2-7,modify ultis and add stack navigation
aaabbbcc1995 Dec 26, 2019
e67271f
JSAEM2-26, use dotenv , change password validation and finished redux
aaabbbcc1995 Dec 27, 2019
4f8611f
JSAEM2-7, remove Personal file to fix file name problem
aaabbbcc1995 Dec 27, 2019
910c677
JSAEM2-7, add personal folder to fix file name problem
aaabbbcc1995 Dec 27, 2019
71cac7f
JSAEM2_26, simplify function params and navigator
aaabbbcc1995 Dec 30, 2019
c9a5db5
JSAEM2-26,modify password rule only at least 8 characters with any nu…
aaabbbcc1995 Jan 6, 2020
a2e80de
JSAEM2-26,modify css, update mainheader and remvoe header
aaabbbcc1995 Jan 6, 2020
1e685fc
JSAEM2-26,modify login css
aaabbbcc1995 Jan 6, 2020
5aebd3a
JSAEM2-26, add error message box
aaabbbcc1995 Jan 7, 2020
0f86358
JSAEM2-26,add error notification on frontend from backend.
aaabbbcc1995 Jan 7, 2020
357aa32
JSAEM2-26, add props validation
aaabbbcc1995 Jan 7, 2020
e807c00
JSAEM2-5 fished basic functions,display all records from closest with…
aaabbbcc1995 Dec 6, 2019
133d7db
Revert "JSAEM2-5 fished basic functions,display all records from clos…
aaabbbcc1995 Jan 8, 2020
da85d9b
JSAEM2-16, remove header of navigator
aaabbbcc1995 Jan 8, 2020
a70c079
JSAEM2-7,basic feature finished.
aaabbbcc1995 Dec 19, 2019
2d9275f
JSAEM-2_7, link to sign up page in personal page by click button
aaabbbcc1995 Dec 19, 2019
32715e7
JSAEM-2_7, add redux store user information and token, switch page af…
aaabbbcc1995 Dec 20, 2019
7d10663
JSAEM-2_7, modify accroding to pr comments
aaabbbcc1995 Dec 24, 2019
582e8be
JSA-2_7,revert personal page, it will display after user reigstered …
aaabbbcc1995 Dec 25, 2019
83e44a8
JSAEM2_7,modify router name
aaabbbcc1995 Dec 25, 2019
2632594
JSAEM2-7,change to port with dotenv
aaabbbcc1995 Dec 25, 2019
54ea42e
JSAEM2-7,use dotenv for configuration and modify password rules, now …
aaabbbcc1995 Dec 25, 2019
44653eb
JSAEM2-7,change babel config to LF form.
aaabbbcc1995 Dec 25, 2019
491b6b1
JSAEM2-7,delete unneccssary blank and modfiy variable name
aaabbbcc1995 Dec 26, 2019
066defa
JSAEM2-7,update password validation and modify import.
aaabbbcc1995 Dec 27, 2019
347ea58
JSAEM2_7, add username in redux ,simpifly function params and navigator
aaabbbcc1995 Dec 30, 2019
6a890fc
JSAEM2-7,change password rule to only at least 8 characters.
aaabbbcc1995 Jan 6, 2020
faf9235
JSAEM2-7,modify mainheader
aaabbbcc1995 Jan 7, 2020
0b67bf6
JSAEM2-7,modify login css
aaabbbcc1995 Jan 8, 2020
1bf11b3
JSAEM2-7,modify signup page UI and add logout button
aaabbbcc1995 Jan 8, 2020
72ff0ff
JSAEM2-7,remove header of navigator
aaabbbcc1995 Jan 8, 2020
2789eab
update: add overlay for restore
KatyTao Jan 8, 2020
34ad41c
update: add type verify
KatyTao Jan 9, 2020
ac60ff8
Merge branch 'development_branch' into JSAEM2-10_user_is_able_to_back…
KatyTao Jan 9, 2020
7480874
update: fix transactions
KatyTao Jan 9, 2020
c1d2c47
fix: fix lint error
KatyTao Jan 9, 2020
e5a3adb
Add: add test
KatyTao Jan 9, 2020
8cc94f9
update: update graph
KatyTao Jan 9, 2020
266083b
JSAEM2-7,modify with backend changes
aaabbbcc1995 Jan 9, 2020
4ed739b
JSAEM2-26,modify with backend changes
aaabbbcc1995 Jan 9, 2020
09c73f2
JSAEM2-7,modify wit backend changes
aaabbbcc1995 Jan 9, 2020
04fed2c
JSAEM2-7,remove tjhrow error
aaabbbcc1995 Jan 9, 2020
0817c9b
temp_delete
KatyTao Jan 9, 2020
59b405e
Merge branch 'temp_signup' into temp_presentation_branch
KatyTao Jan 9, 2020
141c532
update: merge
KatyTao Jan 9, 2020
36ed61a
JSAEM2-26, remove throw error
aaabbbcc1995 Jan 9, 2020
7d49a80
Merge branch 'temp_login' into temp_presentation_branch
KatyTao Jan 9, 2020
c9a8ae3
add
KatyTao Jan 9, 2020
f541961
add
KatyTao Jan 9, 2020
81267ff
Merge branch 'temp_transaction_chart' into temp_presentation_branch
KatyTao Jan 9, 2020
9ee5f98
add chart
KatyTao Jan 9, 2020
bf32a16
update: fix bug
KatyTao Jan 10, 2020
9adf64e
update: update default page
KatyTao Jan 10, 2020
fa96573
fix: close auto restore
KatyTao Jan 10, 2020
172fad5
temp login
KatyTao Jan 10, 2020
6f2074b
update name
KatyTao Jan 10, 2020
93c2811
update personal
KatyTao Jan 10, 2020
6538a14
update submit button
KatyTao Jan 10, 2020
17fd2ff
update submit btn
KatyTao Jan 10, 2020
342cd33
update login
KatyTao Jan 10, 2020
86f8a57
update login file
KatyTao Jan 10, 2020
a620bd3
update login
KatyTao Jan 10, 2020
8ddb224
update register
KatyTao Jan 10, 2020
d6f224f
update login
KatyTao Jan 10, 2020
25707d6
fixed: lint issue and bug
MichaelCTH Jan 11, 2020
39ec300
fixed: page jump after insertion
MichaelCTH Jan 11, 2020
710517e
fixed: lint issue and up date the tests
MichaelCTH Jan 11, 2020
639489d
fixed: email auto-capital issue
MichaelCTH Jan 11, 2020
6dc6d4a
fixed: output catch error
MichaelCTH Jan 11, 2020
49d78f0
update register
KatyTao Jan 11, 2020
b5487c9
Merge branch 'temp_presentation_branch' of https://github.com/green-f…
KatyTao Jan 11, 2020
833a7a6
update register
KatyTao Jan 11, 2020
1d83629
Merge pull request #26 from green-fox-academy/temp_presentation_branch
MichaelCTH Jan 11, 2020
fce85c0
fixed: bug
MichaelCTH Jan 11, 2020
b721645
feat: update the register page
MichaelCTH Jan 11, 2020
587bf78
feat: add open banking page
MichaelCTH Jan 11, 2020
4c8ca13
feat: get bank list
MichaelCTH Jan 11, 2020
ebbbc48
update register css file name
KatyTao Jan 11, 2020
1c02e6d
update: update offset for register page
KatyTao Jan 11, 2020
d088212
feat: add open banking basic page
MichaelCTH Jan 11, 2020
6b97245
fix: fix scrollview on profile page
KatyTao Jan 11, 2020
e9ae7a4
Merge branch 'Final' of https://github.com/green-fox-academy/jsa-emer…
KatyTao Jan 11, 2020
f96ad74
update: add theme btn
KatyTao Jan 11, 2020
a0a3f28
update: add dark mode
KatyTao Jan 11, 2020
1e04a07
update: add dark mode
KatyTao Jan 11, 2020
03b34df
update: update dark theme
KatyTao Jan 11, 2020
aaa00e8
feat: banking auth complete
MichaelCTH Jan 11, 2020
a444e99
update: fix mode error
KatyTao Jan 11, 2020
5356744
fix: fix mode bug
KatyTao Jan 11, 2020
d6494cd
Merge branch 'Final' of https://github.com/green-fox-academy/jsa-emer…
KatyTao Jan 11, 2020
cd662d0
feat: compress images
MichaelCTH Jan 12, 2020
d5d6b18
fixed: persister storage issue
MichaelCTH Jan 12, 2020
8543f48
update: remove white list
KatyTao Jan 12, 2020
8e61ac1
update: add family
KatyTao Jan 12, 2020
d2c7ba7
Merge branch 'add_family' into Final
KatyTao Jan 12, 2020
7cd5a3f
update: fix chart bug
KatyTao Jan 13, 2020
3a98152
feat: open banking transaction pull finished
MichaelCTH Jan 13, 2020
2a91e6a
update: add family trans to backend
KatyTao Jan 13, 2020
57d46c5
feat: theme mode for nav bar
MichaelCTH Jan 13, 2020
2b3be79
update: add new page
KatyTao Jan 13, 2020
ed2f270
Merge branch 'Final' of https://github.com/green-fox-academy/jsa-emer…
KatyTao Jan 13, 2020
99916fe
Merge branch 'temp_family_transaction_branch' into Final
KatyTao Jan 13, 2020
90929e2
update
KatyTao Jan 13, 2020
7500e8e
fixed: capital issue
MichaelCTH Jan 13, 2020
1e06483
update: display family view
KatyTao Jan 13, 2020
4470bbf
update: add family view
KatyTao Jan 13, 2020
40f1a74
Merge branch 'temp_family_transaction' into Final
KatyTao Jan 13, 2020
22fbdd0
style: ui improve
MichaelCTH Jan 13, 2020
111badd
feat: remove EPAM mode and back to profile page after theme switch
MichaelCTH Jan 13, 2020
9319e40
fixed: update header styling
KatyTao Jan 13, 2020
5090ade
Merge branch 'Final' of https://github.com/green-fox-academy/jsa-emer…
KatyTao Jan 13, 2020
5cd6067
update: update family feature
KatyTao Jan 13, 2020
c8e629b
update: update family feature
KatyTao Jan 13, 2020
bb78b2a
remove log
KatyTao Jan 13, 2020
c359733
feat: improve icon tab
MichaelCTH Jan 14, 2020
64ada92
fixed: margin error
MichaelCTH Jan 14, 2020
1765935
feat: update profile page
MichaelCTH Jan 14, 2020
5f1140f
update: add pull to refresh for family transaction
KatyTao Jan 14, 2020
c30b0e5
Merge branch 'Final' of https://github.com/green-fox-academy/jsa-emer…
KatyTao Jan 14, 2020
06726f4
update: add new empty image
KatyTao Jan 14, 2020
80957ea
fix: fix env variable
KatyTao Jan 14, 2020
5fda15e
fixed: card issue
MichaelCTH Jan 14, 2020
4788cd4
Update: update family page
KatyTao Jan 14, 2020
39989fb
Update: add pie chart animation
KatyTao Jan 14, 2020
f0107f8
feat: add animation for trans list
MichaelCTH Jan 15, 2020
94b0a4a
feat: add animation when transaction view change
MichaelCTH Jan 15, 2020
aa1551a
Fix: fix pie legend at dark mode
KatyTao Jan 15, 2020
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
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"editor.tabSize": 2,
"prettier.jsxSingleQuote": true,
"javascript.preferences.quoteStyle": "single",
"prettier.singleQuote": true
}
Binary file added assets/avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blur.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/empty_box.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/familyView.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/loginBg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/loginIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/loginPage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/openBankingHead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/personalDefaultPage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/profile.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
module.exports = (api) => {
api.cache(true);
return {
presets: ['babel-preset-expo'],
presets: [
'babel-preset-expo',
'module:react-native-dotenv',
],
};
};
Loading