wip new architecture

imobico · Mar 28, 2024 · 7bb4a7e · 7bb4a7e
1 parent abae392
commit 7bb4a7e
Show file tree

Hide file tree

Showing 88 changed files with 6 additions and 7 deletions.
diff --git a/apps/next/.env → apps/desktop/.env b/apps/next/.env → apps/desktop/.env
diff --git a/apps/next/.eslintrc.js → apps/desktop/.eslintrc.js b/apps/next/.eslintrc.js → apps/desktop/.eslintrc.js
diff --git a/apps/tauri/.gitignore → apps/desktop/.gitignore b/apps/tauri/.gitignore → apps/desktop/.gitignore
diff --git a/apps/tauri/cfImageLoader.js → apps/desktop/cfImageLoader.js b/apps/tauri/cfImageLoader.js → apps/desktop/cfImageLoader.js
diff --git a/apps/tauri/components/TauriTitlebar.tsx → apps/desktop/components/TauriTitlebar.tsx b/apps/tauri/components/TauriTitlebar.tsx → apps/desktop/components/TauriTitlebar.tsx
diff --git a/apps/next/next-env.d.ts → apps/desktop/next-env.d.ts b/apps/next/next-env.d.ts → apps/desktop/next-env.d.ts
diff --git a/apps/tauri/next.config.js → apps/desktop/next.config.js b/apps/tauri/next.config.js → apps/desktop/next.config.js
diff --git a/apps/tauri/package.json → apps/desktop/package.json b/apps/tauri/package.json → apps/desktop/package.json
diff --git a/apps/tauri/pages/_app.tsx → apps/desktop/pages/_app.tsx b/apps/tauri/pages/_app.tsx → apps/desktop/pages/_app.tsx
diff --git a/apps/tauri/pages/_document.tsx → apps/desktop/pages/_document.tsx b/apps/tauri/pages/_document.tsx → apps/desktop/pages/_document.tsx
diff --git a/apps/tauri/pages/data-fetching.tsx → apps/desktop/pages/data-fetching.tsx b/apps/tauri/pages/data-fetching.tsx → apps/desktop/pages/data-fetching.tsx
diff --git a/apps/next/pages/index.tsx → apps/desktop/pages/index.tsx b/apps/next/pages/index.tsx → apps/desktop/pages/index.tsx
diff --git a/apps/tauri/pages/infinite-list.tsx → apps/desktop/pages/infinite-list.tsx b/apps/tauri/pages/infinite-list.tsx → apps/desktop/pages/infinite-list.tsx
diff --git a/apps/tauri/pages/params/[id].tsx → apps/desktop/pages/params/[id].tsx b/apps/tauri/pages/params/[id].tsx → apps/desktop/pages/params/[id].tsx
diff --git a/apps/tauri/pages/sign-in/index.tsx → apps/desktop/pages/sign-in/index.tsx b/apps/tauri/pages/sign-in/index.tsx → apps/desktop/pages/sign-in/index.tsx
diff --git a/...ages/sign-up/email-verification/index.tsx → ...ages/sign-up/email-verification/index.tsx b/...ages/sign-up/email-verification/index.tsx → ...ages/sign-up/email-verification/index.tsx
diff --git a/apps/tauri/pages/sign-up/index.tsx → apps/desktop/pages/sign-up/index.tsx b/apps/tauri/pages/sign-up/index.tsx → apps/desktop/pages/sign-up/index.tsx
diff --git a/...ri/pages/sign-up/sso-oauth/[strategy].tsx → ...op/pages/sign-up/sso-oauth/[strategy].tsx b/...ri/pages/sign-up/sso-oauth/[strategy].tsx → ...op/pages/sign-up/sso-oauth/[strategy].tsx
diff --git a/apps/tauri/public/auth/apple-logo.png → apps/desktop/public/auth/apple-logo.png b/apps/tauri/public/auth/apple-logo.png → apps/desktop/public/auth/apple-logo.png
diff --git a/apps/tauri/public/auth/discord-logo.png → apps/desktop/public/auth/discord-logo.png b/apps/tauri/public/auth/discord-logo.png → apps/desktop/public/auth/discord-logo.png
diff --git a/apps/tauri/public/auth/google-logo.png → apps/desktop/public/auth/google-logo.png b/apps/tauri/public/auth/google-logo.png → apps/desktop/public/auth/google-logo.png
diff --git a/apps/tauri/public/favicon.ico → apps/desktop/public/favicon.ico b/apps/tauri/public/favicon.ico → apps/desktop/public/favicon.ico
diff --git a/apps/tauri/public/t4-logo-large.png → apps/desktop/public/t4-logo-large.png b/apps/tauri/public/t4-logo-large.png → apps/desktop/public/t4-logo-large.png
diff --git a/apps/tauri/public/t4-logo.png → apps/desktop/public/t4-logo.png b/apps/tauri/public/t4-logo.png → apps/desktop/public/t4-logo.png
diff --git a/apps/tauri/src-tauri/.gitignore → apps/desktop/src-tauri/.gitignore b/apps/tauri/src-tauri/.gitignore → apps/desktop/src-tauri/.gitignore
diff --git a/apps/tauri/src-tauri/Cargo.lock → apps/desktop/src-tauri/Cargo.lock b/apps/tauri/src-tauri/Cargo.lock → apps/desktop/src-tauri/Cargo.lock
diff --git a/apps/tauri/src-tauri/Cargo.toml → apps/desktop/src-tauri/Cargo.toml b/apps/tauri/src-tauri/Cargo.toml → apps/desktop/src-tauri/Cargo.toml
diff --git a/apps/tauri/src-tauri/build.rs → apps/desktop/src-tauri/build.rs b/apps/tauri/src-tauri/build.rs → apps/desktop/src-tauri/build.rs
diff --git a/apps/tauri/src-tauri/icons/128x128.png → apps/desktop/src-tauri/icons/128x128.png b/apps/tauri/src-tauri/icons/128x128.png → apps/desktop/src-tauri/icons/128x128.png
diff --git a/apps/tauri/src-tauri/icons/128x128@2x.png → apps/desktop/src-tauri/icons/128x128@2x.png b/apps/tauri/src-tauri/icons/128x128@2x.png → apps/desktop/src-tauri/icons/128x128@2x.png
diff --git a/apps/tauri/src-tauri/icons/32x32.png → apps/desktop/src-tauri/icons/32x32.png b/apps/tauri/src-tauri/icons/32x32.png → apps/desktop/src-tauri/icons/32x32.png
diff --git a/...uri/src-tauri/icons/Square107x107Logo.png → ...top/src-tauri/icons/Square107x107Logo.png b/...uri/src-tauri/icons/Square107x107Logo.png → ...top/src-tauri/icons/Square107x107Logo.png
diff --git a/...uri/src-tauri/icons/Square142x142Logo.png → ...top/src-tauri/icons/Square142x142Logo.png b/...uri/src-tauri/icons/Square142x142Logo.png → ...top/src-tauri/icons/Square142x142Logo.png
diff --git a/...uri/src-tauri/icons/Square150x150Logo.png → ...top/src-tauri/icons/Square150x150Logo.png b/...uri/src-tauri/icons/Square150x150Logo.png → ...top/src-tauri/icons/Square150x150Logo.png
diff --git a/...uri/src-tauri/icons/Square284x284Logo.png → ...top/src-tauri/icons/Square284x284Logo.png b/...uri/src-tauri/icons/Square284x284Logo.png → ...top/src-tauri/icons/Square284x284Logo.png
diff --git a/...tauri/src-tauri/icons/Square30x30Logo.png → ...sktop/src-tauri/icons/Square30x30Logo.png b/...tauri/src-tauri/icons/Square30x30Logo.png → ...sktop/src-tauri/icons/Square30x30Logo.png
diff --git a/...uri/src-tauri/icons/Square310x310Logo.png → ...top/src-tauri/icons/Square310x310Logo.png b/...uri/src-tauri/icons/Square310x310Logo.png → ...top/src-tauri/icons/Square310x310Logo.png
diff --git a/...tauri/src-tauri/icons/Square44x44Logo.png → ...sktop/src-tauri/icons/Square44x44Logo.png b/...tauri/src-tauri/icons/Square44x44Logo.png → ...sktop/src-tauri/icons/Square44x44Logo.png
diff --git a/...tauri/src-tauri/icons/Square71x71Logo.png → ...sktop/src-tauri/icons/Square71x71Logo.png b/...tauri/src-tauri/icons/Square71x71Logo.png → ...sktop/src-tauri/icons/Square71x71Logo.png
diff --git a/...tauri/src-tauri/icons/Square89x89Logo.png → ...sktop/src-tauri/icons/Square89x89Logo.png b/...tauri/src-tauri/icons/Square89x89Logo.png → ...sktop/src-tauri/icons/Square89x89Logo.png
diff --git a/apps/tauri/src-tauri/icons/StoreLogo.png → apps/desktop/src-tauri/icons/StoreLogo.png b/apps/tauri/src-tauri/icons/StoreLogo.png → apps/desktop/src-tauri/icons/StoreLogo.png
diff --git a/apps/tauri/src-tauri/icons/icon.icns → apps/desktop/src-tauri/icons/icon.icns b/apps/tauri/src-tauri/icons/icon.icns → apps/desktop/src-tauri/icons/icon.icns
diff --git a/apps/tauri/src-tauri/icons/icon.ico → apps/desktop/src-tauri/icons/icon.ico b/apps/tauri/src-tauri/icons/icon.ico → apps/desktop/src-tauri/icons/icon.ico
diff --git a/apps/tauri/src-tauri/icons/icon.png → apps/desktop/src-tauri/icons/icon.png b/apps/tauri/src-tauri/icons/icon.png → apps/desktop/src-tauri/icons/icon.png
diff --git a/apps/tauri/src-tauri/src/main.rs → apps/desktop/src-tauri/src/main.rs b/apps/tauri/src-tauri/src/main.rs → apps/desktop/src-tauri/src/main.rs
diff --git a/apps/tauri/src-tauri/tauri.conf.json → apps/desktop/src-tauri/tauri.conf.json b/apps/tauri/src-tauri/tauri.conf.json → apps/desktop/src-tauri/tauri.conf.json
diff --git a/apps/tauri/styles/globals.css → apps/desktop/styles/globals.css b/apps/tauri/styles/globals.css → apps/desktop/styles/globals.css
diff --git a/apps/tauri/tamagui.config.ts → apps/desktop/tamagui.config.ts b/apps/tauri/tamagui.config.ts → apps/desktop/tamagui.config.ts
diff --git a/apps/tauri/tsconfig.json → apps/desktop/tsconfig.json b/apps/tauri/tsconfig.json → apps/desktop/tsconfig.json
@@ -6,7 +6,6 @@
     "paths": {
       "react-native": ["react-native-web"],
       "app/*": ["../../packages/app/*"],
-      "@t4/api/*": ["../../packages/api/*"],
       "@t4/ui/*": ["../../packages/ui/*"]
     },
     "allowJs": true,

