Главная Обзор Помощь
Регистрация Вход
lee
/
leemorgan-dev
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Move displaying of currency to home page.

Lee Morgan 4 лет назад
Родитель
99d6331348
Сommit
ef24856a2e
6 измененных файлов с 116 добавлено и 189 удалено
Единый вид Показать статистику Diff
  1. 1 1
      controllers/currency.js
  2. 0 2
      routes.js
  3. 0 35
      views/currency/currency.css
  4. 0 88
      views/currency/display.html
  5. 40 1
      views/main/index.css
  6. 75 62
      views/main/index.html

+ 1 - 1
controllers/currency.js
Просмотреть файл 

@@ -48,7 +48,7 @@ module.exports = {
 
                 return currency.save();
 
                 return currency.save();
 
             })
 
             })
 
             .then((currency)=>{
 
             .then((currency)=>{
 
-                return res.redirect("/currency");
 
+                return res.redirect("/");
 
             })
 
             })
 
             .catch((err)=>{
 
             .catch((err)=>{
 
                 switch(err){
 
                 switch(err){

+ 0 - 2
routes.js
Просмотреть файл 

@@ -90,9 +90,7 @@ module.exports = function(app){
 
     app.post("/covid", visit, covid.data);
 
     app.post("/covid", visit, covid.data);
 
 
 
     //CURRENCY
 
     //CURRENCY
 
-    app.get("/currency/style", (req, res)=>res.sendFile(`${views}/currency/currency.css`));
 
     app.get("/currency/new", (req, res)=>{res.sendFile(`${views}/currency/new.html`)});
 
     app.get("/currency/new", (req, res)=>{res.sendFile(`${views}/currency/new.html`)});
 
-    app.get("/currency", visit, (req, res)=>res.sendFile(`${views}/currency/display.html`));
 
     
     
     app.post("/currency", currency.create);
 
     app.post("/currency", currency.create);
 
     app.get("/currency/data", currency.getData);
 
     app.get("/currency/data", currency.getData);

+ 0 - 35
views/currency/currency.css
Просмотреть файл 

@@ -1,35 +0,0 @@
 
-*{margin:0;padding:0;}
 
-
 
-#container{
 
-    display: flex;
 
-    flex-direction: column;
 
-}
 
-
 
-img{
 
-    max-height: 200px;
 
-}
 
-
 
-.currency{
 
-    margin: 25px 10px;
 
-}
 
-
 
-.comment{
 
-    padding-left: 25px;
 
-}
 
-
 
-#locations{
 
-    display: flex;
 
-    margin: 15px;
 
-}
 
-
 
-.locationBtn{
 
-    margin: 10px;
 
-    padding: 5px;
 
-    background: none;
 
-    border: 1px solid black;
 
-    cursor: pointer;
 
-}
 
-
 
-.selected{
 
-    background: green;
 
-}

+ 0 - 88
views/currency/display.html
Просмотреть файл 

@@ -1,88 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-    <head>
 
-        <meta charset="utf-8">
 
-        <link rel="stylesheet" href="/currency/style">
 
-        <title>Lee Morgan</title>
 
-    </head>
 
-    <body>
 
-        <div id="locations">
 
-            <button id="allLocations" class="locationBtn selected">ALL</button>
 
-        </div>
 
-
 
-        <div id="container"></div>
 
-
 
-        <template id="currency">
 
-            <div class="currency">
 
-                <h1 class="location"></h1>
 
-                <p class="info"></p>
 
-                <img class="frontImage">
 
-                <img class="backImage">
 
-                <p class="comment"></p>
 
-            </div>
 
-        </template>
 
-
 
-        <script>
 
-            let filterLocations = (location, currencies)=>{
 
-                let container = document.getElementById("container");
 
-                let template = document.getElementById("currency").content.children[0];
 
-
 
-                while(container.children.length > 0){
 
-                    container.removeChild(container.firstChild);
 
-                }
 
-
 
-                for(let i = 0; i < currencies.length; i++){
 
-                    if(currencies[i].location.toLowerCase() === location || location === "all"){
 
-                        let currency = template.cloneNode(true);
 
-                        currency.querySelector(".location").innerText = currencies[i].location.toUpperCase();
 
-                        currency.querySelector(".info").innerText = `${currencies[i].value} ${currencies[i].name} (${currencies[i].year})`;
 
-                        currency.querySelector(".frontImage").src = currencies[i].frontImage;
 
-                        currency.querySelector(".backImage").src = currencies[i].backImage;
 
-                        currency.querySelector(".comment").innerText = currencies[i].comment;
 
-                        container.appendChild(currency);
 
-                    }
 
-                }
 
-            }
 
-
 
-            fetch("/currency/data")
 
-                .then(r=>r.json())
 
-                .then((response)=>{
 
-                    document.getElementById("allLocations").onclick = ()=>{filterLocations("all", response)};
 
-
 
-                    let container = document.getElementById("container");
 
-                    let locationsContainer = document.getElementById("locations");
 
-                    let template = document.getElementById("currency").content.children[0];
 
-                    let locations = [];
 
-
 
-                    for(let i = 0; i < response.length; i++){
 
-                        let currency = template.cloneNode(true);
 
-                        currency.querySelector(".location").innerText = response[i].location.toUpperCase();
 
-                        currency.querySelector(".info").innerText = `${response[i].value} ${response[i].name} (${response[i].year})`;
 
-                        currency.querySelector(".frontImage").src = response[i].frontImage;
 
-                        currency.querySelector(".backImage").src = response[i].backImage;
 
-                        currency.querySelector(".comment").innerText = response[i].comment;
 
-                        container.appendChild(currency);
 
-                        
-                        if(!locations.includes(response[i].location.toLowerCase())){
 
-                            locations.push(response[i].location.toLowerCase());
 
-
 
-                            let button = document.createElement("button");
 
-                            button.classList.add("locationBtn");
 
-                            button.innerText = response[i].location.toUpperCase();
 
-                            button.onclick = ()=>{
 
-                                let pLocations = document.querySelectorAll(".locationBtn");
 
-                                for(let j = 0; j < pLocations.length; j++){
 
-                                    pLocations[j].classList.remove("selected");
 
-                                }
 
-
 
-                                button.classList.add("selected");
 
-                                filterLocations(response[i].location.toLowerCase(), response);
 
-                            };
 
-                            locationsContainer.appendChild(button);
 
-                        }
 
-                    }
 
-                })
 
-                .catch((err)=>{});
 
-        </script>
 
-    </body>
 
-</html>

+ 40 - 1
views/main/index.css
Просмотреть файл 

@@ -219,4 +219,43 @@ body{
 
     flex-wrap: wrap;
 
     flex-wrap: wrap;
 
     margin-bottom: 25px;
 
     margin-bottom: 25px;
 
     width: 80vw;
 
     width: 80vw;
 
-}
 
+}
 
+
 
+#currency{
 
+    display: flex;
 
+    flex-direction: column;
 
+}
 
+
 
+    #currencyContainer{
 
+        display: flex;
 
+        flex-direction: column;
 
+    }
 
+
 
+    #currency img{
 
+        max-height: 200px;
 
+    }
 
+
 
+    .currency{
 
+        margin: 25px 10px;
 
+    }
 
+
 
+    .curComment{
 
+        padding-left: 25px;
 
+    }
 
+
 
+    #locations{
 
+        display: flex;
 
+        margin: 15px;
 
+    }
 
