diff --git a/db/woman.json b/db/woman.json index 5cf38e5..1b3fa30 100644 --- a/db/woman.json +++ b/db/woman.json @@ -71,12 +71,5 @@ "age" : 39, "bio" : "Bonjour, je suis Élodie et je suis atteinte de l'hippopotomonstrosesquippedaliophobie alors n'utilise pas des mots trop long pour ta disquette." } - ,{ - "prenom" : "", - "nom" : "", - "age" : , - "bio" :"" - } - ] \ No newline at end of file diff --git a/for.php b/for.php index dcd5110..138808c 100644 --- a/for.php +++ b/for.php @@ -1,14 +1,6 @@ - - - /main.css"/> - - - - - Recherche <?php if(isset($_GET["gender"])){ if($_GET["gender"]=="man")echo "d'un homme"; @@ -16,6 +8,17 @@ else header('Location: index.php'); }else header('Location: index.php'); ?> | Don't meet me + + + + + + + + + + + @@ -34,8 +37,9 @@

Tu es au bon endroit !

-
- + + + @@ -78,18 +82,35 @@
- - + + + + + +
+ pain au chocolat ou chocolatine? + + + + +
+ + - +
+ + + +
+
diff --git a/header.php b/header.php index d38fdfa..d70a415 100644 --- a/header.php +++ b/header.php @@ -17,16 +17,13 @@
+
diff --git a/index.php b/index.php index 2a734de..2e6673d 100644 --- a/index.php +++ b/index.php @@ -1,18 +1,22 @@ + Accueil | Don't meet me - /main.css"/> + + + + - Accueil | Don't meet me +
diff --git a/js/nav.js b/js/nav.js index da6185c..1cfb04e 100644 --- a/js/nav.js +++ b/js/nav.js @@ -1,12 +1,7 @@ -const toggleButton = document.getElementsByClassName('burger_button')[0] -const navbarLinks = document.getElementsByClassName('navbar_links')[0] + navbarLinks = document.getElementsByClassName('navbar_links')[0] var hide = 1 -//toggleButton.addEventListener('click',() => { -// navbarLinks.classList.remove('hide') -//}) function menu(){ - console.log('Je rentre dans la fonction') if(hide == 1){ navbarLinks.classList.remove('hide') hide = 0 diff --git a/js/themeManager.js b/js/themeManager.js index 396ed7f..0652624 100644 --- a/js/themeManager.js +++ b/js/themeManager.js @@ -1,32 +1,46 @@ -function updateTheme(a){ - console.log("a"); - // delTheme(); - // if(currentTheme=="today"){ - // link.href = "styles/today/main.css"; - // }else if(themeName=="2000"){ - // setTheme(themeName); +function setTransition(div, n){ + div.style.filter = "blur("+n+"px)" } -function delTheme(){ - let themeNode = document.getElementById("theme"); - themeNode.parentNode.removeChild(themeNode); +var fading = false + +function switchTheme(){ + if(fading)return; + fading = true; + + if(currentTheme=="today"){ + currentTheme="2000"; + }else{ + currentTheme="today"; + } + + let LOOP_TIMES = 100; + + for(let i=0;i<=LOOP_TIMES;++i){ + setTimeout(() => {setTransition(div, i*2)}, i*5); + } + + let div = document.getElementsByTagName("body")[0]; + + setTimeout(()=>{ + setTheme(currentTheme); + + for(let i=0;i<=LOOP_TIMES;++i){ + setTimeout(() => {setTransition(div, (LOOP_TIMES-i)*2)}, i*5); + } + + setTimeout(()=>fading=false, LOOP_TIMES*10) + }, LOOP_TIMES*5) + } function setTheme(themeName){ - - let head = document.getElementsByTagName("HEAD")[0]; - let link = document.createElement("link"); - - // set the attributes for link element - link.rel = "stylesheet"; - link.type = "text/css"; - link.id = "theme"; - if(themeName=="today"){ - link.href = "styles/today/main.css"; - }else if(themeName=="2000"){ - link.href = "styles/2000/main.css"; - }else throw new Error("invalid theme : "+themeName); - head.appendChild(link); + for(let i of document.getElementsByClassName("css")){ + if(i.rel=="stylesheet"){ + let styleName = i.href.split("/").pop(); + i.href = "styles/"+themeName+"/"+styleName; + } + } } var currentTheme = "today"; diff --git a/mentions.php b/mentions.php new file mode 100644 index 0000000..e69de29 diff --git a/resultat.php b/resultat.php deleted file mode 100644 index 69f2bc3..0000000 --- a/resultat.php +++ /dev/null @@ -1,8 +0,0 @@ - - -

- - \ No newline at end of file diff --git a/styles/today/index.css b/styles/today/index.css new file mode 100644 index 0000000..e69de29 diff --git a/styles/today/main.css b/styles/today/main.css index e55a57f..c1056d6 100644 --- a/styles/today/main.css +++ b/styles/today/main.css @@ -1,5 +1,8 @@ body{ background-color: beige; + font-family: 'Zen Kurenaido', sans-serif; + margin: 0; + padding: 0; } #title{ @@ -9,17 +12,17 @@ body{ .burger_button{ position: absolute; - top: .75rem; + top: 30px; right: 1rem; display: none; flex-direction: column; justify-content: space-between; - width: 30px; - height: 21px; + width: 60px; + height: 42px; } .burger_button .bar{ - height: 3px; + height: 6px; width: 100%; background-color: black; border-radius: 10px; @@ -30,7 +33,6 @@ nav ul{ flex-direction: row; justify-content: center; list-style-type: none; - font-family: 'Zen Kurenaido', sans-serif; padding-left: 0; align-items: center; text-decoration: none; @@ -50,25 +52,31 @@ nav ul li{ margin-bottom: auto; } -#sec_switch img{ - height : 1rem; - width : auto; -} - -nav ul li:last-child { +nav ul li:last-child{ border-right: none; - background-color: transparent; + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; + padding-right: 1rem; } -/*nav ul li:hover{ +nav ul li:first-child{ + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + padding-left: 1rem; +} + +nav ul li:hover{ background-color: rgb(24, 88, 207); transition: background-color 1s; -}*/ +} footer{ display: flex; flex-direction: row; + justify-content: space-around; background-color: pink; + padding-bottom: 1rem; + border-radius: 1rem; } footer #feedback #form{ @@ -84,12 +92,16 @@ footer #feedback #form #txtfeedback{ resize: none; } +footer #rightfoot{ + display: flex; + align-items: center; +} + footer #rightfoot ul{ font-size: 1rem; display : flex; flex-direction: column; - text-align: center; - justify-content: center; + list-style-type: none; } @@ -99,7 +111,7 @@ footer #rightfoot ul{ } .burger_button{ - display: flex + display: flex; } .navbar_links{ @@ -118,6 +130,9 @@ footer #rightfoot ul{ .navbar_links li{ text-align: center; + border-right: none; + min-width: 100%; + font-size: 5rem; } .navbar_links li a{ @@ -130,6 +145,5 @@ footer #rightfoot ul{ .hide{ display: none; -c } } \ No newline at end of file diff --git a/success.php b/success.php index e41bef0..942b3ba 100644 --- a/success.php +++ b/success.php @@ -1,22 +1,25 @@ + It's a don't meet ! | Don't meet me - /main.css"/> - /success.css"/> + + + + - It's a don't meet ! | Don't meet me + + + + + + + + +
+ Fade In | + Fade Out
+ + + + + + +