From 342bbd6192284059c18f45a8229d78a926efc638 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni <6173598+dpschen@users.noreply.github.com> Date: Fri, 6 Jun 2025 10:38:52 +0200 Subject: [PATCH] fix: correct comments --- frontend/src/components/tasks/partials/DeferTask.vue | 2 +- frontend/src/i18n/lang/en.json | 6 +++--- frontend/src/models/label.ts | 4 ++-- frontend/src/services/abstractService.ts | 2 +- frontend/src/services/task.ts | 2 +- frontend/src/stores/auth.ts | 6 +++--- frontend/src/styles/components/labels.scss | 2 +- frontend/src/styles/components/tasks.scss | 2 +- frontend/src/styles/custom-properties/colors.scss | 8 ++++---- frontend/src/styles/fonts.scss | 2 +- frontend/src/styles/global.scss | 2 +- frontend/src/sw.ts | 2 +- frontend/src/views/tasks/TaskDetailView.vue | 2 +- frontend/src/views/user/settings/Avatar.vue | 2 +- frontend/tailwind.config.js | 2 +- magefile.go | 6 +++--- pkg/models/label_task.go | 2 +- pkg/models/project_duplicate.go | 2 +- pkg/modules/auth/auth.go | 4 ++-- pkg/modules/migration/trello/trello.go | 2 +- pkg/swagger/docs.go | 2 +- pkg/swagger/swagger.json | 2 +- pkg/swagger/swagger.yaml | 2 +- pkg/webtests/archived_test.go | 2 +- 24 files changed, 35 insertions(+), 35 deletions(-) diff --git a/frontend/src/components/tasks/partials/DeferTask.vue b/frontend/src/components/tasks/partials/DeferTask.vue index 62ca92c4b..f8680c242 100644 --- a/frontend/src/components/tasks/partials/DeferTask.vue +++ b/frontend/src/components/tasks/partials/DeferTask.vue @@ -59,7 +59,7 @@ const {t} = useI18n({useScope: 'global'}) const taskService = shallowReactive(new TaskService()) const task = ref() -// We're saving the due date seperately to prevent null errors in very short periods where the task is null. +// We're saving the due date separately to prevent null errors in very short periods where the task is null. const dueDate = ref() const lastValue = ref() const changeInterval = ref>() diff --git a/frontend/src/i18n/lang/en.json b/frontend/src/i18n/lang/en.json index cb68bed80..1b8eb8689 100644 --- a/frontend/src/i18n/lang/en.json +++ b/frontend/src/i18n/lang/en.json @@ -389,7 +389,7 @@ "targetUrl": "Target URL", "targetUrlInvalid": "Please provide a valid URL.", "events": "Events", - "eventsHint": "Select all events this webhook should recieve updates for (within the current project).", + "eventsHint": "Select all events this webhook should receive updates for (within the current project).", "mustSelectEvents": "You must select at least one event.", "delete": "Delete this webhook", "deleteText": "Are you sure you want to delete this webhook? External targets will not be notified of its events anymore.", @@ -486,8 +486,8 @@ "lessThan": "Less than", "lessThanOrEqual": "Less than or equal to", "like": "Matches a pattern (using wildcard %)", - "in": "Matches any value in a comma-seperated list of values", - "notIn": "Matches any value not present in a comma-seperated list of values" + "in": "Matches any value in a comma-separated list of values", + "notIn": "Matches any value not present in a comma-separated list of values" }, "logicalOperators": { "intro": "To combine multiple conditions, you can use the following logical operators:", diff --git a/frontend/src/models/label.ts b/frontend/src/models/label.ts index 364a93fb1..d57750398 100644 --- a/frontend/src/models/label.ts +++ b/frontend/src/models/label.ts @@ -9,8 +9,8 @@ import {colorIsDark} from '@/helpers/color/colorIsDark' export default class LabelModel extends AbstractModel implements ILabel { id = 0 title = '' - // FIXME: this should be empty and be definied in the client. - // that way it get's never send to the server db and is easier to change in future versions. + // FIXME: this should be empty and be defined in the client. + // that way it gets never send to the server db and is easier to change in future versions. hexColor = '' description = '' createdBy: IUser diff --git a/frontend/src/services/abstractService.ts b/frontend/src/services/abstractService.ts index 391305b82..a09507101 100644 --- a/frontend/src/services/abstractService.ts +++ b/frontend/src/services/abstractService.ts @@ -209,7 +209,7 @@ export default abstract class AbstractService { }) }) - // Process all attachments to preven parsing errors + // Process all attachments to prevent parsing errors if (model.attachments.length > 0) { const attachmentService = new AttachmentService() model.attachments.map(a => { diff --git a/frontend/src/stores/auth.ts b/frontend/src/stores/auth.ts index df12fa589..d056a6c91 100644 --- a/frontend/src/stores/auth.ts +++ b/frontend/src/stores/auth.ts @@ -171,7 +171,7 @@ export const useAuthStore = defineStore('auth', () => { // Save the token to local storage for later use saveToken(response.data.token, true) - // Tell others the user is autheticated + // Tell others the user is authenticated await checkAuth() } catch (e) { if ( @@ -190,7 +190,7 @@ export const useAuthStore = defineStore('auth', () => { /** * Registers a new user and logs them in. - * Not sure if this is the right place to put the logic in, maybe a seperate js component would be better suited. + * Not sure if this is the right place to put the logic in, maybe a separate js component would be better suited. */ async function register(credentials, language: string|null = null) { const HTTP = HTTPFactory() @@ -241,7 +241,7 @@ export const useAuthStore = defineStore('auth', () => { saveToken(response.data.token, true) setLoggedInVia(provider) - // Tell others the user is autheticated + // Tell others the user is authenticated await checkAuth() } finally { setIsLoading(false) diff --git a/frontend/src/styles/components/labels.scss b/frontend/src/styles/components/labels.scss index 049702652..81e33bff0 100644 --- a/frontend/src/styles/components/labels.scss +++ b/frontend/src/styles/components/labels.scss @@ -1,4 +1,4 @@ -// FIXME: adapt lables.vue so that it can be used for this aswell +// FIXME: adapt labels.vue so that it can be used for this as well .labels-list { a, a:hover { text-decoration: none; diff --git a/frontend/src/styles/components/tasks.scss b/frontend/src/styles/components/tasks.scss index 672790aa8..24d277971 100644 --- a/frontend/src/styles/components/tasks.scss +++ b/frontend/src/styles/components/tasks.scss @@ -40,7 +40,7 @@ } } -// FIXME: is only used where is used aswell: +// FIXME: is only used where is used as well: // - Project.vue // -> Move the wrapper including this class definition inside .is-max-width-desktop .tasks .task { diff --git a/frontend/src/styles/custom-properties/colors.scss b/frontend/src/styles/custom-properties/colors.scss index af1c4b05a..5e7bbb193 100644 --- a/frontend/src/styles/custom-properties/colors.scss +++ b/frontend/src/styles/custom-properties/colors.scss @@ -5,7 +5,7 @@ // Added (from bulma-css-variables/css/bulma.css) to fix issues with undefined variables // This section should be removed once bulma/sass scoping issues are fixed // see https://kolaente.dev/vikunja/frontend/issues/1064 - // Variables overriden in Vikunja specific rules below are commented out + // Variables overridden in Vikunja specific rules below are commented out //--scheme-main: white; --scheme-main-bis: #fafafa; --scheme-main-ter: whitesmoke; @@ -252,7 +252,7 @@ // Define custom color variable to prevent change in dark mode --switch-view-color: hsla(var(--white-h), var(--white-s), var(--white-l), var(--white-a)); - // Define custom color variable to alow change in dark mode + // Define custom color variable to allow change in dark mode --card-border-color: var(--grey-200); --logo-text-color: hsl(180, 1%, 15%); @@ -292,7 +292,7 @@ --text-strong: var(--grey-900); // Elements that rely on Bulma defaults in light mode but - // need to be overriden in dark mode + // need to be overridden in dark mode --input-placeholder-color: hsla(var(--grey-900-hsl), 0.6); --tag-color: var(--grey-300); --table-row-hover-background-color: var(--grey-100); @@ -308,7 +308,7 @@ --card-border-color: hsla(var(--grey-100-hsl), 0.3); --logo-text-color: var(--grey-700); - // Slightly different primary color to make sure it has a sufficent contrast ratio + // Slightly different primary color to make sure it has a sufficient contrast ratio --primary-h: 217deg; --primary-s: 98%; --primary-l: 58%; diff --git a/frontend/src/styles/fonts.scss b/frontend/src/styles/fonts.scss index 35552aed0..a004d0a92 100644 --- a/frontend/src/styles/fonts.scss +++ b/frontend/src/styles/fonts.scss @@ -1,7 +1,7 @@ $font-files-path: '@/assets/fonts/'; // this is the same as the latin range that google uses. -// see for examle the unicode-range definition here: +// see for example the unicode-range definition here: // https://fonts.googleapis.com/css2?family=Open+Sans $unicode-range: "U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,\ U+02C6,U+02DA,U+02DC,U+2000-206F,U+2074,U+20AC,\ diff --git a/frontend/src/styles/global.scss b/frontend/src/styles/global.scss index a6a886312..2923e5239 100644 --- a/frontend/src/styles/global.scss +++ b/frontend/src/styles/global.scss @@ -11,7 +11,7 @@ // ################### // // The following imports are the same as in "bulma/bulma.sass" -// with the expeption of the bulma utilities – They are +// with the exception of the bulma utilities – They are // imported globally in common-imports.scss // imports from "bulma-css-variables/sass/base/_all"; diff --git a/frontend/src/sw.ts b/frontend/src/sw.ts index 148e2ad87..edad75436 100644 --- a/frontend/src/sw.ts +++ b/frontend/src/sw.ts @@ -20,7 +20,7 @@ workbox.routing.registerRoute( new workbox.strategies.StaleWhileRevalidate(), ) -// Always send api reqeusts through the network +// Always send api requests through the network workbox.routing.registerRoute( new RegExp('api\\/v1\\/.*$'), new workbox.strategies.NetworkOnly(), diff --git a/frontend/src/views/tasks/TaskDetailView.vue b/frontend/src/views/tasks/TaskDetailView.vue index 1783e8d0e..1db1ec913 100644 --- a/frontend/src/views/tasks/TaskDetailView.vue +++ b/frontend/src/views/tasks/TaskDetailView.vue @@ -693,7 +693,7 @@ onBeforeUnmount(() => { // to the color property change being triggered when the # is removed from it, leading to an update, // which leads in turn to a change... This creates an infinite loop in which the task is updated, changed, // updated, changed, updated and so on. -// To prevent this, we put the task color property in a seperate value which is set to the task color +// To prevent this, we put the task color property in a separate value which is set to the task color // when it is saved and loaded. const taskColor = ref('') diff --git a/frontend/src/views/user/settings/Avatar.vue b/frontend/src/views/user/settings/Avatar.vue index 3a99eb787..51a872efc 100644 --- a/frontend/src/views/user/settings/Avatar.vue +++ b/frontend/src/views/user/settings/Avatar.vue @@ -105,7 +105,7 @@ const AVATAR_PROVIDERS = computed(() => ({ useTitle(() => `${t('user.settings.avatar.title')} - ${t('user.settings.title')}`) const avatarService = shallowReactive(new AvatarService()) -// Seperate variable because some things we're doing in browser take a bit +// Separate variable because some things we're doing in browser take a bit const loading = ref(false) diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index f952c3735..235112a6b 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -1,7 +1,7 @@ /** @type {import('tailwindcss').Config} */ module.exports = { corePlugins: { - // TODO: Readd after removing bulma base styles + // TODO: Re-add after removing bulma base styles preflight: false, }, prefix: 'tw-', diff --git a/magefile.go b/magefile.go index 86d8ed9b3..380e25a2f 100644 --- a/magefile.go +++ b/magefile.go @@ -310,7 +310,7 @@ func copyFile(src, dst string) error { } // os.Rename has issues with moving files between docker volumes. -// Because of this limitaion, it fails in drone. +// Because of this limitation, it fails in drone. // Source: https://gist.github.com/var23rav/23ae5d0d4d830aff886c3c970b8f6c6b func moveFile(src, dst string) error { inputFile, err := os.Open(src) @@ -612,7 +612,7 @@ func (Check) GolangciFix() { runAndStreamOutput("golangci-lint", "run", "--fix") } -// Runs golangci and the swagger test in parralel +// Runs golangci and the swagger test in parallel func (Check) All() { mg.Deps(initVars) mg.Deps( @@ -838,7 +838,7 @@ func (Release) Compress(ctx context.Context) error { // Runs compressing in parallel since upx is single-threaded errs.Go(func() error { - runAndStreamOutput("chmod", "+x", path) // Make sure all binaries are executable. Sometimes the CI does weired things and they're not. + runAndStreamOutput("chmod", "+x", path) // Make sure all binaries are executable. Sometimes the CI does weird things and they're not. runAndStreamOutput("upx", "-9", path) return nil }) diff --git a/pkg/models/label_task.go b/pkg/models/label_task.go index c299b0da4..8981022f2 100644 --- a/pkg/models/label_task.go +++ b/pkg/models/label_task.go @@ -164,7 +164,7 @@ type LabelByTaskIDsOptions struct { } // GetLabelsByTaskIDs is a helper function to get all labels for a set of tasks -// Used when getting all labels for one task as well when getting all lables +// Used when getting all labels for one task as well when getting all labels func GetLabelsByTaskIDs(s *xorm.Session, opts *LabelByTaskIDsOptions) (ls []*LabelWithTaskID, resultCount int, totalEntries int64, err error) { linkShare, isLinkShareAuth := opts.User.(*LinkSharing) diff --git a/pkg/models/project_duplicate.go b/pkg/models/project_duplicate.go index 34412fcf9..af0855993 100644 --- a/pkg/models/project_duplicate.go +++ b/pkg/models/project_duplicate.go @@ -59,7 +59,7 @@ func (pd *ProjectDuplicate) CanCreate(s *xorm.Session, a web.Auth) (canCreate bo // Create duplicates a project // @Summary Duplicate an existing project -// @Description Copies the project, tasks, files, kanban data, assignees, comments, attachments, lables, relations, backgrounds, user/team rights and link shares from one project to a new one. The user needs read access in the project and write access in the parent of the new project. +// @Description Copies the project, tasks, files, kanban data, assignees, comments, attachments, labels, relations, backgrounds, user/team rights and link shares from one project to a new one. The user needs read access in the project and write access in the parent of the new project. // @tags project // @Accept json // @Produce json diff --git a/pkg/modules/auth/auth.go b/pkg/modules/auth/auth.go index bfb9887b1..b93af6425 100644 --- a/pkg/modules/auth/auth.go +++ b/pkg/modules/auth/auth.go @@ -40,7 +40,7 @@ const ( AuthTypeLinkShare ) -// Token represents an authentification token +// Token represents an authentication token type Token struct { Token string `json:"token" example:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"` } @@ -55,7 +55,7 @@ func NewUserAuthTokenResponse(u *user.User, c echo.Context, long bool) error { return c.JSON(http.StatusOK, Token{Token: t}) } -// NewUserJWTAuthtoken generates and signes a new jwt token for a user. This is a global function to be able to call it from web tests. +// NewUserJWTAuthtoken generates and signs a new jwt token for a user. This is a global function to be able to call it from web tests. func NewUserJWTAuthtoken(u *user.User, long bool) (token string, err error) { t := jwt.New(jwt.SigningMethodHS256) diff --git a/pkg/modules/migration/trello/trello.go b/pkg/modules/migration/trello/trello.go index a09e60f8f..2e2d5a8c1 100644 --- a/pkg/modules/migration/trello/trello.go +++ b/pkg/modules/migration/trello/trello.go @@ -208,7 +208,7 @@ func fillCardData(client *trello.Client, board *trello.Board) (err error) { list.Cards = append(list.Cards, card) } - log.Debugf("[Trello Migration] Looked for attachements on all cards of board %s", board.ID) + log.Debugf("[Trello Migration] Looked for attachments on all cards of board %s", board.ID) return } diff --git a/pkg/swagger/docs.go b/pkg/swagger/docs.go index 8b5107be8..7a1c54f3c 100644 --- a/pkg/swagger/docs.go +++ b/pkg/swagger/docs.go @@ -2761,7 +2761,7 @@ const docTemplate = `{ "JWTKeyAuth": [] } ], - "description": "Copies the project, tasks, files, kanban data, assignees, comments, attachments, lables, relations, backgrounds, user/team rights and link shares from one project to a new one. The user needs read access in the project and write access in the parent of the new project.", + "description": "Copies the project, tasks, files, kanban data, assignees, comments, attachments, labels, relations, backgrounds, user/team rights and link shares from one project to a new one. The user needs read access in the project and write access in the parent of the new project.", "consumes": [ "application/json" ], diff --git a/pkg/swagger/swagger.json b/pkg/swagger/swagger.json index 0ef9f2c85..c4e65ac40 100644 --- a/pkg/swagger/swagger.json +++ b/pkg/swagger/swagger.json @@ -2753,7 +2753,7 @@ "JWTKeyAuth": [] } ], - "description": "Copies the project, tasks, files, kanban data, assignees, comments, attachments, lables, relations, backgrounds, user/team rights and link shares from one project to a new one. The user needs read access in the project and write access in the parent of the new project.", + "description": "Copies the project, tasks, files, kanban data, assignees, comments, attachments, labels, relations, backgrounds, user/team rights and link shares from one project to a new one. The user needs read access in the project and write access in the parent of the new project.", "consumes": [ "application/json" ], diff --git a/pkg/swagger/swagger.yaml b/pkg/swagger/swagger.yaml index 57d9baabf..f793dab69 100644 --- a/pkg/swagger/swagger.yaml +++ b/pkg/swagger/swagger.yaml @@ -4004,7 +4004,7 @@ paths: consumes: - application/json description: Copies the project, tasks, files, kanban data, assignees, comments, - attachments, lables, relations, backgrounds, user/team rights and link shares + attachments, labels, relations, backgrounds, user/team rights and link shares from one project to a new one. The user needs read access in the project and write access in the parent of the new project. parameters: diff --git a/pkg/webtests/archived_test.go b/pkg/webtests/archived_test.go index ad7d214c9..2c3a9c587 100644 --- a/pkg/webtests/archived_test.go +++ b/pkg/webtests/archived_test.go @@ -111,7 +111,7 @@ func TestArchived(t *testing.T) { require.Error(t, err) assertHandlerErrorCode(t, err, errCode) }) - t.Run("remove lables", func(t *testing.T) { + t.Run("remove labels", func(t *testing.T) { _, err := testLabelHandler.testDeleteWithUser(nil, map[string]string{"projecttask": taskID, "label": "4"}) require.Error(t, err) assertHandlerErrorCode(t, err, errCode)