diff --git a/apps/admin/Dockerfile b/apps/admin/Dockerfile index 3e52cdf..b9576b0 100755 --- a/apps/admin/Dockerfile +++ b/apps/admin/Dockerfile @@ -18,8 +18,21 @@ RUN npx turbo run build --filter=@sauci/shared # Build admin app with env vars ARG VITE_SUPABASE_URL ARG VITE_SUPABASE_ANON_KEY +ARG VITE_OPENAI_API_KEY +ARG VITE_OPENROUTER_API_KEY +ARG VITE_AI_MODEL +ARG VITE_AI_MODEL_GENERATE +ARG VITE_AI_MODEL_FIX +ARG VITE_AI_MODEL_POLISH + ENV VITE_SUPABASE_URL=$VITE_SUPABASE_URL ENV VITE_SUPABASE_ANON_KEY=$VITE_SUPABASE_ANON_KEY +ENV VITE_OPENAI_API_KEY=$VITE_OPENAI_API_KEY +ENV VITE_OPENROUTER_API_KEY=$VITE_OPENROUTER_API_KEY +ENV VITE_AI_MODEL=$VITE_AI_MODEL +ENV VITE_AI_MODEL_GENERATE=$VITE_AI_MODEL_GENERATE +ENV VITE_AI_MODEL_FIX=$VITE_AI_MODEL_FIX +ENV VITE_AI_MODEL_POLISH=$VITE_AI_MODEL_POLISH RUN npx turbo run build --filter=@sauci/admin diff --git a/apps/admin/docker-compose.yml b/apps/admin/docker-compose.yml index 3b498d1..c11e5e7 100644 --- a/apps/admin/docker-compose.yml +++ b/apps/admin/docker-compose.yml @@ -3,8 +3,6 @@ services: build: context: ../.. dockerfile: apps/admin/Dockerfile.dev - ports: - - "3000:3001" environment: - VITE_SUPABASE_URL=${VITE_SUPABASE_URL} - VITE_SUPABASE_ANON_KEY=${VITE_SUPABASE_ANON_KEY} diff --git a/apps/mobile/app/(auth)/login.tsx b/apps/mobile/app/(auth)/login.tsx index 01420f7..09cd6cc 100755 --- a/apps/mobile/app/(auth)/login.tsx +++ b/apps/mobile/app/(auth)/login.tsx @@ -8,6 +8,7 @@ import { KeyboardAvoidingView, Platform, ScrollView, + Image, } from "react-native"; import { Redirect, router } from "expo-router"; import * as Linking from "expo-linking"; @@ -395,9 +396,11 @@ export default function LoginScreen() { entering={FadeInDown.delay(100).duration(600).springify()} style={styles.brandContainer} > - - - + Sauci Explore intimacy together @@ -594,13 +597,9 @@ const styles = StyleSheet.create({ alignItems: "center", marginBottom: spacing.xl, }, - logoContainer: { - width: 80, - height: 80, - borderRadius: 40, - backgroundColor: colors.primaryLight, - justifyContent: "center", - alignItems: "center", + logoImage: { + width: 100, + height: 100, marginBottom: spacing.md, }, title: { diff --git a/apps/mobile/assets/logo.png b/apps/mobile/assets/logo.png new file mode 100644 index 0000000..b9366bc Binary files /dev/null and b/apps/mobile/assets/logo.png differ diff --git a/apps/mobile/assets/splash-icon.png b/apps/mobile/assets/splash-icon.png old mode 100755 new mode 100644 index f3fbb44..ed706d5 Binary files a/apps/mobile/assets/splash-icon.png and b/apps/mobile/assets/splash-icon.png differ diff --git a/apps/mobile/ios/Sauci.xcodeproj/project.pbxproj b/apps/mobile/ios/Sauci.xcodeproj/project.pbxproj index d410361..4f36c4f 100644 --- a/apps/mobile/ios/Sauci.xcodeproj/project.pbxproj +++ b/apps/mobile/ios/Sauci.xcodeproj/project.pbxproj @@ -400,11 +400,11 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.sauci.app; - PRODUCT_NAME = Sauci; + PRODUCT_NAME = "Sauci"; SWIFT_OBJC_BRIDGING_HEADER = "Sauci/Sauci-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -434,10 +434,10 @@ ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.sauci.app; - PRODUCT_NAME = Sauci; + PRODUCT_NAME = "Sauci"; SWIFT_OBJC_BRIDGING_HEADER = "Sauci/Sauci-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png b/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png index 5ba74b7..4ac5e93 100644 Binary files a/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png and b/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png differ diff --git a/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/Contents.json b/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/Contents.json index bd04914..90d8d4c 100644 --- a/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/apps/mobile/ios/Sauci/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,134 +1,14 @@ { "images": [ { - "filename": "AppIcon@2x.png", - "idiom": "iphone", - "scale": "2x", - "size": "60x60" - }, - { - "filename": "AppIcon@3x.png", - "idiom": "iphone", - "scale": "3x", - "size": "60x60" - }, - { - "filename": "AppIcon~ipad.png", - "idiom": "ipad", - "scale": "1x", - "size": "76x76" - }, - { - "filename": "AppIcon@2x~ipad.png", - "idiom": "ipad", - "scale": "2x", - "size": "76x76" - }, - { - "filename": "AppIcon-83.5@2x~ipad.png", - "idiom": "ipad", - "scale": "2x", - "size": "83.5x83.5" - }, - { - "filename": "AppIcon-40@2x.png", - "idiom": "iphone", - "scale": "2x", - "size": "40x40" - }, - { - "filename": "AppIcon-40@3x.png", - "idiom": "iphone", - "scale": "3x", - "size": "40x40" - }, - { - "filename": "AppIcon-40~ipad.png", - "idiom": "ipad", - "scale": "1x", - "size": "40x40" - }, - { - "filename": "AppIcon-40@2x~ipad.png", - "idiom": "ipad", - "scale": "2x", - "size": "40x40" - }, - { - "filename": "AppIcon-20@2x.png", - "idiom": "iphone", - "scale": "2x", - "size": "20x20" - }, - { - "filename": "AppIcon-20@3x.png", - "idiom": "iphone", - "scale": "3x", - "size": "20x20" - }, - { - "filename": "AppIcon-20~ipad.png", - "idiom": "ipad", - "scale": "1x", - "size": "20x20" - }, - { - "filename": "AppIcon-20@2x~ipad.png", - "idiom": "ipad", - "scale": "2x", - "size": "20x20" - }, - { - "filename": "AppIcon-29.png", - "idiom": "iphone", - "scale": "1x", - "size": "29x29" - }, - { - "filename": "AppIcon-29@2x.png", - "idiom": "iphone", - "scale": "2x", - "size": "29x29" - }, - { - "filename": "AppIcon-29@3x.png", - "idiom": "iphone", - "scale": "3x", - "size": "29x29" - }, - { - "filename": "AppIcon-29~ipad.png", - "idiom": "ipad", - "scale": "1x", - "size": "29x29" - }, - { - "filename": "AppIcon-29@2x~ipad.png", - "idiom": "ipad", - "scale": "2x", - "size": "29x29" - }, - { - "filename": "AppIcon-60@2x~car.png", - "idiom": "car", - "scale": "2x", - "size": "60x60" - }, - { - "filename": "AppIcon-60@3x~car.png", - "idiom": "car", - "scale": "3x", - "size": "60x60" - }, - { - "filename": "AppIcon~ios-marketing.png", - "idiom": "ios-marketing", - "scale": "1x", + "filename": "App-Icon-1024x1024@1x.png", + "idiom": "universal", + "platform": "ios", "size": "1024x1024" } ], "info": { - "author": "iconkitchen", - "version": 1 + "version": 1, + "author": "expo" } } \ No newline at end of file diff --git a/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image.png b/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image.png index 0c8b836..f65d487 100644 Binary files a/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image.png and b/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image.png differ diff --git a/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@2x.png b/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@2x.png index 0c8b836..f65d487 100644 Binary files a/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@2x.png and b/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@2x.png differ diff --git a/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@3x.png b/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@3x.png index 0c8b836..f65d487 100644 Binary files a/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@3x.png and b/apps/mobile/ios/Sauci/Images.xcassets/SplashScreenLogo.imageset/image@3x.png differ diff --git a/etc/logo_cropped.png b/etc/logo_cropped.png new file mode 100644 index 0000000..4de4be1 Binary files /dev/null and b/etc/logo_cropped.png differ diff --git a/etc/logo_cropped_transparent.png b/etc/logo_cropped_transparent.png new file mode 100644 index 0000000..00589fa Binary files /dev/null and b/etc/logo_cropped_transparent.png differ