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

Keygen staging merge #13

Open
wants to merge 65 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
710ba7e
checkpoint before navmenu refactor
sanity May 12, 2023
a5651c1
more direct approach now works with pages only specified once
sanity May 13, 2023
44a3967
navitem removed, return to keygen branch
sanity May 13, 2023
3c30730
lots of work but not done yet
sanity May 17, 2023
4a9e7af
Merge branch 'production' into keygen
sanity May 17, 2023
08cf855
WIP, will probably hit pause and let Derek finish next week
sanity May 18, 2023
9a98eed
Upgrade Kweb version
Derek52 Jul 11, 2023
3bf5a84
Start on skeleton of contributing and signing a keypair.
Derek52 Aug 4, 2023
7aa4600
add Forge JS library
Derek52 Sep 1, 2023
03f2882
Switch to forge.all to include extra utilities
Derek52 Sep 3, 2023
2fa3dbf
Get hashPublicKey and blind() working in JS
Derek52 Sep 4, 2023
6b4bbaa
Get hashPublicKey and blind() working in JS
Derek52 Sep 4, 2023
3ec521c
clean hashPublicKey() and blind() functions
Derek52 Sep 4, 2023
2822eaf
write unblind()
Derek52 Sep 4, 2023
8177e9a
Clean up hashPublicKey(), blind(), and unblind()
Derek52 Sep 5, 2023
d10fc3c
Clean up claimIdPage
Derek52 Sep 6, 2023
5899122
Properly import Stripe
Derek52 Oct 18, 2023
661ec45
Simplify Stripe form.
Derek52 Oct 18, 2023
1ebdbea
Simplify Stripe JS form.
Derek52 Oct 18, 2023
b7101e6
Fix todo regarding the client side keypair.
Derek52 Oct 20, 2023
4bd3a29
touchup claimId page
Derek52 Oct 30, 2023
22a9a99
Complete the functionality of crypto.kt
Derek52 Oct 31, 2023
d7e8b45
Cleanup checkout.js
Derek52 Oct 31, 2023
7a1964a
Simplify ClaimID page.
Derek52 Oct 31, 2023
efa91bd
Merge remote-tracking branch 'origin/staging' into keygen-staging-merge
Derek52 Oct 31, 2023
036c604
Import latestNews
Derek52 Oct 31, 2023
f1a3292
Correct dependencies on staging-merge
Derek52 Nov 1, 2023
148e9df
Merge remote-tracking branch 'origin/staging' into keygen-staging-merge
Derek52 Nov 1, 2023
c6be766
Correct dependencies on staging-merge
Derek52 Nov 2, 2023
2277b70
touchup comments
Derek52 Nov 2, 2023
36b1f0d
Put in successful payment page
Derek52 Nov 2, 2023
c7a220e
ignore run configuration file with api keys
Derek52 Nov 2, 2023
ec4f19e
Add TODO's with crypto bit length
Derek52 Nov 9, 2023
72c46df
Add Claim ID Page to routing and Navbar
Derek52 Nov 20, 2023
75c6996
Merge remote-tracking branch 'origin/staging' into keygen-staging-merge
Derek52 Nov 21, 2023
88986ab
Fix NavBar
Derek52 Nov 21, 2023
d6437c2
Fix NavBar
Derek52 Nov 21, 2023
94dd61b
Merge branch 'keygen' into keygen-staging-merge
Derek52 Nov 21, 2023
9368f91
fix RenderPage error after merge
Derek52 Nov 21, 2023
53bffca
Add skeleton structure of successful payment page
Derek52 Nov 21, 2023
843e2db
Re-add stripe route plugin
Derek52 Nov 21, 2023
37e0532
Move renderCheckout logic to Kvar
Derek52 Nov 21, 2023
a60660a
Add QR Code todo
Derek52 Nov 21, 2023
4bcae49
Merge branch 'keygen' into keygen-staging-merge
Derek52 Dec 5, 2023
b9b236a
Fix renderpage during merge
Derek52 Dec 5, 2023
2317d17
Touchup Stripe integration
Derek52 Dec 6, 2023
4d96a94
Include Jquery
Derek52 Dec 6, 2023
a4cbb16
Upgrade Stripe dependency
Derek52 Dec 6, 2023
81d9a6e
Fix Stripe modal
Derek52 Dec 6, 2023
39e3c34
Removed trailing slash
Derek52 Dec 6, 2023
d435392
Add support for setting tier levels
Derek52 Dec 14, 2023
6e019df
Add imports
Derek52 Dec 14, 2023
9f3c4a8
Consolidate button code.
Derek52 Dec 15, 2023
4717621
Move buttons from columns to button-grup.
Derek52 Dec 15, 2023
417e13f
Load QR Code JS file.
Derek52 Dec 19, 2023
578d946
Load RSA key from environment variable instead of generate one.
Derek52 Dec 19, 2023
5bb5030
Setup dummy QR code.
Derek52 Dec 19, 2023
fe74754
Clean up
Derek52 Dec 19, 2023
9bab63f
Add comment
Derek52 Dec 19, 2023
a4ac7ed
Delete unneeded pages
Derek52 Dec 22, 2023
ddc03f4
store sample RSA key in json.
Derek52 Jan 13, 2024
f7c7d57
Remove unused payment pages.
Derek52 Feb 4, 2024
6074dda
Add tool to create master ECC keypair and contributor RSA key signers.
Derek52 Feb 5, 2024
ce490c1
Touchup key generator
Derek52 Feb 5, 2024
009e315
Touchup and annotate claimIdPage and JS
Derek52 Feb 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -20,6 +20,7 @@
*.rar

.idea/
.run/*
build/
.gradle/*

Expand Down
2 changes: 2 additions & 0 deletions build.gradle.kts
Expand Up @@ -57,6 +57,8 @@ dependencies {
implementation("io.ktor:ktor-client-content-negotiation:2.3.0")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.0")

implementation("com.stripe:stripe-java:24.0.0")

implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.11")

implementation("org.commonmark:commonmark:0.21.0")
Expand Down
16 changes: 0 additions & 16 deletions js_npm/.gitignore

This file was deleted.

76 changes: 0 additions & 76 deletions js_npm/index.js

This file was deleted.