Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feat/render-deploy…
Browse files Browse the repository at this point in the history
…ment-action
  • Loading branch information
CharlesNg35 committed Nov 3, 2023
2 parents c136ec4 + ad97743 commit 0bd3f6f
Show file tree
Hide file tree
Showing 92 changed files with 1,476 additions and 797 deletions.
11 changes: 10 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"words": [
"barcodes",
"cacheable",
"camelcase",
"cloudinary",
"clsxm",
"dummyimage",
Expand All @@ -14,6 +15,8 @@
"headlessui",
"heroicons",
"JITSU",
"kanban",
"passcode",
"plasmo",
"RECAPTCHA",
"svgs",
Expand Down Expand Up @@ -54,7 +57,13 @@
"docker-compose.demo.yml",
"docker-compose.yml",
"wait",
"signin",
"Chatwoot",
"CHATWOOT",
"apps/web/lib/i18n/*.ts",
"apps/mobile/app/i18n/*.ts"
"apps/web/public/locales/**",
"apps/mobile/app/i18n/*.ts",
"apps/mobile/android/**",
"apps/mobile/ios/**"
]
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ Thumbs.db
/apps/**/.cache
/packages/**/.cache
/packages/**/dist

# Local Netlify folder
.netlify
27 changes: 20 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,19 @@
ARG NODE_VERSION=18.17.1
FROM node:${NODE_VERSION}-slim as base


# Next.js app lives here
WORKDIR /app

# Set production environment
ENV NEXT_SHARP_PATH=/app/node_modules/sharp
ENV NEXT_TELEMETRY_DISABLED=1
ENV NEXT_BUILD_OUTPUT_TYPE=standalone
ENV NEXT_SHARP_PATH=/temp/node_modules/sharp

RUN npm i -g npm@latest
# Install sharp, NextJS image optimization
RUN mkdir /temp && cd /temp && \
npm i sharp

RUN npm cache clean --force


# Throw-away build stage to reduce size of final image
Expand All @@ -33,7 +40,7 @@ RUN cd apps/web && \
# Copy application code
COPY --link . .

ENV NODE_ENV="production"
ENV NODE_ENV=production

# Build application
RUN yarn run build:web
Expand All @@ -42,16 +49,22 @@ RUN yarn run build:web
RUN cd apps/web && \
yarn install --prod --ignore-scripts

RUN yarn cache clean


# Final stage for app image
FROM base

ENV NODE_ENV="production"
ENV NODE_ENV=production

# Copy built application
COPY --from=build /app /app
COPY --from=build /app/apps/web/.next/standalone ./
COPY --from=build /app/apps/web/.next/static ./apps/web/.next/static
COPY --from=build /app/apps/web/public ./apps/web/public

# Start the server by default, this can be overwritten at runtime
EXPOSE 3000

CMD [ "npm", "run", "start:web" ]
ENV PORT=3000

CMD [ "node", "./apps/web/server.js" ]
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,15 @@ WIP

### Railway

Note: WIP
[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/7_OfzR?referralCode=40jeja)

[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/EverTeams)
### Fly

[![Deploy on Railway](https://ever.team/fly.png)](https://github.com/ever-co/ever-teams/wiki/Deploy-to-Fly)

### Netlify

[![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/ever-co/ever-teams)

## 📄 Content

Expand All @@ -164,8 +170,8 @@ Note: WIP

## 🔐 Security

Ever Teams Platform follows good security practices, but 100% security cannot be guaranteed in any software!
Ever Teams Platform is provided AS IS without any warranty. Use at your own risk!
**Ever Teams Platform** follows good security practices, but 100% security cannot be guaranteed in any software!
**Ever Teams Platform** is provided AS IS without any warranty. Use at your own risk!
See more details in the [LICENSE.md](LICENSE.md).

In a production setup, all client-side to server-side (backend, APIs) communications should be encrypted using HTTPS/WSS/SSL (REST APIs, GraphQL endpoint, Socket.io WebSockets, etc.).
Expand Down
2 changes: 1 addition & 1 deletion apps/extensions/components/popup/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classNames from 'classnames';
import logoImg from 'data-base64:~assets/logo/gauzy-teams-dark.png';
import logoImg from 'data-base64:~assets/logo/ever-teams-dark.png';
import React, { FC, useState } from 'react';

import AppDropdown from '~components/shared/AppDropdown';
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ android {
applicationId 'ever.team'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionCode 2
versionName "0.1.0"
}

Expand Down
6 changes: 3 additions & 3 deletions apps/mobile/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
</queries>
<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true">
<meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
<meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="exposdk:48.0.0"/>
<meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="@string/expo_runtime_version"/>
<meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
<meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
<meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://u.expo.dev/9f38f768-16f6-4c47-b354-9745ebda1335"/>
<meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://u.expo.dev/2ff924e4-7a91-4b23-9db9-7453a8063bb0"/>
<activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
Expand All @@ -33,4 +33,4 @@
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
</application>
</manifest>
</manifest>
4 changes: 2 additions & 2 deletions apps/mobile/android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<string name="app_name">Ever Teams</string>
<string name="expo_splash_screen_resize_mode" translatable="false">cover</string>
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
<string name="expo_runtime_version">1.0.0</string>
</resources>
<string name="expo_runtime_version">exposdk:48.0.0</string>
</resources>
8 changes: 4 additions & 4 deletions apps/mobile/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"displayName": "Ever Teams",
"expo": {
"name": "Ever Teams",
"slug": "ever-gauzy-teams-mobile-expo",
"slug": "ever-teams-mobile",
"version": "0.1.0",
"orientation": "portrait",
"icon": "./assets/images/gauzy-teams-logo.png",
"icon": "./assets/images/ever-teams-logo.png",
"splash": {
"image": "./assets/images/splash-ever-teams.png",
"resizeMode": "cover",
Expand All @@ -15,7 +15,7 @@
"owner": "everco",
"updates": {
"fallbackToCacheTimeout": 0,
"url": "https://u.expo.dev/9f38f768-16f6-4c47-b354-9745ebda1335"
"url": "https://u.expo.dev/2ff924e4-7a91-4b23-9db9-7453a8063bb0"
},
"jsEngine": "hermes",
"assetBundlePatterns": ["**/*"],
Expand Down Expand Up @@ -74,7 +74,7 @@
},
"extra": {
"eas": {
"projectId": "9f38f768-16f6-4c47-b354-9745ebda1335"
"projectId": "2ff924e4-7a91-4b23-9db9-7453a8063bb0"
}
},
"hooks": {
Expand Down
Loading

0 comments on commit 0bd3f6f

Please sign in to comment.