Skip to content

Commit

Permalink
Merge pull request #13 from socious-io/main
Browse files Browse the repository at this point in the history
Merge main into production
  • Loading branch information
mohammadhb authored Jan 6, 2025
2 parents b7a654f + efe4314 commit e8de5dc
Show file tree
Hide file tree
Showing 70 changed files with 9,175 additions and 776 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
run: |
go test -v ./tests
# - name: Run DB migrations
# run: |
# go run cmd/migrate/main.go up
- name: Run DB migrations
run: |
go run cmd/migrate/main.go up
- name: Docker Setup Buildx
uses: docker/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ jobs:
run: |
go test -v ./tests
# - name: Run DB migrations
# run: |
# go run cmd/migrate/main.go up
- name: Run DB migrations
run: |
go run cmd/migrate/main.go up
- name: Docker Setup Buildx
uses: docker/[email protected]
Expand Down
26 changes: 25 additions & 1 deletion .tmp.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,28 @@ cors:
- '*'
nats:
url: nats://127.0.0.1:4222
secret: secret
secret: secret
payment:
fiats:
- name: STRIPE
apikey: sk_[test/live]_[key]
service: STRIPE
callback: stripe_return_url
- name: STRIPE_JP
apikey: sk_[test/live]_[key]
service: STRIPE
callback: stripe_return_url
chains:
- name: Cardano
explorer: BLOCK_EXPLORER_URL
contractaddress: CONTRACT_ADDRESS
tokens:
- name: Ethereum
symbol: ETH
address: blockchain_address
decimals: 8
type: EVM
mode: MAINNET/TESTNET
apikey: api_key
# connect_redirect: https://socious.io/api/v2/auth/stripe
# client_connect_link: https://webapp2.socious.io/wallet
14 changes: 13 additions & 1 deletion cmd/app/main.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package main

import (
"log"
"socious/src/apps"
"socious/src/config"
"socious/src/database"
"time"

"github.com/socious-io/gopay"
database "github.com/socious-io/pkg_database"
)

func main() {
Expand All @@ -17,5 +20,14 @@ func main() {
Timeout: 5 * time.Second,
})

if err := gopay.Setup(gopay.Config{
DB: database.GetDB(),
Prefix: "gopay",
Chains: config.Config.Payment.Chains,
Fiats: config.Config.Payment.Fiats,
}); err != nil {
log.Fatalf("gopay error %v", err)
}

apps.Serve()
}
Loading

0 comments on commit e8de5dc

Please sign in to comment.