Skip to content
Snippets Groups Projects
Commit 74736ec5 authored by Yusuf Akgül's avatar Yusuf Akgül :hatching_chick:
Browse files

Merge branches 'fix.Likes' and 'main' of gitlab.bht-berlin.de:s86116/project_ss23 into fix.Likes

parents aa31d72d 6b26867f
No related branches found
No related tags found
1 merge request!30Rewrite.gweets
Pipeline #38154 failed
...@@ -2,10 +2,8 @@ import { Inter } from 'next/font/google' ...@@ -2,10 +2,8 @@ import { Inter } from 'next/font/google'
import './globals.css' import './globals.css'
import Providers from '@/components/react-query/provider' import Providers from '@/components/react-query/provider'
import SiteLoad from '@/components/site-loading'
import { ThemeProvider } from '@/components/ui/theme-provider' import { ThemeProvider } from '@/components/ui/theme-provider'
import { Toaster } from '@/components/ui/toaster' import { Toaster } from '@/components/ui/toaster'
import { Suspense } from 'react'
const inter = Inter({ subsets: ['latin'] }) const inter = Inter({ subsets: ['latin'] })
......
...@@ -6,7 +6,11 @@ export default function Loading() { ...@@ -6,7 +6,11 @@ export default function Loading() {
<main className="main-content"> <main className="main-content">
<div className="flex justify-center"> <div className="flex justify-center">
<Card className="p-6 w-full"> <Card className="p-6 w-full">
<Skeleton className="bg-gray-300" /> <div className="grid grid-cols-1 ss:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4 lg:gap-8">
{Array.from({ length: 18 }, (_, i) => i + 1).map((i) => (
<Skeleton key={i} className="aspect-[264/374] bg-gray-300" />
))}
</div>
</Card> </Card>
</div> </div>
</main> </main>
......
This diff is collapsed.
{ {
"name": "project_ss23_gameunity", "name": "project_ss23_gameunity",
"version": "0.2.0", "version": "0.2.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
"turbo": "next dev --turbo", "turbo": "next dev --turbo",
"build": "next build", "build": "next build",
"start": "next start", "start": "next start",
"lint": "next lint", "lint": "next lint",
"preview": "next build && next start", "preview": "next build && next start",
"vercel-build": "prisma generate && prisma migrate deploy && next build" "vercel-build": "prisma generate && prisma migrate deploy && next build"
}, },
"dependencies": { "dependencies": {
"@auth/prisma-adapter": "^1.0.0", "@auth/prisma-adapter": "^1.0.0",
"@hookform/resolvers": "^3.1.0", "@hookform/resolvers": "^3.1.0",
"@prisma/client": "^4.15.0", "@prisma/client": "^4.15.0",
"@radix-ui/react-aspect-ratio": "^1.0.3", "@radix-ui/react-aspect-ratio": "^1.0.3",
"@radix-ui/react-avatar": "^1.0.3", "@radix-ui/react-avatar": "^1.0.3",
"@radix-ui/react-dropdown-menu": "^2.0.5", "@radix-ui/react-dropdown-menu": "^2.0.5",
"@radix-ui/react-label": "^2.0.2", "@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-scroll-area": "^1.0.4", "@radix-ui/react-scroll-area": "^1.0.4",
"@radix-ui/react-select": "^1.2.2", "@radix-ui/react-select": "^1.2.2",
"@radix-ui/react-separator": "^1.0.3", "@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-toast": "^1.1.4", "@radix-ui/react-toast": "^1.1.4",
"@t3-oss/env-nextjs": "^0.4.0", "@t3-oss/env-nextjs": "^0.4.1",
"@tanstack/react-query": "^4.29.12", "@tanstack/react-query": "^4.29.14",
"bcrypt": "^5.1.0", "bcrypt": "^5.1.0",
"class-variance-authority": "^0.6.0", "class-variance-authority": "^0.6.0",
"clsx": "^1.2.1", "clsx": "^1.2.1",
"lucide-react": "^0.241.0", "lucide-react": "^0.246.0",
"next": "^13.4.5", "next": "^13.4.6",
"next-auth": "^4.22.1", "next-auth": "^4.22.1",
"next-themes": "^0.2.1", "next-themes": "^0.2.1",
"normalize-diacritics": "^4.0.0", "normalize-diacritics": "^4.0.0",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-hook-form": "^7.44.3", "react-hook-form": "^7.45.0",
"react-infinite-scroll-component": "^6.1.0", "react-infinite-scroll-component": "^6.1.0",
"tailwind-merge": "^1.13.1", "tailwind-merge": "^1.13.2",
"tailwindcss-animate": "^1.0.6", "tailwindcss-animate": "^1.0.6",
"zod": "^3.21.4" "zod": "^3.21.4"
}, },
"devDependencies": { "devDependencies": {
"@tanstack/eslint-plugin-query": "^4.29.9", "@tanstack/eslint-plugin-query": "^4.29.9",
"@types/bcrypt": "^5.0.0", "@types/bcrypt": "^5.0.0",
"@types/node": "^20.3.0", "@types/node": "^20.3.1",
"@types/react": "^18.2.11", "@types/react": "^18.2.13",
"@types/react-dom": "^18.2.4", "@types/react-dom": "^18.2.6",
"autoprefixer": "10.4.14", "autoprefixer": "10.4.14",
"eslint": "^8.42.0", "eslint": "^8.43.0",
"eslint-config-next": "^13.4.5", "eslint-config-next": "^13.4.6",
"postcss": "8.4.24", "postcss": "8.4.24",
"prisma": "^4.15.0", "prisma": "^4.15.0",
"tailwindcss": "3.3.2", "tailwindcss": "3.3.2",
"typescript": "^5.1.3" "typescript": "^5.1.3"
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment