mirror of
https://github.com/go-vikunja/vikunja.git
synced 2025-12-05 18:57:47 -06:00
fix: correct comments
This commit is contained in:
committed by
kolaente
parent
3b64703135
commit
342bbd6192
@@ -59,7 +59,7 @@ const {t} = useI18n({useScope: 'global'})
|
||||
const taskService = shallowReactive(new TaskService())
|
||||
const task = ref<ITask>()
|
||||
|
||||
// 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<Date | null>()
|
||||
const lastValue = ref<Date | null>()
|
||||
const changeInterval = ref<ReturnType<typeof setInterval>>()
|
||||
|
||||
@@ -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:",
|
||||
|
||||
@@ -9,8 +9,8 @@ import {colorIsDark} from '@/helpers/color/colorIsDark'
|
||||
export default class LabelModel extends AbstractModel<ILabel> 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
|
||||
|
||||
@@ -209,7 +209,7 @@ export default abstract class AbstractService<Model extends IAbstract = IAbstrac
|
||||
// Default factories
|
||||
// It is possible to specify a factory for each type of request.
|
||||
// This makes it possible to have different models returned from different routes.
|
||||
// Specific factories for each request are completly optional, if these are not specified, the defautl factory is used.
|
||||
// Specific factories for each request are completely optional, if these are not specified, the default factory is used.
|
||||
////////////////
|
||||
|
||||
/**
|
||||
|
||||
@@ -99,7 +99,7 @@ export default class TaskService extends AbstractService<ITask> {
|
||||
})
|
||||
})
|
||||
|
||||
// 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 => {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: is only used where <edit-task> is used aswell:
|
||||
// FIXME: is only used where <edit-task> is used as well:
|
||||
// - Project.vue
|
||||
// -> Move the <card> wrapper including this class definition inside <edit-task>
|
||||
.is-max-width-desktop .tasks .task {
|
||||
|
||||
@@ -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%;
|
||||
|
||||
@@ -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,\
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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<ITask['hexColor']>('')
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
|
||||
@@ -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-',
|
||||
|
||||
@@ -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
|
||||
})
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
],
|
||||
|
||||
@@ -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"
|
||||
],
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user