+
 
+    .locationBtn{
 
+        margin: 10px;
 
+        padding: 5px;
 
+        background: none;
 
+        border: 1px solid black;
 
+        cursor: pointer;
 
+    }
 
+
 
+    .curSelected{
 
+        background: green;
 
+    }

+ 75 - 62
views/main/index.html
Просмотреть файл 

@@ -37,16 +37,6 @@
 
                 <p>Blog</p>
 
                 <p>Blog</p>
 
             </button>
 
             </button>
 
 
 
-            <button id="linksButton">
 
-                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 
-                    <rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect>
 
-                    <line x1="3" y1="9" x2="21" y2="9"></line>
 
-                    <line x1="9" y1="21" x2="9" y2="9"></line>
 
-                </svg>
 
-
 
-                <p>Fun Links</p>
 
-            </button>
 
-
 
             <button id="galleryButton">
 
             <button id="galleryButton">
 
                 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 
                 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 
                     <rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect>
 
                     <rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect>
 
@@ -65,6 +55,15 @@
 
 
 
                 <p>Learn</p>
 
                 <p>Learn</p>
 
             </button>
 
             </button>
 
+
 
+            <button id="currencyButton">
 
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
 
+                    <line x1="12" y1="1" x2="12" y2="23"></line>
 
+                    <path d="M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6"></path>
 
+                </svg>
 
+
 
+                <p>Currency</p>
 
+            </button>
 
         </div>
 
         </div>
 
 
 
         <div id="main">
 
         <div id="main">
 
@@ -194,58 +193,6 @@
 
                 </template>
 
                 </template>
 
             </div>
 
             </div>
 
 
 
-            <div id="links" class="cardContainer" style="display:none;">
 
-                <a class="card" href="https://cs-online.club/en/servers">
 
-                    <h2>CS:GO in the browser</h2>
 
-                    <p>A website to play CS:GO in the browser with other people online.</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://driveandlisten.herokuapp.com/">
 
-                    <h2>Drive and Listen</h2>
 
-                    <p>Pretend to be driving your car and listening to the radio. Watch cars driving down the road all over the world while listening to local radio stations.</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://www.ekzhang.com/game-of-life">
 
-                    <h2>Conway's Game of Life</h2>
 
