diff --git a/cmd/bank_app/Styles/style.css b/cmd/bank_app/Styles/style.css
index 55fb7fa..d4390cf 100644
--- a/cmd/bank_app/Styles/style.css
+++ b/cmd/bank_app/Styles/style.css
@@ -52,13 +52,15 @@ header {
color: white;
}
+footer{
+ background-color: #04003f;
+}
+
.footer_container {
background-color: #04003f;
color: white;
- position: fixed;
- left: 0;
- right:0;
- height: 100%;
+ height: 42vh;
+ width: 100%;
text-align: center;
font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
font-size: 10px;
@@ -66,7 +68,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 +86,7 @@ header {
.card_records {
border:1px solid #04003f;
- background-color: rgb(188, 188, 188);
+ background-color: rgb(237, 237, 237);
}
.card_records h1 {
diff --git a/cmd/bank_app/main.go b/cmd/bank_app/main.go
index b431543..d0ca57c 100644
--- a/cmd/bank_app/main.go
+++ b/cmd/bank_app/main.go
@@ -60,22 +60,27 @@ func main() {
r.Static("/Styles", "./Styles/")
r.GET("/", func(c *gin.Context) {
+ deauthentication(c)
c.HTML(200, "index.tmpl", map[string]string{"title": "home_page"})
})
r.GET("/HomeRedir", func(c *gin.Context) {
+ deauthentication(c)
c.Redirect(http.StatusFound, "/")
})
r.GET("/register", func(c *gin.Context) {
+ deauthentication(c)
c.HTML(200, "register.tmpl", map[string]string{"title": "register_page"})
})
r.GET("/RegisterRedir", func(c *gin.Context) {
+ deauthentication(c)
c.Redirect(http.StatusFound, "/register")
})
r.POST("/register", func(c *gin.Context) {
+ deauthentication(c)
var newAccount CreateAccount
c.ShouldBindJSON(&newAccount)
@@ -102,14 +107,17 @@ func main() {
})
r.GET("/login", func(c *gin.Context) {
+ deauthentication(c)
c.HTML(200, "login.tmpl", map[string]string{"title": "login_page"})
})
r.GET("/LoginRedir", func(c *gin.Context) {
+ deauthentication(c)
c.Redirect(http.StatusFound, "/login")
})
r.POST("/login", func(c *gin.Context) {
+ deauthentication(c)
var loginAccount LoginAccount
c.ShouldBindJSON(&loginAccount)
@@ -135,7 +143,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) {
@@ -153,7 +161,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 +232,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 +242,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 +316,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 +326,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) {
@@ -374,3 +382,11 @@ func authentication(c *gin.Context) {
c.Redirect(http.StatusFound, "/")
}
}
+
+func deauthentication(c *gin.Context) {
+ session := sessions.Default(c)
+ var test = session.Get("account_code")
+ if test != nil {
+ c.Redirect(http.StatusFound, "/account")
+ }
+}
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 263f59e..3f871b2 100644
--- a/cmd/bank_app/templates/record.tmpl
+++ b/cmd/bank_app/templates/record.tmpl
@@ -3,7 +3,7 @@
- EASB
+ EASB: Record
@@ -54,13 +54,13 @@
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");
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/register.tmpl b/cmd/bank_app/templates/register.tmpl
index 74c7a53..f58d4c1 100644
--- a/cmd/bank_app/templates/register.tmpl
+++ b/cmd/bank_app/templates/register.tmpl
@@ -3,7 +3,7 @@
- EASB
+ EASB: Register
@@ -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;
}
diff --git a/cmd/bank_app/templates/transaction.tmpl b/cmd/bank_app/templates/transaction.tmpl
index 557bfd5..0bb25da 100644
--- a/cmd/bank_app/templates/transaction.tmpl
+++ b/cmd/bank_app/templates/transaction.tmpl
@@ -3,7 +3,7 @@
- EASB
+ EASB: Transaction
@@ -55,13 +55,13 @@
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");
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/viewrecord.tmpl b/cmd/bank_app/templates/viewrecord.tmpl
index d07c9f3..ad51c8d 100644
--- a/cmd/bank_app/templates/viewrecord.tmpl
+++ b/cmd/bank_app/templates/viewrecord.tmpl
@@ -3,7 +3,7 @@
- EASB
+ EASB: View Record
@@ -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.RecipientCode + " <== " + " £" + records.TransactionAmount + " Sender Card: " + records.SenderCode + "
" + "" + "Made At: " + records.TransactionTimestamp + "
"
card_container.appendChild(carddiv2);
});
}