.env
continuous-integration/drone/push Build encountered an error Details

pull/1/head
Noan07 2 years ago
parent 04b0fc00f2
commit 5a6f448bda

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

@ -1,7 +1,6 @@
import React, { useState } from 'react'
import Connexion from './Connexion';
import Inscription from './Inscription';
import '../../styles/pages/_profil.scss'
const Log = ( props ) => {
const [signUpModal, setSignUpModal] = useState(props.signup);

@ -5,6 +5,7 @@ import { useSelector } from "react-redux";
import PP from "../assets/img/unknown.png";
import cookie from 'js-cookie';
import axios from "axios";
import Logo from "../assets/img/logo.png";
const Navbar = () => {
const uid = useContext( UidContext );
@ -24,7 +25,7 @@ const Navbar = () => {
})
.then(() => removeCookie('jwt'))
.catch((err) => console.log(err));
window.location = "/Profil";
window.location = "/HomeNavigation";
}
@ -35,7 +36,7 @@ const Navbar = () => {
<nav>
<ul className="partie-gauche-nav ul-navBar">
<li className="logo">
<img src=''alt='Logo'/>
<img src={Logo} height="30px" alt='Logo'/>
</li>
</ul>
<ul className="ul-navBar">
@ -62,13 +63,13 @@ const Navbar = () => {
</ul>
<ul className="partie-droit-nav ul-navBar">
<li >
<NavLink to="/Trends" className='b'>
<NavLink to="/Profil" className='b'>
{ (userData==null) ? (<span></span>):(<span>{userData.pseudo}</span>)}
</NavLink>
</li>
<li>
<NavLink to="/Trends" className='b'>
<NavLink to="/Profil" className='b'>
<img src={PP} alt='Logo' className="img-profile"/>
</NavLink>
</li>

@ -1,19 +1,21 @@
import React from 'react';
import { BrowserRouter, Routes, Route } from "react-router-dom";
import Profil from '../../pages/Profil.js';
import HomeNavigation from '../../pages/HomeNavigation.js';
import Home from '../../pages/Home.js';
import Trends from '../../pages/Trends.js';
import Discover from '../../pages/Discover.js';
import Profil from '../../pages/Profil.js';
const index = () => {
return (
<BrowserRouter>
<Routes>
<Route path="/" element={<Profil/>} />
<Route path="/" element={<HomeNavigation/>} />
<Route path="/home" element={<Home/>} />
<Route path="/trends" element={<Trends/>} />
<Route path="/discover" element={<Discover/>} />
<Route path="*" element={<Profil/>} />
<Route path="*" element={<HomeNavigation/>} />
<Route path="/profil" element={<Profil />} />
</Routes>
</BrowserRouter>
);

@ -0,0 +1,24 @@
import React, { useContext } from 'react';
import { UidContext } from '../components/AppContext';
import Log from '../components/Log'
import Home from './Home';
import { NavLink } from 'react-router-dom';
//<Link to="/discover"/>
const HomeNavigation = () => {
const uid = useContext(UidContext);
return (
<div className="profil-page">
{uid ? (
< Home />
) : (
<div className="log-container">
<Log signin={true} signup={false}/>
</div>
)}
</div>
);
};
export default HomeNavigation;

@ -1,25 +1,35 @@
import React, { useContext } from 'react';
import { UidContext } from '../components/AppContext';
import Log from '../components/Log'
import '../styles/pages/_profil.scss';
import Home from './Home';
import { NavLink } from 'react-router-dom';
//<Link to="/discover"/>
import React from 'react';
import { useSelector } from 'react-redux';
import Navbar from '../components/Navbar';
const Profil = () => {
const uid = useContext(UidContext);
const userData = useSelector((state) => state.pictures.pictures);
return (
<div className="profil-page">
{uid ? (
< Home />
) : (
<div className="log-container">
<Log signin={true} signup={false}/>
<>
<Navbar />
<div id="bandeauProfil">
<div id="image">
<img id="PhotoProfile" alt="Profil" src={userData.picture}/>
</div>
<div id="blocName">
<h1>{userData.pseudo}</h1>
<h2 className="subdo">@{userData.pseudo}</h2>
<div>
<div id="blocAbonnement">
<div>
<div className="nombre">10k</div>
<div className="texteNombre">Abonnement</div>
</div>
<div>
<div className="nombre">10k</div>
<div className="texteNombre">Abonnée</div>
</div>
</div>
</div>
</div>
)}
</div>
);
</>
)
};
export default Profil;

@ -1,5 +1,5 @@
@import './_settings.scss';
@import './pages/navbar';
@import './component/navbar';
@import './pages/homenavigation';
@import './pages/profil';
@import './pages/profil';
@import './pages/poste';
@import './component/poste';

@ -0,0 +1,160 @@
$color-1: #A4EBF3;
$color-2: #CCF2F4;
$color-3: #F4F9F9;
$color-4: #AAAAAA;
.ul-profil{
list-style-type: none;
display: flex;
flex-direction: column;
align-items: center;
.button-form{
cursor: pointer;
border: 3px solid black;
border-radius: 20px;
padding: 10px 20px;
transition: 0.2s;
width: 150px;
height: 45px;
text-align: center;
margin-top: 10px;
}
.active-btn {
background: $color-1;
&:hover {
background: $color-2;
}
}
.button-form:not(.active-btn) {
&:hover {
transform: translateX(3px);
}
}
}
.info-form-container{
width: 20%;
border: 2px solid black;
border-radius: 0px 15px 15px 0px;
background-color: aliceblue;
p{
line-height: 15px;
letter-spacing: 1.01px;
}
}
.profile-page{
width: 100%;
}
.form-container{
display: flex;
flex-direction: row-reverse;
justify-content: center;
padding-top: 2%;
}
.description-type-connection{
text-align: center;
}
.cadre {
padding: 50px 50px;
border: 2px solid black;
border-right: 0px solid black;
border-radius: 15px 0px 0px 15px;
background-color: $color-1;
h1 {
letter-spacing: 5px;
margin-bottom: 60px;
font-weight: bold;
text-align: center;
}
.inputbox {
position: relative;
width: 300px;
margin-top: 25px;
input {
width: 100%;
border: 2px solid #000;
outline: none;
background-color: $color-3;
padding: 10px;
border-radius: 10px;
font-size: 1.1em;
}
span {
position: absolute;
top: 14px;
left: 20px;
font-size: 1em;
transition: 0.3s;
font-family: sans-serif;
}
}
.chexkboxConditionGenerale{
margin-top: 3px;
padding: 5px;
}
.error{
padding-left: 5px;
font-size: small;
font-weight: 600;
color: red;
position: absolute;
}
#connexion,#inscription{
margin-top: 5px;
}
}
.span_date{
margin-left: 7px;
font-size: 1em;
font-family: sans-serif;
}
.cadre .inputbox input:focus ~ span,
.cadre .inputbox input:valid ~ span {
transform: translateX(-13px) translateY(-35px);
font-size: 1em;
}
input[type="submit"], .buttonTEL{
border: none;
border-radius: 8px;
border: 2px solid #000;
background-color: $color-3;
width: 300px;
height: 50px;
}
.buttonTEL{
margin-top: 15px;
margin-bottom: 15px;
}
input[type="submit"]:hover, .buttonTEL:hover{
background-color: $color-4;
}
.mdp{
font-weight: 900;
}
.info-form-container{
.info-form-right{
padding-top: 15px;
}
}
.enregistrementReussi{
display: flex;
flex-direction: column;
}

@ -1,160 +1,38 @@
$color-1: #A4EBF3;
$color-2: #CCF2F4;
$color-3: #F4F9F9;
$color-4: #AAAAAA;
.ul-profil{
list-style-type: none;
display: flex;
flex-direction: column;
align-items: center;
.button-form{
cursor: pointer;
border: 3px solid black;
border-radius: 20px;
padding: 10px 20px;
transition: 0.2s;
#PhotoProfile{
display: block;
margin-left: auto;
margin-right: auto;
width: 150px;
height: 45px;
text-align: center;
margin-top: 10px;
}
.active-btn {
background: $color-1;
&:hover {
background: $color-2;
}
}
.button-form:not(.active-btn) {
&:hover {
transform: translateX(3px);
}
}
}
.info-form-container{
width: 20%;
border: 2px solid black;
border-radius: 0px 15px 15px 0px;
background-color: aliceblue;
p{
line-height: 15px;
letter-spacing: 1.01px;
}
height:150px;
border-radius: 80px;
border: 2px solid #555;
}
.profile-page{
width: 100%;
}
.form-container{
#blocAbonnement{
display: flex;
flex-direction: row-reverse;
justify-content: center;
padding-top: 2%;
}
.description-type-connection{
text-align: center;
}
.cadre {
padding: 50px 50px;
border: 2px solid black;
border-right: 0px solid black;
border-radius: 15px 0px 0px 15px;
background-color: $color-1;
h1 {
letter-spacing: 5px;
margin-bottom: 60px;
font-weight: bold;
text-align: center;
}
.inputbox {
position: relative;
width: 300px;
margin-top: 25px;
input {
width: 100%;
border: 2px solid #000;
outline: none;
background-color: $color-3;
padding: 10px;
border-radius: 10px;
font-size: 1.1em;
}
span {
position: absolute;
top: 14px;
left: 20px;
font-size: 1em;
transition: 0.3s;
font-family: sans-serif;
}
}
.chexkboxConditionGenerale{
margin-top: 3px;
padding: 5px;
}
.error{
padding-left: 5px;
font-size: small;
font-weight: 600;
color: red;
position: absolute;
}
#connexion,#inscription{
margin-top: 5px;
}
#blocAbonnement div{
margin-left: 80px;
margin-right: 80px;
}
.span_date{
margin-left: 7px;
font-size: 1em;
font-family: sans-serif;
}
.cadre .inputbox input:focus ~ span,
.cadre .inputbox input:valid ~ span {
transform: translateX(-13px) translateY(-35px);
font-size: 1em;
}
input[type="submit"], .buttonTEL{
border: none;
border-radius: 8px;
border: 2px solid #000;
background-color: $color-3;
width: 300px;
height: 50px;
}
.buttonTEL{
margin-top: 15px;
margin-bottom: 15px;
#blocName{
text-align: center;
}
input[type="submit"]:hover, .buttonTEL:hover{
background-color: $color-4;
.nombre{
color:black;
}
.mdp{
font-weight: 900;
.texteNombre{
color:grey;
}
.info-form-container{
.info-form-right{
padding-top: 15px;
}
#bandeauProfil{
background-color: aqua;
margin-top: 50px;
}
.enregistrementReussi{
display: flex;
flex-direction: column;
}

@ -0,0 +1,4 @@
PORT=5000
DB_USER_PASS=Favor_bdd:JmvgkvOoHP0XGhX7
TOKEN_SECRET=o5ckr52nqbg8cu01dh7p3er6tzxxq09zerg3pqehvldd7adzdada
CLIENT_URL=http://localhost:3000
Loading…
Cancel
Save