diff --git a/v1-com-officielle/public/DATA/audioData.json b/v1-com-officielle/public/DATA/audioData.json index 32228f8..5376cb4 100644 --- a/v1-com-officielle/public/DATA/audioData.json +++ b/v1-com-officielle/public/DATA/audioData.json @@ -1,3 +1,3 @@ [ - "vega" + "vga_nar6_ta" ] diff --git a/v1-com-officielle/public/DATA/peopleData.json b/v1-com-officielle/public/DATA/peopleData.json index 9234b29..8644377 100644 --- a/v1-com-officielle/public/DATA/peopleData.json +++ b/v1-com-officielle/public/DATA/peopleData.json @@ -1,10 +1,10 @@ [ { - "name": "vega", + "name": "vga_nar6_ta", "folder": 2 }, { - "name": "Drags and Nerds /", + "name": "drags_nerds", "folder": 2 } ] diff --git a/v1-com-officielle/src/assets/style.css b/v1-com-officielle/src/assets/style.css index 204fb9d..00fecd1 100644 --- a/v1-com-officielle/src/assets/style.css +++ b/v1-com-officielle/src/assets/style.css @@ -10,7 +10,7 @@ :root[data-theme="light"]{ --back-color: white; --main-color: black; - --accent-color: #C303FF; + --accent-color: #FFA64D; --neon-color: black; } @@ -134,6 +134,7 @@ html, body{ #canvas video { width: 100%; height: 100%; + filter: invert(1) saturate(333%) brightness(93%) hue-rotate(90deg); object-fit: cover; } diff --git a/v1-com-officielle/src/data/audioData.js b/v1-com-officielle/src/data/audioData.js index 9fc4b95..2fa7e60 100644 --- a/v1-com-officielle/src/data/audioData.js +++ b/v1-com-officielle/src/data/audioData.js @@ -24,7 +24,7 @@ export async function loadAudioData() { if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`); const pouets = await res.json(); - const filtered = pouets.filter(p => aData.some(user => p.account.display_name === user)); + const filtered = pouets.filter(p => aData.some(user => p.account.username === user)); //console.log(filtered); const files = {}; for (const user of aData) { diff --git a/v1-com-officielle/src/data/msgData.js b/v1-com-officielle/src/data/msgData.js index cc11a69..69e21b8 100644 --- a/v1-com-officielle/src/data/msgData.js +++ b/v1-com-officielle/src/data/msgData.js @@ -27,7 +27,7 @@ export async function loadMsgData() { if(!res.ok) throw new Error(`Server responded with ${res.status} ${res.statusText}`); const pouets = await res.json(); - const filtered = pouets.filter(p => p.account.display_name === 'Drags and Nerds /Live'); + const filtered = pouets.filter(p => p.account.username === 'drags_nerds_live'); //console.log(filtered); let msgContent = []; diff --git a/v1-com-officielle/src/data/peopleData.js b/v1-com-officielle/src/data/peopleData.js index f26a0d7..f0528a4 100644 --- a/v1-com-officielle/src/data/peopleData.js +++ b/v1-com-officielle/src/data/peopleData.js @@ -56,8 +56,8 @@ function exceptionKey(user, content){ let key = ""; if (data.length > 1) key = data[1].split('
')[0]; //console.log(key); - if (key === "bm90X3dlYnNpdGVfY29udGVudA==" && user !=="Drags and Nerds /") return true; - if (user === "Drags and Nerds /"){ + if (key === "bm90X3dlYnNpdGVfY29udGVudA==" && user !=="drags_nerds") return true; + if (user === "drags_nerds"){ if(key != "c2VuZF9tZXNzYWdlX3RvX3dlYnNpdGU="){ return true; } @@ -75,23 +75,24 @@ export async function loadPeopleData() { throw new Error(`Server responded with ${res.status} ${res.statusText}`); const pouets = await res.json(); - //console.log("POUETS :" , pouets); - const filtered = pouets.filter(p => pData.some(user => p.account.display_name === user.name)); - //console.log("FILTERED :" , filtered); + console.log("POUETS :" , pouets); + const filtered = pouets.filter(p => pData.some(user => p.account.username === user.name)); + console.log("FILTERED :" , filtered); const files = {}; for (const user of pData) { files[user.name] = []; } const description = {}; for (const user of pData){ - const pouet = filtered.find(p => p.account.display_name === user.name); + const pouet = filtered.find(p => p.account.username === user.name); if (pouet){ description[user.name] = pouet.account.note; } } for (const pouet of filtered) { - const username = pouet.account.display_name; + const username = pouet.account.username; + const displayName = pouet.account.display_name; let infos = idAndDate(pouet.created_at); let entry; //console.log(pouet); @@ -114,11 +115,11 @@ export async function loadPeopleData() { if (pouet.content.includes('http')) { let textInfos = titleAndContent(pouet.content); entry = { - id: 'link' + username + infos.id, + id: 'link' + displayName + infos.id, date: infos.date, dateInfo: pouet.created_at, type: "link", - author: username, + author: displayName, caption: textInfos.title + '.liens', links: textInfos.links, description: textInfos.content, @@ -128,11 +129,11 @@ export async function loadPeopleData() { let textInfos = titleAndContent(pouet.content); console.log(pouet); entry = { - id: 'img' + username + infos.id, + id: 'img' + displayName + infos.id, date: infos.date, dateInfo: pouet.created_at, type: "image", - author: username, + author: displayName, caption: textInfos.title + '.star', src: pouet.media_attachments[0].url, alt: pouet.media_attachments[0].description, @@ -143,11 +144,11 @@ export async function loadPeopleData() { } else { let textInfos = titleAndContent(pouet.content); entry = { - id: 'txt' + username + infos.id, + id: 'txt' + displayName + infos.id, date: infos.date, dateInfo: pouet.created_at, type: "text", - author: username, + author: displayName, caption: textInfos.title + '.msg', description: textInfos.content, isSelected: false diff --git a/v1-com-officielle/src/indieComponents/ArtistPannel.vue b/v1-com-officielle/src/indieComponents/ArtistPannel.vue index 593ba1d..d63a1dc 100644 --- a/v1-com-officielle/src/indieComponents/ArtistPannel.vue +++ b/v1-com-officielle/src/indieComponents/ArtistPannel.vue @@ -71,10 +71,11 @@ #artistPannel{ position: fixed; - width: 380px; - height: 500px; + width: 420px; + height: 600px; top: 16.1px; left: 16.1px; + z-index: 33; } #artistContent{ @@ -123,14 +124,15 @@ .theMatrix{ display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); - grid-auto-rows: 133px; - gap: 10px; + grid-auto-rows: 150px; + gap: 16.1px; width: 97%; height: 66%; overflow-y: auto; align-items: center; margin-left: 5px; margin-top: 5px; + padding-top: 10px; } .itemDesc{ diff --git a/v1-com-officielle/src/indieComponents/GraffOverlay.vue b/v1-com-officielle/src/indieComponents/GraffOverlay.vue index b02d3ff..bcf1a0e 100644 --- a/v1-com-officielle/src/indieComponents/GraffOverlay.vue +++ b/v1-com-officielle/src/indieComponents/GraffOverlay.vue @@ -8,7 +8,7 @@