Skip to content

- #37

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

Open
wants to merge 126 commits into
base: master
Choose a base branch
from
Open

- #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
440d75f
Master
KidsonOh Nov 30, 2022
cbb79a3
Done
KidsonOh Nov 30, 2022
bd3a85f
Kidson
KidsonOh Nov 30, 2022
26834af
Change
KidsonOh Nov 30, 2022
d1e372b
done
anthealai Nov 30, 2022
c91f89a
Updated Nav Bar
KidsonOh Nov 30, 2022
4a27729
k
anthealai Nov 30, 2022
9f69cbe
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Nov 30, 2022
6bdb3e6
edit
KidsonOh Nov 30, 2022
9e2c8a4
D
KidsonOh Nov 30, 2022
382c81e
new changes
anthealai Nov 30, 2022
d24369e
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Nov 30, 2022
59614a7
added Abouus on line 42
anthealai Nov 30, 2022
7a2fb39
added codes to aboutus.css and js
anthealai Nov 30, 2022
30d2dd1
update
anthealai Dec 2, 2022
03ea976
new update
anthealai Dec 2, 2022
66fed91
update paragraph
KidsonOh Dec 2, 2022
7618932
changed 'para' to paragraph
anthealai Dec 2, 2022
f88fea3
Updated Navbar, Created dropdown menu, updated css, fixed errors
KidsonOh Dec 3, 2022
6b4212c
Added new Psggrant page
KidsonOh Dec 3, 2022
d0372c1
psggrant commiting
20046050-Ervin Dec 4, 2022
c28bc16
commiting psg jsx
20046050-Ervin Dec 4, 2022
924b14c
finished overlay box in psggrant
KidsonOh Dec 4, 2022
488edcd
Created blog page
20017494-Khor-Jinq-Wen Dec 5, 2022
7f68c64
Blog done
20017494-Khor-Jinq-Wen Dec 5, 2022
5a9adc4
Updated Blog
20017494-Khor-Jinq-Wen Dec 5, 2022
886680e
color change on PSG Grant
KidsonOh Dec 5, 2022
c81f8ca
Finished Media Query and sizing issues on Blog
KidsonOh Dec 5, 2022
afc36a8
fixed error
KidsonOh Dec 5, 2022
cf98f50
fixed text error
KidsonOh Dec 5, 2022
b59c291
aboutus
anthealai Dec 6, 2022
5424c3b
aboutus.1
anthealai Dec 6, 2022
28f4964
fixed about us css issue
KidsonOh Dec 6, 2022
a224f3a
fixed nav bar
KidsonOh Dec 6, 2022
1cf4733
footer updated
KidsonOh Dec 6, 2022
8a4ffbc
navbar fixed
KidsonOh Dec 6, 2022
b58203e
Home css changes
KidsonOh Dec 6, 2022
c811754
added cart
20017494-Khor-Jinq-Wen Dec 8, 2022
4b83411
Login try
KidsonOh Dec 9, 2022
ae307bc
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
KidsonOh Dec 9, 2022
56581b6
fixed cart icon
KidsonOh Dec 9, 2022
bab5b6a
navbar overelay
KidsonOh Dec 9, 2022
8129115
update cart style
20017494-Khor-Jinq-Wen Dec 11, 2022
a98242c
updated cart
20017494-Khor-Jinq-Wen Dec 11, 2022
f6769c0
added checkout
20017494-Khor-Jinq-Wen Dec 11, 2022
644f9e1
Nav bar popup
KidsonOh Dec 12, 2022
89e0ff6
ABOUTUStesting
anthealai Dec 14, 2022
f82637a
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Dec 14, 2022
f98d6b8
login design half finshed
KidsonOh Dec 16, 2022
9b6e4b8
updated checkout page
20017494-Khor-Jinq-Wen Dec 18, 2022
3af7d3b
Done with checkoutinfo page
20017494-Khor-Jinq-Wen Dec 22, 2022
8f6dace
done with the shipping page
20017494-Khor-Jinq-Wen Dec 27, 2022
4490013
Softwarepage sorta done
20046050-Ervin Dec 27, 2022
f5c91fb
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20046050-Ervin Dec 27, 2022
ac55d98
software additional changes
20046050-Ervin Dec 27, 2022
89484d2
bizsupportpic
20046050-Ervin Dec 27, 2022
deb7aab
Login popup modal working
KidsonOh Dec 27, 2022
863966c
fixed footer and button issues
KidsonOh Dec 30, 2022
e34ff7a
done with checkoutpayment
20017494-Khor-Jinq-Wen Dec 30, 2022
4923984
redid SN
anthealai Jan 3, 2023
879c4f0
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Jan 3, 2023
ef721d8
redid SN
anthealai Jan 3, 2023
032f052
Login firerbase
KidsonOh Jan 4, 2023
2fd0b84
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
KidsonOh Jan 4, 2023
5ffe03a
sn
anthealai Jan 6, 2023
5386a4c
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Jan 6, 2023
4408c1c
icon update
anthealai Jan 6, 2023
40b292c
login, logout, home page css
KidsonOh Jan 7, 2023
2dc1ecb
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
KidsonOh Jan 7, 2023
b7169c2
home page edit
KidsonOh Jan 7, 2023
d3fdf84
footer changes
KidsonOh Jan 7, 2023
7aa6a6a
push package modification
20046050-Ervin Jan 7, 2023
a4ead4b
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20046050-Ervin Jan 7, 2023
b89cd40
.
20017494-Khor-Jinq-Wen Jan 7, 2023
eefaf61
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20017494-Khor-Jinq-Wen Jan 7, 2023
b0bb434
slight changes
20017494-Khor-Jinq-Wen Jan 9, 2023
24ba418
Page done
anthealai Jan 11, 2023
71241f2
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Jan 11, 2023
fb43ae5
commit and push product database
20046050-Ervin Jan 18, 2023
c3c55b6
commit and push product database
20046050-Ervin Jan 18, 2023
5900101
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20046050-Ervin Jan 18, 2023
75dc956
Working Login functions
KidsonOh Jan 27, 2023
f083f50
Psge done
anthealai Jan 27, 2023
5faabee
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Jan 27, 2023
4045017
did a mini review section
anthealai Jan 28, 2023
7151796
Carousell final layout
20046050-Ervin Jan 28, 2023
a8cf791
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20046050-Ervin Jan 28, 2023
cd24c8b
css issue
KidsonOh Jan 28, 2023
b7a7601
Login function and Admin Page
KidsonOh Jan 29, 2023
a42ffa1
ChatApp
20046050-Ervin Jan 29, 2023
ce354d1
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20046050-Ervin Jan 29, 2023
8f1027c
App js
KidsonOh Jan 29, 2023
97f2da6
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
KidsonOh Jan 29, 2023
46d73f0
v bar admin
KidsonOh Jan 29, 2023
495c077
login issue fixed
KidsonOh Jan 29, 2023
ea208d2
Login finished
KidsonOh Jan 31, 2023
ebbc565
update
anthealai Jan 31, 2023
5bb0bf6
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Jan 31, 2023
e6c30d4
Login Code finished navbar adjusted
KidsonOh Feb 1, 2023
4647cb8
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
KidsonOh Feb 1, 2023
6b8e4f4
admin page out
20046050-Ervin Feb 1, 2023
a7ebbed
stored in database
anthealai Feb 1, 2023
d27eb95
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Feb 1, 2023
a819a11
support notes review
20046050-Ervin Feb 1, 2023
a0f0e11
support notes push
20046050-Ervin Feb 1, 2023
4f007f4
support notes push 2nd time
20046050-Ervin Feb 1, 2023
eaf6c1b
support notes push
20046050-Ervin Feb 1, 2023
a70f8b6
.
anthealai Feb 1, 2023
6c13e61
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
anthealai Feb 1, 2023
763cfbb
Login Function completed
KidsonOh Feb 7, 2023
6fe84e0
admin panel
20046050-Ervin Feb 7, 2023
026e11a
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20046050-Ervin Feb 7, 2023
23272ef
label edit
anthealai Feb 7, 2023
d8112df
final push
20046050-Ervin Feb 7, 2023
c680757
last push
20046050-Ervin Feb 7, 2023
9669341
Done with cart
20017494-Khor-Jinq-Wen Feb 8, 2023
8bc0527
final push
20046050-Ervin Feb 8, 2023
367da27
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20046050-Ervin Feb 8, 2023
bcf7303
final edit
anthealai Feb 8, 2023
d691fb9
final push
anthealai Feb 8, 2023
940e995
Revert "final push"
20046050-Ervin Feb 8, 2023
95d91ca
final final push
20046050-Ervin Feb 10, 2023
ad41beb
Last Push
20046050-Ervin Feb 10, 2023
96c568e
edit cart
20017494-Khor-Jinq-Wen Feb 11, 2023
d26d1f0
Merge branch 'master' of https://github.com/20000169-Kidson-Oh-Kai-Ju…
20017494-Khor-Jinq-Wen Feb 11, 2023
eebb3bd
last push
20046050-Ervin Feb 11, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
15 changes: 15 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}
1 change: 0 additions & 1 deletion README.md

