Skip to content

Commit

Permalink
Merge pull request #36 from Nicochou/feature/05/ajout-contenu
Browse files Browse the repository at this point in the history 
[05] ajout de service de contenue
  • Loading branch information
@Nicochou
Nicochou authored Oct 5, 2021
2 parents 37bbec5 + 0fd472b commit fc67e55
Show file tree
Hide file tree
Showing 31 changed files with 1,632 additions and 376 deletions.
Binary file modified client/public/LogoGPE.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/public/favicon.ico
View file
Binary file not shown.
Binary file modified client/public/img/streamers/ponce.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions client/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/LogoGPE.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand All @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>AICUT</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file added client/public/logoGPE-large.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion client/public/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "image/x-icon"
},
{
"src": "logo192.png",
"src": "logoGPE.png",
"type": "image/png",
"sizes": "192x192"
},
Expand Down
133 changes: 92 additions & 41 deletions client/src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import React, { Component } from "react";
import { Switch, Route, Link } from "react-router-dom";
import { FaHome, FaHeadset, FaUserAlt, FaUserMd, FaUserTie, FaGlobeAmericas } from "react-icons/fa";
import { AiOutlineLogin, AiOutlinePlusCircle, AiOutlineLogout } from "react-icons/ai";
import { FcClapperboard, FcFilmReel, FcFilm } from "react-icons/fc";
import "bootstrap/dist/css/bootstrap.min.css";
import "./css/App.css";
import "./css/Theme.css";
Expand All @@ -9,7 +12,6 @@ import "./css/Plugin.css";
import AuthService from "./services/auth.service";

// Components

// - Boards
import BoardUser from "./components/boards/board-user.component";
import BoardModerator from "./components/boards/board-moderator.component";
Expand All @@ -35,6 +37,21 @@ import Launch from "./components/launch.component";
import Cut from './components/app/cut.component';
import Edit from "./components/app/edit.component";
import Mount from "./components/app/mount.component";
// - Page - Blog
import Blog from "./components/pages/blog/blog.component";
// - Page - Discover
import Aboutus from "./components/pages/discover/aboutus.component";
import Prices from "./components/pages/discover/prices.component";
// - Page - Support
import Contact from "./components/pages/support/contact.component";
import Faq from "./components/pages/support/faq.component";
import Bogue from "./components/pages/support/bogue.component";
// - Page - Projet
import News from "./components/pages/project/news.component";
import Release from "./components/pages/project/release.component";
import Licences from "./components/pages/project/licences.component";


