diff --git a/app/assets/javascripts/public.js.coffee b/app/assets/javascripts/public.js.coffee index e48dd4b..8802118 100755 --- a/app/assets/javascripts/public.js.coffee +++ b/app/assets/javascripts/public.js.coffee @@ -37,6 +37,7 @@ $(".customer_message_list .height_frame").css "height" : $(".customer_message_show").height()+"px" min_height = 0 + min_height = $(window).height() - $(".top").height() - $(".top_home").height() - $(".bottom").height() - 30 $("#main").css("min-height", min_height+"px") @@ -73,8 +74,6 @@ $(this).find("li").css("max-height", height+"px") - position_img_now(); - @flash_delay = -> $("#flashs").find(".alert").each -> @@ -97,284 +96,8 @@ prev_link = "" $("document").ready -> flash_delay(); - - position_img_now = -> - - - - # alert $("#large .large-img").outerHeight(false) - - imgheight = $("#large .large-img").outerHeight(false) + $("#large h3").outerHeight(false) - - - margintop = (( $(window).height() - imgheight) / 2 ) - - $("#large .large-img").css - "margin-top" :(margintop+"px") - #"width" : "100px" - - - - position_img = -> - $("#large .large-img").one "load", -> - - position_img_now() - - - - $(".expandable_image").click -> - maxwidth = 1000 - maxheight = 900 - - - - - prev_link = $(this) - $("body").append "
" - title = false - - - - $("#large").append "
" - $("#large").append "" - $(".img_container.first").append "" - - if $(this).attr "title" - title = $(this).attr "title" - $(".img_container.first").append "

"+title+"

" - - $("#large .large-img").one "load", -> - $("#large").fadeIn(500) - position_img(); - if $(window).height() > (maxheight+100) - $("#large .large-img").css - "max-height" : maxheight - else - $("#large .large-img").css - "max-height" : "85%" - - if $(window).width() > (maxwidth+100) - $("#large .large-img").css - "max-width" : maxwidth - else - $("#large .large-img").css - "max-width" : "85%" - - position_img(); - - - false - - - $(".rea-gal a").click -> - maxwidth = 1000 - maxheight = 900 - - - - - prev_link = $(this) - $("body").append "
" - title = false - - - $("#large").append "" - $("#large").append "" - $("#large").append "" - - $("#large").append "
" - $(".img_container.first").append "" - - if $(this).attr "title" - title = $(this).attr "title" - $(".img_container.first").append "

"+title+"

" - - $("#large .large-img").one "load", -> - $("#large").fadeIn(500) - position_img(); - if $(window).height() > (maxheight+100) - $("#large .large-img").css - "max-height" : maxheight - else - $("#large .large-img").css - "max-height" : "85%" - - if $(window).width() > (maxwidth+100) - $("#large .large-img").css - "max-width" : maxwidth - else - $("#large .large-img").css - "max-width" : "85%" - - position_img(); - - - false - - - - $("body").on "click", "#large", -> - $(this).fadeOut 300, -> - $(this).remove() - - - $("body").on "click" ,"#large .prev",-> - - if prev_link.prev("a").length > 0 - link = prev_link.closest("a").prev("a") - - - - else - link = prev_link.closest("div").children("a:last") - - - #titre = photo.find("h3") - $(".img_container.first").fadeOut 300, -> - $("#large h3").remove() - if link.attr "title" - title = link.attr "title" - $(".img_container.first").append "

"+title+"

" - - - $('#large .large-img').attr("src", link.attr("href")) - $("#large .large-img").one "load", -> - $(".img_container.first").fadeIn() - position_img(); - prev_link = link - - false - - - $("body").on "click" ,"#large .next",-> - - if prev_link.next("a").length > 0 - link = prev_link.closest("a").next("a") - - - - else - link = prev_link.closest("div").children("a:first") - - - #titre = photo.find("h3") - - $(".img_container.first").fadeOut 300, -> - $("#large h3").remove() - if link.attr "title" - title = link.attr "title" - $(".img_container.first").append "

"+title+"

