Skip to content

hardcode staging key #1179

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.

Sign up for GitHub

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

Merged
lyubov-voloshko merged 5 commits into from
May 22, 2025
Merged

hardcode staging key #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ef8002
hardcode staging key
gugu May 15, 2025
c70bd08
Merge branch 'main' into stripe-staging
gugu May 15, 2025
b6d8a69
correctly provide staging host
gugu May 15, 2025
312a1f8
Merge branch 'stripe-staging' of github.com:rocket-admin/rocketadmin …
gugu May 15, 2025
62b6f57
Merge branch 'main' into stripe-staging
lyubov-voloshko May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/src/environments/environment.prod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export const environment = {
production: true,
apiRoot: "/api",
saasURL: ""
saasURL: "",
stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host
};
3 changes: 2 additions & 1 deletion frontend/src/environments/environment.saas-prod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ export const environment = {
saas: true,
apiRoot: "/api",
saasURL: "",
saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net']
saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net'],
stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host
};
3 changes: 2 additions & 1 deletion frontend/src/environments/environment.saas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ export const environment = {
production: false,
apiRoot: "/api",
saasURL: "",
saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net']
saasHostnames: ['app.rocketadmin.com', 'localhost', 'rocketadmin-dev.tail9f8b2.ts.net'],
stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host
};
5 changes: 3 additions & 2 deletions frontend/src/environments/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

export const environment = {
production: false,
apiRoot: "/api"
apiRoot: "/api",
stagingHost: "rocketadmin-dev.tail9f8b2.ts.net" // Tailscale host
} as Record<string, any>;

/*
Expand All @@ -14,4 +15,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
3 changes: 2 additions & 1 deletion frontend/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const colorConfig: IColorConfig<Palettes, Colors> = {
type Palettes = { primaryPalette: string, accentedPalette: string, warnPalette: string, whitePalette: string, accentedDarkPalette: string, warnDarkPalette: string };
type Colors = { myColorName: string };

const stripeKey = location.host === environment.stagingHost ? 'pk_test_51JM8FBFtHdda1TsBTjVNBFMIAA8cXLNWTmZCF22FCS5swdJIFqMk82ZEeZpvTys7oxlDekdcYIGaQ5MEFz6lWa2s000r6RziCg' : 'pk_live_51JM8FBFtHdda1TsBR7nieMFVFigZAUXbPhQTNvaSyLynIW1lbfzO6rfqqIUn0JAGJRq9mrwKwrVCsDDFOs84M7pE006xDqNgHk'


if (environment.production) {
Expand Down Expand Up @@ -79,7 +80,7 @@ bootstrapApplication(AppComponent, {
// ...saasExtraModules,
NgxThemeModule.forRoot(colorConfig, {
frameworks: ['material'], // optional, default : ['tailwind', 'material']
}), NgxStripeModule.forRoot('pk_live_51JM8FBFtHdda1TsBR7nieMFVFigZAUXbPhQTNvaSyLynIW1lbfzO6rfqqIUn0JAGJRq9mrwKwrVCsDDFOs84M7pE006xDqNgHk'), ConfigModule.buildForConfigUrl('/config.json')),
}), NgxStripeModule.forRoot(stripeKey), ConfigModule.buildForConfigUrl('/config.json')),
PasswordStrengthMeterComponent,
ConnectionsService,
UsersService,
Expand Down