diff --git a/apps/tauri/wrangler.toml → apps/desktop/wrangler.toml b/apps/tauri/wrangler.toml → apps/desktop/wrangler.toml
diff --git a/apps/expo/.gitignore → apps/mobile/.gitignore b/apps/expo/.gitignore → apps/mobile/.gitignore
diff --git a/apps/expo/app.json → apps/mobile/app.json b/apps/expo/app.json → apps/mobile/app.json
diff --git a/apps/expo/app/_layout.tsx → apps/mobile/app/_layout.tsx b/apps/expo/app/_layout.tsx → apps/mobile/app/_layout.tsx
diff --git a/apps/expo/app/index.tsx → apps/mobile/app/index.tsx b/apps/expo/app/index.tsx → apps/mobile/app/index.tsx
diff --git a/apps/expo/app/types.d.ts → apps/mobile/app/types.d.ts b/apps/expo/app/types.d.ts → apps/mobile/app/types.d.ts
diff --git a/apps/expo/app/user/[id].tsx → apps/mobile/app/user/[id].tsx b/apps/expo/app/user/[id].tsx → apps/mobile/app/user/[id].tsx
diff --git a/apps/expo/assets/adaptive-icon.png → apps/mobile/assets/adaptive-icon.png b/apps/expo/assets/adaptive-icon.png → apps/mobile/assets/adaptive-icon.png
diff --git a/apps/expo/assets/favicon.png → apps/mobile/assets/favicon.png b/apps/expo/assets/favicon.png → apps/mobile/assets/favicon.png
diff --git a/apps/expo/assets/icon.png → apps/mobile/assets/icon.png b/apps/expo/assets/icon.png → apps/mobile/assets/icon.png
diff --git a/apps/expo/assets/splash.png → apps/mobile/assets/splash.png b/apps/expo/assets/splash.png → apps/mobile/assets/splash.png
diff --git a/apps/expo/babel.config.js → apps/mobile/babel.config.js b/apps/expo/babel.config.js → apps/mobile/babel.config.js
diff --git a/apps/expo/eas.json → apps/mobile/eas.json b/apps/expo/eas.json → apps/mobile/eas.json
diff --git a/apps/expo/index.js → apps/mobile/index.js b/apps/expo/index.js → apps/mobile/index.js
diff --git a/apps/expo/metro.config.js → apps/mobile/metro.config.js b/apps/expo/metro.config.js → apps/mobile/metro.config.js
diff --git a/apps/expo/package.json → apps/mobile/package.json b/apps/expo/package.json → apps/mobile/package.json
diff --git a/apps/expo/tsconfig.json → apps/mobile/tsconfig.json b/apps/expo/tsconfig.json → apps/mobile/tsconfig.json
diff --git a/apps/tauri/.env → apps/web/.env b/apps/tauri/.env → apps/web/.env
diff --git a/apps/tauri/.eslintrc.js → apps/web/.eslintrc.js b/apps/tauri/.eslintrc.js → apps/web/.eslintrc.js
diff --git a/apps/next/.gitignore → apps/web/.gitignore b/apps/next/.gitignore → apps/web/.gitignore
diff --git a/apps/next/app-demo/TamaguiProvider.tsx → apps/web/app-demo/TamaguiProvider.tsx b/apps/next/app-demo/TamaguiProvider.tsx → apps/web/app-demo/TamaguiProvider.tsx
diff --git a/apps/next/app-demo/layout.tsx → apps/web/app-demo/layout.tsx b/apps/next/app-demo/layout.tsx → apps/web/app-demo/layout.tsx
diff --git a/apps/next/app-demo/page.tsx → apps/web/app-demo/page.tsx b/apps/next/app-demo/page.tsx → apps/web/app-demo/page.tsx
diff --git a/apps/next/app-demo/user/[id]/page.tsx → apps/web/app-demo/user/[id]/page.tsx b/apps/next/app-demo/user/[id]/page.tsx → apps/web/app-demo/user/[id]/page.tsx
diff --git a/apps/tauri/next-env.d.ts → apps/web/next-env.d.ts b/apps/tauri/next-env.d.ts → apps/web/next-env.d.ts
diff --git a/apps/next/next.config.js → apps/web/next.config.js b/apps/next/next.config.js → apps/web/next.config.js
diff --git a/apps/next/package.json → apps/web/package.json b/apps/next/package.json → apps/web/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "cd ../.. && bun build && cd apps/next && next build",
+    "build": "cd ../.. && bun build && cd apps/web && next build",
     "start": "next start",
     "serve": "NODE_ENV=production next start --port 8151",
     "lint": "next lint"

