Revert "chore: move resources to src/resources (#1728)" (#1732)

This reverts commit 9b29ab9.

.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' 

.prettierignore

@@ -1,7 +1,7 @@
 .github/
 apple/
 docs/
-src/resources/
+resources/
 third_party/
 tools/
 node_modules/

config.xml

@@ -32,19 +32,19 @@
     <platform name="android">
         <preference name="SplashMaintainAspectRatio" value="true" />
 
-        <icon density="ldpi" src="src/resources/icons/android/icon_mdpi.png" />
-        <icon density="mdpi" src="src/resources/icons/android/icon_mdpi.png" />
-        <icon density="hdpi" src="src/resources/icons/android/icon_hdpi.png" />
-        <icon density="xhdpi" src="src/resources/icons/android/icon_xhdpi.png" />
-        <icon density="xxhdpi" src="src/resources/icons/android/icon_xxhdpi.png" />
-        <icon density="xxxhdpi" src="src/resources/icons/android/icon_xxxhdpi.png" />
+        <icon density="ldpi" src="resources/icons/android/icon_mdpi.png" />
+        <icon density="mdpi" src="resources/icons/android/icon_mdpi.png" />
+        <icon density="hdpi" src="resources/icons/android/icon_hdpi.png" />
+        <icon density="xhdpi" src="resources/icons/android/icon_xhdpi.png" />
+        <icon density="xxhdpi" src="resources/icons/android/icon_xxhdpi.png" />
+        <icon density="xxxhdpi" src="resources/icons/android/icon_xxxhdpi.png" />
 
-        <splash density="ldpi" src="src/resources/splashscreen/android/splashscreen_hdpi.png" />
-        <splash density="mdpi" src="src/resources/splashscreen/android/splashscreen_hdpi.png" />
-        <splash density="hdpi" src="src/resources/splashscreen/android/splashscreen_hdpi.png" />
-        <splash density="xhdpi" src="src/resources/splashscreen/android/splashscreen_xhdpi.png" />
-        <splash density="xxhdpi" src="src/resources/splashscreen/android/splashscreen_xxhdpi.png" />
-        <splash density="xxxhdpi" src="src/resources/splashscreen/android/splashscreen_xxxhdpi.png" />
+        <splash density="ldpi" src="resources/splashscreen/android/splashscreen_hdpi.png" />
+        <splash density="mdpi" src="resources/splashscreen/android/splashscreen_hdpi.png" />
+        <splash density="hdpi" src="resources/splashscreen/android/splashscreen_hdpi.png" />
+        <splash density="xhdpi" src="resources/splashscreen/android/splashscreen_xhdpi.png" />
+        <splash density="xxhdpi" src="resources/splashscreen/android/splashscreen_xxhdpi.png" />
+        <splash density="xxxhdpi" src="resources/splashscreen/android/splashscreen_xxxhdpi.png" />
 
         <preference name="AndroidInsecureFileModeEnabled" value="true" />
 
@@ -86,47 +86,47 @@
         <preference name="StatusBarStyle" value="lightcontent" />
 
         <!-- https://github.com/apache/cordova-plugin-splashscreen#launch-storyboard-images -->
-        <splash src="src/resources/splashscreen/ios/splashscreen@2x~universal~anyany.png" />
+        <splash src="resources/splashscreen/ios/splashscreen@2x~universal~anyany.png" />
 
         <!-- https://developer.apple.com/ios/human-interface-guidelines/icons-and-images/app-icon -->
         <!-- iPhone -->
-        <icon src="src/resources/icons/ios/[email protected]" width="57" height="57" />
-        <icon src="src/resources/icons/ios/[email protected]" width="114" height="114" />
-        <icon src="src/resources/icons/ios/[email protected]" width="120" height="120" />
-        <icon src="src/resources/icons/ios/[email protected]" width="180" height="180" />
+        <icon src="resources/icons/ios/[email protected]" width="57" height="57" />
+        <icon src="resources/icons/ios/[email protected]" width="114" height="114" />
+        <icon src="resources/icons/ios/[email protected]" width="120" height="120" />
+        <icon src="resources/icons/ios/[email protected]" width="180" height="180" />
         <!-- iPad Pro  -->
-        <icon src="src/resources/icons/ios/[email protected]" width="167" height="167" />
+        <icon src="resources/icons/ios/[email protected]" width="167" height="167" />
         <!-- iPad, iPad Mini  -->
-        <icon src="src/resources/icons/ios/[email protected]" width="72" height="72" />
-        <icon src="src/resources/icons/ios/[email protected]" width="144" height="144" />
-        <icon src="src/resources/icons/ios/[email protected]" width="76" height="76" />
-        <icon src="src/resources/icons/ios/[email protected]" width="152" height="152" />
+        <icon src="resources/icons/ios/[email protected]" width="72" height="72" />
+        <icon src="resources/icons/ios/[email protected]" width="144" height="144" />
+        <icon src="resources/icons/ios/[email protected]" width="76" height="76" />
+        <icon src="resources/icons/ios/[email protected]" width="152" height="152" />
         <!-- App Store -->
-        <icon src="src/resources/icons/ios/[email protected]" width="1024" height="1024" />
+        <icon src="resources/icons/ios/[email protected]" width="1024" height="1024" />
         <!-- Spotlight iPhone, iPad -->
-        <icon src="src/resources/icons/ios/[email protected]" width="80" height="80" />
-        <icon src="src/resources/icons/ios/[email protected]" width="120" height="120" />
-        <icon src="src/resources/icons/ios/[email protected]" width="50" height="50" />
-        <icon src="src/resources/icons/ios/[email protected]" width="100" height="100" />
+        <icon src="resources/icons/ios/[email protected]" width="80" height="80" />
+        <icon src="resources/icons/ios/[email protected]" width="120" height="120" />
+        <icon src="resources/icons/ios/[email protected]" width="50" height="50" />
+        <icon src="resources/icons/ios/[email protected]" width="100" height="100" />
         <!-- Settings iPhone, iPad -->
-        <icon src="src/resources/icons/ios/[email protected]" width="29" height="29" />
-        <icon src="src/resources/icons/ios/[email protected]" width="58" height="58" />
-        <icon src="src/resources/icons/ios/[email protected]" width="87" height="87" />
+        <icon src="resources/icons/ios/[email protected]" width="29" height="29" />
+        <icon src="resources/icons/ios/[email protected]" width="58" height="58" />
+        <icon src="resources/icons/ios/[email protected]" width="87" height="87" />
         <!-- Notifications iPhone, iPad -->
-        <icon src="src/resources/icons/ios/[email protected]" width="40" height="40" />
-        <icon src="src/resources/icons/ios/[email protected]" width="60" height="60" />
+        <icon src="resources/icons/ios/[email protected]" width="40" height="40" />
+        <icon src="resources/icons/ios/[email protected]" width="60" height="60" />
     </platform>
 
     <!-- macOS -->
     <platform name="osx">
         <preference name="deployment-target" value="10.11" />
         <preference name="AllowWebViewNavigation" value="false" />
-        <icon src="src/resources/icons/osx/icon-16.png" width="16" height="16" />
-        <icon src="src/resources/icons/osx/icon-32.png" width="32" height="32" />
-        <icon src="src/resources/icons/osx/icon-64.png" width="64" height="64" />
-        <icon src="src/resources/icons/osx/icon-128.png" width="128" height="128" />
-        <icon src="src/resources/icons/osx/icon-256.png" width="256" height="256" />
-        <icon src="src/resources/icons/osx/icon-512.png" width="512" height="512" />
-        <icon src="src/resources/icons/osx/icon-1024.png" width="1024" height="1024" />
+        <icon src="resources/icons/osx/icon-16.png" width="16" height="16" />
+        <icon src="resources/icons/osx/icon-32.png" width="32" height="32" />
+        <icon src="resources/icons/osx/icon-64.png" width="64" height="64" />
+        <icon src="resources/icons/osx/icon-128.png" width="128" height="128" />
+        <icon src="resources/icons/osx/icon-256.png" width="256" height="256" />
+        <icon src="resources/icons/osx/icon-512.png" width="512" height="512" />
+        <icon src="resources/icons/osx/icon-1024.png" width="1024" height="1024" />
     </platform>
 </widget>

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.

src/cordova/apple/xcode/macos/Outline/config.xml

@@ -21,13 +21,13 @@
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
-    <icon height="16" src="src/resources/icons/osx/icon-16.png" width="16" />
-    <icon height="32" src="src/resources/icons/osx/icon-32.png" width="32" />
-    <icon height="64" src="src/resources/icons/osx/icon-64.png" width="64" />
-    <icon height="128" src="src/resources/icons/osx/icon-128.png" width="128" />
-    <icon height="256" src="src/resources/icons/osx/icon-256.png" width="256" />
-    <icon height="512" src="src/resources/icons/osx/icon-512.png" width="512" />
-    <icon height="1024" src="src/resources/icons/osx/icon-1024.png" width="1024" />
+    <icon height="16" src="resources/icons/osx/icon-16.png" width="16" />
+    <icon height="32" src="resources/icons/osx/icon-32.png" width="32" />
+    <icon height="64" src="resources/icons/osx/icon-64.png" width="64" />
+    <icon height="128" src="resources/icons/osx/icon-128.png" width="128" />
+    <icon height="256" src="resources/icons/osx/icon-256.png" width="256" />
+    <icon height="512" src="resources/icons/osx/icon-512.png" width="512" />
+    <icon height="1024" src="resources/icons/osx/icon-1024.png" width="1024" />
     <preference name="AllowInlineMediaPlayback" value="true" />
     <preference name="AllowWebViewNavigation" value="false" />
     <preference name="BackupWebStorage" value="cloud" />

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": {