Merge branch 'main' of https://github.com/SimonLoir/msc-thesis

apps/app/.env

@@ -1,3 +1,3 @@
 EXPO_USE_METRO_WORKSPACE_ROOT=1
-EXPO_PUBLIC_IOS_URL=http://192.168.0.115:3000
-EXPO_PUBLIC_ANDROID_URL=http://192.168.0.115:3000
+EXPO_PUBLIC_IOS_URL=http://localhost:3000
+EXPO_PUBLIC_ANDROID_URL=http://10.0.2.2:3000

apps/app/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
@@ -29,9 +30,9 @@
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.BROWSABLE"/>
         <data android:scheme="app"/>
-        <data android:scheme="be.unamur.touchIDE"/>
+        <data android:scheme="be.unamur.touchide"/>
       </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
   </application>
-</manifest>
+</manifest>

apps/app/app.json

@@ -24,7 +24,11 @@
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
-      "package": "be.unamur.touchIDE"
+      "package": "be.unamur.touchIDE",
+      "permissions": [
+        "android.permission.INTERNET",
+        "android.permission.ACCESS_NETWORK_STATE"
+      ]
     },
     "web": {
       "favicon": "./assets/favicon.png"

apps/app/app/index.tsx

@@ -1,7 +1,7 @@
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import '../global.css';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { links, trpc, trpcClient } from '../utils/api';
+import { links, trpc, trpcClient, url } from '../utils/api';
 import { useState } from 'react';
 import Scaffold from '../components/Scaffold';
 import Workspace from '../utils/workspace/Workspace';
@@ -15,6 +15,7 @@ import { completionItemSchema } from '@/schemas/exportedSchemas';
 import { KeyboardContext } from '../utils/keyboardContext';
 import { StatusBar } from 'expo-status-bar';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import { Text } from 'react-native';
 
 const queryClient = new QueryClient();
 
@@ -33,6 +34,7 @@ export default function IndexPage() {
 
     return (
         <>
+            <Text>{url}</Text>
             <StatusBar style='light' backgroundColor='rgb(40,40,40)' />
             <GestureHandlerRootView style={{ flex: 1 }}>
                 <KeyboardContext.Provider

docker-compose.override.yml

@@ -0,0 +1,6 @@
+version: '3.9'
+
+services:
+  web:
+    ports:
+      - 3000:3000

docker-compose.prod.yml

@@ -0,0 +1,14 @@
+services:
+  web:
+    networks:
+      - web
+    labels:
+      - traefik.docker.network=web
+      - traefik.enable=true
+      - traefik.http.routers.mscthesis.rule=Host(`mscthesis.loir.app`)
+      - traefik.http.routers.mscthesis.tls=true
+      - traefik.http.routers.mscthesis.tls.certresolver=letsencrypt
+      - traefik.http.services.mscthesis.loadbalancer.server.port=3000
+networks:
+  web:
+    external: true

docker-compose.yml

@@ -7,8 +7,6 @@ services:
     volumes:
       - ./packages/api/src:/usr/src/app/packages/api/src
       - ./projects:/usr/src/app/projects
-    ports:
-      - 3000:3000
     command: npm run dev
     build:
       context: .