aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/core/assets
diff options
context:
space:
mode:
authorMarvin Borner2018-05-31 17:54:20 +0200
committerMarvin Borner2018-05-31 17:54:20 +0200
commit157d462a3edb8841a22c93f8480729131586a7fa (patch)
treecbe12f5422f9be0e8c376592965559f1ae8869d5 /main/app/sprinkles/core/assets
parenta60d3fe2eb9ea7a19b4bbbf8e1976d0a43a56c45 (diff)
Added upload feature in feed tab
Diffstat (limited to 'main/app/sprinkles/core/assets')
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/js/asemica.js31
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/js/asemica.pl3
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/js/main.js36
3 files changed, 63 insertions, 7 deletions
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,28 +186,43 @@ 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
*/
function dec2bin(dec) {
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) {
@@ -105,6 +112,33 @@ MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlid
});
/**
+ * TOP NAVBAR BUTTONS LOGIC
+ */
+$("#ImageUploadButton").on("click", function () {
+ swal({
+ title: 'Choose an image to upload!',
+ html: "<form id='ImageUploadForm'>" +
+ "<input formenctype='multipart/form-data' type='file' name='image' />" +
+ "<input formenctype='multipart/form-data' type='submit' />" +
+ "<input type='hidden' name='" + site.csrf.keys.name + "' value='" + site.csrf.name + "' />" +
+ "<input type='hidden' name='" + site.csrf.keys.value + "' value='" + site.csrf.value + "' />" +
+ "</form>",
+ });
+
+ $("#ImageUploadForm")
+ .submit(function (e) {
+ $.ajax({
+ url: '/api/posts/image',
+ type: 'POST',
+ data: new FormData(this),
+ processData: false,
+ contentType: false
+ });
+ e.preventDefault();
+ });
+});
+
+/**
* SEARCH
*/
UserSearchBar.keyup(function () {