Merge pull request #6 from yeukfei02/development

Development

apps/web/src/app/app.tsx → apps/web/src/app/App.tsx

@@ -24,6 +24,7 @@ const theme = createTheme({
     button: {
       textTransform: 'none',
     },
+    fontFamily: ['Karla', 'sans-serif'].join(','),
   },
 });
 

apps/web/src/components/login/Login.tsx

@@ -14,6 +14,8 @@ import CustomSnackBar from '../customSnackBar/CustomSnackBar';
 import * as userService from '../../services/userService';
 import { Url } from '../../helper/url';
 
+import BackgroundImage from '../../images/background-image.jpg';
+
 interface CopyrightProps {
   sx: {
     mt: number;
@@ -78,7 +80,7 @@ function Login() {
           sm={4}
           md={7}
           sx={{
-            backgroundImage: 'url(https://source.unsplash.com/random)',
+            backgroundImage: `url(${BackgroundImage})`,
             backgroundRepeat: 'no-repeat',
             backgroundColor: (t) =>
               t.palette.mode === 'light'
@@ -139,15 +141,6 @@ function Login() {
                 Login
               </Button>
               <Grid container>
-                <Grid item xs>
-                  <Link
-                    component="button"
-                    onClick={() => navigate(Url.HOME)}
-                    variant="body2"
-                  >
-                    Forgot password?
-                  </Link>
-                </Grid>
                 <Grid item>
                   <Link
                     component="button"

apps/web/src/components/signup/Signup.tsx

@@ -19,6 +19,8 @@ import CustomSnackBar from '../customSnackBar/CustomSnackBar';
 import * as userService from '../../services/userService';
 import { Url } from '../../helper/url';
 
+import BackgroundImage from '../../images/background-image.jpg';
+
 interface CopyrightProps {
   sx: {
     mt: number;
@@ -91,7 +93,7 @@ function Signup() {
           sm={4}
           md={7}
           sx={{
-            backgroundImage: 'url(https://source.unsplash.com/random)',
+            backgroundImage: `url(${BackgroundImage})`,
             backgroundRepeat: 'no-repeat',
             backgroundColor: (t) =>
               t.palette.mode === 'light'
@@ -182,15 +184,6 @@ function Signup() {
                 Sign up
               </Button>
               <Grid container>
-                <Grid item xs>
-                  <Link
-                    component="button"
-                    onClick={() => navigate(Url.HOME)}
-                    variant="body2"
-                  >
-                    Forgot password?
-                  </Link>
-                </Grid>
                 <Grid item>
                   <Link
                     component="button"

apps/web/src/styles.css

@@ -1,5 +1,7 @@
 /* You can add global styles to this file, and also import other style files */
 
+@import url('https://fonts.googleapis.com/css2?family=Karla:wght@500&display=swap');
+
 @tailwind components;
 @tailwind base;
 @tailwind utilities;

package.json

@@ -19,7 +19,7 @@
     "@nestjs/core": "^9.0.0",
     "@nestjs/platform-express": "^9.0.0",
     "@nestjs/serve-static": "^3.0.0",
-    "@prisma/client": "^4.8.0",
+    "@prisma/client": "^4.8.1",
     "axios": "^1.2.2",
     "bcryptjs": "^2.4.3",
     "compression": "^1.7.4",
@@ -84,7 +84,7 @@
     "nx": "15.4.2",
     "postcss": "^8.4.20",
     "prettier": "^2.6.2",
-    "prisma": "^4.8.0",
+    "prisma": "^4.8.1",
     "react-test-renderer": "18.2.0",
     "standard-version": "^9.5.0",
     "tailwindcss": "^3.2.4",

yarn.lock

@@ -1584,10 +1584,10 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
   integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
 
-"@prisma/client@^4.8.0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.8.0.tgz#6ec7adaca6a2e233d7e41dbe7cc6d0fa6143a407"
-  integrity sha512-Y1riB0p2W52kh3zgssP/YAhln3RjBFcJy3uwEiyjmU+TQYh6QTZDRFBo3JtBWuq2FyMOl1Rye8jxzUP+n0l5Cg==
+"@prisma/client@^4.8.1":
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.8.1.tgz#51c16488dfac4e74a275a2753bf20262a65f2a2b"
+  integrity sha512-d4xhZhETmeXK/yZ7K0KcVOzEfI5YKGGEr4F5SBV04/MU4ncN/HcE28sy3e4Yt8UFW0ZuImKFQJE+9rWt9WbGSQ==
   dependencies:
     "@prisma/engines-version" "4.8.0-61.d6e67a83f971b175a593ccc12e15c4a757f93ffe"
 
@@ -1596,10 +1596,10 @@
   resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.8.0-61.d6e67a83f971b175a593ccc12e15c4a757f93ffe.tgz#30401aba1029e7d32e3cb717e705a7c92ccc211e"
   integrity sha512-MHSOSexomRMom8QN4t7bu87wPPD+pa+hW9+71JnVcF3DqyyO/ycCLhRL1we3EojRpZxKvuyGho2REQsMCvxcJw==
 
-"@prisma/[email protected].0":
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.8.0.tgz#5123c67dc0d2caa008268fc63081ca2d68b2ed7e"
-  integrity sha512-A1Asn2rxZMlLAj1HTyfaCv0VQrLUv034jVay05QlqZg1qiHPeA3/pGTfNMijbsMYCsGVxfWEJuaZZuNxXGMCrA==
+"@prisma/[email protected].1":
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.8.1.tgz#8428f7dcd7912c6073024511376595017630dc85"
+  integrity sha512-93tctjNXcIS+i/e552IO6tqw17sX8liivv8WX9lDMCpEEe3ci+nT9F+1oHtAafqruXLepKF80i/D20Mm+ESlOw==
 
 "@remix-run/[email protected]":
   version "1.0.3"
@@ -8159,12 +8159,12 @@ pretty-format@^28.1.1, pretty-format@^28.1.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-prisma@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.8.0.tgz#634dbbdc9d3f76c61604880251673d08ccb6f02b"
-  integrity sha512-DWIhxvxt8f4h6MDd35mz7BJff+fu7HItW3WPDIEpCR3RzcOWyiHBbLQW5/DOgmf+pRLTjwXQob7kuTZVYUAw5w==
+prisma@^4.8.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.8.1.tgz#ef93cd908809b7d02e9f4bead5eea7733ba50c68"
+  integrity sha512-ZMLnSjwulIeYfaU1O6/LF6PEJzxN5par5weykxMykS9Z6ara/j76JH3Yo2AH3bgJbPN4Z6NeCK9s5fDkzf33cg==
   dependencies:
-    "@prisma/engines" "4.8.0"
+    "@prisma/engines" "4.8.1"
 
 process-nextick-args@~2.0.0:
   version "2.0.1"