From b8c176bf29b8ae9303c20a1cff1ff445f6469dee Mon Sep 17 00:00:00 2001 From: William Thomas Date: Tue, 4 Jun 2024 22:22:03 +0100 Subject: [PATCH 01/10] New Branch Created For Review --- cmd/bank_app/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bank_app/main.go b/cmd/bank_app/main.go index b431543..cb9d137 100644 --- a/cmd/bank_app/main.go +++ b/cmd/bank_app/main.go @@ -135,7 +135,7 @@ func main() { r.GET("/account", func(c *gin.Context) { authentication(c) - c.HTML(200, "account.tmpl", map[string]string{"title": "register_page"}) + c.HTML(200, "account.tmpl", map[string]string{"title": "account_page"}) }) r.GET("/AccountRedir", func(c *gin.Context) { From e2021ab31fa096bfbd8268891caa5d83a7f5c6b5 Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 10:54:24 +0100 Subject: [PATCH 02/10] Fixed Validation Error --- cmd/bank_app/templates/register.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bank_app/templates/register.tmpl b/cmd/bank_app/templates/register.tmpl index 74c7a53..7242b81 100644 --- a/cmd/bank_app/templates/register.tmpl +++ b/cmd/bank_app/templates/register.tmpl @@ -63,7 +63,7 @@ } else if (account_email.length > 50){ alert("Email Cannot Be Larger Than 50 characters"); return; - } else if (account_name > 25) { + } else if (account_name.length > 25) { alert("Account Name Cannot Be Larger Than 25 Characters"); return; } From 4f78b4317d549e85cbebd14a42f8bbd2e7183605 Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 11:18:38 +0100 Subject: [PATCH 03/10] Fixed Transaction/Record Null Handling --- cmd/bank_app/templates/record.tmpl | 2 +- cmd/bank_app/templates/transaction.tmpl | 2 +- cmd/bank_app/templates/viewrecord.tmpl | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/bank_app/templates/record.tmpl b/cmd/bank_app/templates/record.tmpl index 263f59e..234283a 100644 --- a/cmd/bank_app/templates/record.tmpl +++ b/cmd/bank_app/templates/record.tmpl @@ -54,7 +54,7 @@ function cardiv(card_json_data){ var card_container = document.getElementById("card_container"); - if (card_json_data.length !== 0){ + if (card_json_data !== null){ card_json_data.forEach(function(record){ const carddiv = document.createElement("div"); diff --git a/cmd/bank_app/templates/transaction.tmpl b/cmd/bank_app/templates/transaction.tmpl index 557bfd5..7f3a7cf 100644 --- a/cmd/bank_app/templates/transaction.tmpl +++ b/cmd/bank_app/templates/transaction.tmpl @@ -55,7 +55,7 @@ function cardiv(card_json_data){ var card_container = document.getElementById("card_container"); - if (card_json_data.length !== 0){ + if (card_json_data !== null){ card_json_data.forEach(function(record){ const carddiv = document.createElement("div"); diff --git a/cmd/bank_app/templates/viewrecord.tmpl b/cmd/bank_app/templates/viewrecord.tmpl index d07c9f3..b01ad98 100644 --- a/cmd/bank_app/templates/viewrecord.tmpl +++ b/cmd/bank_app/templates/viewrecord.tmpl @@ -64,7 +64,6 @@ carddiv.innerHTML = "

" + "Payments Out" + "

" card_container.appendChild(carddiv); - console.log(outgoing_payments.length) if (outgoing_payments !== null){ @@ -95,7 +94,7 @@ let carddiv2 = document.createElement("div"); carddiv2.className = "card_records"; carddiv2.id = records.card_code; - carddiv2.innerHTML = "

" + "Your Card: " + record.SenderCode + " <== " + " £" + record.TransactionAmount + " Recipient Card: " + record.RecipientCode + "

" + "

" + "Made At: " + records.transaction_timestamp + "

" + carddiv2.innerHTML = "

" + "Your Card: " + records.SenderCode + " <== " + " £" + records.TransactionAmount + " Recipient Card: " + records.RecipientCode + "

" + "

" + "Made At: " + records.TransactionTimestamp + "

" card_container.appendChild(carddiv2); }); } From 00fe991e70d5330e94b08e24f6ef38789c5af467 Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 11:41:44 +0100 Subject: [PATCH 04/10] Amended Naming Criteria For ViewRecords --- cmd/bank_app/templates/viewrecord.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bank_app/templates/viewrecord.tmpl b/cmd/bank_app/templates/viewrecord.tmpl index b01ad98..54e4bbd 100644 --- a/cmd/bank_app/templates/viewrecord.tmpl +++ b/cmd/bank_app/templates/viewrecord.tmpl @@ -94,7 +94,7 @@ let carddiv2 = document.createElement("div"); carddiv2.className = "card_records"; carddiv2.id = records.card_code; - carddiv2.innerHTML = "

" + "Your Card: " + records.SenderCode + " <== " + " £" + records.TransactionAmount + " Recipient Card: " + records.RecipientCode + "

" + "

" + "Made At: " + records.TransactionTimestamp + "

" + carddiv2.innerHTML = "

" + "Your Card: " + records.RecipientCode + " <== " + " £" + records.TransactionAmount + " Sender Card: " + records.SenderCode + "

" + "

" + "Made At: " + records.TransactionTimestamp + "

" card_container.appendChild(carddiv2); }); } From 3ced457a75dbcaed05a2137847c615d090942542 Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 11:45:48 +0100 Subject: [PATCH 05/10] Changed Page Names --- cmd/bank_app/main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/bank_app/main.go b/cmd/bank_app/main.go index cb9d137..187cc84 100644 --- a/cmd/bank_app/main.go +++ b/cmd/bank_app/main.go @@ -153,7 +153,7 @@ func main() { r.GET("/createcard", func(c *gin.Context) { authentication(c) - c.HTML(200, "createcard.tmpl", map[string]string{"title": "register_page"}) + c.HTML(200, "createcard.tmpl", map[string]string{"title": "createcard_page"}) }) r.GET("/CreateCardRedir", func(c *gin.Context) { @@ -224,7 +224,7 @@ func main() { r.GET("/transaction", func(c *gin.Context) { authentication(c) - c.HTML(200, "transaction.tmpl", map[string]string{"title": "register_page"}) + c.HTML(200, "transaction.tmpl", map[string]string{"title": "transaction_page"}) }) r.GET("/MakeTransactionRedir", func(c *gin.Context) { @@ -234,7 +234,7 @@ func main() { r.GET("/maketransaction", func(c *gin.Context) { authentication(c) - c.HTML(200, "maketransaction.tmpl", map[string]string{"title": "register_page"}) + c.HTML(200, "maketransaction.tmpl", map[string]string{"title": "maketransaction_page"}) }) r.POST("/create_transaction", func(c *gin.Context) { @@ -308,7 +308,7 @@ func main() { r.GET("/record", func(c *gin.Context) { authentication(c) - c.HTML(200, "record.tmpl", map[string]string{"title": "register_page"}) + c.HTML(200, "record.tmpl", map[string]string{"title": "record_page"}) }) r.GET("/RecordsRedir", func(c *gin.Context) { @@ -318,7 +318,7 @@ func main() { r.GET("/viewrecord", func(c *gin.Context) { authentication(c) - c.HTML(200, "viewrecord.tmpl", map[string]string{"title": "register_page"}) + c.HTML(200, "viewrecord.tmpl", map[string]string{"title": "viewrecord_page"}) }) r.GET("/transaction_history", func(c *gin.Context) { From 6647a2ad5c1b3d8e82784211daec26045569fce2 Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 11:50:03 +0100 Subject: [PATCH 06/10] Changed Page Names HTML --- cmd/bank_app/templates/account.tmpl | 2 +- cmd/bank_app/templates/createcard.tmpl | 2 +- cmd/bank_app/templates/index.tmpl | 2 +- cmd/bank_app/templates/login.tmpl | 2 +- cmd/bank_app/templates/maketransaction.tmpl | 2 +- cmd/bank_app/templates/record.tmpl | 2 +- cmd/bank_app/templates/register.tmpl | 2 +- cmd/bank_app/templates/transaction.tmpl | 2 +- cmd/bank_app/templates/viewrecord.tmpl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/bank_app/templates/account.tmpl b/cmd/bank_app/templates/account.tmpl index db931a3..0126fed 100644 --- a/cmd/bank_app/templates/account.tmpl +++ b/cmd/bank_app/templates/account.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Account diff --git a/cmd/bank_app/templates/createcard.tmpl b/cmd/bank_app/templates/createcard.tmpl index 6961b25..9d08ecc 100644 --- a/cmd/bank_app/templates/createcard.tmpl +++ b/cmd/bank_app/templates/createcard.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Create Card diff --git a/cmd/bank_app/templates/index.tmpl b/cmd/bank_app/templates/index.tmpl index 2d18c5e..0e70192 100644 --- a/cmd/bank_app/templates/index.tmpl +++ b/cmd/bank_app/templates/index.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Home diff --git a/cmd/bank_app/templates/login.tmpl b/cmd/bank_app/templates/login.tmpl index ea53aca..f3738de 100644 --- a/cmd/bank_app/templates/login.tmpl +++ b/cmd/bank_app/templates/login.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Login diff --git a/cmd/bank_app/templates/maketransaction.tmpl b/cmd/bank_app/templates/maketransaction.tmpl index 865662b..39f18e3 100644 --- a/cmd/bank_app/templates/maketransaction.tmpl +++ b/cmd/bank_app/templates/maketransaction.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Make Transaction diff --git a/cmd/bank_app/templates/record.tmpl b/cmd/bank_app/templates/record.tmpl index 234283a..5a49032 100644 --- a/cmd/bank_app/templates/record.tmpl +++ b/cmd/bank_app/templates/record.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Record diff --git a/cmd/bank_app/templates/register.tmpl b/cmd/bank_app/templates/register.tmpl index 7242b81..f58d4c1 100644 --- a/cmd/bank_app/templates/register.tmpl +++ b/cmd/bank_app/templates/register.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Register diff --git a/cmd/bank_app/templates/transaction.tmpl b/cmd/bank_app/templates/transaction.tmpl index 7f3a7cf..b7d468c 100644 --- a/cmd/bank_app/templates/transaction.tmpl +++ b/cmd/bank_app/templates/transaction.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: Transaction diff --git a/cmd/bank_app/templates/viewrecord.tmpl b/cmd/bank_app/templates/viewrecord.tmpl index 54e4bbd..ad51c8d 100644 --- a/cmd/bank_app/templates/viewrecord.tmpl +++ b/cmd/bank_app/templates/viewrecord.tmpl @@ -3,7 +3,7 @@ - EASB + EASB: View Record From 2d28acbc3155220f2e15da2259c0dac2bbc8a69e Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 13:02:01 +0100 Subject: [PATCH 07/10] Changed Page Names HTML --- cmd/bank_app/Styles/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bank_app/Styles/style.css b/cmd/bank_app/Styles/style.css index 55fb7fa..661c3e6 100644 --- a/cmd/bank_app/Styles/style.css +++ b/cmd/bank_app/Styles/style.css @@ -84,7 +84,7 @@ header { .card_records { border:1px solid #04003f; - background-color: rgb(188, 188, 188); + background-color: rgb(228, 228, 228); } .card_records h1 { From ee2c24ed79d7ee72ef61a01fb17232f0a27c4178 Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 13:03:57 +0100 Subject: [PATCH 08/10] Changed Page Names HTML --- cmd/bank_app/Styles/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bank_app/Styles/style.css b/cmd/bank_app/Styles/style.css index 661c3e6..55fb7fa 100644 --- a/cmd/bank_app/Styles/style.css +++ b/cmd/bank_app/Styles/style.css @@ -84,7 +84,7 @@ header { .card_records { border:1px solid #04003f; - background-color: rgb(228, 228, 228); + background-color: rgb(188, 188, 188); } .card_records h1 { From 8f3d1c4849e0a43e59ba986f6a4bbcd1589d47ee Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 13:06:55 +0100 Subject: [PATCH 09/10] StylingChanges --- cmd/bank_app/Styles/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/bank_app/Styles/style.css b/cmd/bank_app/Styles/style.css index 55fb7fa..e6b1f48 100644 --- a/cmd/bank_app/Styles/style.css +++ b/cmd/bank_app/Styles/style.css @@ -66,7 +66,7 @@ header { .card_record { border:1px solid #04003f; - background-color: rgb(188, 188, 188); + background-color: rgb(237, 237, 237); } .card_record h1 { @@ -84,7 +84,7 @@ header { .card_records { border:1px solid #04003f; - background-color: rgb(188, 188, 188); + background-color: rgb(237, 237, 237); } .card_records h1 { From f087481fe433fa2cf078aeae15874b5a2752a20c Mon Sep 17 00:00:00 2001 From: William Thomas Date: Wed, 5 Jun 2024 13:09:10 +0100 Subject: [PATCH 10/10] Balance Visual Improvements --- cmd/bank_app/templates/record.tmpl | 2 +- cmd/bank_app/templates/transaction.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/bank_app/templates/record.tmpl b/cmd/bank_app/templates/record.tmpl index 5a49032..3f871b2 100644 --- a/cmd/bank_app/templates/record.tmpl +++ b/cmd/bank_app/templates/record.tmpl @@ -60,7 +60,7 @@ const carddiv = document.createElement("div"); carddiv.className = "card_record"; carddiv.id = record.card_code; - carddiv.innerHTML = "

" + "Card Code: " + record.card_code + "

" + "

" + "Card Balance: " + record.card_balance + "

" + carddiv.innerHTML = "

" + "Card Code: " + record.card_code + "

" + "

" + "Card Balance: £" + record.card_balance + "

" carddiv.addEventListener('click', () => click_card(record.card_code)); card_container.appendChild(carddiv); }); diff --git a/cmd/bank_app/templates/transaction.tmpl b/cmd/bank_app/templates/transaction.tmpl index b7d468c..0bb25da 100644 --- a/cmd/bank_app/templates/transaction.tmpl +++ b/cmd/bank_app/templates/transaction.tmpl @@ -61,7 +61,7 @@ const carddiv = document.createElement("div"); carddiv.className = "card_record"; carddiv.id = record.card_code; - carddiv.innerHTML = "

" + "Card Code: " + record.card_code + "

" + "

" + "Card Balance: " + record.card_balance + "

" + carddiv.innerHTML = "

" + "Card Code: " + record.card_code + "

" + "

" + "Card Balance: £" + record.card_balance + "

" carddiv.addEventListener('click', () => click_card(record.card_code)); card_container.appendChild(carddiv); });