From 157d462a3edb8841a22c93f8480729131586a7fa Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 31 May 2018 17:54:20 +0200 Subject: Added upload feature in feed tab --- .../sprinkles/core/assets/SiteAssets/js/asemica.js | 31 +++++++++++++++---- .../sprinkles/core/assets/SiteAssets/js/asemica.pl | 3 ++ .../sprinkles/core/assets/SiteAssets/js/main.js | 36 +++++++++++++++++++++- .../sprinkles/core/templates/pages/index.html.twig | 2 +- 4 files changed, 64 insertions(+), 8 deletions(-) (limited to 'main/app/sprinkles') diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/asemica.js b/main/app/sprinkles/core/assets/SiteAssets/js/asemica.js index 628165c..7366aaf 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/asemica.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/asemica.js @@ -12,9 +12,13 @@ function asemica(Text, CorpusUrl, Intent = "enc") { } else { switch (Intent) { case "enc": - return Encode(Text, Transitions, Tokens); + //return Encode(Text, Transitions, Tokens); + console.log(Encode(Text, Transitions, Tokens)); + break; case "dec": - return Decode(Text, Transitions, Tokens); + //return Decode(Text, Transitions, Tokens); + console.log(Decode(Text, Transitions, Tokens)); + break; } } }); @@ -182,27 +186,42 @@ function asemica(Text, CorpusUrl, Intent = "enc") { * Converts a string to several 4bit binary (nibbles) and then to dec */ function str2nibble(str) { + str = str + " \n"; + var DecBytes = []; var Nibbles = []; - for (var i = 0, n = str.length; i < n; i++) { + for (var i = 0, n = str.length; i < n; i++) { // str to dec var char = str.charCodeAt(i); DecBytes.push(char & 0xFF); } DecBytes.forEach(function (Byte, Index) { - Byte = dec2bin(Byte); + Byte = dec2bin(Byte); // dec to bin var FistByteNibble = Byte.slice(-4); var SecondByteNibble = Byte.slice(0, -4).length === 4 ? Byte.slice(0, -4) : 0 + Byte.slice(0, -4); - Nibbles.push(bin2dec((FistByteNibble).split("").reverse().join(""))); - Nibbles.push(bin2dec((SecondByteNibble).split("").reverse().join(""))); + Nibbles.push(bin2dec((FistByteNibble).split("").reverse().join(""))); // formatted bin to dec + Nibbles.push(bin2dec((SecondByteNibble).split("").reverse().join(""))); // formatted bin to dec }); Nibbles = Nibbles.concat([0, 4, 5, 0]); + console.log(Nibbles.join(", ")); + return Nibbles; } + /** + * Converts several dec converted 4bit binary (nibbles) to a string + */ + function nibble2str(DecNibbles) { + var BinNibbles = ""; + + DecNibbles.forEach(function(DecNibble) { + BinNibbles += dec2bin(DecNibble); + }) + } + /** * Converts a decimal value to binary */ diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/asemica.pl b/main/app/sprinkles/core/assets/SiteAssets/js/asemica.pl index f4e2d4b..a9fc266 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/asemica.pl +++ b/main/app/sprinkles/core/assets/SiteAssets/js/asemica.pl @@ -380,6 +380,9 @@ sub verify_exits { sub encode { my ($input, $transitions, $tokens) = @_; + use Data::Dumper; + print Dumper($input); + my $bits = unpack("b*", $input); print $bits; diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index a65d637..26ce2d3 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -19,8 +19,15 @@ const ExploreData = $("#ExploreData"); //var cashedAvatarIcons = $("img.Avatar").imageCaching(); /** - * POPUPS + * ERROR/SUCCESS POPUPS */ +const toast = swal.mixin({ + toast: true, + position: 'top-end', + showConfirmButton: false, + timer: 3000 +}); + function triggerErrorPopup(ErrorCode) { let ErrorMessage = "Unknown Error occurred!", ErrorInformationSite = "", AlsoLogInConsole = true; // WILL BE REWRITTEN (EXCEPT SOMETHING CRAZY HAPPENS) switch (ErrorCode) { @@ -104,6 +111,33 @@ MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlid }, 300); }); +/** + * TOP NAVBAR BUTTONS LOGIC + */ +$("#ImageUploadButton").on("click", function () { + swal({ + title: 'Choose an image to upload!', + html: "
" + + "" + + "" + + "" + + "" + + "
", + }); + + $("#ImageUploadForm") + .submit(function (e) { + $.ajax({ + url: '/api/posts/image', + type: 'POST', + data: new FormData(this), + processData: false, + contentType: false + }); + e.preventDefault(); + }); +}); + /** * SEARCH */ diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index bf4184e..48e9149 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -16,7 +16,7 @@
{{ translate("TAB_CAPTIONS.FEED") }} - +

-- cgit v1.2.3