Merge pull request #42 from ApprenticeofEnder/dev

Pre Release Deployment

Author: ApprenticeofEnder

.env.tpl

@@ -1,7 +1,7 @@
 NEXT_PUBLIC_SUPABASE_ANON_KEY=op://CourseFull/CourseFull/$COURSEFULL_ENV/NEXT_PUBLIC_SUPABASE_ANON_KEY
 NEXT_PUBLIC_SUPABASE_URL=op://CourseFull/CourseFull/$COURSEFULL_ENV/NEXT_PUBLIC_SUPABASE_URL
 NODE_ENV=op://CourseFull/CourseFull/$COURSEFULL_ENV/NODE_ENV
-DATABASE_URL=op://CourseFull/CourseFull/$COURSEFULL_ENV/DATABASE_URL 
+DATABASE_URL=op://CourseFull/CourseFull/$COURSEFULL_ENV/DATABASE_URL
 JWT_SECRET=op://CourseFull/CourseFull/$COURSEFULL_ENV/JWT_SECRET
 RAILS_ENV=op://CourseFull/CourseFull/$COURSEFULL_ENV/RAILS_ENV
 SUPABASE_SERVICE_KEY=op://CourseFull/CourseFull/$COURSEFULL_ENV/SUPABASE_SERVICE_KEY

app/controllers/api/v1/deliverables_controller.rb

@@ -71,11 +71,11 @@ def set_api_v1_deliverable
 
       # Only allow a list of trusted parameters through.
       def api_v1_deliverable_params
-        params.require(:api_v1_deliverable).permit(:name, :weight, :mark, :notes, :api_v1_course_id, :status)
+        params.require(:api_v1_deliverable).permit(:name, :weight, :mark, :notes, :api_v1_course_id, :status, :start_date, :deadline)
       end
 
       def api_v1_deliverable_update_params
-        params.require(:api_v1_deliverable).permit(:name, :weight, :mark, :notes, :status)
+        params.require(:api_v1_deliverable).permit(:name, :weight, :mark, :notes, :status, :start_date, :deadline)
       end
     end
   end

app/controllers/api/v1/users_controller.rb

@@ -38,9 +38,8 @@ def destroy
       res = http.delete("/auth/v1/admin/users/#{@supabase_id}", headers)
       res.value
     rescue Net::HTTPClientException
-      Rails.logger.error(format('Attempt to delete Supabase User with ID %s failed. Status code: %s', @supabase_id,
-                                res.code))
-      Rails.logger.error(format('Deletion details: %s', res.body))
+      Rails.logger.error('Attempt to delete Supabase User with ID %s failed. Status code: %s', @supabase_id, res.code)
+      Rails.logger.error('Deletion details: %s', res.body)
       return render json: { error: 'Failed to delete user.' }, status: res.code
     end
 
@@ -59,12 +58,17 @@ def progress
       'api_v1_semesters.status AS status'
     ]
 
+    joins = [
+      'LEFT JOIN "api_v1_courses" ON "api_v1_courses"."api_v1_semester_id" = "api_v1_semesters"."id"',
+      'LEFT JOIN "api_v1_deliverables" ON "api_v1_deliverables"."api_v1_course_id" = "api_v1_courses"."id"'
+    ]
+
     group_by_clauses = [
       'api_v1_semesters.id', 'api_v1_semesters.name', 'api_v1_semesters.goal', 'api_v1_semesters.status'
     ]
 
     attempted_semester_progress = @api_v1_user.semesters
-                                              .joins(courses: :deliverables)
+                                              .joins(joins)
                                               .select(
                                                 *select_statements
                                               )

app/models/api/v1/course.rb

@@ -28,6 +28,8 @@ def update_goal
         set_goal(goal)
       end
 
+      # TODO: Figure out if having grades and goals cap out at 100% would be better than having weighbt cap out at 100%
+
       def set_goal(goal)
         self.goal = goal
         goal_calculator = GoalCalculator.new(goal)
@@ -43,7 +45,7 @@ def set_goal(goal)
         # end
 
         save
