Skip to content
Closed
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 app/web/components/Datepicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
usePickerContext,
} from "@mui/x-date-pickers";
import { useTranslation } from "i18n";
import { getMuiDateFormat } from "i18n/dates";
import { Control, Controller, UseControllerProps } from "react-hook-form";
import { getMuiDateFormat } from "utils/date";
import dayjs, { Dayjs } from "utils/dayjs";

interface DatepickerProps {
Expand Down
2 changes: 1 addition & 1 deletion app/web/components/Timepicker.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { TimePicker } from "@mui/x-date-pickers";
import { useTranslation } from "i18n";
import { getMuiTimeFormat } from "i18n/dates";
import { GLOBAL } from "i18n/namespaces";
import React, { useMemo } from "react";
import { Control, Controller, UseControllerProps } from "react-hook-form";
import { getMuiTimeFormat } from "utils/date";
import { Dayjs } from "utils/dayjs";

interface TimepickerProps {
Expand Down
2 changes: 1 addition & 1 deletion app/web/features/auth/InviteCodesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import {
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { RpcError } from "grpc-web";
import { useTranslation } from "i18n";
import { localizeDateTime } from "i18n/dates";
import { GLOBAL } from "i18n/namespaces";
import { ListInviteCodesRes } from "proto/account_pb";
import React from "react";
import { inviteRoute } from "routes";
import { service } from "service";
import { localizeDateTime } from "utils/date";

import { inviteCodesKey } from "../queryKeys";

Expand Down
3 changes: 2 additions & 1 deletion app/web/features/auth/jail/ModNoteCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import { Card, styled, Typography } from "@mui/material";
import Button from "components/Button";
import Markdown from "components/Markdown";
import { Trans, useTranslation } from "i18n";
import { localizeDateTime } from "i18n/dates";
import { AUTH, GLOBAL } from "i18n/namespaces";
import { ModNote } from "proto/account_pb";
import { useState } from "react";
import { service } from "service";
import { theme } from "theme";
import { localizeDateTime, timestamp2Date } from "utils/date";
import { timestamp2Date } from "utils/date";

const StyledNoteContainer = styled("div")(() => ({
marginBottom: theme.spacing(4),
Expand Down
3 changes: 2 additions & 1 deletion app/web/features/auth/logins/LoginCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ import {
import IconText from "components/IconText";
import { activeLoginsKey } from "features/queryKeys";
import { Trans } from "i18n";
import { localizeDateTime } from "i18n/dates";
import { AUTH, GLOBAL } from "i18n/namespaces";
import { useTranslation } from "next-i18next";
import { ActiveSession } from "proto/account_pb";
import { service } from "service";
import { localizeDateTime, timestamp2Date } from "utils/date";
import { timestamp2Date } from "utils/date";
import { timeAgo } from "utils/timeAgo";

const StyledCard = styled(Card)(({ theme }) => ({
Expand Down
2 changes: 1 addition & 1 deletion app/web/features/auth/timezone/Timezone.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Typography } from "@mui/material";
import { Trans, useTranslation } from "i18n";
import { localizeDateTime } from "i18n/dates";
import { AUTH } from "i18n/namespaces";
import { localizeDateTime } from "utils/date";
import dayjs from "utils/dayjs";

interface TimezoneProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ import { discussionKey } from "features/queryKeys";
import { useLiteUser } from "features/userQueries/useLiteUsers";
import { RpcError } from "grpc-web";
import { useTranslation } from "i18n";
import { localizeDateTime } from "i18n/dates";
import { COMMUNITIES, GLOBAL } from "i18n/namespaces";
import { useRouter } from "next/router";
import { Discussion } from "proto/discussions_pb";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { service } from "service";
import { theme } from "theme";
import { localizeDateTime, timestamp2Date } from "utils/date";
import { timestamp2Date } from "utils/date";
import { timeAgo } from "utils/timeAgo";

import { sendNativeBack, useIsNativeEmbed } from "../../../utils/nativeLink";
Expand Down
7 changes: 2 additions & 5 deletions app/web/features/communities/events/EventCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ import { eventImagePlaceholderUrl } from "appConstants";
import Divider from "components/Divider";
import FlagButton from "features/FlagButton";
import { useTranslation } from "i18n";
import { BROWSER_TIMEZONE, localizeDateTimeRange } from "i18n/dates";
import { COMMUNITIES } from "i18n/namespaces";
import Link from "next/link";
import { Event } from "proto/events_pb";
import { useMemo } from "react";
import { routeToEvent } from "routes";
import {
BROWSER_TIMEZONE,
localizeDateTimeRange,
timestamp2Date,
} from "utils/date";
import { timestamp2Date } from "utils/date";
import dayjs from "utils/dayjs";
import stripMarkdown from "utils/stripMarkdown";

Expand Down
7 changes: 2 additions & 5 deletions app/web/features/communities/events/EventPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import EventAttendees from "features/communities/events/EventAttendees";
import NotFoundPage from "features/NotFoundPage";
import { RpcError } from "grpc-web";
import { useTranslation } from "i18n";
import { BROWSER_TIMEZONE, localizeDateTimeRange } from "i18n/dates";
import { COMMUNITIES } from "i18n/namespaces";
import { useRouter } from "next/router";
import { AttendanceState, Event } from "proto/events_pb";
Expand All @@ -34,11 +35,7 @@ import {
} from "routes";
import { service } from "service";
import { theme } from "theme";
import {
BROWSER_TIMEZONE,
localizeDateTimeRange,
timestamp2Date,
} from "utils/date";
import { timestamp2Date } from "utils/date";
import dayjs from "utils/dayjs";
import { sendNativeBack, useIsNativeEmbed } from "utils/nativeLink";

Expand Down
7 changes: 2 additions & 5 deletions app/web/features/communities/events/LongEventCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@ import { eventImagePlaceholderUrl } from "appConstants";
import Pill from "components/Pill";
import FlagButton from "features/FlagButton";
import { useTranslation } from "i18n";
import { BROWSER_TIMEZONE, localizeDateTimeRange } from "i18n/dates";
import { COMMUNITIES } from "i18n/namespaces";
import Link from "next/link";
import { Event } from "proto/events_pb";
import { routeToEvent } from "routes";
import {
BROWSER_TIMEZONE,
localizeDateTimeRange,
timestamp2Date,
} from "utils/date";
import { timestamp2Date } from "utils/date";
import dayjs from "utils/dayjs";

const StyledCard = styled(Card)(({ theme }) => ({
Expand Down
2 changes: 1 addition & 1 deletion app/web/features/dashboard/DashboardPublicTripCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import Avatar from "components/Avatar";
import { useCommunity } from "features/communities/hooks";
import { PublicTrip } from "features/publicTrips/useListPublicTrips";
import { useTranslation } from "i18n";
import { localizeDateTimeRange, localizeRelativeDays } from "i18n/dates";
import { DASHBOARD, PUBLIC_TRIPS } from "i18n/namespaces";
import Link from "next/link";
import { myPublicTripsRoute, routeToCommunity } from "routes";
import { localizeDateTimeRange, localizeRelativeDays } from "utils/date";
import dayjs from "utils/dayjs";

export const CARD_WIDTH = 220;
Expand Down
12 changes: 6 additions & 6 deletions app/web/features/dashboard/EventListRow.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { ChevronRight, Group, Place, Schedule } from "@mui/icons-material";
import { Skeleton, styled } from "@mui/material";
import { useTranslation } from "i18n";
import { DASHBOARD } from "i18n/namespaces";
import Link from "next/link";
import { Event } from "proto/events_pb";
import { routeToEvent } from "routes";
import {
BROWSER_TIMEZONE,
localizeDateTime,
localizeMonthAbbreviation,
timestamp2Date,
} from "utils/date";
} from "i18n/dates";
import { DASHBOARD } from "i18n/namespaces";
import Link from "next/link";
import { Event } from "proto/events_pb";
import { routeToEvent } from "routes";
import { timestamp2Date } from "utils/date";

export const EventListContainer = styled("div")({
border: "1px solid var(--mui-palette-grey-300)",
Expand Down
10 changes: 5 additions & 5 deletions app/web/features/dashboard/UpcomingStayCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import { useAuthContext } from "features/auth/AuthProvider";
import useCurrentUser from "features/userQueries/useCurrentUser";
import { useLiteUser } from "features/userQueries/useLiteUsers";
import { useTranslation } from "i18n";
import { DASHBOARD } from "i18n/namespaces";
import Link from "next/link";
import { HostRequest } from "proto/requests_pb";
import { routeToHostRequest } from "routes";
import {
localizeDateTimeRange,
localizeRelativeDays,
UTC_TIMEZONE,
} from "utils/date";
} from "i18n/dates";
import { DASHBOARD } from "i18n/namespaces";
import Link from "next/link";
import { HostRequest } from "proto/requests_pb";
import { routeToHostRequest } from "routes";
import dayjs from "utils/dayjs";

const StyledCard = styled(Box)(({ theme }) => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import useCurrentUser from "features/userQueries/useCurrentUser";
import { useLiteUser } from "features/userQueries/useLiteUsers";
import { RpcError } from "grpc-web";
import { useTranslation } from "i18n";
import { localizeDateTimeRange, UTC_TIMEZONE } from "i18n/dates";
import { MESSAGES } from "i18n/namespaces";
import { HostRequest } from "proto/requests_pb";
import React, { useState } from "react";
import { service } from "service";
import { theme } from "theme";
import { localizeDateTimeRange, UTC_TIMEZONE } from "utils/date";
import dayjs from "utils/dayjs";
import { firstName } from "utils/names";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ import {
import Avatar from "components/Avatar";
import UserSummary from "components/UserSummary";
import { useTranslation } from "i18n";
import { localizeDateTimeRange, UTC_TIMEZONE } from "i18n/dates";
import { MESSAGES } from "i18n/namespaces";
import { LiteUser } from "proto/api_pb";
import { HostRequest } from "proto/requests_pb";
import { theme } from "theme";
import { localizeDateTimeRange, numNights, UTC_TIMEZONE } from "utils/date";
import { numNights } from "utils/date";
import dayjs from "utils/dayjs";
import truncateTextEllipsis from "utils/truncateTextEllipsis";

Expand Down
3 changes: 2 additions & 1 deletion app/web/features/profile/view/ReferenceListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import Pill from "components/Pill";
import TextBody from "components/TextBody";
import UserSummary from "components/UserSummary";
import { referenceBadgeLabel } from "features/profile/constants";
import { localizeYearMonth } from "i18n/dates";
import { COMMUNITIES, GLOBAL } from "i18n/namespaces";
import { useTranslation } from "next-i18next";
import { LiteUser } from "proto/api_pb";
import { Reference } from "proto/references_pb";
import { localizeYearMonth, timestamp2Date } from "utils/date";
import { timestamp2Date } from "utils/date";

export const REFERENCE_LIST_ITEM_TEST_ID = "reference-list-item";

Expand Down
8 changes: 2 additions & 6 deletions app/web/features/profile/view/userLabels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@ import { CheckCircleIcon, ErrorIcon } from "components/Icons";
import LabelAndText from "components/LabelAndText";
import { useLanguages } from "features/profile/hooks/useLanguages";
import { useTranslation } from "i18n";
import { localizeDateTime, localizeYearMonth, UTC_TIMEZONE } from "i18n/dates";
import { COMMUNITIES, GLOBAL, PROFILE } from "i18n/namespaces";
import {
BirthdateVerificationStatus,
GenderVerificationStatus,
User,
} from "proto/api_pb";
import { theme } from "theme";
import {
localizeDateTime,
localizeYearMonth,
timestamp2Date,
UTC_TIMEZONE,
} from "utils/date";
import { timestamp2Date } from "utils/date";
import dayjs, { i18nToDayjsLocale } from "utils/dayjs";
import { timeAgo, TimeUnit } from "utils/timeAgo";

Expand Down
2 changes: 1 addition & 1 deletion app/web/features/publicTrips/PublicTripCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ import { useAuthContext } from "features/auth/AuthProvider";
import useAccountInfo from "features/auth/useAccountInfo";
import FlagButton from "features/FlagButton";
import { useTranslation } from "i18n";
import { localizeDateTimeRange } from "i18n/dates";
import { PUBLIC_TRIPS } from "i18n/namespaces";
import { PublicTripStatus } from "proto/public_trips_pb";
import { useCallback, useState } from "react";
import { routeToCommunity, routeToUser } from "routes";
import { localizeDateTimeRange } from "utils/date";
import dayjs from "utils/dayjs";
import { useIsNativeEmbed } from "utils/nativeLink";

Expand Down
Loading
Loading