Skip to content

Commit d356e0d

Browse files
committed
fix deploy action
1 parent e862436 commit d356e0d

File tree

8 files changed

+29
-85
lines changed

8 files changed

+29
-85
lines changed

.github/workflows/deploy-frontendsupport.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- 'apps/frontendsupport/**'
88
- 'packages/**'
99
- 'pnpm-lock.yaml'
10+
- '.github/workflows/deploy-frontendsupport.yml'
11+
- 'apps/frontendsupport/bin/deploy.sh'
1012

1113
env:
1214
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -37,15 +39,16 @@ jobs:
3739
- name: Install dependencies
3840
run: pnpm install --no-frozen-lockfile
3941

40-
- name: Login to Amazon ECR
41-
run: |
42-
aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 313095418189.dkr.ecr.us-east-1.amazonaws.com
42+
- name: Build
43+
run: pnpm build
4344

4445
- name: Deploy to App Runner
4546
env:
4647
DOCKER_DEFAULT_PLATFORM: linux/amd64
4748
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
49+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
50+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
51+
AWS_DEFAULT_REGION: us-east-1
4852
run: |
53+
echo "Deploying to App Runner"
4954
pnpm --filter @cutting/frontend-support deploy:web
50-
SERVICE_ARN=$(aws apprunner list-services --query "ServiceSummaryList[?ServiceName=='frontendsupport'].ServiceArn | [0]" --output text)
51-
aws apprunner start-deployment --service-arn $SERVICE_ARN

apps/frontendsupport/bin/deploy.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ docker tag frontendsupport:latest 313095418189.dkr.ecr.us-east-1.amazonaws.com/f
1010

1111
docker push 313095418189.dkr.ecr.us-east-1.amazonaws.com/frontendsupport:latest
1212

13+
SERVICE_ARN=$(aws apprunner list-services --query "ServiceSummaryList[?ServiceName=='frontendsupport'].ServiceArn | [0]" --output text)
14+
aws apprunner start-deployment --service-arn $SERVICE_ARN
15+
1316
rm -rf ./pruned

apps/frontendsupport/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
},
1919
"dependencies": {
2020
"@cutting/assert": "workspace:*",
21-
"@cutting/component-library": "5.48.0",
22-
"@cutting/hooks": "4.63.0",
21+
"@cutting/component-library": "workspace:*",
22+
"@cutting/hooks": "workspace:*",
2323
"@cutting/markdown": "workspace:*",
2424
"@cutting/react-hook-form-components": "workspace:*",
2525
"@cutting/use-get-parent-size": "workspace:*",
@@ -70,7 +70,6 @@
7070
"@vanilla-extract/dynamic": "2.1.5",
7171
"@vanilla-extract/sprinkles": "1.6.5",
7272
"@vanilla-extract/vite-plugin": "5.1.4",
73-
"@vitejs/plugin-react-swc": "^4.0.2",
7473
"browserslist": "^4.28.1",
7574
"dedent": "1.7.1",
7675
"eslint-config-prettier": "10.1.8",
@@ -109,10 +108,10 @@
109108
"@vanilla-extract/dynamic": "2.1.5",
110109
"@vanilla-extract/sprinkles": "1.6.5",
111110
"dedent": "1.7.1",
112-
"react": "19.2.0",
111+
"react": "19.2.3",
113112
"react-calendly": "4.4.0",
114113
"react-device-detect": "2.2.3",
115-
"react-dom": "19.2.0",
114+
"react-dom": "19.2.3",
116115
"react-hook-form": "7.69.0",
117116
"react-is": "19.2.0",
118117
"use-debounce": "10.0.6"

apps/frontendsupport/src/components/Scroller/Scroller.css.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export const scroller = style({
2020
display: 'flex',
2121
justifyContent: 'center',
2222
opacity: 1,
23+
marginLeft: '50px',
2324
});
2425

2526
export const arrow = style({

apps/frontendsupport/src/pages/Home/Home.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Box, Heading, Text } from '@cutting/component-library';
22

33
import { ContactButtons } from '~/components/Contact/ContactButtons';
4+
import Testimonials from '~/routes/testimonials';
45

56
import { Scroller } from '../../components/Scroller/Scroller';
67
import * as styles from './Home.css';
@@ -32,7 +33,7 @@ export function Home(): JSX.Element {
3233
</Box>
3334
</Box>
3435

35-
<Box marginBottom="xxxlarge">
36+
<Box marginBottom="xxxlarge" paddingBottom="xxxlarge">
3637
<div>
3738
<h2 className={styles.sectionTitle}>What I Do</h2>
3839
<div className={styles.servicesGrid}>
@@ -63,8 +64,10 @@ export function Home(): JSX.Element {
6364
<h2 className={styles.ctaTitle}>Ready to speed up your site?</h2>
6465
<p className={styles.ctaSubtitle}>Let&apos;s talk about your performance goals</p>
6566
<ContactButtons justify="center" />
67+
<Scroller />
6668
</div>
6769
</section>
70+
<Testimonials />
6871
</Box>
6972
);
7073
}

apps/frontendsupport/tsconfig.dist.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
],
1717
"exclude": ["pruned", "dist"],
1818
"references": [
19+
{ "path": "../../packages/assert/tsconfig.dist.json" },
1920
{ "path": "../../packages/util/tsconfig.dist.json" },
2021
{ "path": "../../packages/hooks/tsconfig.dist.json" },
2122
{ "path": "../../packages/component-library/tsconfig.dist.json" },

packages/component-library/src/components/molecules/Testimonial/Testimonial.css.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ export const root = style({
99
// borderBottom: '1px dotted #0098d8',
1010
});
1111

12+
globalStyle(`${root} figcaption cite span`, {
13+
color: palette.white,
14+
});
15+
1216
globalStyle(`${root} blockquote`, {
1317
boxShadow: '0 0 6px rgb(0 0 0 / 50%)',
1418
background: palette.white,

pnpm-lock.yaml

Lines changed: 4 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)