fix conflicts

.github/workflows/ci.yaml

@@ -5,17 +5,54 @@ on:
   pull_request:
     branches: [main]
 jobs:
+  sdk-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install Rust
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          source $HOME/.cargo/env
+          rustup toolchain install nightly
+          rustup default nightly
+      - name: Frontend tests
+        working-directory: frontend/rust-lib
+        run: cargo test
+      - name: Shared-lib tests
+        working-directory: shared-lib
+        run: cargo test
+        
   build-macos:
     runs-on: macOS-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Env install
-        run: cd frontend && make install_rust && make install_cargo_make && cargo make install_targets
-      - name: Run frontend tests
-        run: cd frontend/rust-lib && cargo test
-      - name: Run shared-lib tests
-        run: cd shared-lib && cargo test
+        working-directory: frontend
+        run: make install_rust
+      - name: Checkou Flutter
+        uses: actions/checkout@v2
+        with:
+          repository: flutter/flutter
+          path: flutter
+      - name: Flutter
+        working-directory: flutter
+        run: |
+          echo "$(pwd)/bin" >> $GITHUB_PATH
+          export PATH="$PATH:$(pwd)/bin"
+          flutter channel dev
+          flutter config --enable-macos-desktop
+          flutter doctor
+      - name: Deps
+        working-directory: frontend
+        run: |
+          cargo install --force cargo-make
+          cargo install --force duckscript_cli
+          cargo make flowy_dev
+      - name: Build
+        working-directory: frontend
+        run: cargo make --profile production-mac-x86 appflowy
   build-ubuntu:
     runs-on: ubuntu-latest
     steps:
@@ -35,7 +72,7 @@ jobs:
           rustup default nightly
       - name: Flutter
         run: |
-          git clone https://github.com/flutter/flutter.git
+          git clone --depth 1 -b dev https://github.com/flutter/flutter.git
           cd flutter
           echo `pwd`"/bin" >> $GITHUB_PATH
           export PATH="$PATH:`pwd`/bin"
@@ -43,16 +80,12 @@ jobs:
           flutter config --enable-linux-desktop
           flutter doctor
       - name: Deps
+        working-directory: frontend
         run: |
-          cd frontend
           cargo install --force cargo-make
           cargo install --force duckscript_cli
           cargo make flowy_dev
-          cargo make -p development-linux-x86 appflowy-linux-dev
-  build-backend:
-    runs-on: macOS-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Run backend tests
-        run: cd backend && cargo test
+      - name: Build
+        run: |
+          cd frontend
+          cargo make --profile production-linux-x86 appflowy

.gitignore

