feat(ui): course color picker (#382)
* fix: update CourseCellColorPicker.tsx background to white * feat: add color picker to CalendarCourseCell component * feat: add color picker functionality to update course colors * fix: type issues with storybook components * feat: add useColorPicker hook, isValidHexColor and updateCourseColors utilities * refactor: color picker logic and UI components * refactor: update useFlattenedCourseSchedule hook to include courseID property * refactor: update storybook calendar components with updated props * refactor: update color picker ui logic to account for position of cell * fix: revert back to error handling for invalid rgb * refactor: update jsdocs * refactor: integrate ColorPickerContext into Calendar components and update props * refactor: integrate ColorPickerContext into Calendar components and update related props * refactor: change JSDocs comments and remove unused color inversion state * refactor: update story components * feat: add functionality for selecting secondary course colors * refactor: enhance HexColorEditor to dynamically adjust tag icon color based on preview color * refactor: simplify JSDoc comment in useColorPicker hook * fix: revert Button component * refactor: update CalendarCourseCell component positioning and styling * fix: correct types in color.ts * feat: add getDarkerShade function to compute darker shades of hex colors * feat: add shadow to color picker button * fix: update button size in ColorPatch component * feat: implement debounced input for hex color editor and add useDebounce hook * chore: utilize the logical and && operator instead of the ternary operator * fix: imports and palette icon * refactor: remove unused import * fix: bug when course add fails with custom colors * chore: run lint * chore: run check-types * feat: add HSL color type and conversion functions * refactor: rename colorway to theme * fix: hide color picker on screenshot * fix: undo important syntax * refactor: rename SomeFunction to DebouncedCallback * refactor: remove inner function * refactor: update return type to DebouncedCallback * fix: adjust sizes for hash and palette button * feat: create tests for hexToHSL and isValidHexColor * refactor: update parameter type to use HexColor * fix: increase size of palette button * fix: update dependency array for hex code debounce * fix: change colorPickerRef element ref --------- Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
This commit is contained in:
@@ -12,7 +12,7 @@ import type { MessageHandler } from 'chrome-extension-toolkit';
|
|||||||
|
|
||||||
const userScheduleHandler: MessageHandler<UserScheduleMessages> = {
|
const userScheduleHandler: MessageHandler<UserScheduleMessages> = {
|
||||||
addCourse({ data, sendResponse }) {
|
addCourse({ data, sendResponse }) {
|
||||||
addCourse(data.scheduleId, new Course(data.course)).then(sendResponse);
|
addCourse(data.scheduleId, new Course(data.course), data.hasColor ?? false).then(sendResponse);
|
||||||
},
|
},
|
||||||
removeCourse({ data, sendResponse }) {
|
removeCourse({ data, sendResponse }) {
|
||||||
removeCourse(data.scheduleId, new Course(data.course)).then(sendResponse);
|
removeCourse(data.scheduleId, new Course(data.course)).then(sendResponse);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export interface UserScheduleMessages {
|
|||||||
*
|
*
|
||||||
* @param data - The schedule id and course to add
|
* @param data - The schedule id and course to add
|
||||||
*/
|
*/
|
||||||
addCourse: (data: { scheduleId: string; course: Course }) => void;
|
addCourse: (data: { scheduleId: string; course: Course; hasColor?: boolean }) => void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds a course by URL
|
* Adds a course by URL
|
||||||
|
|||||||
@@ -25,3 +25,8 @@ export type sRGB = [r: number, g: number, b: number];
|
|||||||
* Represents a Lab color value.
|
* Represents a Lab color value.
|
||||||
*/
|
*/
|
||||||
export type Lab = [l: number, a: number, b: number];
|
export type Lab = [l: number, a: number, b: number];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a HSL color value.
|
||||||
|
*/
|
||||||
|
export type HSL = [h: number, s: number, l: number];
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import type { Serialized } from 'chrome-extension-toolkit';
|
import type { Serialized } from 'chrome-extension-toolkit';
|
||||||
import { theme } from 'unocss/preset-mini';
|
import { theme } from 'unocss/preset-mini';
|
||||||
|
|
||||||
import type { HexColor, Lab, RGB, sRGB } from '../types/Color';
|
import type { HexColor, HSL, Lab, RGB, sRGB } from '../types/Color';
|
||||||
import { isHexColor } from '../types/Color';
|
import { isHexColor } from '../types/Color';
|
||||||
import type { Course } from '../types/Course';
|
import type { Course } from '../types/Course';
|
||||||
import type { CourseColors, TWColorway, TWIndex } from '../types/ThemeColors';
|
import type { CourseColors, TWColorway, TWIndex } from '../types/ThemeColors';
|
||||||
import { colorwayIndexes } from '../types/ThemeColors';
|
import { colors, colorwayIndexes } from '../types/ThemeColors';
|
||||||
import type { UserSchedule } from '../types/UserSchedule';
|
import type { UserSchedule } from '../types/UserSchedule';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -26,6 +26,19 @@ export function hexToRGB(hex: HexColor): RGB | undefined {
|
|||||||
return [parseInt(result[1]!, 16), parseInt(result[2]!, 16), parseInt(result[3]!, 16)];
|
return [parseInt(result[1]!, 16), parseInt(result[2]!, 16), parseInt(result[3]!, 16)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if a given string is a valid hex color.
|
||||||
|
*
|
||||||
|
* A valid hex color is a string that starts with a '#' followed by either
|
||||||
|
* 3 or 6 hexadecimal characters (0-9, A-F, a-f).
|
||||||
|
*
|
||||||
|
* @param hex - The hex color string to validate.
|
||||||
|
* @returns True if the string is a valid hex color, false otherwise.
|
||||||
|
*/
|
||||||
|
export function isValidHexColor(hex: string): boolean {
|
||||||
|
return /^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(hex);
|
||||||
|
}
|
||||||
|
|
||||||
export const useableColorways = Object.keys(theme.colors)
|
export const useableColorways = Object.keys(theme.colors)
|
||||||
// check that the color is a colorway (is an object)
|
// check that the color is a colorway (is an object)
|
||||||
.filter(color => typeof theme.colors[color as keyof typeof theme.colors] === 'object')
|
.filter(color => typeof theme.colors[color as keyof typeof theme.colors] === 'object')
|
||||||
@@ -56,6 +69,13 @@ export function pickFontColor(bgColor: HexColor): 'text-white' | 'text-black' |
|
|||||||
return Ys < 0.365 ? 'text-black' : 'text-theme-black';
|
return Ys < 0.365 ? 'text-black' : 'text-theme-black';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Mapping of Tailwind CSS class names to their corresponding hex values
|
||||||
|
export const tailwindColorMap: Record<string, HexColor> = {
|
||||||
|
'text-white': '#FFFFFF',
|
||||||
|
'text-black': '#000000',
|
||||||
|
'text-theme-black': colors.theme.black,
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get primary and secondary colors from a Tailwind colorway
|
* Get primary and secondary colors from a Tailwind colorway
|
||||||
*
|
*
|
||||||
@@ -82,10 +102,15 @@ export function getCourseColors(colorway: TWColorway, index?: number, offset: nu
|
|||||||
* @param color - The hexadecimal color value.
|
* @param color - The hexadecimal color value.
|
||||||
* @returns The Tailwind colorway.
|
* @returns The Tailwind colorway.
|
||||||
*/
|
*/
|
||||||
export function getColorwayFromColor(color: HexColor): TWColorway {
|
export function getColorwayFromColor(color: HexColor): {
|
||||||
|
colorway: TWColorway;
|
||||||
|
index: TWIndex;
|
||||||
|
} {
|
||||||
for (const colorway of useableColorways) {
|
for (const colorway of useableColorways) {
|
||||||
if (Object.values(theme.colors[colorway]).includes(color)) {
|
const colorValues = Object.values(theme.colors[colorway]);
|
||||||
return colorway as TWColorway;
|
const index = colorValues.indexOf(color);
|
||||||
|
if (index !== -1) {
|
||||||
|
return { colorway: colorway as TWColorway, index: (index * 100) as TWIndex };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,6 +146,124 @@ export function getColorwayFromColor(color: HexColor): TWColorway {
|
|||||||
return getColorwayFromColor(closestColor);
|
return getColorwayFromColor(closestColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a hexadecimal color value to HSL (Hue, Saturation, Lightness) format
|
||||||
|
*
|
||||||
|
* @param hex - The hexadecimal color string
|
||||||
|
* @returns An array of [hue (0-360), saturation (0-100), lightness (0-100)]
|
||||||
|
* @throws If the hex color cannot be converted to RGB
|
||||||
|
*/
|
||||||
|
export const hexToHSL = (hex: HexColor): HSL => {
|
||||||
|
const rgb = hexToRGB(hex);
|
||||||
|
|
||||||
|
if (!rgb) {
|
||||||
|
throw new Error('hexToRGB returned undefined');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert RGB to decimals
|
||||||
|
const r = rgb[0] / 255;
|
||||||
|
const g = rgb[1] / 255;
|
||||||
|
const b = rgb[2] / 255;
|
||||||
|
|
||||||
|
// Find min/max/delta
|
||||||
|
const max = Math.max(r, g, b);
|
||||||
|
const min = Math.min(r, g, b);
|
||||||
|
const delta = max - min;
|
||||||
|
|
||||||
|
// Calculate HSL values
|
||||||
|
let h = 0;
|
||||||
|
let s = 0;
|
||||||
|
let l = (max + min) / 2;
|
||||||
|
|
||||||
|
if (delta !== 0) {
|
||||||
|
// Calculate saturation
|
||||||
|
s = delta / (1 - Math.abs(2 * l - 1));
|
||||||
|
|
||||||
|
// Calculate hue
|
||||||
|
if (max === r) {
|
||||||
|
h = ((g - b) / delta) % 6;
|
||||||
|
} else if (max === g) {
|
||||||
|
h = (b - r) / delta + 2;
|
||||||
|
} else {
|
||||||
|
h = (r - g) / delta + 4;
|
||||||
|
}
|
||||||
|
h *= 60;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalize values
|
||||||
|
h = Math.round(h < 0 ? h + 360 : h);
|
||||||
|
s = Math.round(s * 100);
|
||||||
|
l = Math.round(l * 100);
|
||||||
|
|
||||||
|
return [h, s, l];
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts an HSL color value to RGB format.
|
||||||
|
*
|
||||||
|
* @param hsl - The HSL color value
|
||||||
|
* @returns An RGB color value
|
||||||
|
*/
|
||||||
|
function hslToRGB([hue, saturation, lightness]: HSL): RGB {
|
||||||
|
// Convert percentages to decimals
|
||||||
|
const s = saturation / 100;
|
||||||
|
const l = lightness / 100;
|
||||||
|
|
||||||
|
// Calculate intermediate values
|
||||||
|
const c = (1 - Math.abs(2 * l - 1)) * s;
|
||||||
|
const x = c * (1 - Math.abs(((hue / 60) % 2) - 1));
|
||||||
|
const m = l - c / 2;
|
||||||
|
|
||||||
|
let r = 0;
|
||||||
|
let g = 0;
|
||||||
|
let b = 0;
|
||||||
|
|
||||||
|
// Determine RGB values based on hue
|
||||||
|
if (hue >= 0 && hue < 60) {
|
||||||
|
[r, g, b] = [c, x, 0];
|
||||||
|
} else if (hue >= 60 && hue < 120) {
|
||||||
|
[r, g, b] = [x, c, 0];
|
||||||
|
} else if (hue >= 120 && hue < 180) {
|
||||||
|
[r, g, b] = [0, c, x];
|
||||||
|
} else if (hue >= 180 && hue < 240) {
|
||||||
|
[r, g, b] = [0, x, c];
|
||||||
|
} else if (hue >= 240 && hue < 300) {
|
||||||
|
[r, g, b] = [x, 0, c];
|
||||||
|
} else {
|
||||||
|
[r, g, b] = [c, 0, x];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to 0-255 range and round
|
||||||
|
return [Math.round((r + m) * 255), Math.round((g + m) * 255), Math.round((b + m) * 255)];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a darker shade of the given hex color by reducing the lightness in HSL color space.
|
||||||
|
*
|
||||||
|
* @param color - The hexadecimal color value to darken.
|
||||||
|
* @param offset - The percentage to reduce the lightness by (default is 20).
|
||||||
|
* @returns The darker shade of the given hex color.
|
||||||
|
* @throws If the provided color is not a valid hex color.
|
||||||
|
*/
|
||||||
|
export function getDarkerShade(color: HexColor, offset: number = 20): HexColor {
|
||||||
|
const rgb = hexToRGB(color);
|
||||||
|
if (!rgb) {
|
||||||
|
throw new Error('color: Invalid hex.');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to HSL
|
||||||
|
const [h, s, l] = hexToHSL(color);
|
||||||
|
|
||||||
|
// Reduce lightness by offset percentage, ensuring it doesn't go below 0
|
||||||
|
const newL = Math.max(0, l - offset);
|
||||||
|
|
||||||
|
// Convert back to RGB
|
||||||
|
const newRGB = hslToRGB([h, s, newL]);
|
||||||
|
|
||||||
|
// Convert to hex
|
||||||
|
return `#${newRGB.map(c => Math.round(c).toString(16).padStart(2, '0')).join('')}`;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get next unused color in a tailwind colorway for a given schedule
|
* Get next unused color in a tailwind colorway for a given schedule
|
||||||
*
|
*
|
||||||
@@ -153,17 +296,28 @@ export function getUnusedColor(
|
|||||||
|
|
||||||
const scheduleCourses = schedule.courses.map(c => ({
|
const scheduleCourses = schedule.courses.map(c => ({
|
||||||
...c,
|
...c,
|
||||||
colorway: getColorwayFromColor(c.colors.primaryColor),
|
theme: (() => {
|
||||||
|
try {
|
||||||
|
return getColorwayFromColor(c.colors.primaryColor);
|
||||||
|
} catch (error) {
|
||||||
|
// Default to emerald colorway with index 500
|
||||||
|
return {
|
||||||
|
colorway: 'emerald' as TWColorway,
|
||||||
|
index: 500 as TWIndex,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
})(),
|
||||||
}));
|
}));
|
||||||
const usedColorways = new Set(scheduleCourses.map(c => c.colorway));
|
|
||||||
|
const usedColorways = new Set(scheduleCourses.map(c => c.theme.colorway));
|
||||||
const availableColorways = new Set(useableColorways.filter(c => !usedColorways.has(c)));
|
const availableColorways = new Set(useableColorways.filter(c => !usedColorways.has(c)));
|
||||||
|
|
||||||
if (availableColorways.size > 0) {
|
if (availableColorways.size > 0) {
|
||||||
let sameDepartment = scheduleCourses.filter(c => c.department === course.department);
|
let sameDepartment = scheduleCourses.filter(c => c.department === course.department);
|
||||||
|
|
||||||
sameDepartment.sort((a, b) => {
|
sameDepartment.sort((a, b) => {
|
||||||
const aIndex = useableColorways.indexOf(a.colorway);
|
const aIndex = useableColorways.indexOf(a.theme.colorway);
|
||||||
const bIndex = useableColorways.indexOf(b.colorway);
|
const bIndex = useableColorways.indexOf(b.theme.colorway);
|
||||||
|
|
||||||
return aIndex - bIndex;
|
return aIndex - bIndex;
|
||||||
});
|
});
|
||||||
@@ -172,8 +326,8 @@ export function getUnusedColor(
|
|||||||
// check to see if any adjacent colorways are available
|
// check to see if any adjacent colorways are available
|
||||||
const centerCourse = sameDepartment[Math.floor(Math.random() * sameDepartment.length)]!;
|
const centerCourse = sameDepartment[Math.floor(Math.random() * sameDepartment.length)]!;
|
||||||
|
|
||||||
let nextColorway = getNextColorway(centerCourse.colorway);
|
let nextColorway = getNextColorway(centerCourse.theme.colorway);
|
||||||
let prevColorway = getPreviousColorway(centerCourse.colorway);
|
let prevColorway = getPreviousColorway(centerCourse.theme.colorway);
|
||||||
|
|
||||||
// eslint-disable-next-line no-constant-condition
|
// eslint-disable-next-line no-constant-condition
|
||||||
while (true) {
|
while (true) {
|
||||||
|
|||||||
81
src/shared/util/tests/colors.test.ts
Normal file
81
src/shared/util/tests/colors.test.ts
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
import { hexToHSL, isValidHexColor } from '@shared/util/colors';
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
describe('hexToHSL', () => {
|
||||||
|
it('should convert pure red to HSL', () => {
|
||||||
|
const result = hexToHSL('#FF0000');
|
||||||
|
expect(result).toEqual([0, 100, 50]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should convert pure green to HSL', () => {
|
||||||
|
const result = hexToHSL('#00FF00');
|
||||||
|
expect(result).toEqual([120, 100, 50]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should convert pure blue to HSL', () => {
|
||||||
|
const result = hexToHSL('#0000FF');
|
||||||
|
expect(result).toEqual([240, 100, 50]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should convert white to HSL', () => {
|
||||||
|
const result = hexToHSL('#FFFFFF');
|
||||||
|
expect(result).toEqual([0, 0, 100]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should convert black to HSL', () => {
|
||||||
|
const result = hexToHSL('#000000');
|
||||||
|
expect(result).toEqual([0, 0, 0]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should convert UT burnt orange to HSL', () => {
|
||||||
|
const result = hexToHSL('#BF5700');
|
||||||
|
expect(result).toEqual([27, 100, 37]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should convert gray to HSL', () => {
|
||||||
|
const result = hexToHSL('#808080');
|
||||||
|
expect(result).toEqual([0, 0, 50]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should throw error for invalid hex color', () => {
|
||||||
|
expect(() => hexToHSL('#GGGGGG')).toThrow('hexToRGB returned undefined');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('isValidHexColor', () => {
|
||||||
|
it('should validate 6-digit hex colors with hash', () => {
|
||||||
|
expect(isValidHexColor('#000000')).toBe(true);
|
||||||
|
expect(isValidHexColor('#FFFFFF')).toBe(true);
|
||||||
|
expect(isValidHexColor('#BF5700')).toBe(true);
|
||||||
|
expect(isValidHexColor('#D6D2C4')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should validate 6-digit hex colors without hash', () => {
|
||||||
|
expect(isValidHexColor('000000')).toBe(true);
|
||||||
|
expect(isValidHexColor('FFFFFF')).toBe(true);
|
||||||
|
expect(isValidHexColor('BF5700')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should validate 3-digit hex colors with hash', () => {
|
||||||
|
expect(isValidHexColor('#000')).toBe(true);
|
||||||
|
expect(isValidHexColor('#FFF')).toBe(true);
|
||||||
|
expect(isValidHexColor('#F0F')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should validate 3-digit hex colors without hash', () => {
|
||||||
|
expect(isValidHexColor('000')).toBe(true);
|
||||||
|
expect(isValidHexColor('FFF')).toBe(true);
|
||||||
|
expect(isValidHexColor('F0F')).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should reject invalid hex colors', () => {
|
||||||
|
expect(isValidHexColor('#')).toBe(false);
|
||||||
|
expect(isValidHexColor('#GGG')).toBe(false);
|
||||||
|
expect(isValidHexColor('#GGGGGG')).toBe(false);
|
||||||
|
expect(isValidHexColor('GGGGGG')).toBe(false);
|
||||||
|
expect(isValidHexColor('#12345')).toBe(false);
|
||||||
|
expect(isValidHexColor('#1234567')).toBe(false);
|
||||||
|
expect(isValidHexColor('not a color')).toBe(false);
|
||||||
|
expect(isValidHexColor('')).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -3,6 +3,7 @@ import Instructor from '@shared/types/Instructor';
|
|||||||
import { getCourseColors } from '@shared/util/colors';
|
import { getCourseColors } from '@shared/util/colors';
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
import type { Meta, StoryObj } from '@storybook/react';
|
||||||
import CalendarBottomBar from '@views/components/calendar/CalendarBottomBar';
|
import CalendarBottomBar from '@views/components/calendar/CalendarBottomBar';
|
||||||
|
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
const exampleGovCourse: Course = new Course({
|
const exampleGovCourse: Course = new Course({
|
||||||
@@ -91,9 +92,18 @@ export const Default: Story = {
|
|||||||
async: true,
|
async: true,
|
||||||
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
|
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
|
||||||
componentProps: {
|
componentProps: {
|
||||||
colors: getCourseColors('pink', 200),
|
|
||||||
courseDeptAndInstr: `${exampleGovCourse.department} ${exampleGovCourse.number} – ${exampleGovCourse.instructors[0]!.lastName}`,
|
courseDeptAndInstr: `${exampleGovCourse.department} ${exampleGovCourse.number} – ${exampleGovCourse.instructors[0]!.lastName}`,
|
||||||
status: exampleGovCourse.status,
|
status: exampleGovCourse.status,
|
||||||
|
blockData: {
|
||||||
|
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: `${exampleGovCourse.department} ${exampleGovCourse.number} – ${exampleGovCourse.instructors[0]!.lastName}`,
|
||||||
|
status: exampleGovCourse.status,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: exampleGovCourse,
|
||||||
|
async: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: exampleGovCourse,
|
course: exampleGovCourse,
|
||||||
},
|
},
|
||||||
@@ -101,9 +111,18 @@ export const Default: Story = {
|
|||||||
async: true,
|
async: true,
|
||||||
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
|
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
|
||||||
componentProps: {
|
componentProps: {
|
||||||
colors: getCourseColors('slate', 500),
|
|
||||||
courseDeptAndInstr: `${examplePsyCourse.department} ${examplePsyCourse.number} – ${examplePsyCourse.instructors[0]!.lastName}`,
|
courseDeptAndInstr: `${examplePsyCourse.department} ${examplePsyCourse.number} – ${examplePsyCourse.instructors[0]!.lastName}`,
|
||||||
status: examplePsyCourse.status,
|
status: examplePsyCourse.status,
|
||||||
|
blockData: {
|
||||||
|
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: `${examplePsyCourse.department} ${examplePsyCourse.number} – ${examplePsyCourse.instructors[0]!.lastName}`,
|
||||||
|
status: examplePsyCourse.status,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: examplePsyCourse,
|
||||||
|
async: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: examplePsyCourse,
|
course: examplePsyCourse,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { Status } from '@shared/types/Course';
|
import { Status } from '@shared/types/Course';
|
||||||
import { getCourseColors } from '@shared/util/colors';
|
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
import type { Meta, StoryObj } from '@storybook/react';
|
||||||
import type { CalendarCourseCellProps } from '@views/components/calendar/CalendarCourseCell';
|
import type { CalendarCourseCellProps } from '@views/components/calendar/CalendarCourseCell';
|
||||||
import CalendarCourseCell from '@views/components/calendar/CalendarCourseCell';
|
import CalendarCourseCell from '@views/components/calendar/CalendarCourseCell';
|
||||||
|
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import { ExampleCourse } from '../PopupCourseBlock.stories';
|
import { ExampleCourse } from '../PopupCourseBlock.stories';
|
||||||
@@ -19,7 +19,6 @@ const meta = {
|
|||||||
className: { control: { type: 'text' } },
|
className: { control: { type: 'text' } },
|
||||||
status: { control: { type: 'select', options: Object.values(Status) } },
|
status: { control: { type: 'select', options: Object.values(Status) } },
|
||||||
timeAndLocation: { control: { type: 'text' } },
|
timeAndLocation: { control: { type: 'text' } },
|
||||||
colors: { control: { type: 'object' } },
|
|
||||||
},
|
},
|
||||||
render: (args: CalendarCourseCellProps) => (
|
render: (args: CalendarCourseCellProps) => (
|
||||||
<div className='w-45'>
|
<div className='w-45'>
|
||||||
@@ -31,23 +30,70 @@ const meta = {
|
|||||||
className: ExampleCourse.number,
|
className: ExampleCourse.number,
|
||||||
status: ExampleCourse.status,
|
status: ExampleCourse.status,
|
||||||
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '–' }),
|
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '–' }),
|
||||||
|
|
||||||
colors: getCourseColors('emerald', 500),
|
|
||||||
},
|
},
|
||||||
} satisfies Meta<typeof CalendarCourseCell>;
|
} satisfies Meta<typeof CalendarCourseCell>;
|
||||||
export default meta;
|
export default meta;
|
||||||
|
|
||||||
type Story = StoryObj<typeof meta>;
|
type Story = StoryObj<typeof meta>;
|
||||||
|
|
||||||
export const Default: Story = {};
|
export const Default: Story = {
|
||||||
|
args: {
|
||||||
|
courseDeptAndInstr: ExampleCourse.department,
|
||||||
|
className: ExampleCourse.number,
|
||||||
|
status: ExampleCourse.status,
|
||||||
|
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
|
||||||
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 4,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 11,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: ExampleCourse.department,
|
||||||
|
status: ExampleCourse.status,
|
||||||
|
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export const Variants: Story = {
|
export const Variants: Story = {
|
||||||
render: props => (
|
args: {
|
||||||
<div className='grid grid-cols-2 h-40 max-w-60 w-90vw gap-x-4 gap-y-2'>
|
courseDeptAndInstr: ExampleCourse.department,
|
||||||
<CalendarCourseCell {...props} colors={getCourseColors('green', 500)} />
|
className: ExampleCourse.number,
|
||||||
<CalendarCourseCell {...props} colors={getCourseColors('teal', 400)} />
|
status: ExampleCourse.status,
|
||||||
<CalendarCourseCell {...props} colors={getCourseColors('indigo', 400)} />
|
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
|
||||||
<CalendarCourseCell {...props} colors={getCourseColors('red', 500)} />
|
blockData: {
|
||||||
</div>
|
calendarGridPoint: {
|
||||||
),
|
dayIndex: 4,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 11,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: ExampleCourse.department,
|
||||||
|
status: ExampleCourse.status,
|
||||||
|
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
|
||||||
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 4,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 11,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: ExampleCourse.department,
|
||||||
|
status: ExampleCourse.status,
|
||||||
|
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { Status } from '@shared/types/Course';
|
import { Status } from '@shared/types/Course';
|
||||||
import { getCourseColors } from '@shared/util/colors';
|
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
import type { Meta, StoryObj } from '@storybook/react';
|
||||||
import CalendarGrid from '@views/components/calendar/CalendarGrid';
|
import CalendarGrid from '@views/components/calendar/CalendarGrid';
|
||||||
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
||||||
@@ -32,7 +31,21 @@ const testData: CalendarGridCourse[] = [
|
|||||||
courseDeptAndInstr: 'Course 1',
|
courseDeptAndInstr: 'Course 1',
|
||||||
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
||||||
status: Status.OPEN,
|
status: Status.OPEN,
|
||||||
colors: getCourseColors('emerald', 500),
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 4,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 11,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: 'Course 1',
|
||||||
|
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
||||||
|
status: Status.OPEN,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: ExampleCourse,
|
course: ExampleCourse,
|
||||||
async: false,
|
async: false,
|
||||||
@@ -47,7 +60,21 @@ const testData: CalendarGridCourse[] = [
|
|||||||
courseDeptAndInstr: 'Course 1',
|
courseDeptAndInstr: 'Course 1',
|
||||||
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
||||||
status: Status.OPEN,
|
status: Status.OPEN,
|
||||||
colors: getCourseColors('emerald', 500),
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 2,
|
||||||
|
startIndex: 5,
|
||||||
|
endIndex: 6,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: 'Course 1',
|
||||||
|
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
||||||
|
status: Status.OPEN,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: ExampleCourse,
|
course: ExampleCourse,
|
||||||
async: false,
|
async: false,
|
||||||
@@ -62,7 +89,21 @@ const testData: CalendarGridCourse[] = [
|
|||||||
courseDeptAndInstr: 'Course 2',
|
courseDeptAndInstr: 'Course 2',
|
||||||
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
status: Status.CLOSED,
|
status: Status.CLOSED,
|
||||||
colors: getCourseColors('emerald', 500),
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 1,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 12,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: 'Course 2',
|
||||||
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
|
status: Status.CLOSED,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: ExampleCourse,
|
course: ExampleCourse,
|
||||||
async: false,
|
async: false,
|
||||||
@@ -77,7 +118,21 @@ const testData: CalendarGridCourse[] = [
|
|||||||
courseDeptAndInstr: 'Course 1',
|
courseDeptAndInstr: 'Course 1',
|
||||||
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
||||||
status: Status.OPEN,
|
status: Status.OPEN,
|
||||||
colors: getCourseColors('emerald', 500),
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 4,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 11,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: 'Course 1',
|
||||||
|
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
|
||||||
|
status: Status.OPEN,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: ExampleCourse,
|
course: ExampleCourse,
|
||||||
async: false,
|
async: false,
|
||||||
@@ -92,7 +147,21 @@ const testData: CalendarGridCourse[] = [
|
|||||||
courseDeptAndInstr: 'Course 2',
|
courseDeptAndInstr: 'Course 2',
|
||||||
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
status: Status.CLOSED,
|
status: Status.CLOSED,
|
||||||
colors: getCourseColors('emerald', 500),
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 1,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 12,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: 'Course 2',
|
||||||
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
|
status: Status.CLOSED,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: ExampleCourse,
|
course: ExampleCourse,
|
||||||
async: false,
|
async: false,
|
||||||
@@ -107,7 +176,21 @@ const testData: CalendarGridCourse[] = [
|
|||||||
courseDeptAndInstr: 'Course 3',
|
courseDeptAndInstr: 'Course 3',
|
||||||
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
status: Status.CLOSED,
|
status: Status.CLOSED,
|
||||||
colors: getCourseColors('emerald', 500),
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 1,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 12,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: 'Course 3',
|
||||||
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
|
status: Status.CLOSED,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: ExampleCourse,
|
course: ExampleCourse,
|
||||||
async: false,
|
async: false,
|
||||||
@@ -122,7 +205,21 @@ const testData: CalendarGridCourse[] = [
|
|||||||
courseDeptAndInstr: 'Course 4',
|
courseDeptAndInstr: 'Course 4',
|
||||||
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
status: Status.CLOSED,
|
status: Status.CLOSED,
|
||||||
colors: getCourseColors('emerald', 500),
|
blockData: {
|
||||||
|
calendarGridPoint: {
|
||||||
|
dayIndex: 1,
|
||||||
|
startIndex: 10,
|
||||||
|
endIndex: 12,
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
courseDeptAndInstr: 'Course 4',
|
||||||
|
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
|
||||||
|
status: Status.CLOSED,
|
||||||
|
blockData: {} as CalendarGridCourse,
|
||||||
|
},
|
||||||
|
course: ExampleCourse,
|
||||||
|
async: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course: ExampleCourse,
|
course: ExampleCourse,
|
||||||
async: false,
|
async: false,
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type { ThemeColor } from '@shared/types/ThemeColors';
|
|
||||||
import type { Meta, StoryObj } from '@storybook/react';
|
import type { Meta, StoryObj } from '@storybook/react';
|
||||||
import CourseCellColorPicker from '@views/components/calendar/CalendarCourseCellColorPicker/CourseCellColorPicker';
|
import CourseCellColorPicker from '@views/components/calendar/CalendarCourseCellColorPicker/CourseCellColorPicker';
|
||||||
import React, { useState } from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
const meta = {
|
const meta = {
|
||||||
title: 'Components/Calendar/CourseCellColorPicker',
|
title: 'Components/Calendar/CourseCellColorPicker',
|
||||||
@@ -12,15 +11,7 @@ export default meta;
|
|||||||
type Story = StoryObj<typeof CourseCellColorPicker>;
|
type Story = StoryObj<typeof CourseCellColorPicker>;
|
||||||
|
|
||||||
function CourseCellColorPickerWithState() {
|
function CourseCellColorPickerWithState() {
|
||||||
const [, setSelectedColor] = useState<ThemeColor | null>(null);
|
return <CourseCellColorPicker defaultColor='#000000' />;
|
||||||
const [isInvertColorsToggled, setIsInvertColorsToggled] = useState<boolean>(false);
|
|
||||||
return (
|
|
||||||
<CourseCellColorPicker
|
|
||||||
setSelectedColor={setSelectedColor}
|
|
||||||
isInvertColorsToggled={isInvertColorsToggled}
|
|
||||||
setIsInvertColorsToggled={setIsInvertColorsToggled}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Default: Story = {
|
export const Default: Story = {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { saveAsCal, saveCalAsPng } from '@views/components/calendar/utils';
|
|||||||
import { Button } from '@views/components/common/Button';
|
import { Button } from '@views/components/common/Button';
|
||||||
import Divider from '@views/components/common/Divider';
|
import Divider from '@views/components/common/Divider';
|
||||||
import Text from '@views/components/common/Text/Text';
|
import Text from '@views/components/common/Text/Text';
|
||||||
|
import { ColorPickerProvider } from '@views/contexts/ColorPickerContext';
|
||||||
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
||||||
import clsx from 'clsx';
|
import clsx from 'clsx';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
@@ -41,19 +42,21 @@ export default function CalendarBottomBar({ courseCells, setCourse }: CalendarBo
|
|||||||
—
|
—
|
||||||
</Text>
|
</Text>
|
||||||
<div className='inline-flex gap-2.5'>
|
<div className='inline-flex gap-2.5'>
|
||||||
|
<ColorPickerProvider>
|
||||||
{asyncCourseCells.map(block => {
|
{asyncCourseCells.map(block => {
|
||||||
const { courseDeptAndInstr, status, colors, className } = block.componentProps;
|
const { courseDeptAndInstr, status, className } = block.componentProps;
|
||||||
return (
|
return (
|
||||||
<CalendarCourseBlock
|
<CalendarCourseBlock
|
||||||
courseDeptAndInstr={courseDeptAndInstr}
|
courseDeptAndInstr={courseDeptAndInstr}
|
||||||
status={status}
|
status={status}
|
||||||
colors={colors}
|
|
||||||
key={courseDeptAndInstr}
|
key={courseDeptAndInstr}
|
||||||
className={clsx(className, 'w-35! h-15!')}
|
className={clsx(className, 'w-35! h-15!')}
|
||||||
onClick={() => setCourse(block.course)}
|
onClick={() => setCourse(block.course)}
|
||||||
|
blockData={block}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
</ColorPickerProvider>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
import { ClockUser, LockKey, Prohibit } from '@phosphor-icons/react';
|
import { ClockUser, LockKey, Palette, Prohibit } from '@phosphor-icons/react';
|
||||||
import { initSettings, OptionsStore } from '@shared/storage/OptionsStore';
|
import { initSettings, OptionsStore } from '@shared/storage/OptionsStore';
|
||||||
import type { StatusType } from '@shared/types/Course';
|
import type { StatusType } from '@shared/types/Course';
|
||||||
import { Status } from '@shared/types/Course';
|
import { Status } from '@shared/types/Course';
|
||||||
import type { CourseColors } from '@shared/types/ThemeColors';
|
import { hexToRGB, pickFontColor } from '@shared/util/colors';
|
||||||
import { pickFontColor } from '@shared/util/colors';
|
|
||||||
import Text from '@views/components/common/Text/Text';
|
import Text from '@views/components/common/Text/Text';
|
||||||
|
import { useColorPickerContext } from '@views/contexts/ColorPickerContext';
|
||||||
|
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
||||||
import clsx from 'clsx';
|
import clsx from 'clsx';
|
||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect, useRef, useState } from 'react';
|
||||||
|
|
||||||
|
import { Button } from '../common/Button';
|
||||||
|
import CourseCellColorPicker from './CalendarCourseCellColorPicker/CourseCellColorPicker';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Props for the CalendarCourseCell component.
|
* Props for the CalendarCourseCell component.
|
||||||
@@ -15,9 +19,9 @@ export interface CalendarCourseCellProps {
|
|||||||
courseDeptAndInstr: string;
|
courseDeptAndInstr: string;
|
||||||
timeAndLocation?: string;
|
timeAndLocation?: string;
|
||||||
status: StatusType;
|
status: StatusType;
|
||||||
colors: CourseColors;
|
|
||||||
className?: string;
|
|
||||||
onClick?: React.MouseEventHandler<HTMLDivElement>;
|
onClick?: React.MouseEventHandler<HTMLDivElement>;
|
||||||
|
blockData: CalendarGridCourse;
|
||||||
|
className?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -34,11 +38,25 @@ export default function CalendarCourseCell({
|
|||||||
courseDeptAndInstr,
|
courseDeptAndInstr,
|
||||||
timeAndLocation,
|
timeAndLocation,
|
||||||
status,
|
status,
|
||||||
colors,
|
|
||||||
className,
|
|
||||||
onClick,
|
onClick,
|
||||||
|
blockData,
|
||||||
|
className,
|
||||||
}: CalendarCourseCellProps): JSX.Element {
|
}: CalendarCourseCellProps): JSX.Element {
|
||||||
const [enableCourseStatusChips, setEnableCourseStatusChips] = useState<boolean>(false);
|
const [enableCourseStatusChips, setEnableCourseStatusChips] = useState<boolean>(false);
|
||||||
|
const colorPickerRef = useRef<HTMLDivElement>(null);
|
||||||
|
const { selectedColor, setSelectedCourse, handleCloseColorPicker, isSelectedBlock, isSelectedCourse } =
|
||||||
|
useColorPickerContext();
|
||||||
|
|
||||||
|
const { colors, uniqueId: courseID } = blockData.course;
|
||||||
|
const { dayIndex, startIndex } = blockData.calendarGridPoint;
|
||||||
|
|
||||||
|
let selectedCourse = false;
|
||||||
|
let selectedBlock = false;
|
||||||
|
|
||||||
|
if (isSelectedCourse && isSelectedBlock) {
|
||||||
|
selectedCourse = isSelectedCourse(courseID);
|
||||||
|
selectedBlock = isSelectedBlock(courseID, dayIndex, startIndex);
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
initSettings().then(({ enableCourseStatusChips }) => setEnableCourseStatusChips(enableCourseStatusChips));
|
initSettings().then(({ enableCourseStatusChips }) => setEnableCourseStatusChips(enableCourseStatusChips));
|
||||||
@@ -53,6 +71,26 @@ export default function CalendarCourseCell({
|
|||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
function handleClickOutside(event: MouseEvent) {
|
||||||
|
if (selectedBlock && colorPickerRef.current) {
|
||||||
|
const path = event.composedPath();
|
||||||
|
const isClickOutside = !path.some(
|
||||||
|
element => (element as HTMLElement).classList === colorPickerRef.current?.classList
|
||||||
|
);
|
||||||
|
|
||||||
|
if (isClickOutside) {
|
||||||
|
handleCloseColorPicker();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener('mousedown', handleClickOutside);
|
||||||
|
return () => {
|
||||||
|
document.removeEventListener('mousedown', handleClickOutside);
|
||||||
|
};
|
||||||
|
}, [handleCloseColorPicker, selectedBlock]);
|
||||||
|
|
||||||
let rightIcon: React.ReactNode | null = null;
|
let rightIcon: React.ReactNode | null = null;
|
||||||
if (enableCourseStatusChips) {
|
if (enableCourseStatusChips) {
|
||||||
if (status === Status.WAITLISTED) {
|
if (status === Status.WAITLISTED) {
|
||||||
@@ -71,7 +109,7 @@ export default function CalendarCourseCell({
|
|||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={clsx(
|
className={clsx(
|
||||||
'h-full w-0 flex justify-center rounded p-x-2 p-y-1.2 cursor-pointer hover:shadow-md transition-shadow-100 ease-out',
|
'h-full w-0 flex group relative justify-center rounded p-x-2 p-y-1.2 cursor-pointer screenshot:p-1.5 hover:shadow-md transition-shadow-100 ease-out',
|
||||||
{
|
{
|
||||||
'min-w-full': timeAndLocation,
|
'min-w-full': timeAndLocation,
|
||||||
'w-full': !timeAndLocation,
|
'w-full': !timeAndLocation,
|
||||||
@@ -111,6 +149,62 @@ export default function CalendarCourseCell({
|
|||||||
{rightIcon}
|
{rightIcon}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
<div
|
||||||
|
onClick={e => {
|
||||||
|
e.stopPropagation();
|
||||||
|
}}
|
||||||
|
className={clsx(
|
||||||
|
'absolute screenshot:opacity-0! text-black transition-all ease-in-out group-focus-within:pointer-events-auto group-hover:pointer-events-auto group-focus-within:opacity-100 group-hover:opacity-100 gap-y-0.75',
|
||||||
|
dayIndex === 4 ? 'left-0 -translate-x-full pr-0.75 items-end' : 'right-0 translate-x-full pl-0.75', // If the cell is on the right side of the screen
|
||||||
|
selectedBlock ? 'opacity-100 pointer-events-auto' : 'opacity-0 pointer-events-none'
|
||||||
|
)}
|
||||||
|
style={{
|
||||||
|
// Prevents from button from appear on top of color picker
|
||||||
|
zIndex: selectedBlock ? 30 : 29,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div className={clsx('relative', dayIndex === 4 && 'flex flex-col items-end')}>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
if (selectedBlock) {
|
||||||
|
handleCloseColorPicker();
|
||||||
|
} else {
|
||||||
|
setSelectedCourse(courseID, dayIndex, startIndex);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
icon={Palette}
|
||||||
|
iconProps={{
|
||||||
|
fill: colors.secondaryColor,
|
||||||
|
weight: 'fill',
|
||||||
|
}}
|
||||||
|
variant='outline'
|
||||||
|
className={clsx(
|
||||||
|
'size-8.5! border border-white rounded-full !p-1 bg-opacity-100 !hover:enabled:bg-opacity-100 rounded-full shadow-lg shadow-black/20'
|
||||||
|
)}
|
||||||
|
color='ut-gray'
|
||||||
|
style={{
|
||||||
|
color: colors.secondaryColor,
|
||||||
|
backgroundColor: selectedCourse
|
||||||
|
? (selectedColor ?? colors.primaryColor)
|
||||||
|
: `rgba(${hexToRGB(`${colors.primaryColor}`)}, var(--un-bg-opacity))`,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{selectedBlock && (
|
||||||
|
<div
|
||||||
|
ref={colorPickerRef}
|
||||||
|
className={
|
||||||
|
startIndex < 21 && !blockData.async
|
||||||
|
? 'relative top-0.75 w-max'
|
||||||
|
: 'absolute bottom-full mb-0.75 w-max'
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<CourseCellColorPicker defaultColor={colors.primaryColor} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Check } from '@phosphor-icons/react';
|
import { Check } from '@phosphor-icons/react';
|
||||||
import { getThemeColorHexByName } from '@shared/util/themeColors';
|
import { useColorPickerContext } from '@views/contexts/ColorPickerContext';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -8,7 +8,8 @@ import React from 'react';
|
|||||||
interface ColorPatchProps {
|
interface ColorPatchProps {
|
||||||
color: string;
|
color: string;
|
||||||
isSelected: boolean;
|
isSelected: boolean;
|
||||||
handleSetSelectedColor: (color: string) => void;
|
handleSelectColorPatch: (color: string) => void;
|
||||||
|
defaultColor: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -19,13 +20,25 @@ interface ColorPatchProps {
|
|||||||
* @param handleSetSelectedColor - Function from parent component to control selection state of a patch.
|
* @param handleSetSelectedColor - Function from parent component to control selection state of a patch.
|
||||||
* @returns The rendered color patch button.
|
* @returns The rendered color patch button.
|
||||||
*/
|
*/
|
||||||
export default function ColorPatch({ color, isSelected, handleSetSelectedColor }: ColorPatchProps): JSX.Element {
|
export default function ColorPatch({
|
||||||
const handleClick = () => {
|
color,
|
||||||
handleSetSelectedColor(isSelected ? getThemeColorHexByName('ut-gray') : color);
|
isSelected,
|
||||||
|
handleSelectColorPatch,
|
||||||
|
defaultColor,
|
||||||
|
}: ColorPatchProps): JSX.Element {
|
||||||
|
const { handleCloseColorPicker } = useColorPickerContext();
|
||||||
|
|
||||||
|
const handleClick = async () => {
|
||||||
|
// If the color patch is already selected, close the color picker
|
||||||
|
if (isSelected) {
|
||||||
|
handleCloseColorPicker();
|
||||||
|
} else {
|
||||||
|
handleSelectColorPatch(isSelected ? defaultColor : color);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
className='h-5.5 w-5.5 p-0 transition-all duration-200 hover:scale-110 btn'
|
className='size-6.5 p-0 transition-all duration-200 hover:scale-110 btn'
|
||||||
style={{ backgroundColor: color }}
|
style={{ backgroundColor: color }}
|
||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
import type { ThemeColor, TWIndex } from '@shared/types/ThemeColors';
|
import type { ThemeColor, TWIndex } from '@shared/types/ThemeColors';
|
||||||
import { getThemeColorHexByName } from '@shared/util/themeColors';
|
import { getThemeColorHexByName } from '@shared/util/themeColors';
|
||||||
import Divider from '@views/components/common/Divider';
|
import Divider from '@views/components/common/Divider';
|
||||||
|
import { useColorPickerContext } from '@views/contexts/ColorPickerContext';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { theme } from 'unocss/preset-mini';
|
import { theme } from 'unocss/preset-mini';
|
||||||
|
|
||||||
import InvertColorsIcon from '~icons/material-symbols/invert-colors';
|
|
||||||
import InvertColorsOffIcon from '~icons/material-symbols/invert-colors-off';
|
|
||||||
|
|
||||||
import ColorPatch from './ColorPatch';
|
import ColorPatch from './ColorPatch';
|
||||||
import HexColorEditor from './HexColorEditor';
|
import HexColorEditor from './HexColorEditor';
|
||||||
|
|
||||||
@@ -55,9 +53,7 @@ const hexCodeToBaseColor = new Map<string, string>(
|
|||||||
* Props for the CourseCellColorPicker component.
|
* Props for the CourseCellColorPicker component.
|
||||||
*/
|
*/
|
||||||
export interface CourseCellColorPickerProps {
|
export interface CourseCellColorPickerProps {
|
||||||
setSelectedColor: React.Dispatch<React.SetStateAction<ThemeColor | null>>;
|
defaultColor: string;
|
||||||
isInvertColorsToggled: boolean;
|
|
||||||
setIsInvertColorsToggled: React.Dispatch<React.SetStateAction<boolean>>;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -86,49 +82,43 @@ export interface CourseCellColorPickerProps {
|
|||||||
*
|
*
|
||||||
* @returns The color picker component that displays a color palette with a list of color patches.
|
* @returns The color picker component that displays a color palette with a list of color patches.
|
||||||
*/
|
*/
|
||||||
export default function CourseCellColorPicker({
|
export default function CourseCellColorPicker({ defaultColor }: CourseCellColorPickerProps): JSX.Element {
|
||||||
setSelectedColor: setFinalColor,
|
|
||||||
isInvertColorsToggled,
|
|
||||||
setIsInvertColorsToggled,
|
|
||||||
}: CourseCellColorPickerProps): JSX.Element {
|
|
||||||
// hexCode mirrors contents of HexColorEditor which has no hash prefix
|
// hexCode mirrors contents of HexColorEditor which has no hash prefix
|
||||||
const [hexCode, setHexCode] = React.useState<string>(
|
const [hexCode, setHexCode] = React.useState<string>(
|
||||||
getThemeColorHexByName('ut-gray').slice(1).toLocaleLowerCase()
|
defaultColor.slice(1).toLocaleLowerCase() || getThemeColorHexByName('ut-gray')
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const { setSelectedColor } = useColorPickerContext();
|
||||||
|
|
||||||
const hexCodeWithHash = `#${hexCode}` as ThemeColor;
|
const hexCodeWithHash = `#${hexCode}` as ThemeColor;
|
||||||
const selectedBaseColor = hexCodeToBaseColor.get(hexCodeWithHash);
|
const selectedBaseColor = hexCodeToBaseColor.get(hexCodeWithHash);
|
||||||
|
|
||||||
const handleSelectColorPatch = (baseColor: string) => {
|
const handleSelectColorPatch = (baseColor: string) => {
|
||||||
setHexCode(baseColor.slice(1).toLocaleLowerCase());
|
let hexCode = baseColor.toLocaleLowerCase();
|
||||||
|
|
||||||
|
if (hexCode.startsWith('#')) {
|
||||||
|
hexCode = baseColor.slice(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
setHexCode(hexCode);
|
||||||
|
setSelectedColor(`#${hexCode}` as ThemeColor);
|
||||||
};
|
};
|
||||||
|
|
||||||
React.useEffect(() => {
|
|
||||||
setFinalColor(hexCodeWithHash);
|
|
||||||
}, [hexCodeWithHash, setFinalColor]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='inline-flex flex-col border border-1 border-ut-offwhite rounded-1 p-1.25'>
|
<div className='inline-flex flex-col border border-1 border-ut-offwhite rounded-1 bg-white p-1.25'>
|
||||||
<div className='grid grid-cols-6 gap-1'>
|
<div className='grid grid-cols-6 gap-1'>
|
||||||
{Array.from(colorPatchColors.keys()).map(baseColor => (
|
{Array.from(colorPatchColors.keys()).map(baseColor => (
|
||||||
<ColorPatch
|
<ColorPatch
|
||||||
|
key={baseColor}
|
||||||
color={baseColor}
|
color={baseColor}
|
||||||
isSelected={baseColor === selectedBaseColor}
|
isSelected={baseColor === selectedBaseColor}
|
||||||
handleSetSelectedColor={handleSelectColorPatch}
|
handleSelectColorPatch={handleSelectColorPatch}
|
||||||
|
defaultColor={defaultColor}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
<div className='col-span-3 flex items-center justify-center overflow-hidden'>
|
<div className='col-span-3 flex items-center justify-center overflow-hidden'>
|
||||||
<HexColorEditor hexCode={hexCode} setHexCode={setHexCode} />
|
<HexColorEditor hexCode={hexCode} setHexCode={handleSelectColorPatch} />
|
||||||
</div>
|
</div>
|
||||||
<button
|
|
||||||
className='h-5.5 w-5.5 bg-ut-black p-0 transition-all duration-200 hover:scale-110 btn'
|
|
||||||
onClick={() => setIsInvertColorsToggled(prev => !prev)}
|
|
||||||
>
|
|
||||||
{isInvertColorsToggled ? (
|
|
||||||
<InvertColorsIcon className='h-3.5 w-3.5 color-white' />
|
|
||||||
) : (
|
|
||||||
<InvertColorsOffIcon className='h-3.5 w-3.5 color-white' />
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
{selectedBaseColor && (
|
{selectedBaseColor && (
|
||||||
<>
|
<>
|
||||||
@@ -138,9 +128,11 @@ export default function CourseCellColorPicker({
|
|||||||
.get(selectedBaseColor)
|
.get(selectedBaseColor)
|
||||||
?.map(shadeColor => (
|
?.map(shadeColor => (
|
||||||
<ColorPatch
|
<ColorPatch
|
||||||
|
key={shadeColor}
|
||||||
color={shadeColor}
|
color={shadeColor}
|
||||||
isSelected={shadeColor === hexCodeWithHash}
|
isSelected={shadeColor === hexCodeWithHash}
|
||||||
handleSetSelectedColor={handleSelectColorPatch}
|
handleSelectColorPatch={handleSelectColorPatch}
|
||||||
|
defaultColor={defaultColor}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import { Hash } from '@phosphor-icons/react';
|
import { Hash } from '@phosphor-icons/react';
|
||||||
|
import { isValidHexColor, pickFontColor } from '@shared/util/colors';
|
||||||
import { getThemeColorHexByName } from '@shared/util/themeColors';
|
import { getThemeColorHexByName } from '@shared/util/themeColors';
|
||||||
|
import { useDebounce } from '@views/hooks/useDebounce';
|
||||||
|
import clsx from 'clsx';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -7,7 +10,7 @@ import React from 'react';
|
|||||||
*/
|
*/
|
||||||
export interface HexColorEditorProps {
|
export interface HexColorEditorProps {
|
||||||
hexCode: string;
|
hexCode: string;
|
||||||
setHexCode: React.Dispatch<React.SetStateAction<string>>;
|
setHexCode: (hexCode: string) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -20,23 +23,34 @@ export interface HexColorEditorProps {
|
|||||||
*/
|
*/
|
||||||
export default function HexColorEditor({ hexCode, setHexCode }: HexColorEditorProps): JSX.Element {
|
export default function HexColorEditor({ hexCode, setHexCode }: HexColorEditorProps): JSX.Element {
|
||||||
const baseColor = React.useMemo(() => getThemeColorHexByName('ut-gray'), []);
|
const baseColor = React.useMemo(() => getThemeColorHexByName('ut-gray'), []);
|
||||||
const previewColor = hexCode.length === 6 ? `#${hexCode}` : baseColor;
|
const previewColor = isValidHexColor(`#${hexCode}`) ? `#${hexCode}` : baseColor;
|
||||||
|
const tagColor = pickFontColor(previewColor.slice(1) as `#${string}`);
|
||||||
|
|
||||||
|
const [localHexCode, setLocalHexCode] = React.useState(hexCode);
|
||||||
|
const debouncedSetHexCode = useDebounce((value: string) => setHexCode(value), 500);
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
debouncedSetHexCode(localHexCode);
|
||||||
|
|
||||||
|
// This is on purpose
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [localHexCode]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
style={{ backgroundColor: previewColor }}
|
style={{ backgroundColor: previewColor }}
|
||||||
className='h-5.5 w-5.25 flex items-center justify-center rounded-l-1'
|
className='h-6.5 w-6.5 flex items-center justify-center rounded-l-1'
|
||||||
>
|
>
|
||||||
<Hash className='h-4 w-4 text-color-white' />
|
<Hash className={clsx('h-5 w-5 text-color-white', tagColor)} />
|
||||||
</div>
|
</div>
|
||||||
<div className='h-5.5 w-[53px] flex flex-1 items-center justify-center border-b border-r border-t rounded-br rounded-tr p-1.25'>
|
<div className='h-6.5 w-[53px] flex flex-1 items-center justify-center border-b border-r border-t rounded-br rounded-tr p-1.25'>
|
||||||
<input
|
<input
|
||||||
type='text'
|
type='text'
|
||||||
maxLength={6}
|
maxLength={6}
|
||||||
className='w-full border-none bg-transparent font-size-2.75 font-normal outline-none focus:outline-none'
|
className='w-full border-none bg-transparent font-size-2.75 font-normal outline-none focus:outline-none'
|
||||||
value={hexCode}
|
value={localHexCode}
|
||||||
onChange={e => setHexCode(e.target.value)}
|
onChange={e => setLocalHexCode(e.target.value)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import type { Course } from '@shared/types/Course';
|
import type { Course } from '@shared/types/Course';
|
||||||
import CalendarCourseCell from '@views/components/calendar/CalendarCourseCell';
|
import CalendarCourseCell from '@views/components/calendar/CalendarCourseCell';
|
||||||
import Text from '@views/components/common/Text/Text';
|
import Text from '@views/components/common/Text/Text';
|
||||||
|
import { ColorPickerProvider } from '@views/contexts/ColorPickerContext';
|
||||||
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
@@ -73,7 +74,9 @@ export default function CalendarGrid({
|
|||||||
.map(() => (
|
.map(() => (
|
||||||
<div className='h-4 flex items-end justify-center border-r border-gray-300' />
|
<div className='h-4 flex items-end justify-center border-r border-gray-300' />
|
||||||
))}
|
))}
|
||||||
{courseCells ? <AccountForCourseConflicts courseCells={courseCells} setCourse={setCourse} /> : null}
|
<ColorPickerProvider>
|
||||||
|
{courseCells && <AccountForCourseConflicts courseCells={courseCells} setCourse={setCourse} />}
|
||||||
|
</ColorPickerProvider>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -147,8 +150,8 @@ function AccountForCourseConflicts({ courseCells, setCourse }: AccountForCourseC
|
|||||||
courseDeptAndInstr={courseDeptAndInstr}
|
courseDeptAndInstr={courseDeptAndInstr}
|
||||||
timeAndLocation={timeAndLocation}
|
timeAndLocation={timeAndLocation}
|
||||||
status={status}
|
status={status}
|
||||||
colors={block.course.colors}
|
|
||||||
onClick={() => setCourse(block.course)}
|
onClick={() => setCourse(block.course)}
|
||||||
|
blockData={block}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -44,9 +44,9 @@ export function Button({
|
|||||||
<button
|
<button
|
||||||
style={
|
style={
|
||||||
{
|
{
|
||||||
...style,
|
|
||||||
color: colorHex,
|
color: colorHex,
|
||||||
backgroundColor: `rgb(${colorRgb} / var(--un-bg-opacity)`,
|
backgroundColor: `rgb(${colorRgb} / var(--un-bg-opacity)`,
|
||||||
|
...style,
|
||||||
} satisfies React.CSSProperties
|
} satisfies React.CSSProperties
|
||||||
}
|
}
|
||||||
className={clsx(
|
className={clsx(
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ interface HeadingAndActionProps {
|
|||||||
* @returns The rendered component.
|
* @returns The rendered component.
|
||||||
*/
|
*/
|
||||||
export default function HeadingAndActions({ course, activeSchedule, onClose }: HeadingAndActionProps): JSX.Element {
|
export default function HeadingAndActions({ course, activeSchedule, onClose }: HeadingAndActionProps): JSX.Element {
|
||||||
const { courseName, department, number: courseNumber, uniqueId, instructors, flags, schedule, core } = course;
|
const { courseName, department, number: courseNumber, uniqueId, instructors, flags, core } = course;
|
||||||
const courseAdded = activeSchedule.courses.some(ourCourse => ourCourse.uniqueId === uniqueId);
|
const courseAdded = activeSchedule.courses.some(ourCourse => ourCourse.uniqueId === uniqueId);
|
||||||
const formattedUniqueId = uniqueId.toString().padStart(5, '0');
|
const formattedUniqueId = uniqueId.toString().padStart(5, '0');
|
||||||
const isInCalendar = useCalendar();
|
const isInCalendar = useCalendar();
|
||||||
|
|||||||
45
src/views/contexts/ColorPickerContext.tsx
Normal file
45
src/views/contexts/ColorPickerContext.tsx
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import type { ReactNode } from 'react';
|
||||||
|
import React, { createContext } from 'react';
|
||||||
|
|
||||||
|
import { type ColorPickerInterface, useColorPicker } from '../hooks/useColorPicker';
|
||||||
|
|
||||||
|
const defaultContext: ColorPickerInterface = {
|
||||||
|
selectedColor: null,
|
||||||
|
setSelectedColor: () => {},
|
||||||
|
handleCloseColorPicker: () => {},
|
||||||
|
setSelectedCourse: () => {},
|
||||||
|
isSelectedCourse: () => false,
|
||||||
|
isSelectedBlock: () => false,
|
||||||
|
};
|
||||||
|
|
||||||
|
const ColorPickerContext = createContext<ColorPickerInterface>(defaultContext);
|
||||||
|
|
||||||
|
interface ColorPickerProviderProps {
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides the color picker context to its children.
|
||||||
|
*
|
||||||
|
* @param props - The properties for the ColorPickerProvider component.
|
||||||
|
* @param children - The child components that will have access to the color picker context.
|
||||||
|
* @returns The provider component that supplies the color picker context to its children.
|
||||||
|
*/
|
||||||
|
export const ColorPickerProvider = ({ children }: ColorPickerProviderProps) => {
|
||||||
|
const colorPicker = useColorPicker();
|
||||||
|
|
||||||
|
return <ColorPickerContext.Provider value={colorPicker}>{children}</ColorPickerContext.Provider>;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom hook to use the ColorPicker context.
|
||||||
|
* Throws an error if used outside of a ColorPickerProvider.
|
||||||
|
* @returns The color picker context value.
|
||||||
|
*/
|
||||||
|
export const useColorPickerContext = () => {
|
||||||
|
const context = React.useContext(ColorPickerContext);
|
||||||
|
if (context === undefined) {
|
||||||
|
throw new Error('useColorPickerContext must be used within a ColorPickerProvider');
|
||||||
|
}
|
||||||
|
return context;
|
||||||
|
};
|
||||||
111
src/views/hooks/useColorPicker.ts
Normal file
111
src/views/hooks/useColorPicker.ts
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import type { HexColor } from '@shared/types/Color';
|
||||||
|
import type { ThemeColor } from '@shared/types/ThemeColors';
|
||||||
|
import { isValidHexColor } from '@shared/util/colors';
|
||||||
|
import { useCallback, useEffect, useState } from 'react';
|
||||||
|
|
||||||
|
import { updateCourseColors } from './useSchedules';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface for the color picker functionality.
|
||||||
|
*/
|
||||||
|
export interface ColorPickerInterface {
|
||||||
|
/**
|
||||||
|
* The currently selected color.
|
||||||
|
*/
|
||||||
|
selectedColor: ThemeColor | null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to set the selected color.
|
||||||
|
*/
|
||||||
|
setSelectedColor: React.Dispatch<React.SetStateAction<ThemeColor | null>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to close the color picker.
|
||||||
|
*/
|
||||||
|
handleCloseColorPicker: () => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to set the selected course.
|
||||||
|
*
|
||||||
|
* @param courseID - The ID of the course.
|
||||||
|
* @param dayIndex - The index of the day.
|
||||||
|
* @param startIndex - The start index of the course.
|
||||||
|
*/
|
||||||
|
setSelectedCourse: (courseID: number, dayIndex: number, startIndex: number) => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to check if a course is selected.
|
||||||
|
*
|
||||||
|
* @param courseID - The ID of the course.
|
||||||
|
* @returns True if the course is selected, false otherwise.
|
||||||
|
*/
|
||||||
|
isSelectedCourse: (courseID: number) => boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to check if a course block is selected.
|
||||||
|
*
|
||||||
|
* @param courseID - The ID of the course.
|
||||||
|
* @param dayIndex - The index of the day.
|
||||||
|
* @param startIndex - The start index of the course.
|
||||||
|
* @returns True if the block is selected, false otherwise.
|
||||||
|
*/
|
||||||
|
isSelectedBlock: (courseID: number, dayIndex: number, startIndex: number) => boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom hook for managing color picker state and functionality.
|
||||||
|
*
|
||||||
|
* @returns The color picker interface with state and functions.
|
||||||
|
*/
|
||||||
|
export function useColorPicker(): ColorPickerInterface {
|
||||||
|
const [selectedColor, setSelectedColor] = useState<ThemeColor | null>(null);
|
||||||
|
const [selectedBlock, setSelectedBlock] = useState<{
|
||||||
|
courseID: number | null;
|
||||||
|
dayIndex: number | null;
|
||||||
|
startIndex: number | null;
|
||||||
|
}>({
|
||||||
|
courseID: null,
|
||||||
|
dayIndex: null,
|
||||||
|
startIndex: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
const updateSelectedCourseColor = useCallback(async () => {
|
||||||
|
if (selectedBlock.courseID && selectedColor) {
|
||||||
|
if (isValidHexColor(selectedColor as HexColor)) {
|
||||||
|
await updateCourseColors(selectedBlock.courseID, `#${selectedColor.replace('#', '')}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [selectedBlock.courseID, selectedColor]);
|
||||||
|
|
||||||
|
const setSelectedCourse = (courseID: number, dayIndex: number, startIndex: number) => {
|
||||||
|
setSelectedBlock({ courseID, dayIndex, startIndex });
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCloseColorPicker = () => {
|
||||||
|
setSelectedColor(null);
|
||||||
|
setSelectedBlock({ courseID: null, dayIndex: null, startIndex: null });
|
||||||
|
};
|
||||||
|
|
||||||
|
const isSelectedCourse = (courseID: number) => selectedBlock.courseID === courseID;
|
||||||
|
const isSelectedBlock = (courseID: number, dayIndex: number, startIndex: number) =>
|
||||||
|
selectedBlock.courseID === courseID &&
|
||||||
|
selectedBlock.dayIndex === dayIndex &&
|
||||||
|
selectedBlock.startIndex === startIndex;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (selectedBlock.courseID && selectedColor) {
|
||||||
|
(async () => {
|
||||||
|
await updateSelectedCourseColor();
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
}, [selectedBlock.courseID, selectedColor, updateSelectedCourseColor]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
selectedColor,
|
||||||
|
setSelectedColor,
|
||||||
|
handleCloseColorPicker,
|
||||||
|
setSelectedCourse,
|
||||||
|
isSelectedBlock,
|
||||||
|
isSelectedCourse,
|
||||||
|
};
|
||||||
|
}
|
||||||
41
src/views/hooks/useDebounce.tsx
Normal file
41
src/views/hooks/useDebounce.tsx
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import { useCallback, useEffect, useRef } from 'react';
|
||||||
|
|
||||||
|
type Timer = ReturnType<typeof setTimeout>;
|
||||||
|
type DebouncedCallback<T extends unknown[]> = (...args: T) => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom hook to debounce a function call.
|
||||||
|
*
|
||||||
|
* @param func - The original, non-debounced function.
|
||||||
|
* @param delay - The delay (in ms) for the function to return.
|
||||||
|
* @returns The debounced function, which will run only if the debounced function has not been called in the last (delay) ms.
|
||||||
|
*/
|
||||||
|
export function useDebounce<T extends unknown[]>(
|
||||||
|
func: DebouncedCallback<T>,
|
||||||
|
delay: number = 1000
|
||||||
|
): DebouncedCallback<T> {
|
||||||
|
const timer = useRef<Timer>();
|
||||||
|
|
||||||
|
useEffect(
|
||||||
|
() => () => {
|
||||||
|
if (timer.current) {
|
||||||
|
clearTimeout(timer.current);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[]
|
||||||
|
);
|
||||||
|
|
||||||
|
const debouncedFunction = useCallback(
|
||||||
|
(...args: T) => {
|
||||||
|
if (timer.current) {
|
||||||
|
clearTimeout(timer.current);
|
||||||
|
}
|
||||||
|
timer.current = setTimeout(() => {
|
||||||
|
func(...args);
|
||||||
|
}, delay);
|
||||||
|
},
|
||||||
|
[func, delay]
|
||||||
|
);
|
||||||
|
|
||||||
|
return debouncedFunction;
|
||||||
|
}
|
||||||
@@ -126,7 +126,12 @@ function processAsyncCourses({
|
|||||||
componentProps: {
|
componentProps: {
|
||||||
courseDeptAndInstr,
|
courseDeptAndInstr,
|
||||||
status,
|
status,
|
||||||
colors: course.colors,
|
blockData: {
|
||||||
|
calendarGridPoint: { dayIndex: -1, startIndex: -1, endIndex: -1 },
|
||||||
|
componentProps: { courseDeptAndInstr, status, blockData: {} as CalendarGridCourse },
|
||||||
|
course,
|
||||||
|
async: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
course,
|
course,
|
||||||
async: true,
|
async: true,
|
||||||
@@ -170,7 +175,7 @@ function processInPersonMeetings(
|
|||||||
courseDeptAndInstr,
|
courseDeptAndInstr,
|
||||||
timeAndLocation,
|
timeAndLocation,
|
||||||
status,
|
status,
|
||||||
colors: course.colors,
|
blockData: {} as CalendarGridCourse,
|
||||||
},
|
},
|
||||||
course,
|
course,
|
||||||
async: false,
|
async: false,
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import { UserScheduleStore } from '@shared/storage/UserScheduleStore';
|
import { UserScheduleStore } from '@shared/storage/UserScheduleStore';
|
||||||
|
import type { HexColor } from '@shared/types/Color';
|
||||||
import { UserSchedule } from '@shared/types/UserSchedule';
|
import { UserSchedule } from '@shared/types/UserSchedule';
|
||||||
|
import { getColorwayFromColor, getCourseColors, getDarkerShade } from '@shared/util/colors';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
|
|
||||||
let schedulesCache: UserSchedule[] = [];
|
let schedulesCache: UserSchedule[] = [];
|
||||||
@@ -89,7 +91,6 @@ export async function replaceSchedule(oldSchedule: UserSchedule, newSchedule: Us
|
|||||||
oldIndex = oldIndex !== -1 ? oldIndex : 0;
|
oldIndex = oldIndex !== -1 ? oldIndex : 0;
|
||||||
schedules[oldIndex] = newSchedule;
|
schedules[oldIndex] = newSchedule;
|
||||||
await UserScheduleStore.set('schedules', schedules);
|
await UserScheduleStore.set('schedules', schedules);
|
||||||
console.log('schedule replaced');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -115,3 +116,46 @@ export async function switchScheduleByName(name: string): Promise<void> {
|
|||||||
const activeIndex = schedules.findIndex(s => s.name === name);
|
const activeIndex = schedules.findIndex(s => s.name === name);
|
||||||
await UserScheduleStore.set('activeIndex', activeIndex);
|
await UserScheduleStore.set('activeIndex', activeIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Updates the color of a course in the active schedule.
|
||||||
|
*
|
||||||
|
* @param courseID - The ID of the course to update.
|
||||||
|
* @param color - The new color to set for the course.
|
||||||
|
* @throws If the course with the given ID is not found.
|
||||||
|
*/
|
||||||
|
export async function updateCourseColors(courseID: number, primaryColor: HexColor) {
|
||||||
|
const activeSchedule = getActiveSchedule();
|
||||||
|
const updatedCourseIndex = activeSchedule.courses.findIndex(c => c.uniqueId === courseID);
|
||||||
|
|
||||||
|
if (updatedCourseIndex === -1) {
|
||||||
|
throw new Error(`Course with ID ${courseID} not found`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const newSchedule = new UserSchedule(activeSchedule);
|
||||||
|
const updatedCourse = newSchedule.courses[updatedCourseIndex];
|
||||||
|
|
||||||
|
if (!updatedCourse) {
|
||||||
|
throw new Error(`Course with ID ${courseID} not found`);
|
||||||
|
}
|
||||||
|
|
||||||
|
let secondaryColor: HexColor;
|
||||||
|
try {
|
||||||
|
const { colorway: primaryColorWay, index: primaryIndex } = getColorwayFromColor(primaryColor);
|
||||||
|
const { secondaryColor: colorFromWay } = getCourseColors(primaryColorWay, primaryIndex, 400);
|
||||||
|
|
||||||
|
if (!colorFromWay) {
|
||||||
|
throw new Error('Secondary color not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
secondaryColor = colorFromWay;
|
||||||
|
} catch (e) {
|
||||||
|
secondaryColor = getDarkerShade(primaryColor, 80);
|
||||||
|
}
|
||||||
|
|
||||||
|
updatedCourse.colors.primaryColor = primaryColor;
|
||||||
|
updatedCourse.colors.secondaryColor = secondaryColor;
|
||||||
|
newSchedule.courses[updatedCourseIndex] = updatedCourse;
|
||||||
|
|
||||||
|
await replaceSchedule(activeSchedule, newSchedule);
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user