From 696356df88011344bab6cf42273dee74460e6474 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 18 Apr 2018 17:48:45 +0200 Subject: Fixed color issues on several browsers and added authentication --- .../sprinkles/core/assets/SiteAssets/css/main.css | 17 +- .../assets/SiteAssets/icons/BurgerMenuShort.svg | 6 +- .../SiteAssets/icons/BurgerMenuShortActivated.svg | 57 ++++++ .../SiteAssets/icons/ExploreGlobeOutline.svg | 58 +++--- .../icons/ExploreGlobeOutlineActivated.svg | 210 +++++++++++++++++++++ .../assets/SiteAssets/icons/FriendFeedOutline.svg | 8 +- .../icons/FriendFeedOutlineActivated.svg | 82 ++++++++ .../SiteAssets/icons/MessageBubbleOutline.svg | 8 +- .../icons/MessageBubbleOutlineActivated.svg | 73 +++++++ .../assets/SiteAssets/icons/UserGroupOutline.svg | 16 +- .../SiteAssets/icons/UserGroupOutlineActivated.svg | 80 ++++++++ .../core/assets/SiteAssets/icons/UserOutline.svg | 4 +- .../SiteAssets/icons/UserOutlineActivated.svg | 54 ++++++ .../sprinkles/core/assets/SiteAssets/js/main.js | 10 +- main/app/sprinkles/core/config/default.php | 4 +- main/app/sprinkles/core/locale/de_DE/main.php | 2 +- main/app/sprinkles/core/locale/en_US/main.php | 2 +- main/app/sprinkles/core/locale/fr_FR/main.php | 2 +- main/app/sprinkles/core/routes/routes.php | 1 + .../sprinkles/core/templates/pages/index.html.twig | 12 +- .../core/templates/pages/partials/chat.js.twig | 20 +- 21 files changed, 642 insertions(+), 84 deletions(-) create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/UserOutlineActivated.svg (limited to 'main') diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index c44727b..25c492a 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -1,3 +1,7 @@ +svg path { + fill: green; +} + /****** GENERAL ******/ @@ -103,7 +107,7 @@ HEADER GENERAL TABS ***********/ .MainInTab { - height: 100%; + height: 100% } /********** @@ -226,9 +230,6 @@ NAVBAR .NavbarIconWrap img { height: 30px; width: 30px; - filter: invert(.5); - -webkit-filter: invert(.5); - -moz-filter: invert(.5); } .NavbarLine { @@ -240,11 +241,3 @@ NAVBAR background: #eb12b5; } -.ActiveTab { - -webkit-transition: -moz-transform .3s ease-out; - -moz-transition: -webkit-transform .3s ease-out; - - filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); - -webkit-filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); - -moz-filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg index e8e825e..86f3718 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg @@ -4,11 +4,11 @@ viewBox="0 0 384.97 384.97" style="enable-background:new 0 0 384.97 384.97;" xml:space="preserve"> - - - diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg new file mode 100644 index 0000000..fa3c428 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg index 3bd2b1c..ebec16b 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg @@ -4,176 +4,176 @@ viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg new file mode 100644 index 0000000..193a92f --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg index 1facc93..d4fd052 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg @@ -4,7 +4,7 @@ viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> - - diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg new file mode 100644 index 0000000..cfeea52 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg index 14322ff..b2706bc 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg @@ -4,10 +4,10 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg index 0a8c0f4..dd98e46 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg @@ -5,12 +5,12 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg index 32062dc..a15f174 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg @@ -5,12 +5,12 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index b359d2d..102b102 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -14,7 +14,7 @@ NavbarLine .data("origWidth", NavbarLine.width()); NavbarIconWrap.on("click", function () { NavbarIconWrap.removeClass("ActiveTab"); - $(this).addClass("ActiveTab"); + $(this).children().attr("src", $(this).children().attr("src").split('.svg')[0] + "Activated.svg"); var index = $(this).attr('id'); MainTabWindows.slick('slickGoTo', index); //$('.MainTabWindows').flickity().flickity('select', index); @@ -39,9 +39,13 @@ MainTabWindows.slick({ }); MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlide) { + currentSlide = $("#" + currentSlide); + nextSlide = $("#" + nextSlide); //console.log(nextSlide); - NavbarIconWrap.removeClass("ActiveTab"); - $el = $("#" + nextSlide); + console.log(currentSlide.children().attr("src")); + currentSlide.children().attr("src", (currentSlide.children().attr("src").split('.svg')[0].replace('Activated','') + ".svg")); + nextSlide.children().attr("src", nextSlide.children().attr("src").split('.svg')[0] + "Activated.svg"); + $el = nextSlide; $el.addClass("ActiveTab"); leftPos = $el.position().left; NavbarLine.stop().animate({ diff --git a/main/app/sprinkles/core/config/default.php b/main/app/sprinkles/core/config/default.php index 134b5d4..3478fb6 100644 --- a/main/app/sprinkles/core/config/default.php +++ b/main/app/sprinkles/core/config/default.php @@ -124,8 +124,8 @@ ], 'analytics' => [ 'google' => [ - 'code' => '', - 'enabled' => false + 'code' => 'UA-109245179-2', + 'enabled' => true ] ], 'author' => 'Author', diff --git a/main/app/sprinkles/core/locale/de_DE/main.php b/main/app/sprinkles/core/locale/de_DE/main.php index 4677206..cd9e00c 100644 --- a/main/app/sprinkles/core/locale/de_DE/main.php +++ b/main/app/sprinkles/core/locale/de_DE/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} ist der Gruppe beigetreten", - "YOU_GROUP_JOIN" => "Du bist der Gruppe beigetreten", + "YOU_GROUP_JOIN" => "Du bist der Gruppe {{group}} beigetreten", "USER_DISCONNECT" => "{{user}} hat sich vom Server getrennt" ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/en_US/main.php b/main/app/sprinkles/core/locale/en_US/main.php index 58393d8..06585fc 100644 --- a/main/app/sprinkles/core/locale/en_US/main.php +++ b/main/app/sprinkles/core/locale/en_US/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} joined the group", - "YOU_GROUP_JOIN" => "You joined the group", + "YOU_GROUP_JOIN" => "You joined the group {{group}}", "USER_DISCONNECT" => "{{user}} has disconnected from the server" ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/fr_FR/main.php b/main/app/sprinkles/core/locale/fr_FR/main.php index 6e28f6e..f9e2f79 100644 --- a/main/app/sprinkles/core/locale/fr_FR/main.php +++ b/main/app/sprinkles/core/locale/fr_FR/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} s'est joint au groupe", - "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe", + "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe {{group}}", "USER_DISCONNECT" => "{{user}} s'est déconnecté du serveur" ] ]; diff --git a/main/app/sprinkles/core/routes/routes.php b/main/app/sprinkles/core/routes/routes.php index 3598b7e..56a72ea 100644 --- a/main/app/sprinkles/core/routes/routes.php +++ b/main/app/sprinkles/core/routes/routes.php @@ -11,6 +11,7 @@ $config = $app->getContainer()->get('config'); $app->get('/', 'UserFrosting\Sprinkle\Core\Controller\CoreController:pageIndex') ->add('checkEnvironment') + ->add('authGuard') ->setName('index'); $app->get('/about','UserFrosting\Sprinkle\Core\Controller\CoreController:pageAbout')->add('checkEnvironment'); diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index 5de2d30..3a78a16 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -32,10 +32,11 @@
-
+ +
- {{ translate("TAB_CAPTIONS.CHAT") }} @@ -52,6 +53,7 @@
+
@@ -73,6 +75,10 @@
+
+ {{current_user.first_name}} {{current_user.last_name}} + ({{current_user.user_name}}) +
@@ -84,7 +90,7 @@ - + diff --git a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig index a160087..7ae258b 100644 --- a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig +++ b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig @@ -2,8 +2,8 @@ /************ GENERATE KEYS - ************/ -if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { + ************ + if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { // GENERATE -- LATER ON LOGIN! var EncryptionPhrase = "PASSWORD 123"; // THE USERS PASSWORD -- needs to generate on login! var RSABitLength = 1024; @@ -28,10 +28,9 @@ if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('Keys } -/****** + /****** GENERAL ******/ - var ChatTextInput = $("#ChatTextInput"); var SubscribeTextInput = $("#SubscribeTextInput"); var ChatMessages = $("#ChatMessages"); @@ -82,17 +81,16 @@ WebSocket.onmessage = function (e) { } else if (MessageObject.ServerMessage === true) { if (MessageObject.ServerMessageType === "GroupJoin") { if (MessageObject.WasHimself === false) { - var TempJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedJoinMessage = TempJoinMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + GeneratedJoinMessage + ".


"); + var TranslatedUserJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + TranslatedUserJoinMessage + ".


"); } else if (MessageObject.WasHimself === true) { ChatMessages.empty(); - ChatMessages.append("
{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN") }} " + MessageObject.GroupName + ".


"); + var TranslatedYouJoinMessage = "{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN", {group: "ConvertTranslatedMessageWithGroupName"}) }}".replace("ConvertTranslatedMessageWithGroupName", '"' + MessageObject.GroupName + '"'); + ChatMessages.append("
" + TranslatedYouJoinMessage + ".


"); } } else if (MessageObject.ServerMessageType === "UserDisconnect") { - var TempDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedDisconnectMessage = TempDisconnectMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + GeneratedDisconnectMessage + ".


"); + var TranslatedDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + TranslatedDisconnectMessage + ".


"); } } }; -- cgit v1.2.3