diff --git a/client/agora/public/assets/img/buttons/Agnes.png b/client/agora/public/assets/img/buttons/Agnes.png index 1877f3fa..c22ca910 100644 Binary files a/client/agora/public/assets/img/buttons/Agnes.png and b/client/agora/public/assets/img/buttons/Agnes.png differ diff --git a/client/agora/public/assets/img/logos/Agora-Logo-1-wText-400-Space.png b/client/agora/public/assets/img/logos/Agora-Logo-1-wText-400-Space.png new file mode 100644 index 00000000..5c521109 Binary files /dev/null and b/client/agora/public/assets/img/logos/Agora-Logo-1-wText-400-Space.png differ diff --git a/client/agora/public/assets/img/logos/agora-logo-nav.png b/client/agora/public/assets/img/logos/agora-logo-nav.png new file mode 100644 index 00000000..0928b98b Binary files /dev/null and b/client/agora/public/assets/img/logos/agora-logo-nav.png differ diff --git a/client/agora/public/css/agora-theme.css b/client/agora/public/css/agora-theme.css index fe059780..dd0cceb1 100644 --- a/client/agora/public/css/agora-theme.css +++ b/client/agora/public/css/agora-theme.css @@ -727,7 +727,7 @@ a:hover { /* SIDE MENu */ .sidebar { height: 100%; - width: 85px; + width: 250px; position: fixed; z-index: 1; top: 0; @@ -786,7 +786,7 @@ a:hover { .dashboard-content { - transition: margin-left .5s; + margin-left: 250px; } /* .friends-content { @@ -1624,7 +1624,7 @@ input:checked+.slider:before { top: 50%; left: 60%; font-size: 10px; - font-family: Verdana, sans-serif; + font-family: sans-serif; } input:checked+.slider:after { @@ -2145,12 +2145,12 @@ input:checked+.slider:after { padding-left: 25%; } - -.dashboard-content { +/* +.{ transition: margin-left .5s; } -/* .friends-content { +.friends-content { transition: margin-left .5s; } */ diff --git a/client/agora/public/css/gallery/note-gallery.css b/client/agora/public/css/gallery/note-gallery.css index b3fcbdd2..47b2c72e 100644 --- a/client/agora/public/css/gallery/note-gallery.css +++ b/client/agora/public/css/gallery/note-gallery.css @@ -66,24 +66,27 @@ display: flex; justify-content: center; align-items: center; - min-height: 18rem; - margin-top: 20px; /* Adjust as needed */ + margin-top: -40px; /* Adjust as needed */ + margin-left: auto; } .add-button { - border-radius: 50%; /* Makes the button circular */ - width: 50px; /* Adjust size as needed */ + border-radius: 10px; /* Makes the button circular */ + width: 100px; /* Adjust size as needed */ height: 50px; /* Adjust size as needed */ display: flex; justify-content: center; align-items: center; - font-size: 24px; /* Adjust icon size as needed */ + font-size: 20px; /* Adjust icon size as needed */ + + background-color: #ffffff; + color: #000000; } /* Optional: Add hover effect */ .add-button:hover { - background-color: #007bff; /* Darker shade of primary color */ - color: white; + background-color: #826131; /* Darker shade of primary color */ + color: #ffffff; } /* Drop-down option */ diff --git a/client/agora/public/css/note.css b/client/agora/public/css/note.css index 523b4c51..c91d72b5 100644 --- a/client/agora/public/css/note.css +++ b/client/agora/public/css/note.css @@ -1,6 +1,6 @@ .note-body { transition: margin-left 0.5s; - font-family: Verdana, Geneva, Tahoma, sans-serif; + font-family: sans-serif; } #page-content { diff --git a/client/agora/public/css/topic.css b/client/agora/public/css/topic.css index 17973424..0b761653 100644 --- a/client/agora/public/css/topic.css +++ b/client/agora/public/css/topic.css @@ -4,7 +4,17 @@ .topic-body { transition: margin-left 0.5s; - font-family: Verdana, Geneva, Tahoma, sans-serif; + font-family: sans-serif; +} + +#black-bar { + position: fixed; + right: 0; + top: 0px; + width: 50px; + height: 100%; + z-index: 1; + background-color: #17191a; } .topic-content { @@ -594,6 +604,7 @@ .resource-type-container { + margin-right: 0; float: right; border: 1px solid #ccc; width:120px; @@ -712,7 +723,7 @@ .share-button { position: absolute; - right: 20px; + right: 45px; top: -20px; } @@ -977,9 +988,8 @@ position: fixed; right: 0; height: 100%; - background-color: #1f1f1f; + background-color: #17191a; width: 50px; /* Initial width */ - border-left: 1px solid #dee2e6; z-index: 10; overflow: hidden; transition: width 0.5s; /* Animation for width change */ diff --git a/client/agora/public/js/agnesAI.js b/client/agora/public/js/agnesAI.js index 3d166a7d..f80a8b31 100644 --- a/client/agora/public/js/agnesAI.js +++ b/client/agora/public/js/agnesAI.js @@ -23,9 +23,11 @@ document.getElementById( 'drawer-header' ).addEventListener( 'click', function() // Check the current width and toggle between 70% and 100% if ( resourcesZone.style.width === '65%' ) { resourcesZone.style.width = '95%'; + document.getElementById( 'black-bar' ).style.width = '50px'; // For continuity with the drawer - otherwise there's a big white gap } else { resourcesZone.style.width = '65%'; + document.getElementById( 'black-bar' ).style.width = '30%'; // For continuity with the drawer - otherwise there's a big white gap } } ); diff --git a/client/agora/public/js/editorMain.js b/client/agora/public/js/editorMain.js index 95660d36..0f6de36f 100644 --- a/client/agora/public/js/editorMain.js +++ b/client/agora/public/js/editorMain.js @@ -66,7 +66,7 @@ window.addEventListener( "load", async () => { } // add the event listener for adding a new topic - //addTopicEvent(); + // addTopicEvent(); /** @@ -80,14 +80,13 @@ window.addEventListener( "load", async () => { ( debug ) ? console.log( "Workspace Title Change: complete" ) : null; } ); - const workspaceDescription = document.getElementById( "workspace-desc" ); + /* const workspaceDescription = document.getElementById( "workspace-desc" ); workspaceDescription.addEventListener( "change", async () => { ( debug ) ? console.log( "Workspace Description Change: start" ) : null; getCurrentWorkspace().workspaceDescription = workspaceDescription.value; await saveWorkspace( getCurrentWorkspace() ); ( debug ) ? console.log( "Workspace Description Change: complete" ) : null; - } ); - + } ); */ /** * Event listener for entering a tag @@ -137,7 +136,7 @@ async function addTopicEvent() { await createTopicEditorGui(); // add the event listener for adding a new topic - //addTopicEvent(); + // addTopicEvent(); // prompt the user to name the topic editTopicName( newTopic.topicId ); diff --git a/client/agora/public/js/editorManager.js b/client/agora/public/js/editorManager.js index 52dcd8e8..16fa8729 100644 --- a/client/agora/public/js/editorManager.js +++ b/client/agora/public/js/editorManager.js @@ -58,7 +58,7 @@ const updateWorkspaceDom = function ( ) { ( debug ) ? console.log( "updateWorkspaceDom() : start" ) : null; ( debug && dataDebug ) ? console.log( "using workspace: " + JSON.stringify( getCurrentWorkspace() ) ) : null; document.getElementById( "workspace-title" ).value = getCurrentWorkspace().workspaceName; - document.getElementById( "workspace-desc" ).value = getCurrentWorkspace().workspaceDescription; + //document.getElementById( "workspace-desc" ).value = getCurrentWorkspace().workspaceDescription; ( debug ) ? console.log( "updateWorkspaceDom() : complete" ) : null; }; @@ -643,9 +643,6 @@ function createTextArea( resource, position ) { if( resource ) { - - - // title container let titleContainer = document.createElement( "div" ); titleContainer.className = "title-container"; @@ -663,7 +660,6 @@ function createTextArea( resource, position ) { else{ title.value = "Untitled"; } - // add the change listener for the title title.addEventListener( "change", async () => { diff --git a/client/agora/public/js/scripts.js b/client/agora/public/js/scripts.js index ad71006f..4f94f4b3 100644 --- a/client/agora/public/js/scripts.js +++ b/client/agora/public/js/scripts.js @@ -9,84 +9,15 @@ * Menu management for agora */ -let clientSettings = { - sideBarLocked: false -}; - -let sideBarStatus = true; +let clientSettings = {}; /** * Triggered when the page is loaded. */ window.addEventListener( "load", () => { - // Determines whether the user is on a page that contains the sidebar - if ( document.querySelector( "#agoraSideBar" ) ) { - loadClientSettings(); - - // Only add the hover events if the sidebar is not in the docked position - if ( !clientSettings.sideBarLocked ) { - // add events for toggle sidebar - if ( document.getElementById( "agoraSideBar" ) ) { - toggleSidebar(); - document.getElementById( "agoraSideBar" ).addEventListener( "mouseenter", toggleSidebar ); - document.getElementById( "agoraSideBar" ).addEventListener( "mouseleave", toggleSidebar ); - } - } - - if ( document.getElementById( "pin-menu" ) ) { - document.getElementById( "pin-menu" ).addEventListener( "click", lockSidebar ); - } - } + loadClientSettings(); } ); -/** - * Toggles the sidebar. - */ -function toggleSidebar() { - if ( !sideBarStatus ) { - document.getElementById( "agoraSideBar" ).style.width = "250px"; - document.querySelector( ".dashboard-content" ).style.marginLeft = "250px"; - // document.querySelector(".friends-content").style.marginLeft = "250px"; - } - else { - document.getElementById( "agoraSideBar" ).style.width = "85px"; - if ( window.innerWidth > 992 ) { - document.querySelector( ".dashboard-content" ).style.marginLeft = "85px"; - // document.querySelector(".friends-content").style.marginLeft = "85px"; - } - } - sideBarStatus = !sideBarStatus; -} - -/** - * Locks the sidebar into position. - */ -function lockSidebar() { - if ( !clientSettings.sideBarLocked ) { - document.querySelector( ".dashboard-content" ).style.marginLeft = "250px"; - // document.querySelector(".friends-content").style.marginLeft = "250px"; - - document.getElementById( "agoraSideBar" ).removeEventListener( "mouseenter", toggleSidebar ); - document.getElementById( "agoraSideBar" ).removeEventListener( "mouseleave", toggleSidebar ); - - document.getElementById( "agoraSideBar" ).style.width = "250px"; - - document.getElementById( "tack-icon" ).style.rotate = "45deg"; - - sideBarStatus = true; // important to prevent glitching when enabling/disabling the menu - } - else { - document.getElementById( "tack-icon" ).style.rotate = "0deg"; - - document.getElementById( "agoraSideBar" ).addEventListener( "mouseenter", toggleSidebar ); - document.getElementById( "agoraSideBar" ).addEventListener( "mouseleave", toggleSidebar ); - } - - clientSettings.sideBarLocked = !clientSettings.sideBarLocked; - - saveClientSettings(); -} - /** * Loads the client settings from local storage and sets the properties associated with them. */ @@ -94,23 +25,6 @@ function loadClientSettings() { if ( !localStorage.getItem( 'client-settings' ) ) { saveClientSettings(); } - else { - clientSettings = JSON.parse( localStorage.getItem( 'client-settings' ) ); - - if ( clientSettings.sideBarLocked ) { - document.querySelector( ".dashboard-content" ).style.marginLeft = "250px"; - // document.querySelector(".friends-content").style.marginLeft = "250px"; - - document.getElementById( "agoraSideBar" ).removeEventListener( "mouseenter", toggleSidebar ); - document.getElementById( "agoraSideBar" ).removeEventListener( "mouseleave", toggleSidebar ); - - document.getElementById( "agoraSideBar" ).style.width = "250px"; - - document.getElementById( "tack-icon" ).style.rotate = "45deg"; - - sideBarStatus = true; // important to prevent glitching when enabling/disabling the menu - } - } } /** diff --git a/client/agora/public/js/state/stateManager.js b/client/agora/public/js/state/stateManager.js index 9c07d479..74764c66 100644 --- a/client/agora/public/js/state/stateManager.js +++ b/client/agora/public/js/state/stateManager.js @@ -44,9 +44,9 @@ const initializeWorkspace = async ( workspaceUuid ) => { workspaceSharedUsers = await getAllSharedUsersForWorkspace( workspaceUuid ); // get tags associated with the workspace - workspace.tags = []; + /* workspace.tags = []; const tags = await getTags( "workspace", workspaceUuid ); - ( tags ) ? workspace.tags = tags: []; + ( tags ) ? workspace.tags = tags: []; */ const workspaceTitle = document.getElementById( "workspace-title" ); const workspaceDescription = document.getElementById( "workspace-desc" ); @@ -56,6 +56,10 @@ const initializeWorkspace = async ( workspaceUuid ) => { workspaceDescription.readOnly = true; tagBox.readOnly = true; } + + // Fix for the sidebar until we can find how to make it relative + // I'm convinced there's some absolute positioning somewhere causing this + document.querySelector( ".dashboard-content" ).style.marginLeft = "85px"; } else { console.log( "workspace already initialized" ); @@ -141,8 +145,8 @@ const addNewTopic = async function ( topicName ) { newTopic.topicName = topicName; // make sure the worspace fields are up to date - getCurrentWorkspace().name = document.getElementById( "workspace-title" ).value; - getCurrentWorkspace().description = document.getElementById( "workspace-desc" ).value; + //getCurrentWorkspace().name = document.getElementById( "workspace-title" ).value; + //getCurrentWorkspace().description = document.getElementById( "workspace-desc" ).value; // save the topic newTopic = await saveTopic( newTopic, null ); @@ -239,7 +243,7 @@ function saveTextResource( resource, content ) { ( debug ) ? console.log( "textEditorUpdate() : Start" ) : null; if ( resource ) { // update the resource title - resource.resourceName = document.getElementById( "input-title-" + resource.resourceId ).value; + // resource.resourceName = document.getElementById( "input-title-" + resource.resourceId ).value; // update the resource content if( content != null ) { diff --git a/client/agora/views/add-friends/partials/gallery/control-bar.ejs b/client/agora/views/add-friends/partials/gallery/control-bar.ejs index 60d3add7..a7d6e263 100644 --- a/client/agora/views/add-friends/partials/gallery/control-bar.ejs +++ b/client/agora/views/add-friends/partials/gallery/control-bar.ejs @@ -1,6 +1,8 @@ diff --git a/client/agora/views/dashboard/partials/gallery/grid-template.ejs b/client/agora/views/dashboard/partials/gallery/grid-template.ejs index 904d6bd1..797eb585 100644 --- a/client/agora/views/dashboard/partials/gallery/grid-template.ejs +++ b/client/agora/views/dashboard/partials/gallery/grid-template.ejs @@ -121,12 +121,6 @@ %> <%=//c console.log(ownerWorkspaces[0]) %> - -
- -
diff --git a/client/agora/views/dashboard/partials/gallery/list-template.ejs b/client/agora/views/dashboard/partials/gallery/list-template.ejs index 8dcdb038..d2d64c24 100644 --- a/client/agora/views/dashboard/partials/gallery/list-template.ejs +++ b/client/agora/views/dashboard/partials/gallery/list-template.ejs @@ -71,16 +71,6 @@ } %> - -
  • - Create New Workspace - Workspace - - - - - -
    • diff --git a/client/agora/views/dashboard/partials/topic/topic-view.ejs b/client/agora/views/dashboard/partials/topic/topic-view.ejs index b7cf3928..972a8549 100644 --- a/client/agora/views/dashboard/partials/topic/topic-view.ejs +++ b/client/agora/views/dashboard/partials/topic/topic-view.ejs @@ -11,10 +11,10 @@
    - + - <%- include('../../side-menu/side-menu');%> + <%- include('../../side-menu/editor-side-menu');%> <%- include('./workspace-manager-modal');%> @@ -39,42 +39,58 @@ } %> - -
    - -
    -
    - - -
    - - - - - - -
    -
    +
    - -
      -
      - - - - - <%-include('./discussion-modal'); %> - <%-include('./comment-template'); %> - <%-include('./share-modal'); %> +
      + +
      + + + + +
      + + + + + + + + + + + + + + <%-include('./discussion-modal'); %> + <%-include('./comment-template'); %> + <%-include('./share-modal'); %> + <% if( process.env.OPENAI_TOGGLE === 'true' ) { %> @@ -124,7 +141,7 @@
      - +
      diff --git a/client/agora/views/dashboard/side-menu/editor-side-menu.ejs b/client/agora/views/dashboard/side-menu/editor-side-menu.ejs new file mode 100644 index 00000000..4746eae7 --- /dev/null +++ b/client/agora/views/dashboard/side-menu/editor-side-menu.ejs @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/client/agora/views/dashboard/side-menu/side-menu.ejs b/client/agora/views/dashboard/side-menu/side-menu.ejs index 025ca2c4..11b8419e 100644 --- a/client/agora/views/dashboard/side-menu/side-menu.ejs +++ b/client/agora/views/dashboard/side-menu/side-menu.ejs @@ -18,7 +18,6 @@
      -
    • Home
    • Dashboard
    • Shared
    • Friends
      • @@ -29,11 +28,7 @@