Nextcloud pic and flow update for iOS and macOS (#454)

* Added pic and flow update

* Nextcloud setup for mac and ios update

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

* Update site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

* Better s/s and native mac server address can paste complete address

* Corected path to server for calDav and carDav

* Highlights with dashed lines across all images.

* server path on mac changed to copy from nextcloud

* Arrow fix

* Hit me baby one more time

---------

Co-authored-by: kn0wmad <39687477+kn0wmad@users.noreply.github.com>

site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-ios.rst

@@ -20,47 +20,99 @@ LAN Setup
 =========
 Make sure you have first set up :ref:`LAN access<lan-ios>`.
 
-1. Download the appropriate desktop client from https://nextcloud.com/install/#install-clients
-2. Open the client and click "Log In"
-3. From your server's Nextcloud Service page, go to "Interfaces" and copy the LAN address
-4. Enter your LAN address under "Server Address" and click "Next"
-5. You will be asked to Trust your server's certificate, which is safe to do as you generate and sign this during LAN Setup
-6. Tick the box for "Trust this certificate anyway" and click "Next"
-7. This will launch a page in your web browser, click "Log In" and then "Grant access" to link the desktop client. You can close this browser window afterwards
-8. Next, configure the local directory that you want to sync with Nextcloud. You may use the default or change it, and edit the sync settings to desired. When satisfied, click "Connect"
-9. Files will begin to sync immediately and you will see a green check when this is complete.
-10. That's it! From this desktop client you will recieve notifications, control accounts and syncing, and quickly access your Apps' WebUI pages
+1. Download the iOS Nextcloud client from `App Store <https://apps.apple.com/us/app/nextcloud/id1125420102>`_.
+2. Open the client and tap "Log In".
+
+   .. figure:: /_static/images/nextcloud/nextcloud-iOS-step2.png
+    :width: 30%
+    :alt: nextcloud-ios-login   
+   
+3. From your server's Nextcloud Service page, go to "Interfaces" and copy the LAN address.
+   
+   .. figure:: /_static/images/nextcloud/nextcloud-mac-step3-lan.png
+    :width: 60%
+    :alt: nextcloud-ios-login
+
+4. Enter your LAN address under "Server Address" and tap "Next".
+   
+   .. figure:: /_static/images/nextcloud/nextcloud-iOS-step4.png
+    :width: 30%
+    :alt: nextcloud-ios-login
+
+5. You will be shown the "Connect to your account" screen, and then click "Log In" and "Grant Access".
+
+  .. figure:: /_static/images/nextcloud/nextcloud-iOS-step5.png
+    :width: 30%
+    :alt: nextcloud-ios-login
+  
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step3-lan.png
+    :width: 60%
+    :alt: nextcloud-ios-login
+
+6. Next, you will be asked to enter the username and password, which can be found on the startOS Nextcloud Service page under the "Properties" tab.
+  
+  .. figure:: /_static/images/nextcloud/nextcloud-iOS-step5.png
+    :width: 30%
+    :alt: nextcloud-ios-login
+
+7. The account access page will be displayed, tap "Grant access".
+
+   .. figure:: /_static/images/nextcloud/nextcloud-iOS-step6.png
+    :width: 30%
+    :alt: nextcloud-ios-login
+
+8. Files will begin syncing immediately, and you will see your username and account icon in the top left corner.
+
+   .. figure:: /_static/images/nextcloud/nextcloud-iOS-step7.png
+    :width: 30%
+    :alt: nextcloud-ios-login
+    
+9.  That's it! From this mobile client you can receive notifications, control accounts and syncing, and quickly access your apps' WebUI pages.
 
 Tor Setup
 =========
 You will first need to have the :ref:`Tor daemon running<tor-ios>`.
 
-1. On your desktop application, click the account in the top left -> Settings, then in Settings, click Network, then "Specify proxy manually as" and "SOCKS5 proxy." Enter "127.0.0.1" for the Host and "9050" for the port.
-2. Close the Settings screen and click the account in the top left again, then "Add Account."
-3. On the following screen, click "Log in," then enter your Nextcloud Tor server address, which you can copy from Nextcloud -> Interfaces - Tor. This must start with http:// and end with .onion. Click Next.
-4. This will launch your browser and prompt you to log in to your account. Log in and then grant access as we did for LAN.
-5. That's it! You may wish to set up some select folders for remote sync, but for large files, it is best to sync on LAN only, so you can "Skip folders configuration" on the resulting screen if you wish. Check your connection by clicking the newly created account in the client app.
+1. Click the account in the top left again, then "Add Account."
+2. On the following screen, click "Log in," then enter your Nextcloud Tor server address, which you can copy from Nextcloud -> Interfaces - Tor. This must start with `http://` and end with .onion. Click Next.
+3. This will launch your browser and prompt you to log in to your account. Log in and then grant access as we did for LAN.
+4. That's it! You may wish to set up some select folders for remote sync, but for large files, it is best to sync on LAN only, so you can "Skip folders configuration" on the resulting screen if you wish. Check your connection by clicking the newly created account in the client app.
 
 Device Integration
 ------------------
-In order to sync calendars and contacts with your iOS device, follow the steps below, which are adapted from the `Official Nextcloud guide <https://docs.nextcloud.com/server/25/user_manual/en/groupware/sync_ios.html>`_.  First head into the top-righthand menu of your Nextcloud's WebUI and click "Apps," then search for and install the Calendar and/or Contacts Apps.
+In order to sync calendars and contacts with your iOS device, follow the steps below, which are adapted from the `Official Nextcloud guide <https://docs.nextcloud.com/server/25/user_manual/en/groupware/sync_ios.html>`_.  
 
-1. Open the "Settings" app.
+First head into the top-righthand menu of your Nextcloud's WebUI and click "Apps," then search for and install the Calendar and/or Contacts Apps. Next folow guide for iOS.
+
+.. figure:: /_static/images/nextcloud/nextcloud-iOS-native.png
+    :width: 60%
+    :alt: nextcloud account settings
+
+1. Open the "Settings" app on iOS device.
 
   .. note:: You will need to perform 2 individual setups, one for Calendar and one for Contacts.
 
-2. Select "Calendar" (or "Contacts") -> "Accounts" -> "Add Account" -> "Other" (return to this step after completing one in order to add the other).
+2. Select "Calendar" (or "Contacts") -> "Accounts" -> "Add Account" -> "Other" -> "either CalDAV (for Calendar setup) or CardDAV (for Contacts setup)".  Return to this step after completing one in order to add the other.
 
-3. Select either CalDAV (for Calendar setup) or CardDAV (for Contacts setup), and enter the following fields:
+.. figure:: /_static/images/nextcloud/nextcloud-iOS-native-step1.png
+  :width: 60%
+  :alt: nextcloud account settings
 
-  - Server - Enter your Nextcloud server LAN URL (found in "Interfaces" in the Nextcloud service page), and add `/remote.php/dav` after `.local`
+3. Enter the following fields and tap "Next":
+
+  - Server - Enter your Nextcloud server LAN URL (found in "Interfaces" in the Nextcloud service page), and add --> **`/remote.php/dav`** <-- after `.local`.
   
-  - User name - Your Nextcloud user (Default is "admin")
+  - User name - The default user is "admin," but this is your user within Nextcloud, so be sure it is the correct user if you have more than one.
   
-  - Password - Your Nextcloud user's password (Default found in "Properties" in the Nextcloud service page)
+  - Password - Your Nextcloud user's password (Default found in "Properties" in the Nextcloud service page).
 
-  - Description - Anything to describe this account, such as "Nextcloud CalDAV"
+  - Description - Anything to describe this account, such as "Nextcloud CalDAV".
+
+.. figure:: /_static/images/nextcloud/nextcloud-iOS-native-step2.png
+  :width: 30%
+  :alt: nextcloud account settings
 
 4. If you get a warning about verifying the server identity, it is safe to "Continue."  Add the apps you want to use, such as Calendars, Contacts, and/or Reminders, then tap "Save."
 
-  - That's it!  Go back to step 2 above to set up your other account (CalDAV / CardDAV)
+  - That's it!  Go back to step 2 above to set up your other account (CalDAV / CardDAV).
+

site/source/guides/service-guides/nextcloud/nextcloud-setup/nextcloud-mac.rst

@@ -5,7 +5,7 @@ Nextcloud - MacOS
 =================
 
 .. contents::
-  :depth: 2 
+  :depth: 3 
   :local:
 
 Initial Config
@@ -14,34 +14,91 @@ It is advised to setup your Nextcloud devices on LAN (if available) for the best
 
 Native Desktop Integration
 --------------------------
+The smoothest experience will be using direct account integration with your Mac.  First head into the top-righthand menu of your Nextcloud's WebUI and click "Apps," then search for and install the Calendar and/or Contacts Apps if you don't have them already (these are installed by default on the latest Nextcloud for StartOS).  The steps below are adapted from the `Official Nextcloud guide <https://docs.nextcloud.com/server/24/user_manual/en/groupware/sync_osx.html>`_ and updated for the latest MacOS (Ventura).  Make sure you have first set up :ref:`LAN access<lan-mac>`.
 
-.. note:: The desktop version of NextCloud doesn't have much of a user interface.  Once installed, it solely lives in the top right hand corner of the Mac desktop in the navbar, near the WiFi icon.  When it's synced, the icon turns into a checkmark with a circle around it.
-
-The smoothest experience will be using direct account integration with your Mac.  First head into the top-righthand menu of your Nextcloud's WebUI and click "Apps," then search for and install the Calendar and/or Contacts Apps.  The steps below are adapted from the `Official Nextcloud guide <https://docs.nextcloud.com/server/24/user_manual/en/groupware/sync_osx.html>`_ and updated for the latest MacOS (Ventura).  Make sure you have first set up :ref:`LAN access<lan-mac>`.
-
-1. Open the "System Settings" and select "Internet Accounts," then click "Add Account."
-
-2. Select "Add Other Account"
+.. tabs::
   
-  .. note:: You will need to perform 2 individual setups, one for Calendar and one for Contacts.
+  .. group-tab:: Ventura
 
-3. Select CalDAV for Calendar setup OR CardDAV for Contacts setup.  If you want to do both, you will need to return to this step after finishing setup of the first.
+    1. Open the "System Settings" and select "Internet Accounts," click "Add Account." and then select "Add Other Account".
+      
+      .. figure:: /_static/images/nextcloud/native-nextcloud-integration-macos-step1.png
+          :width: 60%
+          :alt: macOS add account
+    
+      .. figure:: /_static/images/nextcloud/native-nextcloud-integration-macos-step1.2.png
+        :width: 60%
+        :alt: macOS add account
+    
+    2. Select CalDAV for calendar setup or CardDAV for contacts setup. If you want to do both, you will need to return to this step after finishing the setup of the first.
+      
+      .. note:: You will need to perform 2 individual setups, one for Calendar and one for Contacts.
+    
+      .. figure:: /_static/images/nextcloud/native-nextcloud-integration-macos-step2.png
+        :width: 60%
+        :alt: macOS select account
+    
+    3. Select "Advanced" from the "Account Type" dropdown menu and fill in the following fields.
 
-4. Select "Manual" from the "Account Type" dropdown menu and fill in the following fields:
+       .. figure:: /_static/images/nextcloud/native-nextcloud-integration-macos-step3.png
+        :width: 60%
+        :alt: macOS setup account
 
-  - Username - The default user is "admin," but this is your user within Nextcloud, so be sure it is the correct user if you have more than one
+    - Username - The default user is "admin," but this is your user within Nextcloud, so be sure it is the correct user if you have more than one
+
+    - Password - In your Nextcloud WebUI, visit the top-right-hand menu and select "Personal Settings" -> "Security." At the bottom, under Devices & Sessions, create a new app password with a name of your choice, such as "MacCalDAV." Then, copy the resulting password into your Mac's account configuration. 
+
+      .. figure:: /_static/images/nextcloud/native-nextcloud-integration-macos-step3.1.png
+        :width: 60%
+        :alt: nextcloud app password 
+    
+    - Server Address - copy your LAN address from the "Interfaces" section of your Nextcloud service page then paste.
+
+      .. figure:: /_static/images/nextcloud/native-nextcloud-integration-macos-step3.2.png
+        :width: 60%
+        :alt: nextcloud app password
   
-  - Password - In your Nextcloud WebUI, visit the top-righthand menu and select "Personal Settings" -> "Security."  At the bottom, under Devices & Sessions, create a new app password with a name of your choice, such as "MacCalDAV," and then copy the resulting password into your Mac's account config
+    - Server Path - You can find complete path in Nextcloud -> Calendar settings -> Copy iOS/macOS CalDav address. For setting up contacts/CardDav use the same path.
+
+      .. figure:: /_static/images/nextcloud/native-nextcloud-integration-macos-step3.3.png
+        :width: 60%
+        :alt: nextcloud app password
+
+    - Port - Set port to `443`.
   
-  - Server Address - copy your LAN address from the "Interfaces" section of your Nextcloud service page then add `/remote.php/dav` after `.local`
+    4. Click "Sign In."
 
-5. Click "Sign In."
+      - You can now select the apps you want to use on your Mac, such as Calendars, Reminders.
+      - Return to Step 3 to set up CalDAV/CardDAV, whichever you have not done yet.
+  
+  .. group-tab:: Pre-Ventura
 
-  - You can now select the apps you want to use on your Mac, such as Calendars, Reminders, or Contacts
-  - Return to Step 3 to continue setup
+    1. Open the "System Settings" and select "Internet Accounts," then click "Add Account."
+
+    2. Select "Add Other Account"
+      
+      .. note:: You will need to perform 2 individual setups, one for Calendar and one for Contacts.
+
+    3. Select CalDAV for Calendar setup OR CardDAV for Contacts setup.  If you want to do both, you will need to return to this step after finishing setup of the first.
+
+    4. Select "Manual" from the "Account Type" dropdown menu and fill in the following fields:
+
+      - Username - The default user is "admin," but this is your user within Nextcloud, so be sure it is the correct user if you have more than one
+      
+      - Password - In your Nextcloud WebUI, visit the top-righthand menu and select "Personal Settings" -> "Security."  At the bottom, under Devices & Sessions, create a new app password with a name of your choice, such as "MacCalDAV," and then copy the resulting password into your Mac's account config
+      
+      - Server Address - copy your LAN address from the "Interfaces" section of your Nextcloud service page then add `/remote.php/dav` after `.local`
+
+    5. Click "Sign In."
+
+      - You can now select the apps you want to use on your Mac, such as Calendars, Reminders, or Contacts
+      - Return to Step 3 to continue setup
 
 Standalone Clients
 ------------------
+
+.. note:: The desktop version of NextCloud doesn't have much of a user interface.  Once installed, it solely lives in the top right hand corner of the Mac desktop in the navbar, near the WiFi icon.  When it's synced, the icon turns into a checkmark with a circle around it.
+
 For those that prefer to use a desktop client.
 
 File Syncing - Nextcloud Desktop
@@ -52,26 +109,81 @@ LAN Setup
 .........
 Make sure you have first set up :ref:`LAN access<lan-mac>`.  Then do the following:
 
-1. Download the appropriate desktop client from https://nextcloud.com/install/#install-clients
-2. Open the client and click "Log In"
-3. From your server's Nextcloud Service page, go to "Interfaces" and copy the LAN address
-4. Enter your LAN address under "Server Address" and click "Next"
-5. You will be asked to Trust your server's certificate, which is safe to do as you generate and sign this during LAN Setup
-6. Tick the box for "Trust this certificate anyway" and click "Next"
-7. This will launch a page in your web browser, click "Log In" and then "Grant access" to link the desktop client. You can close this browser window afterwards
-8. Next, configure the local directory that you want to sync with Nextcloud. You may use the default or change it, and edit the sync settings to desired. When satisfied, click "Connect"
-9. Files will begin to sync immediately and you will see a green check when this is complete.
-10. That's it! From this desktop client you will recieve notifications, control accounts and syncing, and quickly access your Apps' WebUI pages
+1. Download the appropriate desktop client from the `Nextcloud website <https://nextcloud.com/install/#install-clients>`_.
+2. Open the client and click "Log In".
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step2.png
+    :width: 40%
+    :alt: nextcloud-login
+
+3. From your server's Nextcloud Service page, go to "Interfaces" and copy the LAN address.
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step3-lan.png
+    :width: 60%
+    :alt: nextcloud-login
+
+4. Enter your LAN address under "Server Address" and click "Next".
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step4.png
+    :width: 40%
+    :alt: nextcloud-login
+
+5. This will launch a page in your web browser, click "Log In" and then "Grant access" to link the desktop client. You can close this browser window afterwards.
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step5.png
+    :width: 40%
+    :alt: nextcloud-login
+
+6. Next, configure the local directory that you want to sync with Nextcloud. You may use the default or change it, and edit the sync settings to desired. When satisfied, click "Connect".
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step6.png
+    :width: 60%
+    :alt: nextcloud-login
+
+7. Files will begin to sync immediately and you will see a green check when this is complete.
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step7.png
+    :width: 50%
+    :alt: nextcloud-login
+    
+8. That's it! From this desktop client you can receive notifications, control accounts and syncing, and quickly access your apps' WebUI pages.
 
 Tor Setup
 .........
 You will first need to have the :ref:`Tor daemon running<tor-mac>`.
 
-1. Close the Settings screen and click the account in the top left again, then "Add Account."
-2. On the following screen, click "Log in," then enter your Nextcloud Tor server address, which you can copy from Nextcloud -> Interfaces - Tor. This must start with `http://` and end with .onion. Click Next.
-3. This will launch your browser and prompt you to log in to your account. Log in and then grant access as we did for LAN.
-4. That's it! You may wish to set up some select folders for remote sync, but for large files, it is best to sync on LAN only, so you can "Skip folders configuration" on the resulting screen if you wish. Check your connection by clicking the newly created account in the client app.
+1. On your desktop application, click the account in the top left -> Settings.
 
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-tor1.png
+    :width: 40%
+    :alt: nextcloud-login
+
+2. On the following screen, click "Network" tab and then “Specify proxy manually as” and “SOCKS5 proxy.” Enter “127.0.0.1” for the Host and “9050” for the port.
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-tor2.png
+    :width: 40%
+    :alt: nextcloud-login
+
+3. Close the Settings screen and click the account in the top left again, then “Add Account.”
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-tor3.png
+    :width: 40%
+    :alt: nextcloud-login
+
+4. On the following screen, click “Log in,” then enter your Nextcloud Tor server address, which you can copy from Nextcloud -> Interfaces - Tor. This must start with http:// and end with .onion. Click Next.
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step2.png
+    :width: 40%
+    :alt: nextcloud-login
+
+  .. figure:: /_static/images/nextcloud/nextcloud-mac-step4.png
+    :width: 40%
+    :alt: nextcloud-login
+
+5. This will launch your browser and prompt you to log in to your account. Log in and then grant access as we did for LAN.
+
+6. That’s it! You may wish to set up some select folders for remote sync, but for large files, it is best to sync on LAN only, so you can “Skip folders configuration” on the resulting screen if you wish. Check your connection by clicking the newly created account in the client app.
+   
 Calendar & Contacts Syncing - Thunderbird
 =========================================
 If you wish to use a standalone client for Calendar and Contacts, we recommend Mozilla's `Thunderbird <https://www.thunderbird.net>`_.
@@ -88,4 +200,4 @@ If you wish to use a standalone client for Calendar and Contacts, we recommend M
 7. Enter a name for your account, your nextcloud user name (found in Properties, default is 'admin'), password (found in Properties), and server LAN address (found in Interfaces, ending in `.local`) - then click "Next."
 8.  After connecting, click "Finish."
 9.  In the resulting window, click "Enable and synchronize this account."
-10. Select the items you want to sync, such as contacts and a calendar.
+10. Select the items you want to sync, such as contacts and a calendar.