Skip to content

Commit

Permalink
Merge pull request #249 from Albert-2/revampCSS2
Browse files Browse the repository at this point in the history
Revamp css2
  • Loading branch information
ItsRoy69 committed Apr 17, 2024
2 parents 7a7e497 + a384b0d commit 56e0904
Show file tree
Hide file tree
Showing 11 changed files with 492 additions and 193 deletions.
229 changes: 229 additions & 0 deletions package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"dev": "vite",
"build": "vite build",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
"preview": "vite preview",
"both": "concurrently \"npm run dev\" \"nodemon ./server/server.js\""
},
"dependencies": {
"@emotion/react": "^11.11.3",
Expand Down Expand Up @@ -43,6 +44,7 @@
"@vitejs/plugin-react": "^4.2.1",
"all-contributors-cli": "^6.26.1",
"autoprefixer": "^10.4.16",
"concurrently": "^8.2.2",
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
Expand Down
27 changes: 27 additions & 0 deletions server/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
server/node_modules
server/.env
dist
dist-ssr
*.local
.env

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
14 changes: 5 additions & 9 deletions src/components/Banner/HomeBanner.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import "./homebanner.css";
import { useTheme } from "../../context/ThemeContext";
import { FaPlay, FaPlus, FaRegHeart } from "react-icons/fa";
import { LuMessageSquare, LuPen } from "react-icons/lu";
import { MdOutlineRemoveRedEye } from "react-icons/md";
import { HiOutlineMail } from "react-icons/hi";
import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
import { MdOutlineRemoveRedEye } from "react-icons/md";
import { AiOutlineEyeInvisible } from "react-icons/ai";
import { useForm } from "react-hook-form";
import { useNavigate, Link } from "react-router-dom";
import axios from "axios";
Expand All @@ -29,15 +29,11 @@ const HomeBanner = () => {
const { updateLoggedIn, showToast } = useAppContext();

const { register, handleSubmit } = useForm();

const apiUrl = import.meta.env.VITE_API_URL;

const { mutate: loginUserMutate, isPending: isLoginPending } = useMutation({
mutationFn: (user) =>
axios.post(
`${apiUrl}/api/users/login`,
user
),
mutationFn: (user) => axios.post(`${apiUrl}/api/users/login`, user),
});

const onSubmit = handleSubmit(({ email, password }) => {
Expand Down Expand Up @@ -251,7 +247,7 @@ const HomeBanner = () => {
) : (
<i className="icon-input-icon">
{" "}
<VisibilityOffIcon />
<AiOutlineEyeInvisible size={24} />
</i>
)}
</button>
Expand Down
Loading

0 comments on commit 56e0904

Please sign in to comment.