Skip to content

Commit 1da0a36

Browse files
authored
Merge pull request #36 from UNBiters/register
fix login and cards
2 parents 3f36cdd + 15b5f4f commit 1da0a36

3 files changed

Lines changed: 26 additions & 9 deletions

File tree

app/page.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,26 @@ export default function Home() {
3131
const idSearch = searchParams.get('id')
3232
const router = useRouter()
3333
const [chazas, setChazas] = useState([])
34+
const [token, setToken] = useState('');
3435
const [names, setName] = useState([])
3536
const [posts, setPosts] = useState([])
3637
const [isOpen, setIsOpen] = useState(false)
38+
const [isOpen1, setIsOpen1] = useState(false)
39+
40+
function openModalPost() {
41+
if (!token) {
42+
console.log(token)
43+
//setIsOpen(false)
44+
setIsOpen1(true)
45+
console.log(isOpen1)
46+
} else {
47+
console.log(isOpen)
48+
setIsOpen(true)
49+
}
50+
}
3751
useEffect(() => {
3852

53+
setToken(window.sessionStorage.getItem('token'))
3954
client.get(`chazas`, { next: { revalidate: true | 0 | 60 } })
4055
.then((res) => {
4156
if (!res.status == "200") {
@@ -70,7 +85,7 @@ export default function Home() {
7085
})
7186
}, [])
7287
return (
73-
<div id='home' className='grid grid-cols-2'>
88+
<div id='home' className='pb-8 grid grid-cols-2'>
7489
{idSearch && (<ModalComments numComments={numComments} setNumComments={setNumComments} onClose={() => { router.push(`/#${idSearch}`) }} _id={idSearch} />)
7590

7691
}
@@ -82,13 +97,13 @@ export default function Home() {
8297
</button>
8398
<button
8499
type="button"
85-
onClick={() => setIsOpen(true)}
100+
onClick={() => openModalPost()}
86101
className="text-white px-4 py-2 text-sm font-medium text-gray-900 bg-transparent border border-gray-900 rounded-r-md hover:bg-gray-900 hover:text-white focus:z-10 focus:ring-2 focus:ring-gray-500 focus:bg-gray-900 focus:text-white dark:border-white dark:text-white dark:hover:text-white dark:hover:bg-gray-700 dark:focus:bg-gray-700"
87102
>
88103
Crear publicacíon
89104
</button>
90105
</div>
91-
<NewPost open={isOpen} onClose={() => { router.push("/"); setIsOpen(false) }}></NewPost>
106+
<NewPost isOpen1={isOpen1} setIsOpen1={setIsOpen1} open={isOpen} onClose={() => { router.push("/"); setIsOpen(false) }}></NewPost>
92107
</div>
93108
{/* col-span-2 pt-3 CardProfile justify-items-center grid min-[1000px]:grid-cols-2 min-[1300px]:grid-cols-3 min-[1300px]:px-3 */}
94109
<div className="col-span-2 justify-items-center grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-3">

components/Navbar/Navbar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ function classNames(...classes) {
2727

2828
export default function Navbar({ profile }) {
2929
const { isLogin, userData } = useUsers()
30-
const { chaza } = userData
30+
const { chaza, nombre } = userData
3131
//console.log(chaza)
3232
//console.log("islogin", userData)
3333
//const [isLogin, setIsLogin] = useState("")
3434
const [navigation, setNavigation] = useState([])
3535
const [className, setClassName] = useState("")
36-
const [nombre, setNombre] = useState("")
36+
// const [nombre, setNombre] = useState("")
3737
const [email, setEmail] = useState("")
3838
const router = useRouter();
3939
const [isOpen1, setIsOpen1] = useState(false)
@@ -79,11 +79,11 @@ export default function Navbar({ profile }) {
7979
}
8080
console.log(window.sessionStorage.getItem('nombre'))
8181
var name = window.sessionStorage.getItem('nombre')
82-
if (name !== null) {
82+
/*if (name !== null) {
8383
setNombre(name)
8484
} else {
8585
setNombre("false")
86-
}
86+
}*/
8787
}, [isLogin])
8888
return (<>
8989
{isOpen1 && (<Logout onClose={() => { setIsOpen1(false) }} onLogout={() => { router.push("/unbiters/login"); isLogout(); setIsOpen1(false); }}

components/NewPost.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useRouter } from 'next/navigation';
1010
import NotSesion from './Modal/NotSesion';
1111
import InputChazas from './Input.js/InputChazas';
1212

13-
export default function NewPost({ mode, open, onClose, post, editPostUp, id, posts, setPosts }) {
13+
export default function NewPost({ isOpen1, setIsOpen1, mode, open, onClose, post, editPostUp, id, posts, setPosts }) {
1414
var categoriasLists = [
1515
{
1616
"id": 1,
@@ -80,7 +80,7 @@ export default function NewPost({ mode, open, onClose, post, editPostUp, id, pos
8080
const [selected, setSelected] = useState({})
8181
const [chazaId, setChazaId] = useState({})
8282
const [isOpen, setIsOpen] = useState(false)
83-
const [isOpen1, setIsOpen1] = useState(false)
83+
//const [isOpen1, setIsOpen1] = useState(false)
8484
const [notLogin, setNotLogin] = useState(false)
8585
const [error, setError] = useState('');
8686
const [succes, setSucces] = useState('');
@@ -173,6 +173,8 @@ export default function NewPost({ mode, open, onClose, post, editPostUp, id, pos
173173
setError('')
174174
setSucces("La publicacíon se ha creado exitosamente!")
175175
//refresh()
176+
177+
//setPosts(newPosts)
176178
setTimeout(function () {
177179
clean()
178180
}, 4000);

0 commit comments

Comments
 (0)