Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/admin/core/components/common/logo-spinner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import LogoSpinnerLight from "@/app/assets/images/logo-spinner-light.gif?url";
export function LogoSpinner() {
const { resolvedTheme } = useTheme();

const logoSrc = resolvedTheme === "dark" ? LogoSpinnerLight : LogoSpinnerDark;
const logoSrc = resolvedTheme === "dark" ? LogoSpinnerDark : LogoSpinnerLight;

return (
<div className="flex items-center justify-center">
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "admin",
"version": "1.4.36",
"version": "1.4.37",
"private": true,
"description": "Admin UI for Pace",
"license": "AGPL-3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

// helpers
import { EAuthModes } from "@/types/auth";
import { EAuthModes } from "@pace/constants";

type TAuthHeader = {
authMode: EAuthModes;
Expand Down
3 changes: 1 addition & 2 deletions apps/space/core/components/account/auth-forms/auth-root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { useEffect, useState } from "react";
import { observer } from "mobx-react";
import { useSearchParams } from "@/app/hooks/navigation";
// pace imports
import { EAuthModes, EAuthSteps } from "@pace/constants";
import { SitesAuthService } from "@pace/services";
import type { IEmailCheckData } from "@pace/types";
import { OAuthOptions } from "@pace/ui";
Expand All @@ -17,8 +18,6 @@ import { EErrorAlertType, authErrorHandler, EAuthenticationErrorCodes } from "@/
// hooks
import { useOAuthConfig } from "@/hooks/oauth";
import { useInstance } from "@/hooks/store/use-instance";
// types
import { EAuthModes, EAuthSteps } from "@/types/auth";
// local imports
import { TermsAndConditions } from "../terms-and-conditions";
import { AuthBanner } from "./auth-banner";
Expand Down
3 changes: 1 addition & 2 deletions apps/space/core/components/account/auth-forms/email.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import type { IEmailCheckData } from "@pace/types";
// ui
import { Input, Spinner } from "@pace/ui";
// helpers
import { cn } from "@pace/utils";
import { checkEmailValidity } from "@/helpers/string.helper";
import { checkEmailValidity, cn } from "@pace/utils";

type TAuthEmailForm = {
defaultEmail: string;
Expand Down
3 changes: 1 addition & 2 deletions apps/space/core/components/account/auth-forms/password.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ import React, { useEffect, useMemo, useRef, useState } from "react";
import { observer } from "mobx-react";
import { CloseCircleOutline, HideOutline, ShowOutline } from "@makeplane/propel/icons";
// pace imports
import { API_BASE_URL, E_PASSWORD_STRENGTH } from "@pace/constants";
import { API_BASE_URL, EAuthModes, EAuthSteps, E_PASSWORD_STRENGTH } from "@pace/constants";
import { Button } from "@pace/propel/button";
import { AuthService } from "@pace/services";
import { Input, Spinner, PasswordStrengthIndicator } from "@pace/ui";
import { getPasswordStrength } from "@pace/utils";
// types
import { EAuthModes, EAuthSteps } from "@/types/auth";

type Props = {
email: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
import React, { useEffect, useState } from "react";
import { CloseCircleOutline, TickCircleOutline } from "@makeplane/propel/icons";
// pace imports
import { API_BASE_URL } from "@pace/constants";
import { API_BASE_URL, EAuthModes } from "@pace/constants";
import { Button } from "@pace/propel/button";
import { AuthService } from "@pace/services";
import { Input, Spinner } from "@pace/ui";
// hooks
import { useTimer } from "@pace/hooks";
// types
import { EAuthModes } from "@/types/auth";

// services
const authService = new AuthService();
Expand Down
4 changes: 2 additions & 2 deletions apps/space/core/components/common/logo-spinner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import LogoSpinnerLight from "@/app/assets/images/logo-spinner-light.gif?url";
export function LogoSpinner() {
const { resolvedTheme } = useTheme();

const logoSrc = resolvedTheme === "dark" ? LogoSpinnerLight : LogoSpinnerDark;
const logoSrc = resolvedTheme === "dark" ? LogoSpinnerDark : LogoSpinnerLight;

return (
<div className="flex items-center justify-center">
<img src={logoSrc} alt="logo" className="h-6 w-auto sm:h-11" />
<img src={logoSrc} alt="logo" className="h-6 w-auto object-contain sm:h-11" />
</div>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import { AttachOutline, LinkOutline, ViewsOutline } from "@makeplane/propel/icon
// pace imports
import { Tooltip } from "@pace/propel/tooltip";
import type { IIssueDisplayProperties } from "@pace/types";
import { cn } from "@pace/utils";
import { cn, getDate } from "@pace/utils";
// components
import { WithDisplayPropertiesHOC } from "@/components/issues/issue-layouts/with-display-properties-HOC";
// helpers
import { getDate } from "@/helpers/date-time.helper";
//// hooks
import type { IIssue } from "@/types/issue";
import { IssueBlockCycle } from "./cycle";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
import { observer } from "mobx-react";
import { DueDateOutline } from "@makeplane/propel/icons";
import { Tooltip } from "@pace/propel/tooltip";
import { cn } from "@pace/utils";
import { cn, renderFormattedDate, shouldHighlightIssueDueDate } from "@pace/utils";
// helpers
import { renderFormattedDate } from "@/helpers/date-time.helper";
import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";
// hooks
import { useStates } from "@/hooks/store/use-state";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ import { Menu, Transition } from "@headlessui/react";
// pace imports
import type { EditorRefApi } from "@pace/editor";
import type { TIssuePublicComment } from "@pace/types";
import { getFileURL } from "@pace/utils";
import { calculateTimeAgo, getFileURL } from "@pace/utils";
// components
import { LiteTextEditor } from "@/components/editor/lite-text-editor";
import { CommentReactions } from "@/components/issues/peek-overview/comment/comment-reactions";
// helpers
import { timeAgo } from "@/helpers/date-time.helper";
// hooks
import { usePublish } from "@/hooks/store/publish";
import { useIssueDetails } from "@/hooks/store/use-issue-details";
Expand Down Expand Up @@ -97,7 +95,7 @@ export const CommentCard = observer(function CommentCard(props: Props) {
{comment.actor_detail.is_bot ? comment.actor_detail.first_name + " Bot" : comment.actor_detail.display_name}
</div>
<p className="mt-0.5 text-11 text-secondary">
<>commented {timeAgo(comment.created_at)}</>
<>commented {calculateTimeAgo(comment.created_at)}</>
</p>
</div>
<div className="issue-comments-section p-0">
Expand Down
2 changes: 1 addition & 1 deletion apps/space/core/components/issues/peek-overview/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Listbox, Transition } from "@headlessui/react";
// ui
import { TOAST_TYPE, setToast } from "@pace/propel/toast";
// helpers
import { copyTextToClipboard } from "@/helpers/string.helper";
import { copyTextToClipboard } from "@pace/utils";
// hooks
import { useIssueDetails } from "@/hooks/store/use-issue-details";
import useClipboardWritePermission from "@/hooks/use-clipboard-write-permission";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ import { useTranslation } from "@pace/i18n";
import { StateGroupIcon, PriorityIcon } from "@pace/propel/icons";
import { DueDateOutline, LinkOutline, PriorityOutline, StateOutline } from "@makeplane/propel/icons";
import { TOAST_TYPE, setToast } from "@pace/propel/toast";
import { cn, getIssuePriorityFilters } from "@pace/utils";
import {
addSpaceIfCamelCase,
cn,
copyTextToClipboard,
getIssuePriorityFilters,
renderFormattedDate,
shouldHighlightIssueDueDate,
} from "@pace/utils";
// helpers
import { renderFormattedDate } from "@/helpers/date-time.helper";
import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";
import { copyTextToClipboard, addSpaceIfCamelCase } from "@/helpers/string.helper";
// hooks
import { usePublish } from "@/hooks/store/publish";
import { useStates } from "@/hooks/store/use-state";
Expand Down
2 changes: 1 addition & 1 deletion apps/space/core/hooks/oauth/core.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const useCoreOAuthConfig = (oauthActionText: string): TOAuthConfigs => {
text: `${oauthActionText} with GitHub`,
icon: (
<img
src={resolvedTheme === "dark" ? githubLightLogo : githubDarkLogo}
src={resolvedTheme === "dark" ? githubDarkLogo : githubLightLogo}
height={18}
width={18}
alt="GitHub Logo"
Expand Down
2 changes: 1 addition & 1 deletion apps/space/core/store/state.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { action, computed, makeObservable, observable, runInAction } from "mobx"
import { SitesStateService } from "@pace/services";
import type { IState } from "@pace/types";
// helpers
import { sortStates } from "@/helpers/state.helper";
import { sortStates } from "@pace/utils";
// store
import type { RootStore } from "./root.store";

Expand Down
32 changes: 0 additions & 32 deletions apps/space/core/types/auth.ts

This file was deleted.

65 changes: 0 additions & 65 deletions apps/space/helpers/date-time.helper.ts

This file was deleted.

35 changes: 0 additions & 35 deletions apps/space/helpers/issue.helper.ts

This file was deleted.

19 changes: 0 additions & 19 deletions apps/space/helpers/state.helper.ts

This file was deleted.

Loading
Loading