@@ -1,7 +1,5 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
-
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 # backend
@@ -10,11 +8,10 @@
 ./backend/configuration/base.yaml 
 Cargo.lock
 
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
 **/target/
 **/*.db
 .idea/
 /flowy-test/
-.ruby-version
+.ruby-version

README.md

@@ -101,8 +101,13 @@ flutter config --enable-linux-desktop
 ```
 
 * Open the `app_flowy` folder located at xx/appflowy/frontend with Visual Studio Code or other IDEs at your disposal.
-* Go to the Run and Debug tab and then click the run button.
-![Run the project](https://github.com/AppFlowy-IO/appflowy/blob/main/doc/imgs/run.png)
+* Go to the Run and Debug tab and then click the run button. 
+![Run the project](https://github.com/AppFlowy-IO/appflowy/blob/main/doc/imgs/run.png) 
+
+* If you want to build for the other platform, you should modify the build_sdk.sh before running.
+![build_sdk](https://user-images.githubusercontent.com/86001920/143262377-bb49e913-10ca-4198-80ec-bd814a13ee1d.png)
+
+
   
 ## Roadmap
 

backend/doc/database_setup.md

@@ -36,6 +36,9 @@ By default, Docker images do not expose their ports to the underlying host machi
 
 ### Sqlx
 
+**sqlx-cli**
+*  [install sqlx-cli](https://github.com/launchbadge/sqlx/tree/master/sqlx-cli)
+
 **Sqlx and Diesel commands** 
 * create migration
     * sqlx: sqlx migrate add $(table)
@@ -71,4 +74,4 @@ By default, Docker images do not expose their ports to the underlying host machi
 > Don't forget to relaunch your terminal.
 
 ## More
-* [11-database-drivers](https://blog.logrocket.com/11-database-drivers-and-orms-for-rust-that-are-ready-for-production/) 
+* [11-database-drivers](https://blog.logrocket.com/11-database-drivers-and-orms-for-rust-that-are-ready-for-production/) 

backend/doc/database_struct.md

@@ -0,0 +1,200 @@
+
+# Table Struct
+
+## Table: user_table
+
+- `Name`: UserTable
+- `Comment`: UserTable
+
+### `Primary Key`
+
+- `Columns`: id
+
+### `Indexes[]`
+
+| `Columns` | `Unique` |
+| --------- | -------- |
+| email     | `true`   |
+
+### `Foreign Keys[]`
+
+| `Columns` | `Ref Table` | `Ref Columns` | `Options` |
+| --------- | ----------- | ------------- | --------- |
+
+
+### `Columns[]`
+
+| `Label`     | `Name`      | `Type`      | `Nullable` | `Default` | `Comment` |
+| ----------- | ----------- | ----------- | ---------- | --------- | --------- |
+| id          | id          | uuid        | `false`    |           |           |
+| email       | email       | text        | `false`    |           |           |
+| name        | name        | text        | `false`    |           |           |
+| password    | password    | text        | `false`    |           |           |
+| create_time | create_time | timestamptz | `false`    |           |           |
+
+
+## Table: workspace_table
+
+- `Name`: WorkspaceTable
+- `Comment`: WorkspaceTable
+
+### `Primary Key`
+
+- `Columns`: id
+
+### `Indexes[]`
+
+| `Columns` | `Unique` |
+| --------- | -------- |
+
+### `Foreign Keys[]`
+
+| `Columns` | `Ref Table` | `Ref Columns` | `Options` |
+| --------- | ----------- | ------------- | --------- |
+| user_id   | user_table  | id            |           |
+
+### `Columns[]`
+
+| `Label`       | `Name`        | `Type`      | `Nullable` | `Default` | `Comment` |
+| ------------- | ------------- | ----------- | ---------- | --------- | --------- |
+| id            | id            | uuid        | `false`    |           |           |
+| user_id       | user_id       | text        | `false`    |           |           |
+| name          | name          | text        | `false`    |           |           |
+| description   | description   | text        | `false`    |           |           |
+| create_time   | create_time   | timestamptz | `false`    |           |           |
+| modified_time | modified_time | timestamptz | `false`    |           |           |
+
+
+## Table: app_table
+
+- `Name`: AppTable
+- `Comment`: AppTable
+
+### `Primary Key`
+
+- `Columns`: id
+
+### `Indexes[]`
+
+| `Columns` | `Unique` |
+| --------- | -------- |
+
+### `Foreign Keys[]`
+
+| `Columns`    | `Ref Table`     | `Ref Columns` | `Options` |
+| ------------ | --------------- | ------------- | --------- |
+| user_id      | user_table      | id            |           |
+| workspace_id | workspace_table | id            |           |
+| last_view_id | view_table      | id            |           |
+
+### `Columns[]`
+
+| `Label`       | `Name`        | `Type`      | `Nullable` | `Default` | `Comment` |
+| ------------- | ------------- | ----------- | ---------- | --------- | --------- |
+| id            | id            | uuid        | `false`    |           |           |
+| user_id       | user_id       | text        | `false`    |           |           |
+| workspace_id  | workspace_id  | text        | `false`    |           |           |
+| last_view_id  | workspace_id  | text        | `false`    |           |           |
+| name          | name          | text        | `false`    |           |           |
+| description   | description   | text        | `false`    |           |           |
+| color_style   | color_style   | text        | `false`    |           |           |
+| is_trash      | is_trash      | bool        | `false`    | `false`   |           |
+| create_time   | create_time   | timestamptz | `false`    |           |           |
+| modified_time | modified_time | timestamptz | `false`    |           |           |
+
+
+## Table: view_table
+
+- `Name`: ViewTable
+- `Comment`: ViewTable
+
+### `Primary Key`
+
+- `Columns`: id
+
+### `Indexes[]`
+
+| `Columns` | `Unique` |
+| --------- | -------- |
+
+### `Foreign Keys[]`
+
+| `Columns`    | `Ref Table` | `Ref Columns` | `Options` |
+| ------------ | ----------- | ------------- | --------- |
+| user_id      | user_table  | id            |           |
+| belong_to_id | app_table   | id            |           |
+
+### `Columns[]`
+
+| `Label`       | `Name`        | `Type`      | `Nullable` | `Default` | `Comment` |
+| ------------- | ------------- | ----------- | ---------- | --------- | --------- |
+| id            | id            | uuid        | `false`    |           |           |
+| belong_to_id  | belong_to_id  | text        | `false`    |           |           |
+| name          | name          | text        | `false`    |           |           |
+| description   | description   | text        | `false`    |           |           |
+| thumbnail     | thumbnail     | text        | `false`    |           |           |
+| view_type     | view_type     | int         | `false`    |           |           |
+| create_time   | create_time   | timestamptz | `false`    |           |           |
+| modified_time | modified_time | timestamptz | `false`    |           |           |
+
+
+## Table: doc_table
+
+- `Name`: DocTable
+- `Comment`: DocTable
+
+### `Primary Key`
+
+- `Columns`: id
+
+### `Indexes[]`
+
+| `Columns` | `Unique` |
+| --------- | -------- |
+
+### `Foreign Keys[]`
+
+| `Columns` | `Ref Table` | `Ref Columns` | `Options` |
+| --------- | ----------- | ------------- | --------- |
+| rev_id    | doc_table   | id            |           |
+
+
+
+### `Columns[]`
+
+| `Label` | `Name` | `Type` | `Nullable` | `Default` | `Comment` |
+| ------- | ------ | ------ | ---------- | --------- | --------- |
+| id      | id     | uuid   | `false`    |           |           |
+| rev_id  | rev_id | text   | `false`    |           |           |
+| data    | data   | text   | `false`    |           |           |
+
+
+## Table: trash_table
+
+- `Name`: TrashTable
+- `Comment`: TrashTable
+
+### `Primary Key`
+
+- `Columns`: id
+
+### `Indexes[]`
+
+| `Columns` | `Unique` |
+| --------- | -------- |
+
+### `Foreign Keys[]`
+
+| `Columns` | `Ref Table` | `Ref Columns` | `Options` |
+| --------- | ----------- | ------------- | --------- |
+| user_id   | user_table  | id            |           |
+
+
+### `Columns[]`
+
+| `Label` | `Name`  | `Type` | `Nullable` | `Default` | `Comment` |
+| ------- | ------- | ------ | ---------- | --------- | --------- |
+| id      | id      | uuid   | `false`    |           |           |
+| user_id | user_id | text   | `false`    |           |           |
+| ty      | ty      | int4   | `false`    | 0         |           |
+

doc/BUILD_ON_LINUX.md

@@ -18,12 +18,12 @@ Note:
     - [ ] Arch Linux - X86_64
     - [ ] Deepin - X86_64
     - [ ] Raspberry Pi OS - aarch64
-* You may need to disable hardware 3D acceleration if you are running in a VM. Otherwise certain GL failures will prevent app from launching
+* You may need to disable hardware 3D acceleration if you are running it on a VM. Otherwise, certain GL failures will prevent app from launching
 
 ### Detail steps
-1. Install pre-requests
+1. Install prerequisites 
 ```shell
-sudo apt-get install curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev
+sudo apt-get install curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev unzip
 # optional, for generating protobuf in step 8 only
 sudo apt-get install protobuf-compiler
 ```
@@ -54,8 +54,6 @@ flutter config --enable-linux-desktop
 5. Fix problem reported by flutter doctor
 ```shell
 flutter doctor
-# install Android toolchain (optional)
-# install Chrome (optional)
 ```
 6. Install cargo make
 ```shell
@@ -70,11 +68,13 @@ cargo install --force duckscript_cli
 ```shell
 cargo make flowy_dev
 ```
-9. Generate protobuf for dart (optional, if you modify the shared-lib's entities)
+
+9. [Optional] Generate protobuf for dart (optional, if you modify the shared-lib's entities)
 ```shell
 cargo make -p development-linux-x86 pb
 ```
-10. Build flowy-sdk-dev (dart-ffi) (optional), step 10 covers this step
+10. [Optional] Build flowy-sdk-dev (dart-ffi), step 10 covers this step
+
 ```shell
 # for development
 cargo make --profile development-linux-x86 flowy-sdk-dev
@@ -82,6 +82,7 @@ cargo make --profile development-linux-x86 flowy-sdk-dev
 # for production
 cargo make --profile production-linux-x86 flowy-sdk-release
 ```
+
 11. Build app_flowy
 ```shell
 # for development
@@ -98,7 +99,7 @@ cargo make -p production-linux-x86 appflowy-linux
 # ./app_flowy
 ```
 
-## Step 3: Build Server side application (optional if you don't need to host web service locally)
+## [Optional] Step 3: Build Server side application (optional if you don't need to host web service locally)
 ------------------------------
 
 Note: You can launch postgresql server by using docker container

doc/BUILD_ON_WINDOWS.md

@@ -19,47 +19,51 @@ Note:
     - [ ] Windows 11 arm64
 
 ### Detail steps
-1. Install Visual Studio 2019 community. See: https://visualstudio.microsoft.com/downloads/
-    - Note: Didn't test Visual Studio 2022. It should also work.
-2. Install choco according to https://chocolatey.org/install
-3. Install vcpkg according to https://github.com/microsoft/vcpkg#quick-start-windows. Make sure to add vcpkg installation folder to PATH env var.
-4. Install flutter according to https://docs.flutter.dev/get-started/install/windows
+1. Install Visual Studio 2022 build tools. Download from https://visualstudio.microsoft.com/downloads/
+    - In section of "All Downloads" => "Tools for Visual Studio 2022" => Build Tools for Visual Studio 2022, hit Download button to get it.
+    - Launch "vs_BuildTools.exe" to install
+2. Install vcpkg according to https://github.com/microsoft/vcpkg#quick-start-windows. Make sure to add vcpkg installation folder to PATH env var.
+3. Install flutter according to https://docs.flutter.dev/get-started/install/windows
 ```shell
 flutter channel dev
+flutter doctor
 ```
-5. Install rust
+4. Install rust
 ```shell
-choco install rustup.install
-rustup toolchain install nightly
+# Download rustup.exe from https://win.rustup.rs/x86_64
+# Call rustup.exe from powershell or cmd
+rustup.exe toolchain install nightly
 ```
-6. Install cargo make
+5. Install cargo make
 ```shell
 cd appflowy/frontend
 cargo install --force cargo-make
 ```
-7. Install duckscript
+6. Install duckscript
 ```shell
 cargo install --force duckscript_cli
 ```
-8. Check pre-request
+7. Check pre-request
 ```shell
 cargo make flowy_dev
 ```
-9. Generate protobuf for dart (optional, if you modify the shared-lib's entities)
+8. [Optional] Generate protobuf for dart (optional, if you modify the shared-lib's entities)
 ```shell
 cargo make -p development-windows pb
 ```
-10. Build flowy-sdk (dart-ffi)
+9. [Optional] Build flowy-sdk (dart-ffi)
 ```shell
-# TODO: for development
+# for development
+cargo make --profile development-windows-x86 flowy-sdk-dev
 # for production
-cargo make --profile production-desktop-windows-x86 flowy-sdk-release
+cargo make --profile production-windows-x86 flowy-sdk-release
 ```
-11. Build app_flowy
+10. Build app_flowy
 ```shell
-# TODO: for development
+# for development
+cargo make -p development-windows-x86 appflowy-windows-dev
 # for production
-cargo make -p production-desktop-windows-x86 appflowy-windows
+cargo make -p production-windows-x86 appflowy-windows
 ```
 
 ## Step 3: Build Server side application (optional if you don't need to host web service locally)

frontend/Makefile

@@ -9,4 +9,4 @@ install_cargo_make:
 
 install_rust:
 	brew bundle
-	rustup-init -y
+	rustup-init -y --default-toolchain=nightly

frontend/Makefile.toml

@@ -27,14 +27,14 @@ BUILD_FLAG = "debug"
 FLUTTER_OUTPUT_DIR = "Debug"
 PRODUCT_EXT = "app"
 
-[env.production-desktop-mac-aarch64]
+[env.production-mac-aarch64]
 BUILD_FLAG = "release"
 TARGET_OS = "macos"
 RUST_COMPILE_TARGET = "aarch64-apple-darwin"
 FLUTTER_OUTPUT_DIR = "Release"
 PRODUCT_EXT = "app"
 
-[env.production-desktop-mac-x86]
+[env.production-mac-x86]
 BUILD_FLAG = "release"
 TARGET_OS = "macos"
 RUST_COMPILE_TARGET = "x86_64-apple-darwin"
@@ -42,7 +42,7 @@ FLUTTER_OUTPUT_DIR = "Release"
 PRODUCT_EXT = "app"
 
 
-[env.development-windows]
+[env.development-windows-x86]
 TARGET_OS = "windows"
 RUST_COMPILE_TARGET = "x86_64-pc-windows-msvc"
 BUILD_FLAG = "debug"
@@ -51,7 +51,7 @@ PRODUCT_EXT = "exe"
 CRATE_TYPE = "cdylib"
 SDK_EXT = "dll"
 
-[env.production-desktop-windows-x86]
+[env.production-windows-x86]
 BUILD_FLAG = "release"
 TARGET_OS = "windows"
 RUST_COMPILE_TARGET = "x86_64-pc-windows-msvc"
@@ -99,6 +99,7 @@ LINUX_ARCH = "arm64"
 [tasks.echo_env]
 script = [
     '''
+    echo "-------- Env Parameters --------"
     echo CRATE_TYPE: ${CRATE_TYPE}
     echo BUILD_FLAG: ${BUILD_FLAG}
     echo TARGET_OS: ${TARGET_OS}
@@ -106,9 +107,15 @@ script = [
     echo FEATURES: ${FEATURES}
     echo PRODUCT_EXT: ${PRODUCT_EXT}
     echo ${platforms}
+
+    echo "-------- Flutter --------"
+    flutter doctor
+
+    echo "-------- Rust --------"
+    rustup show
     '''
 ]
-script_runner = "@duckscript"
+script_runner = "@shell"
 
 [env.production-ios]
 BUILD_FLAG = "release"

frontend/app_flowy/.vscode/tasks.json

@@ -2,7 +2,7 @@
 	"version": "2.0.0",
 	// https://code.visualstudio.com/docs/editor/tasks
 			//https://gist.github.com/deadalusai/9e13e36d61ec7fb72148
-			
+
 			// ${workspaceRoot}: the root folder of the team
 			// ${file}: the current opened file
 			// ${fileBasename}: the current opened file's basename
@@ -13,6 +13,16 @@
 		{
 			"type": "shell",
 			"command": "sh ./scripts/build_sdk.sh",
+			"windows": {
+				"options": {
+					"shell": {
+						"executable": "cmd.exe",
+						"args": [
+							"/d", "/c", ".\\scripts\\build_sdk.cmd"
+						]
+					}
+				}
+			},
 			"group": "build",
 			"options": {
 				"cwd": "${workspaceFolder}/../"

frontend/app_flowy/lib/user/presentation/sign_in_screen.dart

@@ -168,8 +168,8 @@ class PasswordTextField extends StatelessWidget {
         return RoundedInputField(
           obscureText: true,
           style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
-          obscureIcon: svg("home/Hide"),
-          obscureHideIcon: svg("home/Show"),
+          obscureIcon: svg("home/hide"),
+          obscureHideIcon: svg("home/show"),
           hintText: 'Password',
           normalBorderColor: theme.shader4,
           highlightBorderColor: theme.red,