Merge branch 'main' of https://github.com/Iteam1337/foodMarket

.github/workflows/gh-pages.yml

@@ -1,14 +1,8 @@
 name: Publish to Github Pages
 
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 on:
   push:
     branches: ['main']
-    # Publish semver tags as releases.
     tags: ['v*.*.*']
 
 jobs:
@@ -24,10 +18,7 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      - name: Git user config
-        run: git config --global user.email "[email protected]"
-      - name: Git user config
-        run: git config --global user.name "ghpages bot"
-
       - name: Publish to Github Pages
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npm run deploy

Dockerfile

@@ -5,4 +5,5 @@ RUN npm install --omit=dev
 RUN npm install -g ts-node
 COPY . .
 EXPOSE 3000
+RUN npm run build
 CMD ["ts-node", "api/server.ts"]

api/server.ts

@@ -23,6 +23,7 @@ const io = new Server(server, {
   },
 })
 
+app.use('/', express.static(path.join(__dirname, '../dist')))
 app.use('/assets', express.static(path.join(__dirname, '../assets')))
 app.get('/healthz', (req, res) => res.send('ok'))
 

package.json

@@ -9,7 +9,7 @@
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "expo start --web",
-    "serve": "expo export && npx serve dist -p 3000",
+    "build": "expo export",
     "deploy": "gh-pages -d dist",
     "predeploy": "expo export && echo skaff.iteam.pub > dist/CNAME"
   },

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "expo/tsconfig.base",
   "compilerOptions": {
-    "strict": true
+    "strict": false
   }
 }