From 74808f3fb28fb66a45ea679ce38b6dba72a23a10 Mon Sep 17 00:00:00 2001 From: Teppy Date: Tue, 11 Mar 2025 19:07:16 -0400 Subject: [PATCH 1/4] changes --- foftickets.js | 1 + public/styles.css | 33 +++++++++++++++++++++++---------- views/changepassword.ejs | 2 +- views/error.ejs~ | 9 --------- views/notickets.ejs~ | 27 --------------------------- views/partials/nav.ejs | 40 +++++++++++++++++++++------------------- views/simpleowner.ejs~ | 28 ---------------------------- views/transfer.ejs~ | 28 ---------------------------- 8 files changed, 46 insertions(+), 122 deletions(-) delete mode 100644 views/error.ejs~ delete mode 100644 views/notickets.ejs~ delete mode 100644 views/simpleowner.ejs~ delete mode 100644 views/transfer.ejs~ diff --git a/foftickets.js b/foftickets.js index 582cb8e..6e8c640 100644 --- a/foftickets.js +++ b/foftickets.js @@ -761,6 +761,7 @@ app.post('/buy',requireLogin,(req,res) => { + app.post('/charge', requireLogin, async (req, res) => { const payforwhat=req.body.payforwhat; if (!check_payforwhat(payforwhat,req)) return res.json({ error: 'Invalid PayForWhat' }); diff --git a/public/styles.css b/public/styles.css index c21cf32..d0168c0 100644 --- a/public/styles.css +++ b/public/styles.css @@ -35,30 +35,43 @@ cursor: pointer; } +h1 { + font-size: 1.2rem; +} body { display: grid; grid-template-columns: 240px auto; grid-template-rows: 40px auto; font-family: Arial, sans-serif; + } -.nav { - grid-column: 1; - grid-row: 1 / 3; - background-color: #FFC0C0; +.nav-header { + font-size: 1.5rem; + padding: 10px 15px; + grid-column: 1 / 3; + grid-row: 1; + background-color: #C0C0C0; +} + +.nav-items { + padding: 10px 15px; + grid-column: 1; + grid-row: 2 / 3; + background-color: #C0C0C0; } .message { - grid-column: 2; - grid-row: 1; - background-color: #C0FFC0; - align-content: center; - justify-items: center; + grid-column: 2; + grid-row: 1; + background-color: #C0C0C0; + align-content: center; + justify-items: center; } .content { grid-column: 2; grid-row: 2; - background-color: #C0C0FF; + background-color: #E0E0E0; } diff --git a/views/changepassword.ejs b/views/changepassword.ejs index 5c3cc11..15a24b9 100644 --- a/views/changepassword.ejs +++ b/views/changepassword.ejs @@ -7,7 +7,7 @@ <%- include('partials/nav') %>
- Change Password +

Change Password

Old Password:
New Password:
diff --git a/views/error.ejs~ b/views/error.ejs~ deleted file mode 100644 index 65cedf5..0000000 --- a/views/error.ejs~ +++ /dev/null @@ -1,9 +0,0 @@ - - - - You don't have any tickets - - -

No tickets for you!!

- - diff --git a/views/notickets.ejs~ b/views/notickets.ejs~ deleted file mode 100644 index c6403f7..0000000 --- a/views/notickets.ejs~ +++ /dev/null @@ -1,27 +0,0 @@ - - - - Your Tickets - - -

Welcome, <%= username %>!

- - - - - - - - <% for (const t in tlist) { %> - - - - - - - <% } %> - - -
TicketOwnerOffered ToQRCode
<%= t %> <%= tlist[t].owner %> <%= tlist[t].offered %> <%= QRCode.toDataURL("https://abc.com", function(err,url) { if (err) { console.error(err); return; } console.log(url); }); %>
- - diff --git a/views/partials/nav.ejs b/views/partials/nav.ejs index d031e45..c4668c8 100644 --- a/views/partials/nav.ejs +++ b/views/partials/nav.ejs @@ -1,26 +1,28 @@ -
- Falls on Fire
+
+ Falls on Fire +
+
Buy Tickets
-<%if (typeof username!='undefined' && username) {%> - View My Tickets
-<%}%> -<%if (typeof superuser!='undefined' && superuser) {%> - View Camps (Admin)
- Settings (Admin)
-<%}%> -<%if (typeof username!='undefined' && username) {%> - Change Password
- Log Out
-<%} else {%> - Create Account
- Log In
-<%}%> + <%if (typeof username!='undefined' && username) {%> + View My Tickets
+ <%}%> + <%if (typeof superuser!='undefined' && superuser) {%> + View Camps (Admin)
+ Settings (Admin)
+ <%}%> + <%if (typeof username!='undefined' && username) {%> + Change Password
+ Log Out
+ <%} else {%> + Create Account
+ Log In
+ <%}%>
-<% if (typeof commonData.message !== 'undefined') { %> -

<%= commonData.message %>

-<% } %> + <% if (typeof commonData.message !== 'undefined') { %> +

<%= commonData.message %>

+ <% } %>
<% if (commonData.error) { %>
diff --git a/views/simpleowner.ejs~ b/views/simpleowner.ejs~ deleted file mode 100644 index f6ac4ef..0000000 --- a/views/simpleowner.ejs~ +++ /dev/null @@ -1,28 +0,0 @@ - - - - Your Tickets - - -

Welcome, <%= username %>!

- - - - - - - - <% for (const t in tlist) { %> - - - - - - - - <% } %> - - -
TicketOwnerOffered ToQRCode
<%= t %> <%= tlist[t].owner %> <%= tlist[t].offered %> <%= simpledata %> <%= QRCode.toDataURL("https://abc.com", function(err,url) { if (err) { console.error(err); return; } console.log(url); }); %>
- - diff --git a/views/transfer.ejs~ b/views/transfer.ejs~ deleted file mode 100644 index f6ac4ef..0000000 --- a/views/transfer.ejs~ +++ /dev/null @@ -1,28 +0,0 @@ - - - - Your Tickets - - -

Welcome, <%= username %>!

- - - - - - - - <% for (const t in tlist) { %> - - - - - - - - <% } %> - - -
TicketOwnerOffered ToQRCode
<%= t %> <%= tlist[t].owner %> <%= tlist[t].offered %> <%= simpledata %> <%= QRCode.toDataURL("https://abc.com", function(err,url) { if (err) { console.error(err); return; } console.log(url); }); %>
- - From 938f2d5564ab376292c971ed5bd86ee5077ee312 Mon Sep 17 00:00:00 2001 From: Teppy Date: Wed, 12 Mar 2025 19:49:35 +0000 Subject: [PATCH 2/4] changes --- .env | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 4fb2ae3..0000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -PORT=3000 -BASE_URL=http://localhost:3000 -STRIPE_SECRET_KEY=sk_test_51QZlMSCHHjDgpHosJ9y6P9rtqJwmaGogCFy1gsZ1HDJyT98LlmSrRFJByawVJbvJh5DEhH6lIcWitsB8vJfPtkus00AomfjTaA From f059b231c7135e1b2d520acd1444381d76f89139 Mon Sep 17 00:00:00 2001 From: Teppy Date: Wed, 12 Mar 2025 16:53:29 -0400 Subject: [PATCH 3/4] changes --- .env | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..4fb2ae3 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +PORT=3000 +BASE_URL=http://localhost:3000 +STRIPE_SECRET_KEY=sk_test_51QZlMSCHHjDgpHosJ9y6P9rtqJwmaGogCFy1gsZ1HDJyT98LlmSrRFJByawVJbvJh5DEhH6lIcWitsB8vJfPtkus00AomfjTaA From d074e4b1712c4ece0a1260d299a086d17bcf7041 Mon Sep 17 00:00:00 2001 From: Teppy Date: Wed, 12 Mar 2025 22:40:41 -0400 Subject: [PATCH 4/4] changes --- foftickets.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/foftickets.js b/foftickets.js index 6e8c640..1010dd6 100644 --- a/foftickets.js +++ b/foftickets.js @@ -62,6 +62,13 @@ const QRSalt ="!SaltyMagic5392370662"; // + See how much each camp/ticket has paid (Admin) // + Purchase individual open camping tickets // + Deactivate individual magic links (Admin) +// If you only have a magic link, supress "Change Password" +// Once a ticket is used, disallow transfer (oneticket) +// Once a ticket is used, disallow transfer (manytickets) +// Why does the live version redirect back to localhost? +// Make sure open camping tickets actually send email +// Don't hardcode MainURL and PORT +// Limit number of Open Camping tickets // Maybe: // Deactivate individual magic links (User) // Option to "Email me my QR Code"