Skip to content
Open

Feed #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
11cdf2a
Merge branch 'developA' of https://github.com/jhosnodev/projUnity int…
lauragrisanzio Oct 20, 2023
d00b779
changes
lauragrisanzio Oct 20, 2023
159cce1
user
lauragrisanzio Oct 22, 2023
c7f5139
user
lauragrisanzio Oct 22, 2023
74e4e7b
feed
lauragrisanzio Oct 22, 2023
4ce3f20
changes user
lauragrisanzio Oct 23, 2023
53e9478
changes
lauragrisanzio Oct 23, 2023
9a53939
changes
lauragrisanzio Oct 23, 2023
d3cca88
Actualizo ruta para borrado lógico
DracoAlex84 Oct 24, 2023
c04001f
Corrigo buf detail
DracoAlex84 Oct 24, 2023
2f22125
changes
lauragrisanzio Oct 24, 2023
d8cfa2a
changes
lauragrisanzio Oct 24, 2023
8b1d3d7
Agrego notificaciones a users y projects
DracoAlex84 Oct 24, 2023
f65e0b2
Actualizo detail
DracoAlex84 Oct 25, 2023
539d2bb
A
DracoAlex84 Oct 25, 2023
5941490
Face
DracoAlex84 Oct 25, 2023
f96d24f
Corrijo bug detail
DracoAlex84 Oct 25, 2023
00e2d0d
changes
lauragrisanzio Oct 25, 2023
909ea33
Actualizo borrado lógico de proyectos y usuarios para admin
DracoAlex84 Oct 25, 2023
37feddd
changes
lauragrisanzio Oct 25, 2023
3a61d1b
changes
lauragrisanzio Oct 25, 2023
ea8264f
changes
lauragrisanzio Oct 25, 2023
dab6ba6
Agregando loader para evitar que se crashee la pagina
jhosnodev Oct 25, 2023
90fb5a4
chan
lauragrisanzio Oct 25, 2023
7e7595e
Corrijo bug delete
DracoAlex84 Oct 25, 2023
361d015
changes
lauragrisanzio Oct 25, 2023
0190655
profile - faltan comentarios y requests
lauragrisanzio Oct 25, 2023
382cdbb
total views lista
lauragrisanzio Oct 26, 2023
6c527bf
Update mercadopago.js
guspaz0 Oct 26, 2023
08a9b72
Update auth.js
guspaz0 Oct 26, 2023
2ee2d52
Update package.json
guspaz0 Oct 26, 2023
4ca4d01
Update index.js
guspaz0 Oct 26, 2023
a4fae00
Update projectsUser.json
guspaz0 Oct 26, 2023
4c478ac
Update dashboard.js
guspaz0 Oct 26, 2023
a8ff16b
Update userDashboard.js
guspaz0 Oct 26, 2023
05d9e9b
jsonwebtoken en package log
DracoAlex84 Oct 26, 2023
48aff3d
modificamos re-direct de git hub
DracoAlex84 Oct 26, 2023
bb7000e
Modifico github
DracoAlex84 Oct 26, 2023
e6ad5f6
Github
DracoAlex84 Oct 26, 2023
0517376
Console log req
DracoAlex84 Oct 26, 2023
057c1bf
Comento nodemailer en user
DracoAlex84 Oct 26, 2023
d7d92bf
Modifico mail de Alexis
DracoAlex84 Oct 26, 2023
fdf62eb
Sube mail de usuario
DracoAlex84 Oct 26, 2023
598244d
Update Users.js
guspaz0 Oct 26, 2023
8f2b09d
Update user.js
guspaz0 Oct 26, 2023
7911aa4
Update payment.js
guspaz0 Oct 26, 2023
51e7eca
Update package.json
guspaz0 Oct 26, 2023
8eaa86f
Update payment.js
guspaz0 Oct 26, 2023
27907b6
Update payment.js
guspaz0 Oct 26, 2023
07b62c9
Update Users.js
guspaz0 Oct 26, 2023
833203d
Update Users.js
guspaz0 Oct 26, 2023
079f381
Update Users.js
guspaz0 Oct 26, 2023
a7132ba
Update Users.js
guspaz0 Oct 26, 2023
0f5d102
Update users.js
guspaz0 Oct 26, 2023
8c4e5fa
Update index.js
guspaz0 Oct 26, 2023
36aeb98
Update userDashboard.js
guspaz0 Oct 26, 2023
353ec7e
Update Users.js
guspaz0 Oct 26, 2023
36e6e0c
c
lauragrisanzio Oct 26, 2023
887b318
Merge branch 'main' of https://github.com/jhosnodev/projUnity into feed
lauragrisanzio Oct 26, 2023
c4d41bd
agregue borrado logico
lauragrisanzio Oct 26, 2023
3b6f26f
vuelve a funcionar historial de compras
lauragrisanzio Oct 26, 2023
d76e9e1
Update projects.js
guspaz0 Oct 26, 2023
7e8bf35
Update projects.js
guspaz0 Oct 27, 2023
c490599
Update projects.js
guspaz0 Oct 27, 2023
97461d6
no funciona descargar pdf
lauragrisanzio Oct 27, 2023
f5d9ec8
Merge branch 'developA' of https://github.com/jhosnodev/projUnity int…
lauragrisanzio Oct 27, 2023
3b8ae8d
Corrijo bug
DracoAlex84 Oct 27, 2023
9e34c3f
Update mercadopago.js
guspaz0 Oct 27, 2023
a129ba6
Update mercadopago.js
guspaz0 Oct 27, 2023
49c6b5a
Update index.js
guspaz0 Oct 27, 2023
bf1dd87
Update index.js
guspaz0 Oct 27, 2023
ce79618
Update mercadopago.js
guspaz0 Oct 27, 2023
608a0af
Update payment.js
guspaz0 Oct 27, 2023
6552da3
Update payment.js
guspaz0 Oct 27, 2023
b49f9dc
Update payment.js
guspaz0 Oct 27, 2023
f39d7a9
Update payment.js
guspaz0 Oct 27, 2023
a6f3dc1
Update payment.js
guspaz0 Oct 27, 2023
98682af
Mail confirmación usuario
DracoAlex84 Oct 27, 2023
7fffefa
Envio mail de usuario
DracoAlex84 Oct 27, 2023
b9c5784
Modifico mensaje de proyecto
DracoAlex84 Oct 27, 2023
274b82a
Merge branch 'developA' of https://github.com/jhosnodev/projUnity int…
lauragrisanzio Oct 27, 2023
3b45b20
c
lauragrisanzio Oct 27, 2023
1fdeaba
res
lauragrisanzio Oct 27, 2023
e76bcee
Update projects.js
guspaz0 Oct 27, 2023
4e960ae
Update projects.js
guspaz0 Oct 27, 2023
e068ec1
Merge branch 'developA' of https://github.com/jhosnodev/projUnity int…
lauragrisanzio Oct 27, 2023
51a1bab
Update projects.js
guspaz0 Oct 27, 2023
555f2ca
Update payment.js
guspaz0 Oct 27, 2023
8a19e70
Update userDashboard.js
guspaz0 Oct 27, 2023
1584a96
Update projects.js
guspaz0 Oct 27, 2023
fdb08c7
Update projects.js
guspaz0 Oct 27, 2023
29e9c2a
Update projects.js
guspaz0 Oct 27, 2023
c955a7a
Update projects.js
guspaz0 Oct 27, 2023
14345f1
saque coments de user profile
lauragrisanzio Oct 27, 2023
c17ab78
Update projects.js
guspaz0 Oct 27, 2023
5f1e803
Merge branch 'developA' of https://github.com/jhosnodev/projUnity int…
lauragrisanzio Oct 27, 2023
28cae0c
no funciona borrado logico
lauragrisanzio Oct 27, 2023
57880ba
browser
lauragrisanzio Oct 27, 2023
7eaab53
Merge branch 'main' of https://github.com/jhosnodev/projUnity into feed
lauragrisanzio Oct 27, 2023
56aa9a6
m
lauragrisanzio Oct 27, 2023
9918623
Depurando para deployar
jhosnodev Oct 28, 2023
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
2 changes: 1 addition & 1 deletion front/components/comments/CreateComments.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { createComment } from "../../redux/actions/actionsComment";
import Swal from "sweetalert2";
import { getSesion } from "../../redux/actions/actionsUser";
import { getCommentsToDetail } from "../../redux/actions/actions";
getCommentsToDetail


