Compare commits

...

4 Commits

Author SHA1 Message Date
llaniau 8de926b22f Modif param mail et resolution de bugs mineur 2020-09-19 11:46:29 +02:00
llaniau eb70757671 Suppression d'un user (correction d'un bug) 2020-09-17 16:35:50 +02:00
llaniau 0c82a72da5 oubli de mdp 2020-09-16 18:08:01 +02:00
llaniau 719c6ae0ee erreur 404 2020-09-15 17:43:41 +02:00
20 changed files with 145 additions and 128 deletions
@@ -1,7 +1,9 @@
{% extends "base.html.twig" %}
{% trans_default_domain 'FOSUserBundle' %}
{% block menu %}
{% endblock %}
{% block content %}
<div class="container contentWrapper">
<div class="row">
@@ -2,6 +2,9 @@
{% block title %}Talents Tube : Le 1er job board 100% vidéo{% endblock %}
{% trans_default_domain 'FOSUserBundle' %}
{% block menu %}
{% endblock %}
{% block content %}
<main id="content">
<div class="container space-2 ">
@@ -1,7 +1,9 @@
{% extends "basetemporaire.html.twig" %}
{% trans_default_domain 'FOSUserBundle' %}
{% block menu %}
{% endblock %}
{% block content %}
<div class="container contentWrapper">
@@ -51,7 +51,7 @@
</div>
<div class="js-form-message mb-3">
<div class="input-field col s12">
<a href="/mentions-legales">Lire les conditions générales d'utilisations</a>
<a href="/cgu">Lire les conditions générales d'utilisations</a>
<br /><br />
</div>
</div>
@@ -22,7 +22,9 @@
content="{{ url(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) }}" />
{% endblock %}
{% block menu %}
{% endblock %}
{% block content %}
<main id="content">
@@ -1,5 +1,6 @@
{% extends 'baseV2.html.twig' %}
{% extends 'basev2.html.twig' %}
{% block content %}
<main id="content">
<div class="row">
<div class="col s12">
<h2 class="center-align m-t-100">Page introuvable</h2>
@@ -9,4 +10,5 @@
</p>
</div>
</div>
</main>
{% endblock %}
@@ -1,4 +1,4 @@
{% extends 'base.html.twig' %}
{% extends 'basetemporaire.html.twig' %}
{% block title %}Offres d'emploi et recrutement {{ company.brandName }} | TalentsTube{% endblock %}
@@ -33,55 +33,56 @@
<div class=" container-fluid container-fixed-lg bg-white">
<!-- START card -->
<div class="row">
<div class="col-lg-6">
<div class="col-lg-12s">
<div class="card card-transparent">
{{ form_start(form, { 'action': path('company_my_account'), 'attr': { 'class': 'fos_user_profile_edit' } }) }}
<div class="card-body">
{% if form_errors(form) %}
<span class="red-text text-darken-2">{{ form_errors(form) }}</span>
{% endif %}
<div class="row">
<div class="col-md-6">
<div class="form-group form-group-default required">
<div class="card-body">
{% if form_errors(form) %}
<span class="red-text text-darken-2">{{ form_errors(form) }}</span>
{% endif %}
{{ form_row(form.firstname) }}
<div class="row">
<div class="col-md-6">
<div class="form-group form-group-default required">
{{ form_row(form.firstname) }}
</div>
</div>
<div class="col-md-6">
<div class="form-group form-group-default">
{{ form_row(form.lastname) }}
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group form-group-default">
<div class="row">
<div class="col-md-12">
{{ form_row(form.lastname) }}
<div class="form-group ">
{{ form_row(form.gender) }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="form-group ">
<br />
<div style="text-align: right;">
<button class="btn btn-default" type="submit">Sauvegarde</button>
{{ form_row(form.gender) }}
</div>
</div>
</div>
<br />
<div style="text-align: right;">
<button class="btn btn-default" type="submit">Sauvegarde</button>
</div>
{{ form_end(form) }}
</div>
{{ form_end(form) }}
</div>
<!-- END card -->
</div>
<!-- END card -->
<div class="col-lg-6">
<div class="card card-transparent">
</div>
<div class="col-lg-12">
{# <div class="card card-transparent">
{{ form_start(formPw) }}
<div class="card-body">
{% if form_errors(formPw) %}
@@ -99,7 +100,17 @@
</div>
</div>
</div>
{{ form_end(formPw) }}
{{ form_end(formPw) }} #}
<div class="card card-transparent">
<div class="card-body">
<div class="row">
<div class="col-md-12">
<a href="/resetting/request" target="_blank">Réinitialisation de mot de passe</a>
</div>
</div>
</div>
</div>
</div>
<!-- END card -->
@@ -72,7 +72,7 @@
<div class="col-lg-4 order-lg-1 d-flex align-items-start flex-column">
<!-- Logo -->
<a class="d-inline-block mb-5" href="index.html" aria-label="Space">
<a class="d-inline-block mb-5" href="/" aria-label="Space">
<img src="{{ asset('v2/svg/logos/talentstube-logo-mobile.svg') }}" alt="Logo" style="width: 40px; max-width: 100%;">
</a>
<!-- End Logo -->
@@ -194,7 +194,7 @@
</div>
<!-- End Title -->
<div class="w-md-80 w-lg-60 text-center mx-md-auto mb-9">
<button type="button" class="btn btn-block btn-primary" href="https://blog.talentstube.com/contact" target="_blank">Contactez-nous</button>
<a href="https://blog.talentstube.com/contact" target="_blank"><button type="button" class="btn btn-block btn-primary" >Contactez-nous</button></a>
</div>
</div>
@@ -40,13 +40,13 @@ votre entreprise et attirer de nouveaux talents.</p>
width="100%" height="550" frameborder="0" webkitallowfullscreen
mozallowfullscreen allowfullscreen></iframe>
</div>
{% else %}
{# {% else %}
<div class="no-presentation-video">
<strong>
Vous ne disposez pas de vidéo de présentation !
</strong><br/>
Cliquez sur le bouton ci-dessous pour la sélectionner dans votre bibliothèque.
</div>
</div> #}
{% endif %}
</div>
@@ -72,11 +72,12 @@ votre entreprise et attirer de nouveaux talents.</p>
{% endif %}
<a class="btn btn-cancel-premier red tooltipped btn-round right" href="#!"
data-position="top" data-tooltip="Annuler">Annuler</a>
<a class="btn btn-default btn-video-premier right btn-orange">
{% if app.user.company.presentationVideo %}
Remplacer ma vidéo marque employeur
{% else %}
Ajouter une vidéo marque employeur
Choisir une vidéo marque employeur
{% endif %}
</a>
@@ -87,9 +88,9 @@ votre entreprise et attirer de nouveaux talents.</p>
<strong>
Guide
</strong><br/>
Pour remplacer votre vidéo marque employeur, cliquer sur le bouton remplacer et choisissez une vidéo dans la liste ci dessous </div>
Pour choisir votre vidéo marque employeur, cliquer sur le bouton remplacer et choisissez une vidéo dans la liste ci dessous </div>
{# {% endif %} #}
</p>
</div>
</div>
{% endif %}
View File
@@ -4,7 +4,7 @@ parameters:
mailer_transport: smtp
mailer_host: mail.gandi.net
mailer_user: noreply@talentstube.io
mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
mailer_password: eaV76D3AEhRbLxNVwfuz9
secret: 416157a2389cec970df2a46fa8ffd361b76516d1
database_host: tt-website.postgres.dev
database_port: '5432'
@@ -1,15 +1,17 @@
parameters:
mailer_transport: smtp
mailer_host: mail.gandi.net
# mailer_user: noreply@talentstube.io
# mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
mailer_user: noreply@talentstube.io
mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
mailer_password: eaV76D3AEhRbLxNVwfuz9
secret: 416157a2389cec970df2a46fa8ffd361b76516d1
database_host: 'tt-website.postgres.preprod'
database_port: '5432'
database_name: database
database_user: user
database_password: 7C|Uk2B[.>"6{QO{
#database_password: b|RN:iR<g,TNMqM6
#database_password: 7C|Uk2B[.>"6{QO{
database_password: b|RN:iR<g,TNMqM6
#Mongo
mongodb_server: "mongodb://tt-website.mongo.preprod:27017"
#Prestashop
@@ -23,10 +25,7 @@ parameters:
prestashop_url: https://www.talentstube.com/store/
#Media
media_video_dir: '%kernel.root_dir%/../web/uploads/videos/'
media_video_url: 'http://pp-static.talentstube.com/videos/'
media_photo_dir: '%kernel.root_dir%/../web/uploads/photos/'
elastic_host: tt-website.elasticsearch.preprod
media_video_url: 'http://pp-static.tall.laniau+11745@talentstube.com.preprod
elastic_port: 9200
delivery_addresses: l.laniau@talentstube.com
push_params:
@@ -1,8 +1,10 @@
parameters:
mailer_transport: smtp
mailer_host: mail.gandi.net
#mailer_user: noreply@talentstube.com
#mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
mailer_user: noreply@talentstube.io
mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
mailer_password: eaV76D3AEhRbLxNVwfuz9
secret: 416157a2389cec970df2a46fa8ffd361b76516d1
database_host: 'tt-website.postgres.prod'
database_port: '5432'
@@ -108,19 +108,19 @@ class UserController extends Controller
}
\assert(!\is_null($user));
$company = $user->getCompany();
if ($company) {
$company->setPresentationVideo(null);
$em->persist($company);
$em->flush();
}
// $company = $user->getCompany();
// if ($company) {
// $company->setPresentationVideo(null);
// $em->persist($company);
// $em->flush();
// }
$this->deleteRelation($user);
$em->remove($user);
$em->flush();
if ($company) {
$em->remove($company);
$em->flush();
}
// if ($company) {
// $em->remove($company);
// $em->flush();
// }
// if ($company) {
// $em->remove($company);
@@ -111,20 +111,20 @@ class CompanyController extends Controller
);
}
$formFactory = $this->container->get('fos_user.change_password.form.factory');
$formPw = $formFactory->createForm();
$formPw->setData($user);
$formPw->handleRequest($request);
if ($formPw->isSubmitted() && $formPw->isValid()) {
$userManager->updateUser($user);
$this->addFlash(
'notice',
$this->get('translator')->trans('company.account.save.title')
);
}
// $formFactory = $this->container->get('fos_user.change_password.form.factory');
// $formPw = $formFactory->createForm();
// $formPw->setData($user);
// $formPw->handleRequest($request);
// if ($formPw->isSubmitted() && $formPw->isValid()) {
// $userManager->updateUser($user);
// $this->addFlash(
// 'notice',
// $this->get('translator')->trans('company.account.save.title')
// );
// }
return $this->render('company/my_account.html.twig', [
'form' => $form->createView(),
'formPw' => $formPw->createView(),
// 'formPw' => $formPw->createView(),
]);
}
@@ -51,7 +51,8 @@ class DefaultController extends Controller
}
$form = $this->createForm(AdSearchType::class);
return $this->render(
'default/index.html.twig', [
'ads' => $ads,
@@ -110,6 +111,8 @@ class DefaultController extends Controller
$csrfToken = $params["csrfToken"];
$error = $params["error"];
$destination_login = "admin/dashboard";
//var_dump($mailManager);
return $this->render(
'defaultv2/accueil/index.html.twig', [
'last_username' => $usename,
@@ -23,7 +23,7 @@ use Symfony\Component\HttpFoundation\Session\Session;
class MediaController extends Controller
{
/**
* @Route("/entreprise/me/videotheque", name="company_media")
* @Route("/entreprise/me/videotheque", name="company_marque")
*/
public function companyMediaAction(Request $request)
{
@@ -50,34 +50,6 @@ class MediaController extends Controller
));
}
/**
* @Route("/entreprise/me/video-marque-employeur", name="company_marque")
*/
public function companyMarqueAction(Request $request)
{
$event = new UserEvent($this->getUser());
$this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROD_UPDATE, $event);
$em = $this->getDoctrine()->getManager();
$medias = $em->getRepository('AppBundle:Media')->findBy(array('creator' => $this->getUser()));
$form = $this->createForm(MediaType::class);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$title = $form['title']->getData();
$idMedia = $form['media']->getData();
$media = $em->getRepository('AppBundle:Media')->findOneBy(array('id' => $idMedia, 'creator' => $this->getUser()));
$media->setTitle($title);
$em->persist($media);
$em->flush();
return $this->redirectToRoute('company_marque');
}
return $this->render('media/media_list.html.twig', array(
'form' => $form->createView(),
'medias' => $medias,
));
}
/**
* @Route("/territoire/me/videotheque", name="territory_media")
*/
@@ -133,7 +105,7 @@ class MediaController extends Controller
/**
* @Route("/media/create/{id}", name="create_media")
* @Security("ad.getStatus() == 'DRAFT' or ad.getStatus() == 'TO_PUBLISH' or ad.getStatus() == 'DECLINED'")
* @Security("ad.getStatus() == 'DRAFT' or ad.getStatus() == 'DECLINED'")
*/
public function createMediaAction(Request $request, Ad $ad)
{
@@ -150,27 +122,14 @@ class MediaController extends Controller
->add('title', TextType::class, array(
'label' => 'Titre de la vidéo',
'required' => true,
'attr' => array(
'class' => 'form-control'
)
))
->getForm();
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$media = $form->getData();
$em->persist($media);
// Modif de la date de publication à la date du jour
$now = new \DateTime('now');
$ad->setPublishedAt($now);
$numberOfMonth = 6;
$unpublishedDate = new \DateTime('now');
$unpublishedDate = $unpublishedDate->add(new \DateInterval('P' . $numberOfMonth . 'M'));
$ad->setUnpublishedAt($unpublishedDate);
$em->persist($ad);
$em->flush();
//return $this->redirectToRoute('company_ad_step3', array('id' => $ad->getId()));
return $this->redirectToRoute('company_ad_step3', array('id' => $ad->getId()));
}
return $this->render('company/createMedia.html.twig', array(
@@ -210,13 +169,7 @@ class MediaController extends Controller
$mediaManager = $this->get('media_manager');
$message = $mediaManager->upload($ad, $uploadedFile, $ad->getCreator());
}
$em = $this->getDoctrine()->getManager();
$ad->setIsVerified(true);
$ad->setPrivate(false);
$ad->setPromoted(true);
$em->persist($ad);
dump($ad);
$em->flush();
return new JsonResponse($message);
}
@@ -321,7 +274,7 @@ class MediaController extends Controller
$user = $em->getRepository('AppBundle:User')->findOneBy(array('id' => $idUser));
$video = $em->getRepository('AppBundle:Media')->findOneBy(array('id' => $idVideo));
$company = $user->getCompany();
if ($user->hasRole('ROLE_TALENT') || $user->hasRole('ROLE_TERRITORY') || ($user->hasRole('ROLE_COMPANY') && $company->hasCompanyVideo())) {
if ($user->hasRole('ROLE_TALENT') || $user->hasRole('ROLE_TERRITORY') || ($user->hasRole('ROLE_COMPANY') )) {
$company->setPresentationVideo($video);
}
}
@@ -417,4 +370,4 @@ class MediaController extends Controller
return $res;
}
}
}
@@ -72,4 +72,41 @@ class MailManager
return $message;
}
/**
* @param $subject
* @param $message
* @param $user
* @param $templateName
* @return array
*/
public function sendMailSimple($subject, $message, $user, $templateName)
{
$htmlView = $this->twig->render('email/' . $templateName . '.html.twig', array(
'type' => 'html',
'message' => $message,
'user' => $user,
));
$plainView = $this->twig->render('email/' . $templateName . '_plain.html.twig', array(
'type' => 'plain',
'message' => $message,
'user' => $user,
));
$email = \Swift_Message::newInstance()
->setSubject($subject)
->setFrom('noreply@talentstube.io')
->setTo('l.laniau@talentstube.com')
->setBody($message, 'text/html')
;
if ($this->mailer->send($email)) {
// $spool = $this->mailer->getTransport()->getSpool();
// $spool->flushQueue($this->transport);
$message = array('success' => 200);
} else {
$message = array('success' => 500);
}
//var_dump($message);
return $message;
}
}