Merge pull request #1063 from overthq/landing-page

Landing page and CD improvements
overthq · Jun 24, 2024 · d4c8a75 · d4c8a75
2 parents 1bc9a08 + e23bcae
commit d4c8a75
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -6,9 +6,28 @@ on:
       - main
 
 jobs:
+  changes:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    outputs:
+      app: ${{ steps.filter.outputs.app }}
+      dashboard: ${{ steps.filter.outputs.dashboard }}
+    steps:
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            app:
+              - 'apps/app/**'
+            dashboard:
+              - 'apps/dashboard/**'
+
   deploy-app:
     name: Deploy app
     runs-on: ubuntu-latest
+    needs: changes
+    if: ${{ needs.changes.outputs.app == 'true' }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -35,6 +54,8 @@ jobs:
   deploy-dashboard:
     name: Deploy dashboard
     runs-on: ubuntu-latest
+    needs: changes
+    if: ${{ needs.changes.outputs.dashboard == 'true' }}
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/apps/dashboard/src/components/product/Images.tsx b/apps/dashboard/src/components/product/Images.tsx
@@ -46,7 +46,10 @@ const Images: React.FC<ImagesProps> = ({
 				{imagesToUpload.map(uri => (
 					<Image key={uri} source={{ uri }} style={styles.image} />
 				))}
-				<TouchableOpacity onPress={handlePickImage} style={styles.add}>
+				<TouchableOpacity
+					onPress={handlePickImage}
+					style={[styles.add, { borderColor: theme.border.color }]}
+				>
 					<Icon name='plus' size={24} />
 				</TouchableOpacity>
 			</View>
@@ -76,7 +79,6 @@ const styles = StyleSheet.create({
 		width: 60,
 		height: 60,
 		borderRadius: 6,
-		borderColor: '#E3E3E3',
 		borderWidth: 2,
 		justifyContent: 'center',
 		alignItems: 'center'

diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
@@ -4,7 +4,7 @@ import Hero from '@/components/home/Hero';
 
 const Home = () => {
 	return (
-		<main>
+		<main style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}>
 			<Header />
 			<Hero />
 			<Footer />

diff --git a/apps/web/src/components/home/Hero.tsx b/apps/web/src/components/home/Hero.tsx
@@ -1,11 +1,15 @@
-import Image from 'next/image';
-
-import appProductScreen from '@/assets/app-product-screen.png';
-import appStoreScreen from '@/assets/app-store-screen.png';
-
 const Hero = () => {
 	return (
-		<div style={{ padding: '100px 0', textAlign: 'center' }}>
+		<div
+			style={{
+				textAlign: 'center',
+				display: 'flex',
+				flexDirection: 'column',
+				justifyContent: 'center',
+				flexGrow: 1,
+				padding: '0 16px'
+			}}
+		>
 			<h1 style={{ fontSize: '2.8125rem', fontWeight: '700' }}>
 				Online shopping, simplified.
 			</h1>
@@ -23,7 +27,7 @@ const Hero = () => {
 						style={{
 							marginTop: 16,
 							padding: '12px 24px',
-							backgroundColor: '#108910',
+							backgroundColor: '#2D2D2D',
 							borderRadius: 4,
 							color: '#FFFFFF',
 							fontSize: '1.1rem',
@@ -44,10 +48,7 @@ const Hero = () => {
 					gap: 16,
 					justifyContent: 'center'
 				}}
-			>
-				<Image src={appStoreScreen} alt='App store screen' width={240} />
-				<Image src={appProductScreen} alt='App product screen' width={240} />
-			</div>
+			></div>
 		</div>
 	);
 };