-                    <p>Play around and experiment with different situations in Conway's Game of Life</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://librivox.org/">
 
-                    <h2>LibriVox</h2>
 
-                    <p>Free public domain audiobooks. Listen to books for free, or volunteer your time to read them for others to listen to</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://rocketcrab.com/">
 
-                    <h2>rocketcrab.com</h2>
 
-                    <p>Party games right on your phone</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://thetruesize.com/">
 
-                    <h2>The True Size of</h2>
 
-                    <p>The common Mercator projection map that we are used to distorts the real size of countries. This site will let you move and directly compare the real size of different countries to see how big they really are</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://win95.ajf.me/">
 
-                    <h2>Windows 95</h2>
 
-                    <p>Use a virtual Windows 95 computer right in your browser</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://pointerpointer.com/">
 
-                    <h2>Pointer Pointer</h2>
 
-                    <p>Point to your pointer</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://pudding.cool/2020/12/judge-my-spotify">
 
-                    <h2>Judge My Spotify</h2>
 
-                    <p>Let an AI criticize your taste in music</p>
 
-                </a>
 
-
 
-                <a class="card" href="https://pessimistress.github.io/ascii/">
 
-                    <h2>ASCII video player</h2>
 
-                    <p>View video that is rendered using ASCII characters. Including from your own webcam!</p>
 
-                </a>
 
-            </div>
 
-
 
             <div id="gallery" style="display:none">
 
             <div id="gallery" style="display:none">
 
                 <div id="galleryTags" class="tagContainer"></div>
 
                 <div id="galleryTags" class="tagContainer"></div>
 
 
 
@@ -253,6 +200,22 @@
 
             </div>
 
             </div>
 
 
 
             <div id="learn" class="cardContainer" style="display:none"></div>
 
             <div id="learn" class="cardContainer" style="display:none"></div>
 
+
 
+            <div id="currency" style="display:none">
 
+                <div id="locations"></div>
 
+        
+                <div id="currencyContainer"></div>
 
+        
+                <template id="currencyTemplate">
 
+                    <div class="currency">
 
+                        <h1 class="location"></h1>
 
+                        <p class="info"></p>
 
+                        <img class="frontImage">
 
+                        <img class="backImage">
 
+                        <p class="comment"></p>
 
+                    </div>
 
+                </template>
 
+            </div>
 
         </div>
 
         </div>
 
 
 
         <script>
 
         <script>
 
@@ -439,6 +402,56 @@
 
                     }
 
                     }
 
                 })
 
                 })
 
                 .catch((err)=>{});
 
                 .catch((err)=>{});
 
+
 
+            //Get currency data
 
+            let filterLocations = (location, currencies)=>{
 
+                let container = document.getElementById("currencyContainer");
 
+                let template = document.getElementById("currencyTemplate").content.children[0];
 
+
 
+                while(container.children.length > 0){
 
+                    container.removeChild(container.firstChild);
 
+                }
 
+
 
+                for(let i = 0; i < currencies.length; i++){
 
+                    if(currencies[i].location.toLowerCase() === location){
 
+                        let currency = template.cloneNode(true);
 
+                        currency.querySelector(".location").innerText = currencies[i].location.toUpperCase();
 
+                        currency.querySelector(".info").innerText = `${currencies[i].value} ${currencies[i].name} (${currencies[i].year})`;
 
+                        currency.querySelector(".frontImage").src = currencies[i].frontImage;
 
+                        currency.querySelector(".backImage").src = currencies[i].backImage;
 
+                        currency.querySelector(".comment").innerText = currencies[i].comment;
 
+                        container.appendChild(currency);
 
+                    }
 
+                }
 
+            }
 
+
 
+            fetch("/currency/data")
 
+                .then(r=>r.json())
 
+                .then((response)=>{
 
+                    let locationsContainer = document.getElementById("locations");
 
+                    let locations = [];
 
+
 
+                    for(let i = 0; i < response.length; i++){
 
+                        if(!locations.includes(response[i].location.toLowerCase())){
 
+                            locations.push(response[i].location.toLowerCase());
 
+
 
+                            let button = document.createElement("button");
 
+                            button.classList.add("locationBtn");
 
+                            button.innerText = response[i].location.toUpperCase();
 
+                            button.onclick = ()=>{
 
+                                let btnLocations = document.querySelectorAll(".locationBtn");
 
+                                for(let j = 0; j <btnLocations.length; j++){
 
+                                    btnLocations[j].classList.remove("curSelected");
 
+                                }
 
+
 
+                                button.classList.add("curSelected");
 
+                                filterLocations(response[i].location.toLowerCase(), response);
 
+                            }
 
+                            locationsContainer.appendChild(button);
 
+                        }
 
+                    }
 
+                })
 
+                .catch((err)=>{});
 
         </script>
 
         </script>
 
     </body>
 
     </body>
 
 </html>
 
 </html>