-        deliverables.active.update_all(goal: deliverable_goal)
+        deliverables.active.update(goal: deliverable_goal)
       end
 
       def current_grade; end

app/models/api/v1/deliverable.rb

@@ -3,6 +3,9 @@
 module Api
   module V1
     class Deliverable < ApplicationRecord
+      attribute :start_date, :datetime
+      attribute :deadline, :datetime
+
       # Relationships
       belongs_to :course, foreign_key: 'api_v1_course_id'
       belongs_to :user, foreign_key: 'api_v1_user_id'
@@ -21,6 +24,8 @@ class Deliverable < ApplicationRecord
       validates :notes, presence: true, allow_blank: true, length: { maximum: 5000 }
       validates :goal, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }
       validates :status, inclusion: { in: statuses.keys }
+      validates :start_date, presence: true
+      validates :deadline, presence: true
       validates :course, presence: true
       validates :user, presence: true
     end

client/.prettierrc

@@ -1,5 +1,5 @@
 {
   "trailingComma": "es5",
   "tabWidth": 4,
-  "singleQuote": true,
+  "singleQuote": true
 }

client/@coursefull/data.d.ts

@@ -0,0 +1,57 @@
+import { ItemStatus } from '@coursefull/enums.d';
+import { DateValue, ZonedDateTime } from '@internationalized/date';
+
+export interface BaseAcademicItem {
+    id?: string;
+    api_v1_user_id?: string;
+    status: ItemStatus;
+}
+
+export interface Semester extends BaseAcademicItem {
+    name: string;
+    goal: number;
+    courses: Course[];
+}
+
+export interface Course extends BaseAcademicItem {
+    title: string;
+    course_code: string;
+    api_v1_semester_id?: string;
+    goal?: number;
+    grade?: number;
+    deliverable_goal?: number;
+    deliverables: Deliverable[];
+}
+
+export interface Deliverable extends BaseAcademicItem {
+    name: string;
+    weight: number;
+    mark: number;
+    notes: string;
+    start_date: ZonedDateTime;
+    deadline: ZonedDateTime;
+    api_v1_course_id?: string;
+    goal?: number;
+}
+
+export type Updated<T extends BaseAcademicItem> = T & {
+    id: string;
+}
+
+export interface User {
+    id: string;
+    first_name: string;
+    last_name: string;
+    email: string;
+    supabase_id: string;
+    courses_remaining: number;
+    subscribed: boolean;
+}
+
+export interface Product {
+    name: string;
+    description: string;
+    stripe_id: string;
+    stripe_price: string;
+    price: number;
+}

client/@coursefull/dto.d.ts

@@ -1 +1,22 @@
-// A place to put DTO objects
+import { Semester, Course, Deliverable, Product } from './data';
+
+export interface SemesterDto extends Semester {
+    courses?: CourseDto[];
+}
+
+export interface CourseDto extends Course {
+    deliverables?: DeliverableDto[];
+}
+
+export interface ModifyCourseDto {
+    api_v1_course: CourseDto
+}
+
+export interface DeliverableDto extends Deliverable {
+    start_date: string;
+    deadline: string;
+}
+
+export interface PaymentLinkDto {
+    redirect: string;
+}

client/@coursefull/enums.d.ts

@@ -24,4 +24,5 @@ export enum ItemStatus {
     NOT_STARTED = 'not_started',
     ACTIVE = 'active',
     COMPLETE = 'complete',
+    OVERDUE = 'overdue',
 }

client/@coursefull/home-page.d.ts

@@ -0,0 +1,18 @@
+export type HomePageRef = {
+    ref: RefObject<HTMLDivElement>;
+    scrollIntoView: () => void;
+    navigateTo: () => void;
+};
+
+export interface HomePageRefs {
+    benefitsRef: HomePageRef;
+    callToValueRef: HomePageRef;
+    faqRef: HomePageRef;
+    featuresRef: HomePageRef;
+    heroRef: HomePageRef;
+    inActionRef: HomePageRef;
+    mechanicsRef: HomePageRef;
+    pricingRef: HomePageRef;
+    resultsRef: HomePageRef;
+    socialProofRef: HomePageRef;
+}