class App extends Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -73,94 +90,133 @@ class App extends Component {
<ul class="navbar-nav mr-auto">
<li className="nav-item">
<Link to={"/home"} className="nav-link">
Home
<FaHome />Home
</Link>
</li>
{showModeratorBoard && (
<li className="nav-item">
<Link to={"/mod"} className="nav-link">
Moderator Board
<FaUserMd />Moderator
</Link>
</li>
)}
{showAdminBoard && (
<li className="nav-item">
<Link to={"/admin"} className="nav-link">
Admin Board
<FaUserTie />Admin
</Link>
</li>
)}
{showStreamerBoard && (
<li className="nav-item">
<Link to={"/stre"} className="nav-link">
Streamer Board
<FaHeadset />Streamer
</Link>
</li>
)}
{currentUser && (
<li className="nav-item">
<Link to={"/user"} className="nav-link">
User Board
<FaUserAlt />User
</Link>
</li>
)}
</ul>
<a class="navbar-brand mx-auto" href="/">AICUT
<a class="navbar-brand mx-auto" href="/"><img src={'./logoGPE.png'} />AICUT
{currentUser && (
<div id="appRoute">
{showStreamerBoard && (
<li className="nav-item">
<Link to={"/cut"} className="nav-link">
Cut
<FcClapperboard />
</Link>
</li>
)}
{showStreamerBoard && (
<li className="nav-item">
<Link to={"/edit"} className="nav-link">
Edit
<FcFilmReel />
</Link>
</li>
)}
{showStreamerBoard && (
<li className="nav-item">
<Link to={"/mount"} className="nav-link">
Mount
<FcFilm />
</Link>
</li>
)}
</div>
)}
</a>
<ul class="navbar-nav ml-auto">
<li className="dropdown"><Link className="nav-link">Découvrir</Link>
<ul className="dropdown-menu">
<li className="nav-link text-dark"><Link to={"/aboutus"}>Nous concernant</Link></li>
<li className="nav-link text-dark"><Link to={"/prices"}>Prix</Link></li>
</ul>
</li>
<li className="ml-auto">
<Link to={"/blog"} className="nav-link">
Blog
</Link>
</li>
<li className="ml-auto dropdown"><Link className="nav-link">Support</Link>
<ul class="dropdown-menu">
<li className="nav-link text-dark"><Link to={"/contact"} >Contact</Link></li>
<li className="nav-link text-dark"><Link to={"/faq"} >FAQ</Link></li>
<li className="nav-link text-dark"><Link to={"/bogue"} >Rapporter un bogue</Link></li>
</ul>
</li>
<li className="ml-auto dropdown"><Link className="nav-link">Projet</Link>
<ul class="dropdown-menu">
<li className="nav-link text-dark"><Link to={"/release"} >Ajout récent</Link></li>
<li className="nav-link text-dark"><Link to={"/news"} >News</Link></li>
<li className="nav-link text-dark"><Link to={"/licences"} >Licences</Link></li>
</ul>
</li>
</ul>
{currentUser ? (
<ul class="navbar-nav ml-auto">
<li className="nav-item">
<Link to={"/profile"} className="nav-link">
<div>
{currentUser.username}
<img src={currentUser.profile_image_url} alt="Avatar" id="ProfilePic" align="center" />
<img src={currentUser.profile_image_url} alt="Avatar" id="ProfilePic" align="center" />
</div>

</Link>
</li>
<li className="nav-item ml-auto">
<a href="/login" className="nav-link" onClick={this.logOut}>
LogOut
<AiOutlineLogout />
</a>
</li>
</ul>
):(
<ul class="navbar-nav ml-auto">
<li className="nav-item">
<Link to={"/login"} className="nav-link">
Login
<AiOutlineLogin />
</Link>
</li>
<li className="nav-item">
<Link to={"/register"} className="nav-link">
Sign Up
<AiOutlinePlusCircle />
</Link>
</li>
<li className="nav-item">
<div class="p-dropdown">
<a className="nav-link" href="#"><FaGlobeAmericas /><span>FR</span></a>
<ul class="p-dropdown-content">
<li><a href="#">French</a></li>
<li><a href="#">Spanish</a></li>
<li><a href="#">English</a></li>
<li><a href="#">Russian</a></li>
<li><a href="#">Italian</a></li>
<li><a href="#">中国人</a></li>
</ul>
</div>
</li>
</ul>
)}
</nav>
Expand All @@ -169,6 +225,15 @@ class App extends Component {
<Switch>
<Route exact path="/" component={Launch} />
<Route exact path="/home" component={Home} />
<Route exact path="/blog" component={Blog} />
<Route exact path="/contact" component={Contact} />
<Route exact path="/faq" component={Faq} />
<Route exact path="/bogue" component={Bogue} />
<Route exact path="/aboutus" component={Aboutus} />
<Route exact path="/prices" component={Prices} />
<Route exact path="/release" component={Release} />
<Route exact path="/news" component={News} />
<Route exact path="/licences" component={Licences} />
<Route exact path="/game" component={Games} />
<Route exact path="/clip" component={Clips} />
<Route exact path="/game/:slug" component={GameStreams} />
Expand All @@ -195,49 +260,35 @@ class App extends Component {
<div className="row">
<div className="col-xl-2 col-lg-2 col-md-3">
<div className="widget">
<h4>PROJECT</h4>
<h4>DECOUVRIR</h4>
<ul className="list text-light">
<li>Latest Release</li>
<li>Updates</li>
<li>License</li>
<li>News</li>
<li>Links</li>
<li>Nous-concernant</li>
<li>Prix</li>
</ul>
</div>
</div>
<div className="col-xl-2 col-lg-2 col-md-3">
<div className="widget">
<h4>SUPPORT</h4>
<ul className="list text-light">
<li>Troubleshooting</li>
<li>Common Questions</li>
<li>Report a Bug</li>
<li>Get Help</li>
<li>FAQS</li>
</ul>
<h4>BLOG</h4>
</div>
</div>
<div className="col-xl-2 col-lg-2 col-md-3">
<div className="widget">
<h4>COMPANY</h4>
<h4>PROJET</h4>
<ul className="list text-light">
<li>About</li>
<li>Contact</li>
<li>Home</li>
<li>Blog</li>
<li>Portfolio</li>
<li>Ajout récent</li>
<li>News</li>
<li>Licences</li>
</ul>
</div>
</div>
<div className="col-xl-2 col-lg-2 col-md-3">
<div className="widget">
<h4>INFO</h4>
<h4>SUPPORT</h4>
<ul className="list text-light">
<li>Get Directions</li>
<li>Call Us</li>
<li>Our Staff</li>
<li>Working Hours</li>
<li>Offices</li>
<li>Contact</li>
<li>Faq</li>
<li>Bogue</li>
</ul>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions client/src/components/api/Header/Header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function Header(){

<ul className="nav nav-pills flex-column" id="box-trend">
<h3>Tendances</h3>
<li className="nav-item">
<li className="navigation">
<form className="formSubmit" onSubmit={handleSubmit}>

<input required value={searchInput} onChange={(e) => handleKeyPress(e)} type="text" className="inputRecherche"/>
Expand All @@ -78,12 +78,12 @@ function Header(){
</form>
</li>
<li onClick={hideMenu} className="nav-item">
<Link className="nav-link" to="/game">
<Link to="/game">
Games
</Link>
</li>
<li onClick={hideMenu} className="nav-item dropdown">
<Link class="nav-link dropdown-toggle" data-bs-toggle="dropdown" to="/top-streams" role="button" aria-haspopup="true" aria-expanded="false">Streamer</Link>
<Link class="dropdown-toggle" data-bs-toggle="dropdown" to="/top-streams" role="button" aria-haspopup="true" aria-expanded="false">Streamer</Link>
<div class="dropdown-menu" data-popper-placement="bottom-start">
<Link class="dropdown-item" href="#">Action</Link>
<Link class="dropdown-item" href="#">Another action</Link>
Expand All @@ -94,7 +94,7 @@ function Header(){
</li>
{/* set up middlewar and rooting */}
<li onClick={hideMenu} className="nav-item">
<Link className="nav-link" to="/clip">
<Link to="/clip">
Clips
</Link>
</li>
Expand Down
Loading

0 comments on commit fc67e55

Please sign in to comment.