Skip to content

Commit

Permalink
chore(client): restructure components
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivo committed Apr 28, 2023
1 parent 4d7b180 commit 323e6be
Show file tree
Hide file tree
Showing 12 changed files with 10 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Server } from "lucide-react";
import { useRouter } from "next/router";
import { useTranslation } from "next-i18next";

import { DynamicRunningAbortButton } from "@app/components/DynamicRunningAbortButton";
import { DynamicRunningAbortButton } from "@app/components/Dynamic/Running/AbortButton";
import { GetAdminRunningDynamicsListResult } from "@app/queries/useAdminRunningDynamicsList";

interface AdminRunningDynamicsListProps {
Expand Down
2 changes: 2 additions & 0 deletions apps/client/src/components/Forms/SignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,14 @@ export function SignInForm() {
) : null}
<Input
error={errors.identifier}
disabled={isAuthenticating}
label={t("signin:identifier.title")}
placeholder={t("signin:identifier.placeholder")}
{...register("identifier")}
/>
<Input
error={errors.password}
disabled={isAuthenticating}
label={t("signin:password.title")}
placeholder={t("signin:password.placeholder")}
type="password"
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/components/Input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
) : null}
<input
className={clsx(
`h-10 rounded-lg border border-primary-400/60 bg-gray-50 px-2 py-1 outline-none transition-all duration-150 file:-ml-1 file:mr-2 file:h-full file:rounded-md file:border-0 file:bg-primary-500 file:px-2 file:py-1 file:text-sm file:font-semibold file:text-gray-50 placeholder:text-zinc-400 hover:file:bg-primary-600 focus:ring-2 focus:ring-primary-400 focus:ring-offset-2 focus:ring-offset-gray-200 dark:bg-gray-900 dark:focus:ring-offset-gray-900 ${className}`,
`h-10 rounded-lg border border-primary-400/60 bg-gray-50 px-2 py-1 outline-none transition-all duration-150 file:-ml-1 file:mr-2 file:h-full file:rounded-md file:border-0 file:bg-primary-500 file:px-2 file:py-1 file:text-sm file:font-semibold file:text-gray-50 placeholder:text-zinc-400 hover:file:bg-primary-600 focus:ring-2 focus:ring-primary-400 focus:ring-offset-2 focus:ring-offset-gray-200 disabled:opacity-60 dark:bg-gray-900 dark:focus:ring-offset-gray-900 ${className}`,
{
"border-red-600/95 focus:ring-red-500": error
}
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/pages/admin/running.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useAdminRunningDynamicsList } from "@app/queries/useAdminRunningDynamic

const AdminRunningDynamicsList = dynamic(
() =>
import("@app/components/AdminRunningDynamicsList").then(
import("@app/components/Admin/RunningDynamicsList").then(
(mod) => mod.AdminRunningDynamicsList
),
{
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/pages/admin/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useAdminSignUpRequestList } from "@app/queries/useAdminSignUpRequestLis

const AdminSignUpRequestList = dynamic(
() =>
import("@app/components/AdminSignUpRequestList").then(
import("@app/components/Admin/SignUpRequestList").then(
(mod) => mod.AdminSignUpRequestList
),
{
Expand Down
6 changes: 3 additions & 3 deletions apps/client/src/pages/dynamic/running.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { User } from "next-auth";
import { useTranslation } from "next-i18next";

import { Button } from "@app/components/Button";
import { DynamicRunningAbortButton } from "@app/components/DynamicRunningAbortButton";
import { DynamicRunningAbortButton } from "@app/components/Dynamic/Running/AbortButton";
import { SEO } from "@app/components/SEO";
import { withSSRAuth } from "@app/hocs/withSSRAuth";
import { withSSRTranslations } from "@app/hocs/withSSRTranslations";
Expand All @@ -18,7 +18,7 @@ import {

const DynamicRunningRealtimeLog = dynamic(
() =>
import("@app/components/DynamicRunningRealtimeLog").then(
import("@app/components/Dynamic/Running/RealtimeLog").then(
(mod) => mod.DynamicRunningRealtimeLog
),
{
Expand All @@ -28,7 +28,7 @@ const DynamicRunningRealtimeLog = dynamic(

const DynamicRunningStepList = dynamic(
() =>
import("@app/components/DynamicRunningStepList").then(
import("@app/components/Dynamic/Running/StepList").then(
(mod) => mod.DynamicRunningStepList
),
{
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/pages/my-dynamics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
} from "@app/queries/useListDynamics";

const DynamicCard = dynamic(
() => import("@app/components/DynamicCard").then((mod) => mod.DynamicCard),
() => import("@app/components/Dynamic/Card").then((mod) => mod.DynamicCard),
{
ssr: false
}
Expand Down

0 comments on commit 323e6be

Please sign in to comment.