Skip to content

release: v5.4.0 #442

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

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Resolve merge conflicts in DefaultLayout.js and Login.js
  • Loading branch information
Karimsaid01 committed May 18, 2025
commit 9e1362c2272328ff557ea5e392733d9fadb2c0cc
7 changes: 0 additions & 7 deletions src/layout/DefaultLayout.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
<<<<<<< HEAD
import React from 'react'
import { AppContent, AppSidebar, AppFooter, AppHeader } from '../components/index'

const DefaultLayout = () => {
=======
import React, { useEffect } from 'react'
import { useNavigate } from 'react-router-dom'
import { AppContent, AppSidebar, AppFooter, AppHeader } from '../components/index'
Expand All @@ -18,7 +12,6 @@ const DefaultLayout = () => {
navigate('/login')
}
}, [user, navigate])
>>>>>>> 33b7218 (Initial commit)
return (
<div>
<AppSidebar />
Expand Down
29 changes: 0 additions & 29 deletions src/views/pages/login/Login.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<<<<<<< HEAD
import React from 'react'
import { Link } from 'react-router-dom'
=======
import React, { useState } from 'react'
import { Link, useNavigate } from 'react-router-dom'
>>>>>>> 33b7218 (Initial commit)
import {
CButton,
CCard,
Expand All @@ -17,19 +12,13 @@ import {
CInputGroup,
CInputGroupText,
CRow,
<<<<<<< HEAD
} from '@coreui/react'
=======
CAlert,
} from '@coreui/react'
import { useAuth } from '../../../context/AuthContext'
>>>>>>> 33b7218 (Initial commit)
import CIcon from '@coreui/icons-react'
import { cilLockLocked, cilUser } from '@coreui/icons'

const Login = () => {
<<<<<<< HEAD
=======
const [username, setUsername] = useState('');
const [password, setPassword] = useState('');
const [error, setError] = useState('');
Expand All @@ -48,7 +37,6 @@ const Login = () => {
}
};

>>>>>>> 33b7218 (Initial commit)
return (
<div className="bg-body-tertiary min-vh-100 d-flex flex-row align-items-center">
<CContainer>
Expand All @@ -57,11 +45,6 @@ const Login = () => {
<CCardGroup>
<CCard className="p-4">
<CCardBody>
<<<<<<< HEAD
<CForm>
<h1>Login</h1>
<p className="text-body-secondary">Sign In to your account</p>
=======
<CForm onSubmit={handleSubmit}>
<h1>Login</h1>
<p className="text-body-secondary">Sign In to your account</p>
Expand All @@ -70,22 +53,17 @@ const Login = () => {
{error}
</CAlert>
)}
>>>>>>> 33b7218 (Initial commit)
<CInputGroup className="mb-3">
<CInputGroupText>
<CIcon icon={cilUser} />
</CInputGroupText>
<<<<<<< HEAD
<CFormInput placeholder="Username" autoComplete="username" />
=======
<CFormInput
placeholder="Username"
autoComplete="username"
value={username}
onChange={(e) => setUsername(e.target.value)}
required
/>
>>>>>>> 33b7218 (Initial commit)
</CInputGroup>
<CInputGroup className="mb-4">
<CInputGroupText>
Expand All @@ -95,21 +73,14 @@ const Login = () => {
type="password"
placeholder="Password"
autoComplete="current-password"
<<<<<<< HEAD
=======
value={password}
onChange={(e) => setPassword(e.target.value)}
required
>>>>>>> 33b7218 (Initial commit)
/>
</CInputGroup>
<CRow>
<CCol xs={6}>
<<<<<<< HEAD
<CButton color="primary" className="px-4">
=======
<CButton type="submit" color="primary" className="px-4">
>>>>>>> 33b7218 (Initial commit)
Login
</CButton>
</CCol>
Expand Down