Merge pull request #719 from The-Commit-Company/develop

Release 1.4.2
The-Commit-Company · Feb 24, 2024 · 9d6807c · 9d6807c
2 parents fa6a60b + 6ead867
commit 9d6807c
Show file tree

Hide file tree

Showing 18 changed files with 814 additions and 594 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,99 @@
+
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    name: Server
+
+    services:
+      redis-cache:
+        image: redis:alpine
+        ports:
+          - 13000:6379
+      redis-queue:
+        image: redis:alpine
+        ports:
+          - 11000:6379
+      redis-socketio:
+        image: redis:alpine
+        ports:
+          - 12000:6379
+      mariadb:
+        image: mariadb:10.6
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          check-latest: true
+
+      - name: Cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py', '**/setup.cfg') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: 'echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT'
+
+      - uses: actions/cache@v3
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Setup
+        run: |
+          bash ${GITHUB_WORKSPACE}/.github/helper/install_dependencies.sh
+          pip install frappe-bench
+          bench init --skip-redis-config-generation --skip-assets --python "$(which python)" ~/frappe-bench
+          mysql --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'"
+          mysql --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
+
+      - name: Install
+        working-directory: /home/runner/frappe-bench
+        run: |
+          bench get-app https://github.com/The-Commit-Company/Raven.git $GITHUB_WORKSPACE
+          bench setup requirements
+          bench new-site --db-root-password root --admin-password admin test_site
+          bench --site test_site install-app raven
+          bench build
+        env:
+          CI: 'Yes'
+
+      - name: Run Tests
+        working-directory: /home/runner/frappe-bench
+        run: |
+          bench --site test_site set-config allow_tests true
+          bench --site test_site run-tests --app raven
+        env:
+          TYPE: server
diff --git a/mobile/package.json b/mobile/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mobile",
   "private": true,
-  "version": "1.4.1",
+  "version": "1.4.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -47,7 +47,13 @@
     "rehype-sanitize": "^6.0.0",
     "remark-gfm": "^4.0.0",
     "tippy.js": "^6.3.7",
-    "turndown": "^7.1.2"
+    "turndown": "^7.1.2",
+    "@vitejs/plugin-react": "^4.2.1",
+    "autoprefixer": "^10.4.17",
+    "postcss": "^8.4.35",
+    "tailwindcss": "^3.4.1",
+    "vite": "^5.1.4",
+    "vite-plugin-pwa": "^0.19.0"
   },
   "devDependencies": {
     "@capacitor/cli": "^5.7.0",
@@ -56,12 +62,6 @@
     "@types/react-router": "5.1.11",
     "@types/react-router-dom": "^5.3.3",
     "@types/turndown": "^5.0.4",
-    "@vitejs/plugin-react": "^4.2.1",
-    "autoprefixer": "^10.4.17",
-    "postcss": "^8.4.35",
-    "tailwindcss": "^3.4.1",
-    "typescript": "^4.9.3",
-    "vite": "^5.1.4",
-    "vite-plugin-pwa": "^0.19.0"
+    "typescript": "^4.9.3"
   }
 }
diff --git a/mobile/src/pages/profile/Profile.tsx b/mobile/src/pages/profile/Profile.tsx
@@ -56,7 +56,7 @@ export const Profile = () => {
                     </IonItem>
                 </IonList>
                 <div className="ion-text-center mt-16">
-                    <IonText><span className='cal-sans text-lg tracking-[0.03em]'>Raven</span> <span className='text-zinc-500'>v1.4.1</span></IonText>
+                    <IonText><span className='cal-sans text-lg tracking-[0.03em]'>Raven</span> <span className='text-zinc-500'>v1.4.2</span></IonText>
                     <br />
                     <p className='text-zinc-500'>Made by <IonText className='font-bold'>The Commit Company</IonText></p>
                 </div>

diff --git a/mobile/src/types/RavenMessaging/RavenMention.ts b/mobile/src/types/RavenMessaging/RavenMention.ts
@@ -0,0 +1,15 @@
+
+export interface RavenMention{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	User : Data	*/
+	user: string
+}
diff --git a/mobile/src/types/RavenMessaging/RavenMessage.ts b/mobile/src/types/RavenMessaging/RavenMessage.ts
@@ -1,3 +1,4 @@
+import { RavenMention } from './RavenMention'
 
 export interface RavenMessage {
 	creation: string
@@ -46,4 +47,6 @@ export interface RavenMessage {
 	link_document?: string
 	/**	Is Edited : Check	*/
 	is_edited?: 0 | 1
+	/**	Mentions : Table - Raven Mention	*/
+	mentions?: RavenMention[]
 }