Skip to content

Commit

Permalink
Revert "add global loading page when the server is sleeping modeMain.…
Browse files Browse the repository at this point in the history
…next"
  • Loading branch information
mildronize authored Apr 24, 2024
1 parent eb39515 commit e6b63e3
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 385 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ on:
pull_request:
branches:
- main
# release:
# types: [published]

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
Expand Down
75 changes: 1 addition & 74 deletions budget-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions budget-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@
"react-number-format": "^5.3.4",
"sonner": "^1.4.41",
"ts-odata-client": "^2.0.2",
"usehooks-ts": "^3.1.0",
"uuid": "^9.0.1",
"vaul": "^0.9.0",
"zod": "^3.22.4",
"zod-validation-error": "^3.1.0",
"zustand": "^4.5.2"
"zod-validation-error": "^3.1.0"
},
"devDependencies": {
"@types/core-js": "^2.5.8",
Expand Down
5 changes: 0 additions & 5 deletions budget-app/src/app/api/health/route.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { NextResponse } from "next/server";

// const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
export async function GET() {

// if(Math.random() > 0.3) {
// await delay(2000);
// }
return NextResponse.json({
health: "OK",
});
Expand Down
59 changes: 0 additions & 59 deletions budget-app/src/app/components/FullPageLoading.tsx

This file was deleted.

11 changes: 0 additions & 11 deletions budget-app/src/app/components/GlobalStateProvider.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions budget-app/src/app/components/TransactionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Typography from "@mui/material/Typography";
import dayjs from "dayjs";
import { ListItemButton } from "@mui/material";
import numbro from 'numbro';
import { useSafeRouter } from "@/hooks/use-safe-router";
import { useRouter } from 'next/navigation'

/**
* Hotfix for uuid gen
Expand Down Expand Up @@ -41,7 +41,7 @@ export interface TransactionListProps {
}

export function TransactionList(props: TransactionListProps) {
const router = useSafeRouter()
const router = useRouter()
const handleListClick = (item: TransactionListProps['data'][number]) => {
console.log(`Redirecting to /transaction/edit/${item.id}`);
router.push(`/transaction/edit/${item.id}`);
Expand Down
3 changes: 1 addition & 2 deletions budget-app/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ import CssBaseline from "@mui/material/CssBaseline";
import theme from "@/theme";
import "./globals.css";
import { ReactQueryClientProvider } from "./components/ReactQueryClientProvider";
import { GlobalStateProvider } from "./components/GlobalStateProvider";

export default function RootLayout(props: { children: React.ReactNode }) {
return (
Expand All @@ -70,7 +69,7 @@ export default function RootLayout(props: { children: React.ReactNode }) {
{/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
<CssBaseline />
<ReactQueryClientProvider>
<GlobalStateProvider>{props.children}</GlobalStateProvider>
{props.children}
</ReactQueryClientProvider>
</ThemeProvider>
</AppRouterCacheProvider>
Expand Down
3 changes: 1 addition & 2 deletions budget-app/src/app/tabs/components/BottomNavigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { useState } from "react";
import { RecentTransactionTab } from "../RecentTransactionTab";
import { AddTransactionTab } from "../AddTransactionTab";
import { SettingTab } from "../SettingTab";
import { useSafeRouter } from "@/hooks/use-safe-router";

const routerMap = {
0: {
Expand All @@ -35,7 +34,7 @@ export interface BottomNavigationProps {
currentRouterKey: RouterMapKey;
}
export function BottomNavigation(props: BottomNavigationProps) {
const router = useSafeRouter();
const router = useRouter();
const [currentTab, setCurrentTab] = useState(props.currentRouterKey);

return (
Expand Down
68 changes: 0 additions & 68 deletions budget-app/src/hooks/use-health-check.ts

This file was deleted.

Loading

0 comments on commit e6b63e3

Please sign in to comment.