Merge remote-tracking branch 'origin/master' into daniellacosse/apple…

…_privacy_required_reasons

.eslintrc.json

@@ -17,45 +17,45 @@
       "error",
       {
         "zones": [
-          // This means that in the src/infrastructure folder,
+          // This means that in the /infrastructure folder,
           // you can't import any code,
-          // with the exception of other files within the src/infrastructure folder.
+          // with the exception of other files within the /infrastructure folder.
           {
-            "target": "./src/infrastructure",
+            "target": "./infrastructure",
             "from": ".",
-            "except": ["./src/infrastructure", "./node_modules"]
+            "except": ["./infrastructure", "./node_modules"]
           },
           // Similar to above but for src/www/model, but you can use files from both the
           // src/www/model and src/www/infrastructure paths.
           {
-            "target": "./src/www/model",
+            "target": "./client/src/www/model",
             "from": ".",
-            "except": ["./src/www/model", "./src/infrastructure", "./node_modules"]
+            "except": ["./client/src/www/model", "./infrastructure", "./node_modules"]
           },
           // Prevents the internals of the outline_server_repository from being used publicly in the app.
           {
-            "target": "./src/www/app/*.ts",
-            "from": "./src/www/app/outline_server_repository/server.ts"
+            "target": "./client/src/www/app/*.ts",
+            "from": "./client/src/www/app/outline_server_repository/server.ts"
           },
           {
-            "target": "./src/www/app/*.ts",
-            "from": "./src/www/app/outline_server_repository/access_key_serialization.ts"
+            "target": "./client/src/www/app/*.ts",
+            "from": "./client/src/www/app/outline_server_repository/access_key_serialization.ts"
           },
           {
-            "target": "./src/www/views",
-            "from": "./src/www/model"
+            "target": "./client/src/www/views",
+            "from": "./client/src/www/model"
           },
           {
-            "target": "./src/www/ui_components",
-            "from": "./src/www/model"
+            "target": "./client/src/www/ui_components",
+            "from": "./client/src/www/model"
           },
           {
-            "target": "./src/www/views",
-            "from": "./src/www/app"
+            "target": "./client/src/www/views",
+            "from": "./client/src/www/app"
           },
           {
-            "target": "./src/www/ui_components",
-            "from": "./src/www/app"
+            "target": "./client/src/www/ui_components",
+            "from": "./client/src/www/app"
           }
         ]
       }
@@ -117,7 +117,7 @@
     },
     // No need to check browser compatibility for electron files
     {
-      "files": ["./src/www/app/electron_main.ts"],
+      "files": ["./client/src/www/app/electron_main.ts"],
       "rules": {
         "compat/compat": "off"
       }

client/src/cordova/android/README.md

@@ -23,13 +23,13 @@ Additional requirements for Android:
 To build for android, run:
 
 ```sh
-  npm run action cordova/build android
+  npm run action client/src/cordova/build android
 ```
 
 We also support passing a `--verbose` option on cordova android:
 
 ```sh
-  npm run action cordova/build android -- --verbose
+  npm run action client/src/cordova/build android -- --verbose
 ```
 
 Make sure to rebuild after modifying platform dependent files!
@@ -48,7 +48,7 @@ A Docker image with all pre-requisites for Android builds is included. To build:
 ### To install the APK
 
 - Connect an Android device and enable [USB debugging](https://developer.android.com/studio/debug/dev-options.html#enable).
-- Build the app, with `npm run action cordova/build android`
+- Build the app, with `npm run action client/src/cordova/build android`
 - From the project root, run: `adb install -r -d platforms/android/app/build/outputs/apk/<processor>/debug/app-<processor>-debug.apk`
 
 ### To debug the web app on Android

client/src/cordova/apple/README.md

@@ -16,18 +16,18 @@ You will need:
 
 ## Set up XCode project
 
-The XCode project is created by Cordova. To create the project and open it on XCode, use `npm run action cordova/setup $PLATFORM`, then open the XCode workspace file (not the project).
+The XCode project is created by Cordova. To create the project and open it on XCode, use `npm run action client/src/cordova/setup $PLATFORM`, then open the XCode workspace file (not the project).
 
 For the **iOS** client and **Mac Catalyst** client:
 
 ```sh
-npm run action cordova/build ios && open ./src/cordova/apple/ios.xcworkspace
+npm run action client/src/cordova/build ios && open ./client/src/cordova/apple/ios.xcworkspace
 ```
 
 For the **macOS** client:
 
 ```sh
-SENTRY_DSN=https://[email protected]/1 npm run action cordova/setup macos -- --buildMode=release --versionName=0.0.0-dev && open ./src/cordova/apple/macos.xcworkspace
+SENTRY_DSN=https://[email protected]/1 npm run action client/src/cordova/setup macos -- --buildMode=release --versionName=0.0.0-dev && open ./client/src/cordova/apple/macos.xcworkspace
 ```
 
 > **Note** On Apple Silicon the macOS web UI is broken in debug mode, so we need to build it in release mode. We are specifying a fake `SENTRY_DSN`, you should specify your own in your releases.

client/src/www/ui_components/licenses/README.md

@@ -4,7 +4,7 @@
 
 - `cd` to the root of your clone of this repo.
 - Ensure `node_modules` is up to date by running `npm ci`.
-- `npx generate-license-file --input package.json --output src/www/ui_components/licenses/licenses.txt`
-- `./src/www/ui_components/licenses/third_party.sh >> ./src/www/ui_components/licenses/licenses.txt`
+- `npx generate-license-file --input package.json --output client/src/www/ui_components/licenses/licenses.txt`
+- `./client/src/www/ui_components/licenses/third_party.sh >> ./client/src/www/ui_components/licenses/licenses.txt`
 
 Done!

server_manager/messages/master_messages.json

@@ -893,6 +893,10 @@
     "message": "Terms",
     "description": "This string appears in an application drawer as a navigation link. Clicking it opens Outline's terms of service in the browser."
   },
+  "no": {
+    "description": "Negative answer to a form question.",
+    "message": "No"
+  },
   "notification_app_update": {
     "message": "An updated version of the Outline Manager has been downloaded. It will be installed when you restart the application.",
     "description": "This string appears in a transient notification toast. It is shown when an update to the application is ready to install."
@@ -1412,5 +1416,9 @@
         "content": "{openLink}"
       }
     }
+  },
+  "yes": {
+    "description": "Affirmative answer to a form question.",
+    "message": "Yes"
   }
 }

server_manager/web_app/ui_components/outline-contact-us-dialog.ts

@@ -65,6 +65,7 @@ export class OutlineContactUsDialog extends LitElement implements OutlineFeedbac
       css`
         :host {
           --mdc-theme-primary: var(--primary-green);
+          --mdc-theme-text-primary-on-background: rgba(0, 0, 0, 0.54);
         }
 
         paper-dialog {