diff --git a/index.js b/index.js index 764f311b585f6acfed7c78c4db136698b5bcbbfe..b429c3f03751abe5faa4235268cd88063dd7be12 100644 --- a/index.js +++ b/index.js @@ -11,6 +11,7 @@ app.get('/mcgalagony', renderer('mcgalagony')); app.get('/meli', renderer('meli')); app.get('/photocount_mcg', photoCounter('./static/pictures/mcgalagony')); app.get('/photocount_meli', photoCounter('./static/pictures/meli')); +app.get('/photocount_common', photoCounter('./static/pictures/common')); app.get('/activitycount_mcg', photoCounter('./static/activity_images/mcgalagony')); app.get('/activitycount_meli', photoCounter('./static/activity_images/meli')); app.use(express.static('static')); diff --git a/static/activity_images/mcgalagony/3.jpg b/static/activity_images/mcgalagony/3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..08a348f67643f201763451ef103a36e357e795b1 Binary files /dev/null and b/static/activity_images/mcgalagony/3.jpg differ diff --git a/static/activity_images/mcgalagony/4.jpg b/static/activity_images/mcgalagony/4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..24f35bb7732e542717974bf4a27cb5d30229fcbc Binary files /dev/null and b/static/activity_images/mcgalagony/4.jpg differ diff --git a/static/activity_images/mcgalagony/5.jpg b/static/activity_images/mcgalagony/5.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5698fd0a95ab1e631ec02e8e064066688b63a1ee Binary files /dev/null and b/static/activity_images/mcgalagony/5.jpg differ diff --git a/static/activity_images/mcgalagony/6.jpg b/static/activity_images/mcgalagony/6.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d65200ca4e4f7d4c363fbd87a7dba436dfc876cf Binary files /dev/null and b/static/activity_images/mcgalagony/6.jpg differ diff --git a/static/activity_images/mcgalagony/7.jpg b/static/activity_images/mcgalagony/7.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3b515794c967e0d5340d9b0489765f432ab2fad3 Binary files /dev/null and b/static/activity_images/mcgalagony/7.jpg differ diff --git a/static/activity_images/meli/1.jpg b/static/activity_images/meli/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b6209f2c008f7de2a606d1e97762bf029862f99b Binary files /dev/null and b/static/activity_images/meli/1.jpg differ diff --git a/static/activity_images/meli/2.jpg b/static/activity_images/meli/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5cf4e00bd82c2eb53205ea86fc76a329b1811825 Binary files /dev/null and b/static/activity_images/meli/2.jpg differ diff --git a/static/activity_images/meli/3.jpg b/static/activity_images/meli/3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..be82150f0163cc687542769cac8e9e37e6a0999b Binary files /dev/null and b/static/activity_images/meli/3.jpg differ diff --git a/static/activity_images/meli/4.jpg b/static/activity_images/meli/4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e966913153042a346975ecb60350b06768b22393 Binary files /dev/null and b/static/activity_images/meli/4.jpg differ diff --git a/static/activity_images/meli/5.jpg b/static/activity_images/meli/5.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c8afa9443a3bb52e81aba3196bd514b65e0e3ed7 Binary files /dev/null and b/static/activity_images/meli/5.jpg differ diff --git a/static/activity_images/meli/6.jpg b/static/activity_images/meli/6.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0dec3aa470885c73511422d76bad71eeb8a22eb5 Binary files /dev/null and b/static/activity_images/meli/6.jpg differ diff --git a/static/chat_mcgalagony.js b/static/chat_mcgalagony.js index 20314dee27e88c7bf6dacf9e3ee3ba07e91895d8..eef42d97488c2f254a155fc677ad695e97874b27 100644 --- a/static/chat_mcgalagony.js +++ b/static/chat_mcgalagony.js @@ -6,7 +6,18 @@ function selectPhoto() { $.ajax({ url: "/photocount_mcg", success: function (result) { - resolve('<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony' + Math.floor(Math.random() * result.count) + '.jpg"></div>'); + resolve('<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony/' + Math.floor(Math.random() * result.count + 1) + '.jpg"></div>'); + } + }); + }); +} + +function selectCommonPhoto() { + return new Promise((resolve, reject) => { + $.ajax({ + url: "/photocount_common", + success: function (result) { + resolve('<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/common/' + Math.floor(Math.random() * result.count + 1) + '.jpg"></div>'); } }); }); @@ -24,6 +35,11 @@ function tellWhatDoing() { '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony/18.jpg"></div>', '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/1.jpg"></div>', '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/2.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/3.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/4.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/5.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/6.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/7.jpg"></div><div class="message catmessage">🥷🏾</div>', ]; resolve(activities[Math.floor(Math.random() * activities.length)]); }); @@ -42,20 +58,31 @@ const replies = new Map([ ['legcicább', '😍 😍 😍'], ['cirmos', '🥺'], ['<3', '❤️'], - ['nasi', 'Kop-kop-kop-kop-kop-kop'], - ['nasnas', 'Kop-kop-kop-kop-kop-kop'], + ['nasi', '👀'], + ['nasnas', '👀'], ['szeret', 'doromb'], ['simi', 'doromb'], ['simogat', 'doromb'], ['puszi', 'doromb'], ['ágy', 'Mürr!'], + ['kanapé', 'Mürr!'], ['gyere', 'Mürr!'], ['hiány', '😿'], ['miau miau', 'Miau miau!'], ['miau', 'Miau miau'], + ['játék', 'sutty-sutty-sutty'], + ['játsz', 'sutty-sutty-sutty'], + ['toll', 'sutty-sutty-sutty'], + ['kiscica', '😾'], + ['király', '👑'], + ['este', '🪶?'], + ['balhé', '👉🏿 😼'], ]); const dinamicReplies = new Map([ + ['közös kép', selectCommonPhoto], + ['közös fotó', selectCommonPhoto], + ['közös játék', selectCommonPhoto], ['kép', selectPhoto], ['fotó', selectPhoto], ['mutas', selectPhoto], diff --git a/static/chat_meli.js b/static/chat_meli.js index 20314dee27e88c7bf6dacf9e3ee3ba07e91895d8..618b31589c9cf45b92abffc9a8351a1375324177 100644 --- a/static/chat_meli.js +++ b/static/chat_meli.js @@ -4,9 +4,20 @@ let history; function selectPhoto() { return new Promise((resolve, reject) => { $.ajax({ - url: "/photocount_mcg", + url: "/photocount_meli", success: function (result) { - resolve('<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony' + Math.floor(Math.random() * result.count) + '.jpg"></div>'); + resolve('<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/meli/' + Math.floor(Math.random() * result.count + 1) + '.jpg"></div>'); + } + }); + }); +} + +function selectCommonPhoto() { + return new Promise((resolve, reject) => { + $.ajax({ + url: "/photocount_common", + success: function (result) { + resolve('<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/common/' + Math.floor(Math.random() * result.count + 1) + '.jpg"></div>'); } }); }); @@ -16,14 +27,14 @@ function tellWhatDoing() { return new Promise((resolve, reject) => { const activities = [ '<div class="message catmessage">*kapar-kapar*</div>', - '<div class="message catmessage">*dörgöl-dörgöl*</div>', - '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony/11.jpg"></div>', - '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony/15.jpg"></div>', - '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony/16.jpg"></div>', - '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony/17.jpg"></div>', - '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/mcgalagony/18.jpg"></div>', - '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/1.jpg"></div>', - '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/mcgalagony/2.jpg"></div>', + '<div class="message catmessage">*szimat-szimat*</div>', + '<div class="message catmessage">⛈️</div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/meli/1.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/meli/2.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/meli/3.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/meli/4.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/meli/5.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/meli/6.jpg"></div>', ]; resolve(activities[Math.floor(Math.random() * activities.length)]); }); @@ -36,26 +47,42 @@ const replies = new Map([ ['heló', 'Nyau'], ['helló', 'Nyau'], ['szervusz', 'Nyau'], - ['szép', '😍'], - ['gyönyörű', '😍'], - ['nagyon cica', '😍 😍'], - ['legcicább', '😍 😍 😍'], - ['cirmos', '🥺'], - ['<3', '❤️'], - ['nasi', 'Kop-kop-kop-kop-kop-kop'], - ['nasnas', 'Kop-kop-kop-kop-kop-kop'], - ['szeret', 'doromb'], - ['simi', 'doromb'], - ['simogat', 'doromb'], - ['puszi', 'doromb'], - ['ágy', 'Mürr!'], - ['gyere', 'Mürr!'], - ['hiány', '😿'], + ['cirmos', '😸'], + ['vörös', '😸'], + ['nasi', '🏃💨'], + ['nasnas', '🏃💨'], + ['vacsi', 'Miau! Miau!'], + ['vacsor', 'Miau! Miau!'], + ['reggeli', 'Miau! Miau!'], ['miau miau', 'Miau miau!'], ['miau', 'Miau miau'], + ['villám', 'patt👆 - patt👇 - patt👆 - patt👇'], + ['játék', 'tap-tap-tap-tap-tap-tap-tap, ZUTTY!'], + ['játsz', 'tap-tap-tap-tap-tap-tap-tap, ZUTTY!'], + ['toll', 'tap-tap-tap-tap-tap-tap-tap, ZUTTY!'], + ['labda', 'ham-nyam-nyam-nyam-nyam'], + ['rugó', '👀'], + ['torony', '🔝'], + ['kaparó', '🔝'], + ['orr', 'szimat-szimat'], + ['simi', 'Hamm!'], + ['simogat', 'Hamm!'], + ['ölel', '*kapálózik*'], + ['búj', 'Hamm!'], + ['puszi', '🙄'], + ['fül', '✈️'], + ['repülő', 'tap-tap-tap-tap-tap-tap-tap, ZUTTY!'], + ['szeret', 'doromb'], + ['imád', '🪶?'], + ['hajnal', '⏰'], + ['balhé', '👀'], + ]); const dinamicReplies = new Map([ + ['közös kép', selectCommonPhoto], + ['közös fotó', selectCommonPhoto], + ['közös játék', selectCommonPhoto], ['kép', selectPhoto], ['fotó', selectPhoto], ['mutas', selectPhoto], diff --git a/static/pictures/common/1.jpg b/static/pictures/common/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c183ad56f46256bfcd0c1b8f8a749c154f80f56b Binary files /dev/null and b/static/pictures/common/1.jpg differ diff --git a/static/pictures/common/2.jpg b/static/pictures/common/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..59ddb8349aac522b8691f3db3ab8012b199176b1 Binary files /dev/null and b/static/pictures/common/2.jpg differ diff --git a/static/pictures/common/3.jpg b/static/pictures/common/3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..17928287a417960ccb19a60613624fff9c8a3b0e Binary files /dev/null and b/static/pictures/common/3.jpg differ diff --git a/static/pictures/mcgalagony/19.jpg b/static/pictures/mcgalagony/19.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c6f522ba3b24d42dfa86a867d117f017c3aee638 Binary files /dev/null and b/static/pictures/mcgalagony/19.jpg differ diff --git a/static/pictures/mcgalagony/20.jpg b/static/pictures/mcgalagony/20.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7dac3bd778330f46ec379aaf761db98fa021baad Binary files /dev/null and b/static/pictures/mcgalagony/20.jpg differ diff --git a/static/pictures/mcgalagony/21.jpg b/static/pictures/mcgalagony/21.jpg new file mode 100644 index 0000000000000000000000000000000000000000..08a348f67643f201763451ef103a36e357e795b1 Binary files /dev/null and b/static/pictures/mcgalagony/21.jpg differ diff --git a/static/pictures/mcgalagony/22.jpg b/static/pictures/mcgalagony/22.jpg new file mode 100644 index 0000000000000000000000000000000000000000..24f35bb7732e542717974bf4a27cb5d30229fcbc Binary files /dev/null and b/static/pictures/mcgalagony/22.jpg differ diff --git a/static/pictures/mcgalagony/23.jpg b/static/pictures/mcgalagony/23.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dfe125ac49ee31a6c2b7f885110963d60458de96 Binary files /dev/null and b/static/pictures/mcgalagony/23.jpg differ diff --git a/static/pictures/mcgalagony/24.jpg b/static/pictures/mcgalagony/24.jpg new file mode 100644 index 0000000000000000000000000000000000000000..025fd61b03bdfdfba30b28f701eb696ab039b397 Binary files /dev/null and b/static/pictures/mcgalagony/24.jpg differ diff --git a/static/pictures/mcgalagony/25.jpg b/static/pictures/mcgalagony/25.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5954bb1a03429fa80ed50ceb33c83edb26bd1323 Binary files /dev/null and b/static/pictures/mcgalagony/25.jpg differ diff --git a/static/pictures/mcgalagony/26.jpg b/static/pictures/mcgalagony/26.jpg new file mode 100644 index 0000000000000000000000000000000000000000..911157f83c3c166948f4e2c2ae3e9831e2cce5ca Binary files /dev/null and b/static/pictures/mcgalagony/26.jpg differ diff --git a/static/pictures/mcgalagony/27.jpg b/static/pictures/mcgalagony/27.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9736b0617bc1c5056195be875a7280bd958912f8 Binary files /dev/null and b/static/pictures/mcgalagony/27.jpg differ diff --git a/static/pictures/mcgalagony/28.jpg b/static/pictures/mcgalagony/28.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4c20c3d8ec4560da6387fda04b13f46c41ac6460 Binary files /dev/null and b/static/pictures/mcgalagony/28.jpg differ diff --git a/static/pictures/mcgalagony/29.jpg b/static/pictures/mcgalagony/29.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3b515794c967e0d5340d9b0489765f432ab2fad3 Binary files /dev/null and b/static/pictures/mcgalagony/29.jpg differ diff --git a/static/pictures/meli/1.jpg b/static/pictures/meli/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..52bab1326a03bb6c65262ca58f9c8d6b4a1efe8a Binary files /dev/null and b/static/pictures/meli/1.jpg differ diff --git a/static/pictures/meli/10.jpg b/static/pictures/meli/10.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d2cff625c1c0ae143ef699d68e7c6f1d6c46190b Binary files /dev/null and b/static/pictures/meli/10.jpg differ diff --git a/static/pictures/meli/11.jpg b/static/pictures/meli/11.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0dec3aa470885c73511422d76bad71eeb8a22eb5 Binary files /dev/null and b/static/pictures/meli/11.jpg differ diff --git a/static/pictures/meli/2.jpg b/static/pictures/meli/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0f2f0da2f9755b5b8d38880701baf227da4e186d Binary files /dev/null and b/static/pictures/meli/2.jpg differ diff --git a/static/pictures/meli/3.jpg b/static/pictures/meli/3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5cf4e00bd82c2eb53205ea86fc76a329b1811825 Binary files /dev/null and b/static/pictures/meli/3.jpg differ diff --git a/static/pictures/meli/4.jpg b/static/pictures/meli/4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7630c2357eb5e0a3b50a86d408116c545fea3fca Binary files /dev/null and b/static/pictures/meli/4.jpg differ diff --git a/static/pictures/meli/5.jpg b/static/pictures/meli/5.jpg new file mode 100644 index 0000000000000000000000000000000000000000..54aad7e241a6dead4c48e6dc067b769eb4e7fc98 Binary files /dev/null and b/static/pictures/meli/5.jpg differ diff --git a/static/pictures/meli/6.jpg b/static/pictures/meli/6.jpg new file mode 100644 index 0000000000000000000000000000000000000000..71446d59b3d2c1cd551d20666ac7f71297835df1 Binary files /dev/null and b/static/pictures/meli/6.jpg differ diff --git a/static/pictures/meli/7.jpg b/static/pictures/meli/7.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e966913153042a346975ecb60350b06768b22393 Binary files /dev/null and b/static/pictures/meli/7.jpg differ diff --git a/static/pictures/meli/8.jpg b/static/pictures/meli/8.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fd1e2a4a38712d64587e41cbb604ed9220297430 Binary files /dev/null and b/static/pictures/meli/8.jpg differ diff --git a/static/pictures/meli/9.jpg b/static/pictures/meli/9.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c8afa9443a3bb52e81aba3196bd514b65e0e3ed7 Binary files /dev/null and b/static/pictures/meli/9.jpg differ diff --git a/static/style.css b/static/style.css index 8964108cb823421b1e3a17e946b6d45e547f4940..b74e0f327dee0a2f487d35a4f362a51c8a1d2a7d 100644 --- a/static/style.css +++ b/static/style.css @@ -148,21 +148,22 @@ footer>* { } .message { - padding: 5px 20px; + padding: 10px 25px; margin-bottom: 10px; - border-radius: 10px; width: fit-content; } .catmessage { - background-color: #d3d3d3; + background-color: #c4c4c4; align-self: flex-start; + border-radius: 10px 10px 10px 0; } .humanmessage { background-color: #ff9d00; color: white; align-self: flex-end; + border-radius: 10px 10px 0 10px; } img.previewpic {