Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

chore: add billing menu

goenning0a627f3cfd89
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 073cdd648..176d2298a 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -9,6 +9,7 @@ import (
"github.com/getfider/fider/app/handlers/apiv1"
"github.com/getfider/fider/app/middlewares"
"github.com/getfider/fider/app/models/enum"
+ "github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/web"
)
@@ -173,6 +174,10 @@ func routes(r *web.Engine) *web.Engine {
ui.Post("/_api/admin/roles/:role/users", handlers.ChangeUserRole())
ui.Put("/_api/admin/users/:userID/block", handlers.BlockUser())
ui.Delete("/_api/admin/users/:userID/block", handlers.UnblockUser())
+
+ if env.IsBillingEnabled() {
+ ui.Get("/admin/billing", handlers.ManageBilling())
+ }
}
api := r.Group()
diff --git a/app/handlers/billing.go b/app/handlers/billing.go
new file mode 100644
index 000000000..7d80c437a
--- /dev/null
+++ b/app/handlers/billing.go
@@ -0,0 +1,15 @@
+package handlers
+
+import (
+ "github.com/getfider/fider/app/pkg/web"
+)
+
+// ManageBilling is the page used by administrators for billing settings
+func ManageBilling() web.HandlerFunc {
+ return func(c *web.Context) error {
+ return c.Page(web.Props{
+ Title: "Manage Billing · Site Settings",
+ ChunkName: "ManageBilling.page",
+ })
+ }
+}
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index 6a3004892..0766606ec 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -16,7 +16,7 @@ import (
var (
// these values are replaced during CI build
buildnumber = ""
- version = "0.19.0"
+ version = "0.20.0-dev"
)
func Version() string {
@@ -40,7 +40,11 @@ type config struct {
HostDomain string `env:"HOST_DOMAIN,required"`
Locale string `env:"LOCALE,default=en"`
JWTSecret string `env:"JWT_SECRET,required"`
- Metrics struct {
+ Paddle struct {
+ VendorID string `env:"PADDLE_VENDOR_ID"`
+ VendorAuthCode string `env:"PADDLE_VENDOR_AUTHCODE"`
+ }
+ Metrics struct {
Enabled bool `env:"METRICS_ENABLED,default=false"`
Port string `env:"METRICS_PORT,default=4000"`
}
@@ -175,6 +179,11 @@ func MultiTenantDomain() string {
return ""
}
+// IsBillingEnabled returns true if Paddle is configured
+func IsBillingEnabled() bool {
+ return Config.Paddle.VendorID != "" && Config.Paddle.VendorAuthCode != ""
+}
+
// IsProduction returns true on Fider production environment
func IsProduction() bool {
return Config.Environment == "production" || (!IsTest() && !IsDevelopment())
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index 35264cbfc..18325622c 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -201,15 +201,16 @@ func (r *Renderer) Render(w io.Writer, statusCode int, templateName string, prop
public["tenant"] = tenant
public["props"] = props.Data
public["settings"] = &Map{
- "mode": env.Config.HostMode,
- "locale": locale,
- "environment": env.Config.Environment,
- "googleAnalytics": env.Config.GoogleAnalytics,
- "domain": env.MultiTenantDomain(),
- "hasLegal": env.HasLegal(),
- "baseURL": ctx.BaseURL(),
- "assetsURL": AssetsURL(ctx, ""),
- "oauth": oauthProviders.Result,
+ "mode": env.Config.HostMode,
+ "locale": locale,
+ "environment": env.Config.Environment,
+ "googleAnalytics": env.Config.GoogleAnalytics,
+ "domain": env.MultiTenantDomain(),
+ "hasLegal": env.HasLegal(),
+ "isBillingEnabled": env.IsBillingEnabled(),
+ "baseURL": ctx.BaseURL(),
+ "assetsURL": AssetsURL(ctx, ""),
+ "oauth": oauthProviders.Result,
}
if ctx.IsAuthenticated() {
diff --git a/public/AsyncPages.tsx b/public/AsyncPages.tsx
index 655a2d42c..6d53a5557 100644
--- a/public/AsyncPages.tsx
+++ b/public/AsyncPages.tsx
@@ -95,6 +95,14 @@ export const AsyncAdvancedSettingsPage = load(
)
)
+export const AsyncManageBillingPage = load(
+ () =>
+ import(
+ /* webpackChunkName: "ManageBilling.page" */
+ "@fider/pages/Administration/pages/ManageBilling.page"
+ )
+)
+
export const AsyncManageWebhooksPage = load(
() =>
import(
diff --git a/public/models/settings.ts b/public/models/settings.ts
index 5afac3ea3..cd023aee6 100644
--- a/public/models/settings.ts
+++ b/public/models/settings.ts
@@ -16,6 +16,7 @@ export interface SystemSettings {
environment: string
domain: string
hasLegal: boolean
+ isBillingEnabled: boolean
baseURL: string
assetsURL: string
oauth: OAuthProviderOption[]
diff --git a/public/pages/Administration/components/SideMenu.tsx b/public/pages/Administration/components/SideMenu.tsx
index 2077368fc..f0f80ba14 100644
--- a/public/pages/Administration/components/SideMenu.tsx
+++ b/public/pages/Administration/components/SideMenu.tsx
@@ -49,6 +49,7 @@ export const SideMenu = (props: SiteMenuProps) => {
<SideMenuItem name="advanced" title="Advanced" href="/admin/advanced" isActive={activeItem === "advanced"} />
{fider.session.user.isAdministrator && (
<>
+ {fider.settings.isBillingEnabled && <SideMenuItem name="billing" title="Billing" href="/admin/billing" isActive={activeItem === "billing"} />}
<SideMenuItem name="webhooks" title="Webhooks" href="/admin/webhooks" isActive={activeItem === "webhooks"} />
<SideMenuItem name="export" title="Export" href="/admin/export" isActive={activeItem === "export"} />
</>
diff --git a/public/pages/Administration/pages/ManageBilling.page.tsx b/public/pages/Administration/pages/ManageBilling.page.tsx
new file mode 100644
index 000000000..a1fb6d7ce
--- /dev/null
+++ b/public/pages/Administration/pages/ManageBilling.page.tsx
@@ -0,0 +1,12 @@
+import React from "react"
+import { AdminPageContainer } from "../components/AdminBasePage"
+
+const ManageBillingPage = () => {
+ return (
+ <AdminPageContainer id="p-admin-billing" name="billing" title="Billing" subtitle="Manage your billing settings">
+ Work in Progress
+ </AdminPageContainer>
+ )
+}
+
+export default ManageBillingPage
diff --git a/public/router.tsx b/public/router.tsx
index 2c913574a..ce35763c9 100644
--- a/public/router.tsx
+++ b/public/router.tsx
@@ -23,6 +23,7 @@ const defaultRoutes = [
route("/admin/invitations", Pages.AsyncInvitationsPage),
route("/admin/authentication", Pages.AsyncManageAuthenticationPage),
route("/admin/advanced", Pages.AsyncAdvancedSettingsPage),
+ route("/admin/billing", Pages.AsyncManageBillingPage),
route("/admin/webhooks", Pages.AsyncManageWebhooksPage),
route("/admin", Pages.AsyncGeneralSettingsPage),
route("/terms", Pages.AsyncLegalPage, false),