fix(deps): update golang.org/x/sync digest to f12130a

docs/content/doc/development/development.md

@@ -36,9 +36,8 @@ Make sure to check the other doc articles for specific development tasks like [t
 ## Frontend requirements
 
 The code for the frontend is located at [code.vikunja.io/frontend](https://code.vikunja.io/frontend).
-More instructions can be found in the repo's README.
 
-You need to have [pnpm](https://pnpm.io/) and nodejs in version 16 or 18 installed.
+You need to have yarn v1 and nodejs in version 16 installed.
 
 ## Git flow
 

docs/content/doc/development/test.md

@@ -98,12 +98,12 @@ Check out the docs [in the frontend repo](https://kolaente.dev/vikunja/frontend/
 To run the frontend unit tests, run
 
 {{< highlight bash >}}
-pnpm test:unit
+yarn test:unit
 {{< /highlight >}}
 
 The frontend also has a watcher available that re-runs all unit tests every time you change something.
 To use it, simply run
 
 {{< highlight bash >}}
-pnpm test:unit-watch
+yarn test:unit-watch
 {{< /highlight >}}

docs/content/doc/setup/build-from-source.md

@@ -38,7 +38,9 @@ More options are available, please refer to the [magefile docs]({{< ref "../deve
 
 The code for the frontend is located at [code.vikunja.io/frontend](https://code.vikunja.io/frontend).
 
-1. Make sure you have [pnpm](https://pnpm.io/) properly installed on your system.
-2. Clone the repo with `git clone https://code.vikunja.io/frontend` and switch into the directory.
-3. Install all dependencies with `pnpm install`
-4. Build the frontend with `pnpm build`. This will result in a static js bundle in the `dist/` folder which you can deploy.
+You need to have yarn v1 and nodejs in version 16 installed.
+
+1. Make sure [yarn v1](https://yarnpkg.com/getting-started/install) is properly installed on your system.
+3. Clone the repo with `git clone https://code.vikunja.io/frontend` and switch into the directory.
+3. Install all dependencies with `yarn install`
+4. Build the frontend with `yarn build`. This will result in a js bundle in the `dist/` folder which you can deploy.

docs/content/doc/setup/subdirectory.md

@@ -1,39 +0,0 @@
----
-title: "Running Vikunja in a subdirectory"
-date: 2022-09-23T12:15:04+02:00
-draft: false
-menu:
-  sidebar:
-    parent: "setup"
----
-
-# Running Vikunja in a subdirectory
-
-Running Vikunja in a subdirectory is not supported out of the box.
-However, you can still run it in a subdirectory but need to build the frontend yourself.
-
-## Frontend
-
-First, make sure you're able to build the frontend from source.
-Check [the guide about building from source]({{< ref "build-from-source.md">}}#frontend) about that.
-
-Then, run 
-
-```
-pnpm vite build --base=/SUBPATH
-pnpm workbox copyLibraries dist/
-```
-
-Where `SUBPATH` is the subdirectory you want to run Vikunja on.
-
-Once you have the build files you can deploy them as usual.
-Note that when deploying in docker you'll need to put the files in a web container yourself, you 
-can't use the `Dockerfile` in the repo without modifications.
-
-## API
-
-If you're not using a reverse proxy you're good to go.
-Simply configure the api url in the frontend as you normally would.
-
-If you're using a reverse proxy you'll need to adjust the paths so that the api is available at `/SUBPATH/api/v1`.
-You can check if everything is working correctly by opening `/SUBPATH/api/v1/info` in a browser.

go.mod

@@ -65,7 +65,7 @@ require (
 	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
 	golang.org/x/image v0.0.0-20220722155232-062f8c9fd539
 	golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
+	golang.org/x/sync v0.0.0-20220907140024-f12130a52804
 	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab
 	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
 	gopkg.in/d4l3k/messagediff.v1 v1.2.1

go.sum

@@ -1051,6 +1051,8 @@ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDE
 golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
+golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

pkg/models/tasks.go

@@ -1289,39 +1289,18 @@ func setTaskDatesFromCurrentDateRepeat(oldTask, newTask *Task) {
 		}
 	}
 
-	// We want to preserve intervals among the due, start and end dates.
-	// The due date is used as a reference point for all new dates, so the
-	// behaviour depends on whether the due date is set at all.
-	if oldTask.DueDate.IsZero() {
-		// If a task has no due date, but does have a start and end date, the
-		// end date should keep the difference to the start date when setting
-		// them as new
-		if !oldTask.StartDate.IsZero() && !oldTask.EndDate.IsZero() {
-			diff := oldTask.EndDate.Sub(oldTask.StartDate)
-			newTask.StartDate = now.Add(repeatDuration)
-			newTask.EndDate = now.Add(repeatDuration + diff)
-		} else {
-			if !oldTask.StartDate.IsZero() {
-				newTask.StartDate = now.Add(repeatDuration)
-			}
-
-			if !oldTask.EndDate.IsZero() {
-				newTask.EndDate = now.Add(repeatDuration)
-			}
-		}
+	// If a task has a start and end date, the end date should keep the difference to the start date when setting them as new
+	if !oldTask.StartDate.IsZero() && !oldTask.EndDate.IsZero() {
+		diff := oldTask.EndDate.Sub(oldTask.StartDate)
+		newTask.StartDate = now.Add(repeatDuration)
+		newTask.EndDate = now.Add(repeatDuration + diff)
 	} else {
-		// If the old task has a start and due date, we set the new start date
-		// to preserve the interval between them.
 		if !oldTask.StartDate.IsZero() {
-			diff := oldTask.DueDate.Sub(oldTask.StartDate)
-			newTask.StartDate = newTask.DueDate.Add(-diff)
+			newTask.StartDate = now.Add(repeatDuration)
 		}
 
-		// If the old task has an end and due date, we set the new end date
-		// to preserve the interval between them.
 		if !oldTask.EndDate.IsZero() {
-			diff := oldTask.DueDate.Sub(oldTask.EndDate)
-			newTask.EndDate = newTask.DueDate.Add(-diff)
+			newTask.EndDate = now.Add(repeatDuration)
 		}
 	}