Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEATURE] [MER-3298] Workspace nav bar and new instructor dashboard #4963

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[FEATURE] [MER-3298] Workspace nav bar and new instructor dashboard #4963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fddcdf4
add workspace navbar icons
nicocirio Jul 10, 2024
5a7c6cf
remove unused section attribute from UserAccount.menu function component
nicocirio Jul 10, 2024
3a0ff6b
implement workspace navbar within a new workspace layout
nicocirio Jul 10, 2024
8a3f6e5
add workspace label and adjust sidebar width
nicocirio Jul 10, 2024
7449c4f
implement new instructor dashboard
nicocirio Jul 11, 2024
8ce333b
remove warning
nicocirio Jul 11, 2024
4db7cdb
remove 'New Section' link from student workspace - now on instructor …
nicocirio Jul 11, 2024
91bf7f4
add course description to card
nicocirio Jul 11, 2024
a63d9bb
remove unnecessary base_project preload on open and free sections query
nicocirio Jul 11, 2024
c9c0c5e
remove tests for role badge and progress since they were removed from…
nicocirio Jul 11, 2024
6756f22
update tests that match student workspace
nicocirio Jul 11, 2024
562e6a6
add tests
nicocirio Jul 11, 2024
6ad4511
improve header and background for light mode
nicocirio Jul 11, 2024
4de1df8
Merge branch 'master' into MER-3298-workspace-nav-bar-and-new-instruc…
nicocirio Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/oli/delivery/sections.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,6 @@ defmodule Oli.Delivery.Sections do
where:
e.user_id == ^user_id and s.open_and_free == true and s.status == :active and
e.status == :enrolled,
preload: [:base_project],
select: s
)

Expand Down
79 changes: 79 additions & 0 deletions lib/oli_web/backgrounds.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,85 @@ defmodule OliWeb.Backgrounds do
"""
end

def instructor_dashboard_header(assigns) do
~H"""
<svg
width="100%"
viewBox="0 0 100 100"
preserveAspectRatio="none"
height="291"
fill="none"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
>
<g clip-path="url(#clip0_494_8778)">
<rect width="100%" height="291" class="fill-[#87E1B6] dark:fill-[#0CAF61]" />
<g filter="url(#filter0_f_494_8778)">
<ellipse
cx="408.292"
cy="291.135"
rx="341.325"
ry="130.815"
class="fill-[#9AC3FF] dark:fill-[#0062F2]"
/>
</g>
<g filter="url(#filter1_f_494_8778)">
<ellipse
cx="656.342"
cy="145.366"
rx="290.075"
ry="111.146"
class="fill-[#87E1B6] dark:fill-[#0CAF61]"
/>
</g>
<g style="mix-blend-mode:color-burn" opacity="0.25">
<rect width="100%" height="291" fill="url(#pattern0_494_8778)" />
</g>
<rect y="0" width="100%" height="309" fill="black" fill-opacity="0.24" />
</g>
<defs>
<filter
id="filter0_f_494_8778"
x="-442.033"
y="-348.681"
width="1700.65"
height="1279.63"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
<feGaussianBlur stdDeviation="254.5" result="effect1_foregroundBlur_494_8778" />
</filter>
<filter
id="filter1_f_494_8778"
x="-142.733"
y="-474.78"
width="1598.15"
height="1240.29"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
<feGaussianBlur stdDeviation="254.5" result="effect1_foregroundBlur_494_8778" />
</filter>
<pattern
id="pattern0_494_8778"
patternContentUnits="objectBoundingBox"
width="0.228659"
height="1.03093"
>
<use xlink:href="#image0_494_8778" transform="scale(0.000114329 0.000515464)" />
</pattern>
<clipPath id="clip0_494_8778">
<rect width="100%" height="291" fill="white" />
</clipPath>
</defs>
</svg>
"""
end

defp student_signin_background_color do
Application.fetch_env!(:oli, :student_sign_in)[:background_color]
end
Expand Down
1 change: 0 additions & 1 deletion lib/oli_web/components/delivery/instructor_dashboard.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ defmodule OliWeb.Components.Delivery.InstructorDashboard do
<UserAccount.menu
id="user-account-menu"
ctx={@ctx}
section={@section}
class="hover:!bg-delivery-instructor-dashboard-header-700"
dropdown_class="text-body-color dark:text-body-color-dark"
is_system_admin={@is_system_admin}
Expand Down
Loading
Loading