From 4162b03d1188cab514e5baa2befab5065359fefc Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Fri, 29 Sep 2023 14:00:48 -0400 Subject: [PATCH] Revert "chore: move resources to src/resources (#1728)" This reverts commit 9b29ab9ef6f7a4da8e2ae969f649536edaf898f9. --- .github/workflows/pull_request_checks.yml | 2 +- .prettierignore | 2 +- config.xml | 78 +++++++++--------- docs/invitation_instructions.md | 6 +- .../resources => resources}/electron/icon.png | Bin .../icons/android/icon_hdpi.png | Bin .../icons/android/icon_mdpi.png | Bin .../icons/android/icon_xhdpi.png | Bin .../icons/android/icon_xxhdpi.png | Bin .../icons/android/icon_xxxhdpi.png | Bin .../icons/ios/Icon-20@2x.png | Bin .../icons/ios/Icon-20@3x.png | Bin .../icons/ios/Icon-29@1x.png | Bin .../icons/ios/Icon-29@2x.png | Bin .../icons/ios/Icon-29@3x.png | Bin .../icons/ios/Icon-40@2x.png | Bin .../icons/ios/Icon-40@3x.png | Bin .../icons/ios/Icon-50@1x.png | Bin .../icons/ios/Icon-50@2x.png | Bin .../icons/ios/Icon-512@2x.png | Bin .../icons/ios/Icon-57@1x.png | Bin .../icons/ios/Icon-57@2x.png | Bin .../icons/ios/Icon-60@2x.png | Bin .../icons/ios/Icon-60@3x.png | Bin .../icons/ios/Icon-72@1x.png | Bin .../icons/ios/Icon-72@2x.png | Bin .../icons/ios/Icon-76@1x.png | Bin .../icons/ios/Icon-76@2x.png | Bin .../icons/ios/Icon-83.5@2x.png | Bin .../icons/osx/icon-1024.png | Bin .../icons/osx/icon-128.png | Bin .../icons/osx/icon-16.png | Bin .../icons/osx/icon-256.png | Bin .../icons/osx/icon-32.png | Bin .../icons/osx/icon-512.png | Bin .../icons/osx/icon-64.png | Bin .../original_messages.json | 0 .../android/splashscreen_hdpi.png | Bin .../android/splashscreen_xhdpi.png | Bin .../android/splashscreen_xxhdpi.png | Bin .../android/splashscreen_xxxhdpi.png | Bin .../ios/splashscreen@2x~universal~anyany.png | Bin .../tray/connected.png | Bin .../tray/disconnected.png | Bin .../apple/xcode/macos/Outline/config.xml | 14 ++-- src/electron/electron-builder.json | 2 +- 46 files changed, 52 insertions(+), 52 deletions(-) rename {src/resources => resources}/electron/icon.png (100%) rename {src/resources => resources}/icons/android/icon_hdpi.png (100%) rename {src/resources => resources}/icons/android/icon_mdpi.png (100%) rename {src/resources => resources}/icons/android/icon_xhdpi.png (100%) rename {src/resources => resources}/icons/android/icon_xxhdpi.png (100%) rename {src/resources => resources}/icons/android/icon_xxxhdpi.png (100%) rename {src/resources => resources}/icons/ios/Icon-20@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-20@3x.png (100%) rename {src/resources => resources}/icons/ios/Icon-29@1x.png (100%) rename {src/resources => resources}/icons/ios/Icon-29@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-29@3x.png (100%) rename {src/resources => resources}/icons/ios/Icon-40@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-40@3x.png (100%) rename {src/resources => resources}/icons/ios/Icon-50@1x.png (100%) rename {src/resources => resources}/icons/ios/Icon-50@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-512@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-57@1x.png (100%) rename {src/resources => resources}/icons/ios/Icon-57@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-60@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-60@3x.png (100%) rename {src/resources => resources}/icons/ios/Icon-72@1x.png (100%) rename {src/resources => resources}/icons/ios/Icon-72@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-76@1x.png (100%) rename {src/resources => resources}/icons/ios/Icon-76@2x.png (100%) rename {src/resources => resources}/icons/ios/Icon-83.5@2x.png (100%) rename {src/resources => resources}/icons/osx/icon-1024.png (100%) rename {src/resources => resources}/icons/osx/icon-128.png (100%) rename {src/resources => resources}/icons/osx/icon-16.png (100%) rename {src/resources => resources}/icons/osx/icon-256.png (100%) rename {src/resources => resources}/icons/osx/icon-32.png (100%) rename {src/resources => resources}/icons/osx/icon-512.png (100%) rename {src/resources => resources}/icons/osx/icon-64.png (100%) rename {src/resources => resources}/original_messages.json (100%) rename {src/resources => resources}/splashscreen/android/splashscreen_hdpi.png (100%) rename {src/resources => resources}/splashscreen/android/splashscreen_xhdpi.png (100%) rename {src/resources => resources}/splashscreen/android/splashscreen_xxhdpi.png (100%) rename {src/resources => resources}/splashscreen/android/splashscreen_xxxhdpi.png (100%) rename {src/resources => resources}/splashscreen/ios/splashscreen@2x~universal~anyany.png (100%) rename {src/resources => resources}/tray/connected.png (100%) rename {src/resources => resources}/tray/disconnected.png (100%) diff --git a/.github/workflows/pull_request_checks.yml b/.github/workflows/pull_request_checks.yml index bd88f97eb0..88ecf270c7 100644 --- a/.github/workflows/pull_request_checks.yml +++ b/.github/workflows/pull_request_checks.yml @@ -98,7 +98,7 @@ jobs: id: changed-original-messages uses: tj-actions/changed-files@v35 with: - files: src/resources/original_messages.json + files: resources/original_messages.json - name: Collect src/www/messages Changes if: steps.changed-original-messages.outputs.any_changed == 'true' diff --git a/.prettierignore b/.prettierignore index 6622851599..face83d9a2 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,7 @@ .github/ apple/ docs/ -src/resources/ +resources/ third_party/ tools/ node_modules/ diff --git a/config.xml b/config.xml index 80bf6c19c3..40371730ff 100644 --- a/config.xml +++ b/config.xml @@ -32,19 +32,19 @@ - - - - - - + + + + + + - - - - - - + + + + + + @@ -86,47 +86,47 @@ - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - - - + + + - - + + - - - - - - - + + + + + + + diff --git a/docs/invitation_instructions.md b/docs/invitation_instructions.md index 9e9f082f05..2f682456d5 100644 --- a/docs/invitation_instructions.md +++ b/docs/invitation_instructions.md @@ -3,12 +3,12 @@ Have an invitation to connect to an Outline server? Follow these instructions to access to the open internet from your device. No personal information will be collected. ## 1. Copy your access key -![Copy access key](src/resources/invitation_instructions_001.png "Copy your access key") +![Copy access key](resources/invitation_instructions_001.png "Copy your access key") `ss://xxx` located at the bottom of your invitation email or message. The Outline app will instantly add this server from your clipboard. ## 2. Install Outline -![Install Outline](src/resources/invitation_instructions_002.png "Install Outline") +![Install Outline](resources/invitation_instructions_002.png "Install Outline") |Download| | | ------------- | ------------- | @@ -20,6 +20,6 @@ Have an invitation to connect to an Outline server? Follow these instructions to ## 3. Add server and connect -![Add server and connect](src/resources/invitation_instructions_003.png "Add server and connect") +![Add server and connect](resources/invitation_instructions_003.png "Add server and connect") Open the app and confirm your new server. Tap or click to connect. **Having trouble?** Try copying your access key again to add your server. diff --git a/src/resources/electron/icon.png b/resources/electron/icon.png similarity index 100% rename from src/resources/electron/icon.png rename to resources/electron/icon.png diff --git a/src/resources/icons/android/icon_hdpi.png b/resources/icons/android/icon_hdpi.png similarity index 100% rename from src/resources/icons/android/icon_hdpi.png rename to resources/icons/android/icon_hdpi.png diff --git a/src/resources/icons/android/icon_mdpi.png b/resources/icons/android/icon_mdpi.png similarity index 100% rename from src/resources/icons/android/icon_mdpi.png rename to resources/icons/android/icon_mdpi.png diff --git a/src/resources/icons/android/icon_xhdpi.png b/resources/icons/android/icon_xhdpi.png similarity index 100% rename from src/resources/icons/android/icon_xhdpi.png rename to resources/icons/android/icon_xhdpi.png diff --git a/src/resources/icons/android/icon_xxhdpi.png b/resources/icons/android/icon_xxhdpi.png similarity index 100% rename from src/resources/icons/android/icon_xxhdpi.png rename to resources/icons/android/icon_xxhdpi.png diff --git a/src/resources/icons/android/icon_xxxhdpi.png b/resources/icons/android/icon_xxxhdpi.png similarity index 100% rename from src/resources/icons/android/icon_xxxhdpi.png rename to resources/icons/android/icon_xxxhdpi.png diff --git a/src/resources/icons/ios/Icon-20@2x.png b/resources/icons/ios/Icon-20@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-20@2x.png rename to resources/icons/ios/Icon-20@2x.png diff --git a/src/resources/icons/ios/Icon-20@3x.png b/resources/icons/ios/Icon-20@3x.png similarity index 100% rename from src/resources/icons/ios/Icon-20@3x.png rename to resources/icons/ios/Icon-20@3x.png diff --git a/src/resources/icons/ios/Icon-29@1x.png b/resources/icons/ios/Icon-29@1x.png similarity index 100% rename from src/resources/icons/ios/Icon-29@1x.png rename to resources/icons/ios/Icon-29@1x.png diff --git a/src/resources/icons/ios/Icon-29@2x.png b/resources/icons/ios/Icon-29@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-29@2x.png rename to resources/icons/ios/Icon-29@2x.png diff --git a/src/resources/icons/ios/Icon-29@3x.png b/resources/icons/ios/Icon-29@3x.png similarity index 100% rename from src/resources/icons/ios/Icon-29@3x.png rename to resources/icons/ios/Icon-29@3x.png diff --git a/src/resources/icons/ios/Icon-40@2x.png b/resources/icons/ios/Icon-40@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-40@2x.png rename to resources/icons/ios/Icon-40@2x.png diff --git a/src/resources/icons/ios/Icon-40@3x.png b/resources/icons/ios/Icon-40@3x.png similarity index 100% rename from src/resources/icons/ios/Icon-40@3x.png rename to resources/icons/ios/Icon-40@3x.png diff --git a/src/resources/icons/ios/Icon-50@1x.png b/resources/icons/ios/Icon-50@1x.png similarity index 100% rename from src/resources/icons/ios/Icon-50@1x.png rename to resources/icons/ios/Icon-50@1x.png diff --git a/src/resources/icons/ios/Icon-50@2x.png b/resources/icons/ios/Icon-50@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-50@2x.png rename to resources/icons/ios/Icon-50@2x.png diff --git a/src/resources/icons/ios/Icon-512@2x.png b/resources/icons/ios/Icon-512@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-512@2x.png rename to resources/icons/ios/Icon-512@2x.png diff --git a/src/resources/icons/ios/Icon-57@1x.png b/resources/icons/ios/Icon-57@1x.png similarity index 100% rename from src/resources/icons/ios/Icon-57@1x.png rename to resources/icons/ios/Icon-57@1x.png diff --git a/src/resources/icons/ios/Icon-57@2x.png b/resources/icons/ios/Icon-57@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-57@2x.png rename to resources/icons/ios/Icon-57@2x.png diff --git a/src/resources/icons/ios/Icon-60@2x.png b/resources/icons/ios/Icon-60@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-60@2x.png rename to resources/icons/ios/Icon-60@2x.png diff --git a/src/resources/icons/ios/Icon-60@3x.png b/resources/icons/ios/Icon-60@3x.png similarity index 100% rename from src/resources/icons/ios/Icon-60@3x.png rename to resources/icons/ios/Icon-60@3x.png diff --git a/src/resources/icons/ios/Icon-72@1x.png b/resources/icons/ios/Icon-72@1x.png similarity index 100% rename from src/resources/icons/ios/Icon-72@1x.png rename to resources/icons/ios/Icon-72@1x.png diff --git a/src/resources/icons/ios/Icon-72@2x.png b/resources/icons/ios/Icon-72@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-72@2x.png rename to resources/icons/ios/Icon-72@2x.png diff --git a/src/resources/icons/ios/Icon-76@1x.png b/resources/icons/ios/Icon-76@1x.png similarity index 100% rename from src/resources/icons/ios/Icon-76@1x.png rename to resources/icons/ios/Icon-76@1x.png diff --git a/src/resources/icons/ios/Icon-76@2x.png b/resources/icons/ios/Icon-76@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-76@2x.png rename to resources/icons/ios/Icon-76@2x.png diff --git a/src/resources/icons/ios/Icon-83.5@2x.png b/resources/icons/ios/Icon-83.5@2x.png similarity index 100% rename from src/resources/icons/ios/Icon-83.5@2x.png rename to resources/icons/ios/Icon-83.5@2x.png diff --git a/src/resources/icons/osx/icon-1024.png b/resources/icons/osx/icon-1024.png similarity index 100% rename from src/resources/icons/osx/icon-1024.png rename to resources/icons/osx/icon-1024.png diff --git a/src/resources/icons/osx/icon-128.png b/resources/icons/osx/icon-128.png similarity index 100% rename from src/resources/icons/osx/icon-128.png rename to resources/icons/osx/icon-128.png diff --git a/src/resources/icons/osx/icon-16.png b/resources/icons/osx/icon-16.png similarity index 100% rename from src/resources/icons/osx/icon-16.png rename to resources/icons/osx/icon-16.png diff --git a/src/resources/icons/osx/icon-256.png b/resources/icons/osx/icon-256.png similarity index 100% rename from src/resources/icons/osx/icon-256.png rename to resources/icons/osx/icon-256.png diff --git a/src/resources/icons/osx/icon-32.png b/resources/icons/osx/icon-32.png similarity index 100% rename from src/resources/icons/osx/icon-32.png rename to resources/icons/osx/icon-32.png diff --git a/src/resources/icons/osx/icon-512.png b/resources/icons/osx/icon-512.png similarity index 100% rename from src/resources/icons/osx/icon-512.png rename to resources/icons/osx/icon-512.png diff --git a/src/resources/icons/osx/icon-64.png b/resources/icons/osx/icon-64.png similarity index 100% rename from src/resources/icons/osx/icon-64.png rename to resources/icons/osx/icon-64.png diff --git a/src/resources/original_messages.json b/resources/original_messages.json similarity index 100% rename from src/resources/original_messages.json rename to resources/original_messages.json diff --git a/src/resources/splashscreen/android/splashscreen_hdpi.png b/resources/splashscreen/android/splashscreen_hdpi.png similarity index 100% rename from src/resources/splashscreen/android/splashscreen_hdpi.png rename to resources/splashscreen/android/splashscreen_hdpi.png diff --git a/src/resources/splashscreen/android/splashscreen_xhdpi.png b/resources/splashscreen/android/splashscreen_xhdpi.png similarity index 100% rename from src/resources/splashscreen/android/splashscreen_xhdpi.png rename to resources/splashscreen/android/splashscreen_xhdpi.png diff --git a/src/resources/splashscreen/android/splashscreen_xxhdpi.png b/resources/splashscreen/android/splashscreen_xxhdpi.png similarity index 100% rename from src/resources/splashscreen/android/splashscreen_xxhdpi.png rename to resources/splashscreen/android/splashscreen_xxhdpi.png diff --git a/src/resources/splashscreen/android/splashscreen_xxxhdpi.png b/resources/splashscreen/android/splashscreen_xxxhdpi.png similarity index 100% rename from src/resources/splashscreen/android/splashscreen_xxxhdpi.png rename to resources/splashscreen/android/splashscreen_xxxhdpi.png diff --git a/src/resources/splashscreen/ios/splashscreen@2x~universal~anyany.png b/resources/splashscreen/ios/splashscreen@2x~universal~anyany.png similarity index 100% rename from src/resources/splashscreen/ios/splashscreen@2x~universal~anyany.png rename to resources/splashscreen/ios/splashscreen@2x~universal~anyany.png diff --git a/src/resources/tray/connected.png b/resources/tray/connected.png similarity index 100% rename from src/resources/tray/connected.png rename to resources/tray/connected.png diff --git a/src/resources/tray/disconnected.png b/resources/tray/disconnected.png similarity index 100% rename from src/resources/tray/disconnected.png rename to resources/tray/disconnected.png diff --git a/src/cordova/apple/xcode/macos/Outline/config.xml b/src/cordova/apple/xcode/macos/Outline/config.xml index de9b64fe35..9ab07ddbf1 100755 --- a/src/cordova/apple/xcode/macos/Outline/config.xml +++ b/src/cordova/apple/xcode/macos/Outline/config.xml @@ -21,13 +21,13 @@ - - - - - - - + + + + + + + diff --git a/src/electron/electron-builder.json b/src/electron/electron-builder.json index 465e06b3c1..2a6b014ff8 100644 --- a/src/electron/electron-builder.json +++ b/src/electron/electron-builder.json @@ -1,5 +1,5 @@ { - "files": ["build/electron", "www", "src/resources/tray", "!node_modules/electron"], + "files": ["build/electron", "www", "resources/tray", "!node_modules/electron"], "asarUnpack": ["third_party", "tools"], "artifactName": "Outline-Client.${ext}", "directories": {