diff --git a/apps/next/pages/_app.tsx → apps/web/pages/_app.tsx b/apps/next/pages/_app.tsx → apps/web/pages/_app.tsx
diff --git a/apps/next/pages/_document.tsx → apps/web/pages/_document.tsx b/apps/next/pages/_document.tsx → apps/web/pages/_document.tsx
diff --git a/apps/tauri/pages/index.tsx → apps/web/pages/index.tsx b/apps/tauri/pages/index.tsx → apps/web/pages/index.tsx
diff --git a/apps/next/pages/user/[id].tsx → apps/web/pages/user/[id].tsx b/apps/next/pages/user/[id].tsx → apps/web/pages/user/[id].tsx
diff --git a/apps/next/public/favicon.ico → apps/web/public/favicon.ico b/apps/next/public/favicon.ico → apps/web/public/favicon.ico
diff --git a/apps/next/public/tamagui.css → apps/web/public/tamagui.css b/apps/next/public/tamagui.css → apps/web/public/tamagui.css
diff --git a/apps/next/public/vercel.svg → apps/web/public/vercel.svg b/apps/next/public/vercel.svg → apps/web/public/vercel.svg
diff --git a/apps/next/tsconfig.json → apps/web/tsconfig.json b/apps/next/tsconfig.json → apps/web/tsconfig.json
diff --git a/apps/next/types.d.ts → apps/web/types.d.ts b/apps/next/types.d.ts → apps/web/types.d.ts
diff --git a/apps/next/vercel.json → apps/web/vercel.json b/apps/next/vercel.json → apps/web/vercel.json
diff --git a/package.json b/package.json
@@ -6,10 +6,10 @@
     "packages/*"
   ],
   "scripts": {
-    "native": "cd apps/expo && bun start",
+    "native": "cd apps/mobile && bun start",
     "watch": "bun workspaces foreach -pi run watch",
     "vercel:install": "bun set version 3.5 && bun install",
-    "web": "turbo dev --parallel --filter={imoblr-web,@t4/api}",
+    "web": "turbo dev --parallel --filter={imoblr-web,@my/ui}",
     "web:extract": "DISABLE_EXTRACTION=false bun workspace imoblr-web dev",
     "web:prod": "bun workspace imoblr-web build",
     "web:prod:serve": "bun workspace imoblr-web serve",
@@ -19,8 +19,8 @@
     "upgrade:tamagui": "bun up '*tamagui*'@latest '@tamagui/*'@latest react-native-web-lite@latest",
     "upgrade:tamagui:canary": "bun up '*tamagui*'@canary '@tamagui/*'@canary react-native-web-lite@canary",
     "check-deps": "check-dependency-version-consistency .",
-    "desktop": "cd apps/tauri && bun dev",
-    "build:desktop": "cd apps/tauri && bun run build"
+    "desktop": "cd apps/desktop && bun dev",
+    "build:desktop": "cd apps/desktop && bun run build"
   },
   "resolutions": {
     "react": "^18.2.0",

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -14,7 +14,7 @@
   ],
   "scripts": {
     "build": "tamagui-build --skip-types",
-    "watch": "tamagui-build --skip-types --watch"
+    "dev": "tamagui-build --skip-types --watch"
   },
   "dependencies": {
     "@my/config": "0.0.1",