This file was deleted.

13 changes: 13 additions & 0 deletions build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"files": {
"main.css": "/static/css/main.fb1ca052.css",
"main.js": "/static/js/main.40600ff8.js",
"index.html": "/index.html",
"main.fb1ca052.css.map": "/static/css/main.fb1ca052.css.map",
"main.40600ff8.js.map": "/static/js/main.40600ff8.js.map"
},
"entrypoints": [
"static/css/main.fb1ca052.css",
"static/js/main.40600ff8.js"
]
}
Binary file added build/favicon.ico
Binary file not shown.
Binary file added build/images/Aboutus.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 build/images/AboutusMYob.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 build/images/Account.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 build/images/BankingJPG.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 build/images/Cardfile.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 build/images/CustomiseForm.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 build/images/Inventory.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 build/images/MYOBEssentials.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 build/images/MYOB_Logo.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 build/images/MultiCurrency.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 build/images/PurchasesJPG.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 build/images/SN.gif
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 build/images/SVBankingJPG.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 build/images/SVInventory.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 build/images/SVPayroll.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 build/images/SVPurchases.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 build/images/SVSales.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 build/images/Sales.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 build/images/SupportNote.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 build/images/TimeBilling.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 build/images/Xero1.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 build/images/aboutus.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 build/images/bizsupportpic.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 build/images/blog pic.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 build/images/bottompic2.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 build/images/box designs.jpg
Binary file added build/images/carouseldesc.PNG
Binary file added build/images/cart.png
Binary file added build/images/forgetpasswordimage.gif
Binary file added build/images/general1.JPG
Binary file added build/images/generatereports.PNG
Binary file added build/images/gst.JPG
Binary file added build/images/keyfeatures.PNG
Binary file added build/images/loginimage.gif
Binary file added build/images/managegst.PNG
Binary file added build/images/manageyourbooks.PNG
Binary file added build/images/manageyourinventory.PNG
Binary file added build/images/myob new4.jpg
Binary file added build/images/myobsquare4.png
Binary file added build/images/payroll.JPG
Binary file added build/images/processsales.PNG
Binary file added build/images/psg2.png
Binary file added build/images/psgPic1.gif
Binary file added build/images/psggrantbanner.PNG
Binary file added build/images/psginfographic.PNG
Binary file added build/images/psgpattern.PNG
Binary file added build/images/quick.png
Binary file added build/images/secureyourbooks.PNG
Binary file added build/images/softwarebanner.PNG
Binary file added build/images/softwaregif.gif
Binary file added build/images/trusted img.png
Binary file added build/images/update1.jpg
1 change: 1 addition & 0 deletions build/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.13.1/css/all.css" integrity="sha384-xxzQGERXS00kBmZW/6qxqJPyxW3UR0BPsL4c8ILaIWXva5kFi7TxkIIaMiKtqV1Q" crossorigin="anonymous"/><link href="https://fonts.googleapis.com/css2?family=PT+Sans:wght@700&display=swap" rel="stylesheet"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.40600ff8.js"></script><link href="/static/css/main.fb1ca052.css" rel="stylesheet"></head><body><script src="https://kit.fontawesome.com/9d770065f6.js" crossorigin="anonymous"></script><div id="root"></div></body></html>
Binary file added build/logo192.png
Binary file added build/logo512.png
25 changes: 25 additions & 0 deletions build/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
2 changes: 2 additions & 0 deletions build/static/css/main.fb1ca052.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/css/main.fb1ca052.css.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions build/static/js/main.40600ff8.js

Large diffs are not rendered by default.

Loading