" - - $('#large .large-img').attr("src", link.attr("href")) - $("#large .large-img").one "load", -> - $(".img_container.first").fadeIn() - position_img(); - prev_link = link - - false - - - $('.gal').bxSlider - adaptiveHeight: true, - auto: true, - speed:1000, - pause:5000, - - - - - left =0 - - top = 0 - offset= 0 - + resize() - - - - - - resize() - $('.bxslider').bxSlider - mode: 'fade' - captions: true - auto: true - resize() - - - - resize_annonces = -> - $(".search_results").each -> - - width = $(this).width() - - - small_width = (width - 4*14) / 2 - small_height = small_width * (250 / 450) - - big_width = width - 2*14 - - if width > 740 - - $(this).find(".annonce_list").css - "width" : small_width+"px" - "max-width" : small_width+"px" - $(this).find(".annonce_list .default_image").css - "height" : small_height+"px" - - $(this).find(".annonce_list.big").css - "width" : big_width+"px" - "max-width" : big_width+"px" - $(this).find(".annonce_list.big .default_image").css - "height" : (small_height+90)+"px" - - else - $(this).find(".annonce_list").css - "width" : big_width+"px" - "max-width" : big_width+"px" - $(this).find(".annonce_list .default_image").css - "height" : "height" : small_height+"px" - - $(this).find(".annonce_list.big").css - "width" : big_width+"px" - "max-width" : big_width+"px" - $(this).find(".annonce_list.big .default_image").css - "height" : (small_height+90)+"px" - - - - - - - resize_annonces() - - $(window).on "resize", -> - resize() - resize_annonces() - - place_annonce_panel = -> - if $(window).scrollTop() > 230 - $("#annonce_save").addClass("fixed") - else - $("#annonce_save").removeClass("fixed") - - - $(window).on "scroll", -> - place_annonce_panel() - - place_annonce_panel() - - top_height = $(window).height() - img_height = 0.0 - initial_y = 0 - - - - - - - $(document).on "click", ".tags label", -> - if $("#"+$(this).attr("for")).is(':checked') - $(this).removeClass("active") - else - $(this).addClass("active") + +$(window).on "resize", -> + resize() \ No newline at end of file diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss index 0933c62..aedc58a 100755 --- a/app/assets/stylesheets/public.scss +++ b/app/assets/stylesheets/public.scss @@ -16,57 +16,20 @@ @import "vendor/flipclock"; - - - -#document_cart_overlay{ - background:rgba(255,255,255,0.9); - position:fixed; - top:0; - left:0; - right:0; - bottom:0; - z-index:10000; - - #document_cart{ - position:relative; - width:90%; - max-width:600px; - margin:auto; - background:white; - text-align:center; - padding:20px; - box-shadow:0 0 10px rgba(0,0,0,0.3); - .button{ - padding:5px 10px; - text-transform:uppercase; - font-weight:bold; - cursor:pointer; - display:inline-block; - margin:20px 10px; - - } +.quartz{ + position:absolute; + bottom:10px; + right:10px; + color:rgba(black, 0.5); + font-size:0.9em; + img{ + height:20px; + - a{ - .button{ - color:white; - background:$orange; - } - } } - .close{ - padding:5px 10px; - background:#F7F7F7; - position:absolute; - right:20px; - top:-30px; - cursor:hand; - } - } - .reseaux_body{ .top{ @@ -109,16 +72,9 @@ #main{ position:relative; - .body-container{ +padding-bottom:60px; +padding-top:50px; - background-color: #ededed; - padding-top:50px; - padding-bottom:30px; - } - .footer{ - height:500px; - background-color: #777777; - } } @@ -128,7 +84,7 @@ position:relative; //margin-bottom:10px; position:relative; - background:rgba(2,43,71,1) ; + background:rgba(32,110,149,1) ; background-size:100%; background-size:cover; @@ -143,7 +99,8 @@ position:relative; color:white; } - background:white; + background:rgba(2,43,71,1); + } @@ -205,16 +162,12 @@ position:relative; #menu{ - background:rgba(0,0,0,0) !important; + width:100%; z-index:10; - -webkit-transition: background-color 1000ms linear; - -moz-transition: background-color 1000ms linear; - -o-transition: background-color 1000ms linear; - -ms-transition: background-color 1000ms linear; - transition: background-color 1000ms linear; + a{ color:white; @@ -1054,5 +1007,76 @@ height: 100%; } +.reseauxes_home_video{ + a{ + color:rgba(black,0.8); + } +} +.reseauxes_home_container{ + text-align:center; + .logo{ + max-width:180px; + display:block; + margin:auto; + margin-bottom:50px; + } + p{ + max-width:320px; + margin:30px auto; + text-align:center; + + strong{ + font-size:1.2em; + } + } + .reseauxes_home{ + max-width:400px; + margin:auto; + border-bottom:1px solid #d9d9d9; + a{ + display:block; + padding:10px 15px; + padding-right:20px; + font-size:1.2em; + color:rgba(black,0.7); + border:1px solid #d9d9d9; + border-bottom:0; + border-right:0; + border-left:0; + text-align:left; + position:relative; + .arrow{ + position:absolute; + top:50%; + right:10px; + + i{ + position:relative; + top:-0.75em; + + } + + + } + + span{ + font-size:0.9em; + font-style:italic; + color:rgba(black,0.5); + display:block; + margin-top:-5px; + } + + &:hover{ + background:#52bad5; + color:white;text-decoration:none; + border:#52bad5; + span{ + color:white; + } + } + } + + } - +} \ No newline at end of file diff --git a/app/assets/stylesheets/public/boutique.css.scss b/app/assets/stylesheets/public/boutique.css.scss index 0be8d28..58c2555 100644 --- a/app/assets/stylesheets/public/boutique.css.scss +++ b/app/assets/stylesheets/public/boutique.css.scss @@ -207,7 +207,7 @@ $dark_orange:#206e95; &.active, &:hover{ - background : $orange; + color:white !important; } } @@ -222,4 +222,79 @@ $dark_orange:#206e95; td{ padding:0 !important; } -} \ No newline at end of file +} + + +#document_cart_overlay{ + background:rgba(255,255,255,0.9); + position:fixed; + top:0; + left:0; + right:0; + bottom:0; + z-index:10000; + + #document_cart{ + position:relative; + width:90%; + max-width:600px; + margin:auto; + background:white; + text-align:center; + padding:20px; + box-shadow:0 0 10px rgba(0,0,0,0.3); + h3{ + font-size:1.3em; + text-align:center; + } + .product.product-item{ + background:#f9f9f9; + text-align:left; + padding:10px; + img{ + float:left; + width:150px; + } + .description{ + margin-left:155px; + text-align:left; + } + h3{ + color:black; + margin-top:0; + font-size:1.1em; + text-decoration:none; + text-align:left; + } + + + } + + + .button{ + padding:5px 10px; + text-transform:uppercase; + font-weight:bold; + cursor:pointer; + display:inline-block; + margin:20px 10px; + + } + + a{ + .button{ + color:white; + + } + } + } + .close{ + padding:5px 10px; + background:#F7F7F7; + position:absolute; + right:20px; + top:-30px; + cursor:hand; + } + +} diff --git a/app/assets/stylesheets/public/general.scss b/app/assets/stylesheets/public/general.scss index 01d397e..8c39212 100755 --- a/app/assets/stylesheets/public/general.scss +++ b/app/assets/stylesheets/public/general.scss @@ -1,18 +1,25 @@ +html, body { + margin: 0; + height: 100%; +} + body{ - font-family:"Helvetica", "Arial", sans-serif; + font-family:"Lato", "Arial", sans-serif; font-weight:400; line-height:1.5; text-align:justify; - background:rgba(32,110,149,1); + background-color: #ededed; font-size:15px; color:#55595B; + padding:0; + } h1, h2, h3,h4{ font-weight:400 ; - font-family:"Varela Round","Helvetica", "Arial", sans-serif; + font-family:"Lato","Helvetica", "Arial", sans-serif; text-align:left; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 37cec7d..a406f32 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,6 +5,16 @@ class ApplicationController < ActionController::Base before_filter :set_order + + + + def get_reseaux + if session[:reseaux_id] + @reseaux = current_customer.reseauxes.find(session[:reseaux_id]) + @reseaux_layout = true + end + end + def set_order if session[:product_order_id] && @product_order = ProductOrder.where(id: session[:product_order_id]).first diff --git a/app/controllers/public/contact_messages_controller.rb b/app/controllers/public/contact_messages_controller.rb index 33b417b..a84a973 100755 --- a/app/controllers/public/contact_messages_controller.rb +++ b/app/controllers/public/contact_messages_controller.rb @@ -1,6 +1,6 @@ class Public::ContactMessagesController < ApplicationController layout "public" - + #before_filter :get_reseaux def index ContactMessage.update_all(read_by_customer: true) @contact_message = ContactMessage.new diff --git a/app/controllers/public/my_account_controller.rb b/app/controllers/public/my_account_controller.rb index 21a358c..eedaf24 100755 --- a/app/controllers/public/my_account_controller.rb +++ b/app/controllers/public/my_account_controller.rb @@ -3,7 +3,10 @@ class Public::MyAccountController < ApplicationController layout "public" before_filter :auth_customer - + def my_reseauxes + + + end def index @accepted_offers = current_customer.accepted_offers.order(created_at: :desc).page(params[:page_offers]).per(5) diff --git a/app/controllers/public/product_order_products_controller.rb b/app/controllers/public/product_order_products_controller.rb index 922f4c5..9bc2a3d 100755 --- a/app/controllers/public/product_order_products_controller.rb +++ b/app/controllers/public/product_order_products_controller.rb @@ -1,7 +1,7 @@ class Public::ProductOrderProductsController < ApplicationController layout "public" - + before_filter :get_reseaux def create #clear params params[:product_order_product][:product_size_id] = nil if params[:product_order_product][:product_size_id] == "" diff --git a/app/controllers/public/products_controller.rb b/app/controllers/public/products_controller.rb index 3eb1a6a..bf64da0 100755 --- a/app/controllers/public/products_controller.rb +++ b/app/controllers/public/products_controller.rb @@ -2,7 +2,7 @@ class Public::ProductsController < ApplicationController - + before_filter :auth_customer layout "public" def show diff --git a/app/controllers/public/reseauxes_controller.rb b/app/controllers/public/reseauxes_controller.rb index d618fe0..9be7913 100755 --- a/app/controllers/public/reseauxes_controller.rb +++ b/app/controllers/public/reseauxes_controller.rb @@ -1,6 +1,6 @@ class Public::ReseauxesController < ApplicationController layout "public" - + before_filter :auth_customer def index @reseauxes = current_customer.own_reseauxes.order(:name) diff --git a/app/views/admin/product_orders/bl.html.haml b/app/views/admin/product_orders/bl.html.haml index a2b5dcd..a53d3c9 100644 --- a/app/views/admin/product_orders/bl.html.haml +++ b/app/views/admin/product_orders/bl.html.haml @@ -4,6 +4,7 @@ %meta{:"http-equiv" => "Content-Type", :content=>"text/html; charset=UTF-8"} %meta{:name=>"viewport", :content=>"width=device-width,initial-scale=1"} + :scss body{ font-size:11pt; @@ -11,7 +12,7 @@ margin:0px; background-color: transparent; - font-family:"Arial" ; + font-family:"Lato", Arial, Sans-serif; padding:1cm; } #main{ @@ -96,7 +97,7 @@ %body #main - %div{:style => "position:absolute;top:4.8cm;right:1cm;text-align:right;"} + %div{:style => "position:absolute;top:4.4cm;right:1cm;text-align:right;"} Bon de commande n° =@product_order.bl_number %br @@ -107,9 +108,9 @@ - %table.table{:style => "position:absolute;right:1cm;top:240px"} + %table.table{:style => "position:absolute;right:1cm;top:220px"} %tr - %td{:style => "min-width:6cm;border:0"} + %td{:style => "width:5.5cm;border:0"} %h3 Adresse de facturation %strong=@product_order.particular_bill.organisation @@ -131,7 +132,7 @@ =@product_order.particular_bill.country - %td{:style => "border:0"} + %td{:style => "width:5.5cm;border:0"} %h3 Adresse de livraison %strong=@product_order.particular_bill.organisation diff --git a/app/views/admin/reseauxes/_form.html.haml b/app/views/admin/reseauxes/_form.html.haml index f78a845..6095991 100755 --- a/app/views/admin/reseauxes/_form.html.haml +++ b/app/views/admin/reseauxes/_form.html.haml @@ -9,6 +9,7 @@ =f.inputs do =f.input :name, :label => "Nom du réseau : " + =f.input :baseline, :label => "Baseline :" =f.input :description, :label => "A propos : ", :input_html => {:class => "redactor_textarea"} -if !@reseaux.parent =f.input :chef_reseau, :label => "Chef réseau : ", :collection => Customer.where(:chef_reseau => true).pluck(Arel.sql("CONCAT(`firstname`, ' ', `name`)"), :id) diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 83a63d2..a9d2e9a 100755 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -21,15 +21,15 @@ = stylesheet_link_tag 'public' = stylesheet_link_tag '/fonts/Stylograph/stylesheet.css' - + =javascript_include_tag "https://maps.googleapis.com/maps/api/js?libraries=places&sensor=false" - %body{:class => ("reseaux_body " if @reseaux_layout).to_s} - + %body{:class => ("reseaux_body " if @reseaux_layout).to_s, :style => ("background:#f8f8f8 url('/fond-accueil.jpg') center center;background-size:100%;background-size:cover;" if @my_reseauxes).to_s } + .top @@ -41,32 +41,43 @@ .clear -if @reseaux_layout - =link_to image_tag("/logo-mb.png", :id => "logo-mb"), "/" - -if @reseaux_layout - =link_to public_reseaux_products_path(:reseaux_id => session[:reseaux_id].to_i) do - .reseaux_top.with_ratio{:data => {:ratio => "0.2"},:style => "background-image:url('"+(@reseaux.background_image_file.file.large.url if @reseaux.background_image_file).to_s+"');"} + =link_to image_tag("/logo-mb.png", :id => "logo-mb"), public_my_reseauxes_path + -if !@my_reseauxes + -if @reseaux_layout + =link_to public_reseaux_products_path(:reseaux_id => session[:reseaux_id].to_i) do + .reseaux_top.with_ratio{:data => {:ratio => "0.2"},:style => "background-image:url('"+(@reseaux.background_image_file.file.large.url if @reseaux.background_image_file).to_s+"');"} - =image_tag @reseaux.logo_image_file.file.large.url, :class => "logo_reseaux" if @reseaux.logo_image_file + =image_tag @reseaux.logo_image_file.file.large.url, :class => "logo_reseaux" if @reseaux.logo_image_file - -else - -if @biglogo - =link_to image_tag("/logo.png", :id => "big-logo"), "/" - -else - =link_to image_tag("/logo.png", :id => "logo"), "/" + -else + -if @biglogo + =link_to image_tag("/logo.png", :id => "big-logo"), "/" + -else + =link_to image_tag("/logo.png", :id => "logo"), "/" + .clear{:style => "height:1px;"} + #main - .body-container - =yield - .footer - + =yield + -if !@my_reseauxes + .footer + =link_to "http://quartz.xyz", :target => "_blank" do + .quartz + =image_tag "/logo-quartz.png" + Développement Quartz Agence + + .clear .clear =#render :partial => "public/shared/bottom" - - + -if @my_reseauxes + .reseauxes_home_video{:style => "position:absolute;bottom:10px;right:10px;"}=link_to ic(:"youtube-play")+" Présentation Négos","", :class => "btn negos-video" + + + #flashs= bootstrap_flash - -if flash[:read_video] + -if flash[:read_video] and false :javascript $(document).ready(function() { $.magnificPopup.open({ diff --git a/app/views/public/my_account/my_reseauxes.html.haml b/app/views/public/my_account/my_reseauxes.html.haml new file mode 100644 index 0000000..42aa294 --- /dev/null +++ b/app/views/public/my_account/my_reseauxes.html.haml @@ -0,0 +1,30 @@ +-@my_reseauxes = true +.padding.center.reseauxes_home_container + + + =link_to image_tag("/logo3.png", :class => "logo"), "/" + + + %p + %strong + Bonjour + =current_customer.firstname+"," + %br + Choissisez le réseaux sur lequel vous souhaitez vous connecter : + .reseauxes_home + =link_to public_needs_path, :class => "reseauxes" do + .arrow + =ic :"angle-right" + Plateforme Négos + %span + Vous choisissez, nous négocions ! + -current_customer.reseauxes.where(:parent_id => nil).each do |reseaux| + =link_to public_reseaux_products_path(:reseaux_id => reseaux.id), :class => "reseauxes" do + .arrow + =ic :"angle-right" + =reseaux.name + %span + =reseaux.baseline + + + \ No newline at end of file diff --git a/app/views/public/product_order_products/_cart.html.haml b/app/views/public/product_order_products/_cart.html.haml index f915511..e09e66a 100644 --- a/app/views/public/product_order_products/_cart.html.haml +++ b/app/views/public/product_order_products/_cart.html.haml @@ -13,13 +13,35 @@ -else commandé - + -product = Product.where(:archived => false, :reseaux_id => @reseaux.id).where("id != ?",@product.id ).first + -if product + %h3 Ce produit pourrait aussi vous intéresser : + =link_to public_reseaux_product_path(:reseaux_id => @reseaux.id,:id => product.id, :slug => product.lang(I18n.locale).slug) do + .product.product-item + .inner + =image_tag product.default_image.image_file.file.large.medium.url if product.default_image + + .description + %h3.product-title + =product.lang(I18n.locale).title + %p + .btn.btn-primary + Voir ce produit + + .clear + + + + + + .buttons .button{:onclick => "$('#document_cart_overlay').remove()"} + =ic :"arrow-left" Continuer ma visite =link_to public_my_cart_path do - .button + .button.btn.btn-primary Commander diff --git a/app/views/public/shared/_menu.html.haml b/app/views/public/shared/_menu.html.haml index 25856da..a1d62ac 100755 --- a/app/views/public/shared/_menu.html.haml +++ b/app/views/public/shared/_menu.html.haml @@ -3,18 +3,22 @@ -if current_customer %ul - -if current_customer.account_validated? - %li=link_to ic(:"youtube-play")+" Présentation Négos","", :class => "btn negos-video" + -if !@my_reseauxes -if current_customer.account_validated? - %li=link_to ic(:star)+" Besoins", public_needs_path, :class => "btn" - - unread_message = ContactMessage.where(contact_id: current_customer.id, read_by_customer: false).count - %li=link_to ic(:comment)+" Nous contacter" + (unread_message > 0 ? " (#{unread_message})" : ""), public_contact_messages_path, :class => "btn" - %li=link_to ic(:user)+" Mon compte", public_my_account_path, :class => "btn" + %li=link_to ic(:home)+" Accueil", public_my_reseauxes_path, :class => "btn" + -if !@reseaux + %li=link_to ic(:"youtube-play")+" Présentation Négos","", :class => "btn negos-video" + -if current_customer.account_validated? + %li=link_to ic(:star)+" Besoins", public_needs_path, :class => "btn" + - unread_message = ContactMessage.where(contact_id: current_customer.id, read_by_customer: false).count + %li=link_to ic(:comment)+" Nous contacter" + (unread_message > 0 ? " (#{unread_message})" : ""), public_contact_messages_path, :class => "btn" + -if !@reseaux + %li=link_to ic(:user)+" Mon compte", public_my_account_path, :class => "btn" - -if current_customer.own_reseauxes.count > 0 - %li=link_to ic(:users)+" Mon réseau", public_reseauxes_path, :class => "btn" + -if current_customer.own_reseauxes.count > 0 + %li=link_to ic(:users)+" Mon réseau", public_reseauxes_path, :class => "btn" - %li=link_to ic(:envelope)+" Conversations", public_customer_messages_path, :class => "btn" + %li=link_to ic(:envelope)+" Conversations", public_customer_messages_path, :class => "btn" %li=link_to "Se déconnecter", logout_public_customers_auths_path, :class => "btn" diff --git a/config/routes.rb b/config/routes.rb index b52718a..0c49637 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -84,7 +84,7 @@ Rails.application.routes.draw do get :buy_option end end - + get 'my_account/mes-reseaux' => "my_account#my_reseauxes", :as => "my_reseauxes" get 'my_account/favoris', :as => "favs" get 'my_account/filleuls', :as => "filleuls" get 'my_account/binary', :as => "binary" diff --git a/pdf_stamp/bl.pdf b/pdf_stamp/bl.pdf index f78988c..a3c9b30 100644 Binary files a/pdf_stamp/bl.pdf and b/pdf_stamp/bl.pdf differ diff --git a/public/fond-accueil.jpg b/public/fond-accueil.jpg new file mode 100644 index 0000000..47cdbf8 Binary files /dev/null and b/public/fond-accueil.jpg differ diff --git a/public/fond-accueil1.jpg b/public/fond-accueil1.jpg new file mode 100644 index 0000000..b4c629a Binary files /dev/null and b/public/fond-accueil1.jpg differ diff --git a/public/logo-mb.png b/public/logo-mb.png index 17f3ccb..3ae1bb8 100644 Binary files a/public/logo-mb.png and b/public/logo-mb.png differ diff --git a/public/logo-quartz.png b/public/logo-quartz.png new file mode 100644 index 0000000..5f10747 Binary files /dev/null and b/public/logo-quartz.png differ diff --git a/public/logo3.png b/public/logo3.png new file mode 100755 index 0000000..9f3f0e9 Binary files /dev/null and b/public/logo3.png differ