Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat#(69)/create-user #6

Merged
merged 4 commits into from
Jul 31, 2024
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
13 changes: 9 additions & 4 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
PORT=4000
NEXT_PUBLIC_API_URL="http://localhost:3000"
GOOGLE_CLIENT_ID=""
GOOGLE_CLIENT_SECRET=""
NEXT_PUBLIC_API_URL=
NEXTAUTH_URL=
NEXTAUTH_SECRET=
JWT_SECRET=
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
MICROSOFT_CLIENT_ID=
MICROSOFT_CLIENT_SECRET=
MICROSOFT_TENANT_ID=
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ services:
restart: on-failure
build: .
ports:
- "4000:4000"
- "3000:3000"
environment:
- NODE_ENV=development
volumes:
- ./src:/app/src
env_file:
- .env.local
- .env

157 changes: 94 additions & 63 deletions package-lock.json

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

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@
"dev": "next dev",
"format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\" \"test/**/*.ts\"",
"build": "next build",
"start": "next start -p 4000",
"start": "next start -p 3000",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"test": "jest --passWithNoTests --no-cache --runInBand",
"test:all": "npm run test -- --coverage --config jest.config.ts"
},
"dependencies": {
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
"@hookform/resolvers": "^3.9.0",
"@tanstack/react-query": "^5.51.11",
"axios": "^1.7.2",
"cookie": "^0.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@heroicons/react": "^2.1.5",
"@hookform/resolvers": "^3.9.0",
"@mui/icons-material": "^5.16.5",
"@mui/material": "^5.16.5",
"@tanstack/react-query": "^5.51.11",
"axios": "^1.7.2",
"cookie": "^0.6.0",
"dotenv": "^16.4.5",
"jsonwebtoken": "^9.0.2",
"next": "^14.2.5",
"next-auth": "^5.0.0-beta.20",
"next-auth": "^4.24.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.52.1",
Expand Down
18 changes: 0 additions & 18 deletions src/actions/auth.actions.ts

This file was deleted.

9 changes: 3 additions & 6 deletions src/app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
import { Box } from '@mui/material';
import Image from 'next/image';
import calcuclusLogo from '@/public/calculus-logo.svg';
import LoginForm from '@/app/components/loginForm';
import { auth } from '@/auth';
import { useEffect } from 'react';
import { toast } from 'react-toastify';
import LoginComponent from '@/app/components/login.component';

export default async function LoginPage() {
export default function LoginPage() {
return (
<Box className="h-screen w-screen flex justify-center items-center bg-[#F8F3F3] box-border gap-0">
<Box className="flex flex-col text-center box-border gap-3 max-h-[900px] justify-self-center">
Expand All @@ -22,7 +19,7 @@ export default async function LoginPage() {
/>
<p className="text-[32px] font-bold">Login</p>
</Box>
<LoginForm />
<LoginComponent />
</Box>
</Box>
);
Expand Down
Loading
Loading