diff --git a/Management.Web/Shared/Module/NewModule.razor b/Management.Web/Shared/Module/NewModule.razor
index 2d7555d..86ca6e0 100644
--- a/Management.Web/Shared/Module/NewModule.razor
+++ b/Management.Web/Shared/Module/NewModule.razor
@@ -1,4 +1,4 @@
-@inject IModuleManager moduleManager
+@inject CoursePlanner configurationManagement
@code {
@@ -12,7 +12,7 @@
private async Task submitHandler()
{
var module = new CourseModule(Name: Name, Assignments: new LocalAssignment[] { });
- moduleManager.AddModule(module);
+ configurationManagement.Modules = configurationManagement.Modules.Append(module);
Name = "";
await OnSubmit.InvokeAsync();
}
diff --git a/Management.Web/Shared/Semester/Day.razor b/Management.Web/Shared/Semester/Day.razor
index cf5aca8..d9f0e22 100644
--- a/Management.Web/Shared/Semester/Day.razor
+++ b/Management.Web/Shared/Semester/Day.razor
@@ -1,4 +1,5 @@
@inject AssignmentDragContainer dragContainer
+@inject CoursePlanner configurationManagement
@code
{
diff --git a/Management.Web/Shared/Spinner.razor b/Management.Web/Shared/Spinner.razor
new file mode 100644
index 0000000..93cdbd2
--- /dev/null
+++ b/Management.Web/Shared/Spinner.razor
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Management.Web/Shared/Spinner.razor.css b/Management.Web/Shared/Spinner.razor.css
new file mode 100644
index 0000000..c0d6049
--- /dev/null
+++ b/Management.Web/Shared/Spinner.razor.css
@@ -0,0 +1,56 @@
+.loader {
+ width: 48px;
+ height: 48px;
+ border-radius: 50%;
+ display: inline-block;
+ position: relative;
+ border: 3px solid;
+ border-color: #6c757d #6c757d transparent transparent;
+ box-sizing: border-box;
+ animation: rotation 2s linear infinite;
+}
+.loader::after,
+.loader::before {
+ content: '';
+ box-sizing: border-box;
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+ border: 3px solid;
+ border-color: transparent transparent #092565 #092565;
+ width: 40px;
+ height: 40px;
+ border-radius: 50%;
+ box-sizing: border-box;
+ animation: rotationBack 1s linear infinite;
+ transform-origin: center center;
+}
+/* #092565 */
+/* #3a0647 */
+.loader::before {
+ width: 32px;
+ height: 32px;
+ border-color: #6c757d #6c757d transparent transparent;
+ animation: rotation 3s linear infinite;
+}
+
+@keyframes rotation {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
+}
+@keyframes rotationBack {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(-360deg);
+ }
+}
+
\ No newline at end of file
diff --git a/Management.Web/Utils/StorageManagement.cs b/Management.Web/Utils/StorageManagement.cs
new file mode 100644
index 0000000..30fd8cc
--- /dev/null
+++ b/Management.Web/Utils/StorageManagement.cs
@@ -0,0 +1,72 @@
+using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
+
+public class StorageManagement
+{
+ private string moduleStorageKey = "module storage key";
+ private string assignmentStorageKey = "assignment storage key";
+ private string courseIdKey = "course id storage key";
+
+ private CoursePlanner planner { get; }
+ private ProtectedLocalStorage storage { get; }
+ private CanvasService canvas { get; }
+
+ public StorageManagement(
+ CoursePlanner configurationManagement,
+ ProtectedLocalStorage BrowserStorage,
+ CanvasService canvasService
+ )
+ {
+ planner = configurationManagement;
+ storage = BrowserStorage;
+ canvas = canvasService;
+ }
+
+ public async Task LoadStoredConfig()
+ {
+ // var storedModules = await storage.GetAsync
>(moduleStorageKey);
+ // if (storedModules.Success)
+ // {
+ // planner.Modules =
+ // storedModules.Value
+ // ?? throw new Exception("stored modules was null, it shouldn't have been");
+ // }
+ // else
+ // {
+ // Console.WriteLine("no stored modules");
+ // }
+
+ // var storedAssignments = await storage.GetAsync>(assignmentStorageKey);
+ // if (storedAssignments.Success)
+ // {
+ // planner.Modules =
+ // storedAssignments.Value
+ // ?? throw new Exception("stored assignments are null, it shouldn't have been");
+ // }
+ // else
+ // {
+ // Console.WriteLine("no stored assignments");
+ // }
+
+ var storedCourseId = await storage.GetAsync(courseIdKey);
+ if (storedCourseId.Success)
+ {
+ // var courses =
+ planner.Course = await canvas.GetCourse(storedCourseId.Value);
+ }
+ else
+ {
+ Console.WriteLine("no stored assignments");
+ }
+ }
+
+ public async Task Save()
+ {
+ // await storage.SetAsync(moduleStorageKey, planner.Modules);
+ // await storage.SetAsync(assignmentStorageKey, planner.Assignments);
+
+ if (planner.Course != null)
+ await storage.SetAsync(courseIdKey, planner.Course.Id);
+ else
+ await storage.DeleteAsync(courseIdKey);
+ }
+}
diff --git a/Management/Features/Configuration/ConfigrationManagement.cs b/Management/Features/Configuration/CoursePlanner.cs
similarity index 67%
rename from Management/Features/Configuration/ConfigrationManagement.cs
rename to Management/Features/Configuration/CoursePlanner.cs
index f7b1acc..82a062d 100644
--- a/Management/Features/Configuration/ConfigrationManagement.cs
+++ b/Management/Features/Configuration/CoursePlanner.cs
@@ -1,6 +1,7 @@
using CanvasModel.EnrollmentTerms;
+using CanvasModel.Courses;
-public class ConfigurationManagement : IConfigurationManagement
+public class CoursePlanner
{
public void SetConfiguration(
EnrollmentTermModel canvasTerm,
@@ -18,8 +19,8 @@ public class ConfigurationManagement : IConfigurationManagement
}
public SemesterCalendarConfig? SemesterCalendar { get; set; } = null;
- public IModuleManager ModuleManager {get; private set;} = new ModuleManager();
-
-
+ public IEnumerable Modules { get; set; } = new CourseModule[] { };
+ public IEnumerable Assignments { get; set; } = new LocalAssignment[] { };
+ public CourseModel? Course { get; set; } = null;
}
\ No newline at end of file
diff --git a/Management/Features/Configuration/IConfigurationManagement.cs b/Management/Features/Configuration/IConfigurationManagement.cs
deleted file mode 100644
index fd1ce17..0000000
--- a/Management/Features/Configuration/IConfigurationManagement.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using CanvasModel.EnrollmentTerms;
-
-public interface IConfigurationManagement
-{
- SemesterCalendarConfig? SemesterCalendar { get; set; }
-
- void SetConfiguration(EnrollmentTermModel canvasTerm, DayOfWeek[] daysOfWeek);
-}
diff --git a/Management/Features/Modules/IModuleManager.cs b/Management/Features/Modules/IModuleManager.cs
deleted file mode 100644
index ba2458b..0000000
--- a/Management/Features/Modules/IModuleManager.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-public interface IModuleManager
-{
- IEnumerable Modules { get; set; }
- public void AddModule(CourseModule newModule);
- public void AddAssignment(int moduleIndex, LocalAssignment assignment);
-}
diff --git a/Management/Features/Modules/ModuleManager.cs b/Management/Features/Modules/ModuleManager.cs
deleted file mode 100644
index c613f83..0000000
--- a/Management/Features/Modules/ModuleManager.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-public class ModuleManager : IModuleManager
-{
- public IEnumerable Modules { get; set; } = new CourseModule[] { };
-
- public void AddAssignment(int moduleIndex, LocalAssignment assignment)
- {
- var newAssignments = Modules.ElementAt(moduleIndex).Assignments.Append(assignment);
- var newModule = Modules.ElementAt(moduleIndex) with { Assignments = newAssignments };
- if (newModule == null)
- throw new Exception($"cannot get module at index {moduleIndex}");
-
- Modules = Modules
- .Take(moduleIndex)
- .Append(newModule)
- .Concat(Modules.Skip(moduleIndex + 1));
- }
-
- public void AddModule(CourseModule newModule)
- {
- Modules = Modules.Append(newModule);
- }
-}
\ No newline at end of file
diff --git a/Management/Models/LocalAssignment.cs b/Management/Models/LocalAssignment.cs
index 816c07b..2b55b90 100644
--- a/Management/Models/LocalAssignment.cs
+++ b/Management/Models/LocalAssignment.cs
@@ -1,31 +1,29 @@
-public record RubricItem(
- int Points,
- string Label
-);
+public record RubricItem(int Points, string Label);
public enum SubmissionType
{
- online_quiz,
- none,
- on_paper,
- discussion_topic,
- external_tool,
- online_upload,
- online_text_entry,
- online_url,
- media_recording,
- student_annotation,
+ online_quiz,
+ none,
+ on_paper,
+ discussion_topic,
+ external_tool,
+ online_upload,
+ online_text_entry,
+ online_url,
+ media_recording,
+ student_annotation,
}
public record LocalAssignment
{
- public string name { get; init; } = "";
- public string description { get; init; } = "";
- public bool published { get; init; }
- public bool lock_at_due_date { get; init; }
- public IEnumerable rubric { get; init; } = new RubricItem[] { };
- public DateTime? lock_at { get; init; }
- public DateTime due_at { get; init; }
- public int points_possible { get; init; }
- public IEnumerable submission_types { get; init; } = new SubmissionType[] { };
-}
\ No newline at end of file
+ public string id { get; init; } = "";
+ public string name { get; init; } = "";
+ public string description { get; init; } = "";
+ public bool published { get; init; }
+ public bool lock_at_due_date { get; init; }
+ public IEnumerable rubric { get; init; } = new RubricItem[] { };
+ public DateTime? lock_at { get; init; }
+ public DateTime due_at { get; init; }
+ public int points_possible { get; init; }
+ public IEnumerable submission_types { get; init; } = new SubmissionType[] { };
+}
diff --git a/Management/Services/CanvasService.cs b/Management/Services/CanvasService.cs
index 8bb8e1e..8b17d16 100644
--- a/Management/Services/CanvasService.cs
+++ b/Management/Services/CanvasService.cs
@@ -13,6 +13,7 @@ public class CanvasService : ICanvasService
private const string BaseUrl = "https://snow.instructure.com/api/v1/";
private readonly IWebRequestor webRequestor;
private string courseid { get; }
+
public CanvasService(IWebRequestor webRequestor)
{
courseid = "774898";
@@ -25,20 +26,40 @@ public class CanvasService : ICanvasService
var request = new RestRequest(url);
var termResponses = await PaginatedRequest(request);
- var terms = termResponses
- .Select(r => r.EnrollmentTerms)
- .SelectMany(s => s).ToArray();
+ var terms = termResponses.Select(r => r.EnrollmentTerms).SelectMany(s => s).ToArray();
return terms;
}
+ public async Task> GetCourses(ulong termId)
+ {
+ var url = $"courses";
+ var request = new RestRequest(url);
+ var coursesResponse = await PaginatedRequest>(request);
+ return coursesResponse.SelectMany(c => c).Where(c => c.EnrollmentTermId == termId).ToArray();
+ }
+
+ public async Task GetCourse(ulong courseId)
+ {
+ var url = $"course/${courseId}";
+ var request = new RestRequest(url);
+ var response = await webRequestor.GetAsync(request);
+
+ if (response.Data == null)
+ {
+ System.Console.WriteLine(response.Content);
+ System.Console.WriteLine(response.ResponseUri);
+ throw new Exception("error getting course from canvas");
+ }
+ return response.Data;
+ }
+
private async Task> PaginatedRequest(RestRequest request)
{
var requestCount = 1;
request.AddQueryParameter("per_page", "100");
RestResponse response = await webRequestor.GetAsync(request);
- var returnData = response.Data != null
- ? new T[] { response.Data }
- : new T[] { };
+
+ var returnData = response.Data != null ? new T[] { response.Data } : new T[] { };
var nextUrl = getNextUrl(response.Headers);
while (nextUrl is not null)
@@ -56,34 +77,33 @@ public class CanvasService : ICanvasService
return returnData;
}
-
- private static string? getNextUrl(IEnumerable? headers) => headers?
- .ToList()
- .Find(h => h.Name == "Link")?
- .Value?
- .ToString()?
- .Split(",")
+ private static string? getNextUrl(IEnumerable? headers) =>
+ headers
+ ?.ToList()
+ .Find(h => h.Name == "Link")
+ ?.Value?.ToString()
+ ?.Split(",")
.Where(url => url.Contains("rel=\"next\""))
- .FirstOrDefault()?
- .Split(";")
- .FirstOrDefault()?
- .TrimEnd('>')
+ .FirstOrDefault()
+ ?.Split(";")
+ .FirstOrDefault()
+ ?.TrimEnd('>')
.TrimStart('<')
.Replace(" ", "")
.Replace(BaseUrl, "");
- public async Task> GetCurrentTermsFor(DateTime? _queryDate = null)
+ public async Task> GetCurrentTermsFor(
+ DateTime? _queryDate = null
+ )
{
DateTime queryDate = _queryDate ?? DateTime.Now;
var terms = await GetTerms();
- var currentTerms = terms.Where(t =>
- t.EndAt != null
- && t.EndAt > queryDate
- && t.EndAt < queryDate.AddYears(1)
- ).Take(3);
+ var currentTerms = terms
+ .Where(t => t.EndAt != null && t.EndAt > queryDate && t.EndAt < queryDate.AddYears(1))
+ .Take(3);
return currentTerms;
}
-}
\ No newline at end of file
+}
diff --git a/Management/Services/WebRequestor.cs b/Management/Services/WebRequestor.cs
index 7d2d344..b354094 100644
--- a/Management/Services/WebRequestor.cs
+++ b/Management/Services/WebRequestor.cs
@@ -5,21 +5,24 @@ public class WebRequestor : IWebRequestor
private const string BaseUrl = "https://snow.instructure.com/api/v1/";
private string token;
private RestClient client;
- private string courseid { get; }
+
public WebRequestor()
{
- token = Environment.GetEnvironmentVariable("CANVAS_TOKEN") ?? throw new Exception("CANVAS_TOKEN not in environment");
+ token =
+ Environment.GetEnvironmentVariable("CANVAS_TOKEN")
+ ?? throw new Exception("CANVAS_TOKEN not in environment");
client = new RestClient(BaseUrl);
client.AddDefaultHeader("Authorization", $"Bearer {token}");
- courseid = "774898";
}
+
public async Task> GetManyAsync(RestRequest request)
{
return await client.ExecuteGetAsync(request);
}
+
public async Task> GetAsync(RestRequest request)
{
return await client.ExecuteGetAsync(request);
}
-}
\ No newline at end of file
+}
diff --git a/requests/semester.http b/requests/semester.http
index 0b041cb..873609b 100644
--- a/requests/semester.http
+++ b/requests/semester.http
@@ -4,6 +4,16 @@ GET https://snow.instructure.com/api/v1/account_calendars
Authorization: Bearer {{$dotenv CANVAS_TOKEN}}
###
-GET https://snow.instructure.com/api/v1/accounts/10/terms
+GET https://snow.instructure.com/api/v1/accounts/10/terms?per_page=100
Authorization: Bearer {{$dotenv CANVAS_TOKEN}}
+###
+
+GET https://snow.instructure.com/api/v1/courses?enrollment_term_id=751
+Authorization: Bearer {{$dotenv CANVAS_TOKEN}}
+
+
+###
+
+GET https://snow.instructure.com/api/v1/courses?enrollment_term_id=751&per_page=100
+Authorization: Bearer {{$dotenv CANVAS_TOKEN}}
\ No newline at end of file