const CreateComments = ({ project, replyTo }) => {
const router = useRouter();
Expand Down
4 changes: 2 additions & 2 deletions front/components/feed/IndexFeed.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ const IndexFeed = () => {
<Tab title="Global Feed">
<GlobalFeed />
</Tab>
<Tab key="my" title="My Feed">
{/* <Tab key="my" title="My Feed">
<MyFeed />
</Tab>

<Tab key="your" title="For your Feed">
<YourFeed />
</Tab>
</Tab> */}
</Tabs>
</div>
// <div className="p-4">
Expand Down
4 changes: 2 additions & 2 deletions front/components/feed/Menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const Menu = () => {
Posts
</Link>
</NavbarItem>
<NavbarItem>
{/* <NavbarItem>
<Link className=" text-primaryfont-bold ml-4" isDisabled>
Rating
</Link>
Expand All @@ -76,7 +76,7 @@ const Menu = () => {
>
Mi Actividad
</Link>
</NavbarItem>
</NavbarItem> */}
</NavbarContent>
</Navbar>
);
Expand Down
28 changes: 14 additions & 14 deletions front/components/socialMedia.jsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
import { Link, link } from "@nextui-org/react";
import { FaTwitter, FaEnvelope, FaLinkedin, FaGithub } from "react-icons/fa";

const SocialMedia = ({email}) => {

const SocialMedia = ({ user }) => {
const { email, githubUser, linkedinUser, twitterUser } = user;
return (
<div className="flex flex-row ml-8 mb-4 ">
<a
href="https://mail.google.com/mail/?view=cm&fs=1&to=lauragrisanzio2@gmail.com
&body=Hola%20me%20gustaría%20contactarte%20por%20el%20proyecto%20que%20desarrollaste%20."
<Link
href={`https://mail.google.com/mail/?view=cm&fs=1&to=${email}
&body=Hola%20me%20gustaría%20contactarte%20por%20el%20proyecto%20que%20desarrollaste%20.`}
target="_blank"
>
<FaEnvelope
style={{ margin: "10px", fontSize: "50px", marginRight: "25px" }}
/>
</a>
</Link>

<a
href="https://www.linkedin.com/in/laura-grisanzio-39b8311a2/"
target="_blank"
>
<Link href={`https://www.linkedin.com/in/${linkedinUser}`} target="_blank">
<FaLinkedin
style={{ margin: "10px", fontSize: "50px", marginRight: "25px" }}
/>
</a>
</Link>

<a href="https://twitter.com/twitterlatam?lang=es" target="_blank">
<Link href={`https://twitter.com/${twitterUser}`} target="_blank">
<FaTwitter
style={{ margin: "10px", fontSize: "50px", marginRight: "25px" }}
/>
</a>
</Link>

<a href="https://github.com/lauragrisan" target="_blank">
<Link href={`https://github.com/${githubUser}`} target="_blank">
<FaGithub style={{ margin: "10px", fontSize: "50px" }} />
</a>
</Link>
</div>
);
};
Expand Down
63 changes: 63 additions & 0 deletions front/components/userDashboard/Buttons.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { useDispatch, useSelector } from "react-redux";
import { useEffect, useState } from "react";

import { restoreProjects } from "../../redux/actions/actions";
import { deleteProjects } from "../../redux/actions/actions";

import {Button} from "@nextui-org/react";
import Swal from "sweetalert2";

const Buttons = ({ id }) => {


const dispatch = useDispatch()
const [activeButton, setActiveButton] = useState(false);
const [desactiveButton, setDesactiveButton] = useState(true);

const active = () => {
dispatch(restoreProjects(id));
Swal.fire({
icon: "success",
title: "Proyecto activado con exito!",
showConfirmButton: true,
timer: 3500,
});

setActiveButton(false);
setDesactiveButton(true);
};
const desactive = () => {
dispatch(deleteProjects(id))
Swal.fire({
icon: "success",
title: "Proyecto desactivado con exito!",
showConfirmButton: true,
timer: 3500,
})
setActiveButton(true);
setDesactiveButton(false);
}



return (
<div>
<Button
onPress={active}
isDisabled={!activeButton}
className="text-white mb-4 mr-8 bg-orange-600 rounded-none text-lg font-bold"
>
Activar
</Button>
<Button
onPress={desactive}
isDisabled={!desactiveButton}
className="text-white mb-4 mr-8 bg-orange-600 rounded-none text-lg font-bold"
>
Desactivar
</Button>
</div>
);
};

export default Buttons;
Loading