mirror of
https://github.com/BetterSEQTA/BetterSEQTA-Plus.git
synced 2026-06-06 11:44:40 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 SethBurkart123
|
d53dc9ff06 |
@@ -1,585 +0,0 @@
|
|||||||
# Theme Creation Guide
|
|
||||||
|
|
||||||
This guide covers everything you need to know about creating custom themes for BetterSEQTA+.
|
|
||||||
|
|
||||||
## Table of Contents
|
|
||||||
|
|
||||||
1. [Overview](#overview)
|
|
||||||
2. [Theme Structure](#theme-structure)
|
|
||||||
3. [CSS Variables](#css-variables)
|
|
||||||
4. [CSS Selectors & Classes](#css-selectors--classes)
|
|
||||||
5. [Custom Images](#custom-images)
|
|
||||||
6. [Theme Settings](#theme-settings)
|
|
||||||
7. [Best Practices](#best-practices)
|
|
||||||
8. [Examples](#examples)
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
Themes in BetterSEQTA+ allow you to completely customize the appearance of SEQTA Learn. A theme consists of:
|
|
||||||
|
|
||||||
- **Custom CSS**: CSS rules that override default styles
|
|
||||||
- **Custom Images**: Images that can be referenced via CSS variables
|
|
||||||
- **Theme Metadata**: Name, description, default color, etc.
|
|
||||||
- **Theme Settings**: Options like forcing dark/light mode
|
|
||||||
|
|
||||||
Themes are applied by injecting CSS into the SEQTA page and setting CSS custom properties (variables) on the document root.
|
|
||||||
|
|
||||||
## CSS Variables
|
|
||||||
|
|
||||||
BetterSEQTA+ provides a comprehensive set of CSS variables that you can use in your themes. These variables automatically adapt to light/dark mode and user preferences.
|
|
||||||
|
|
||||||
### Core Background Variables
|
|
||||||
|
|
||||||
| Variable | Light Mode | Dark Mode | Description |
|
|
||||||
|----------|------------|-----------|-------------|
|
|
||||||
| `--background-primary` | `#ffffff` | `#232323` | Main background color |
|
|
||||||
| `--background-secondary` | `#e5e7eb` | `#1a1a1a` | Secondary background color |
|
|
||||||
| `--theme-primary` | `#ffffff` | `#232323` | Primary theme color (same as background-primary) |
|
|
||||||
| `--theme-secondary` | `#e5e7eb` | `#1a1a1a` | Secondary theme color (same as background-secondary) |
|
|
||||||
| `--text-primary` | `black` | `white` | Primary text color |
|
|
||||||
| `--text-color` | `black` | `white` | Text color (alias for text-primary) |
|
|
||||||
|
|
||||||
### BetterSEQTA+ Specific Variables
|
|
||||||
|
|
||||||
| Variable | Description | Notes |
|
|
||||||
|----------|-------------|-------|
|
|
||||||
| `--better-main` | User's selected accent color | Dynamically set based on color picker |
|
|
||||||
| `--better-sub` | Dark navy color | Always `#161616` |
|
|
||||||
| `--better-pale` | Lightened version of accent color | Only available in light mode |
|
|
||||||
| `--better-light` | Lighter version of accent color | Calculated based on brightness |
|
|
||||||
| `--better-alert-highlight` | Alert/highlight color | `#c61851` |
|
|
||||||
| `--betterseqta-logo` | Logo URL | Changes based on dark/light mode |
|
|
||||||
| `--auto-background` | Auto background color | Falls back to `--better-pale` or `--background-secondary` |
|
|
||||||
| `--navy` | Navy color | `#1a1a1a` |
|
|
||||||
| `--theme-fg-parts` | Theme foreground parts | `white` |
|
|
||||||
|
|
||||||
### Subject/Item Color Variables
|
|
||||||
|
|
||||||
| Variable | Description |
|
|
||||||
|----------|-------------|
|
|
||||||
| `--item-colour` | Subject/item color | Set dynamically per subject/item |
|
|
||||||
| `--colour` | Generic color variable | Used in various contexts |
|
|
||||||
| `--person-colour` | Person/avatar color | `var(--better-light)` for staff |
|
|
||||||
|
|
||||||
### Transparency Effects
|
|
||||||
|
|
||||||
When transparency effects are enabled, background variables become semi-transparent:
|
|
||||||
|
|
||||||
| Variable | Light Mode (Transparent) | Dark Mode (Transparent) |
|
|
||||||
|----------|--------------------------|-------------------------|
|
|
||||||
| `--background-primary` | `rgba(255, 255, 255, 0.6)` | `rgba(35, 35, 35, 0.6)` |
|
|
||||||
| `--background-secondary` | `rgba(229, 231, 235, 0.6)` | `rgba(26, 26, 26, 0.6)` |
|
|
||||||
|
|
||||||
### Using CSS Variables
|
|
||||||
|
|
||||||
You can use these variables in your custom CSS:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Example: Style a custom element */
|
|
||||||
.my-custom-element {
|
|
||||||
background: var(--background-primary);
|
|
||||||
color: var(--text-primary);
|
|
||||||
border: 1px solid var(--better-main);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Example: Create a gradient */
|
|
||||||
.gradient-box {
|
|
||||||
background: linear-gradient(
|
|
||||||
to bottom,
|
|
||||||
var(--better-main),
|
|
||||||
var(--background-secondary)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## CSS Selectors & Classes
|
|
||||||
|
|
||||||
BetterSEQTA+ uses specific CSS selectors and classes that you can target in your themes. Here are the most important ones:
|
|
||||||
|
|
||||||
### Main Layout Elements
|
|
||||||
|
|
||||||
| Selector | Description |
|
|
||||||
|----------|-------------|
|
|
||||||
| `#container` | Main container element |
|
|
||||||
| `#content` | Content area |
|
|
||||||
| `#main` | Main content wrapper |
|
|
||||||
| `#title` | Top title bar |
|
|
||||||
| `#menu` | Sidebar menu |
|
|
||||||
|
|
||||||
### Dark Mode
|
|
||||||
|
|
||||||
The `dark` class is added to `html` when dark mode is active:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Target dark mode specifically */
|
|
||||||
html.dark #main {
|
|
||||||
background: var(--background-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Target light mode */
|
|
||||||
html:not(.dark) #main {
|
|
||||||
background: var(--background-primary);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Transparency Effects
|
|
||||||
|
|
||||||
When transparency effects are enabled, the `transparencyEffects` class is added to `html`:
|
|
||||||
|
|
||||||
```css
|
|
||||||
html.transparencyEffects .notice {
|
|
||||||
backdrop-filter: blur(80px);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Common SEQTA Classes
|
|
||||||
|
|
||||||
| Class/Selector | Description |
|
|
||||||
|----------------|-------------|
|
|
||||||
| `.notice` | Notice cards |
|
|
||||||
| `.day` | Day containers in timetable |
|
|
||||||
| `.dashboard` | Dashboard sections |
|
|
||||||
| `.dashlet` | Dashboard widgets |
|
|
||||||
| `.document` | Document elements |
|
|
||||||
| `.quickbar` | Quick action bar |
|
|
||||||
| `.calendar` | Calendar elements |
|
|
||||||
| `.message` | Message elements |
|
|
||||||
| `.thread` | Forum threads |
|
|
||||||
| `.shortcut` | Shortcut buttons |
|
|
||||||
| `.upcoming-assessment` | Upcoming assessments |
|
|
||||||
| `.entry.class` | Timetable entries |
|
|
||||||
|
|
||||||
### BetterSEQTA+ Specific Classes
|
|
||||||
|
|
||||||
| Class | Description |
|
|
||||||
|-------|-------------|
|
|
||||||
| `.addedButton` | BetterSEQTA+ added buttons |
|
|
||||||
| `.tooltip` | Tooltip elements |
|
|
||||||
| `.notice-unified-content` | Unified notice content |
|
|
||||||
| `.home-container` | Home page container |
|
|
||||||
| `.timetable-container` | Timetable container |
|
|
||||||
| `.notices-container` | Notices container |
|
|
||||||
|
|
||||||
### Attribute Selectors
|
|
||||||
|
|
||||||
SEQTA uses data attributes that you can target:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Target specific data types */
|
|
||||||
[data-type="student"] .header {
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Target specific labels */
|
|
||||||
[data-label="inbox"] {
|
|
||||||
/* Styles */
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### CSS Modules
|
|
||||||
|
|
||||||
SEQTA uses CSS modules with hashed class names. You can target them using attribute selectors:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Target CSS module classes */
|
|
||||||
[class*="MessageList__MessageList___"] {
|
|
||||||
background: var(--background-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
[class*="BasicPanel__BasicPanel___"] {
|
|
||||||
border-radius: 16px;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Custom Images
|
|
||||||
|
|
||||||
Themes can include custom images that are made available as CSS variables.
|
|
||||||
|
|
||||||
### Adding Images
|
|
||||||
|
|
||||||
1. Upload an image in the theme creator
|
|
||||||
2. Set a CSS variable name (e.g., `custom-background`)
|
|
||||||
3. The image will be available as `var(--custom-background)`
|
|
||||||
|
|
||||||
### Using Image Variables
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Use as background */
|
|
||||||
.my-element {
|
|
||||||
background-image: var(--custom-background);
|
|
||||||
background-size: cover;
|
|
||||||
background-position: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Use in content */
|
|
||||||
.my-icon::before {
|
|
||||||
content: '';
|
|
||||||
background-image: var(--custom-icon);
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Image Variable Format
|
|
||||||
|
|
||||||
Images are stored as `url()` values:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* The variable contains: url(blob:...) */
|
|
||||||
--custom-background: url(blob:chrome-extension://...);
|
|
||||||
```
|
|
||||||
|
|
||||||
## Theme Settings
|
|
||||||
|
|
||||||
### Force Dark/Light Mode
|
|
||||||
|
|
||||||
You can force a theme to always use dark or light mode:
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
forceDark: true // Force dark mode
|
|
||||||
forceDark: false // Force light mode
|
|
||||||
forceDark: undefined // Use user's preference (default)
|
|
||||||
```
|
|
||||||
|
|
||||||
When `forceDark` is set, users cannot toggle dark/light mode while the theme is active.
|
|
||||||
|
|
||||||
### Default Color
|
|
||||||
|
|
||||||
Set a default accent color for your theme:
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
defaultColour: "rgba(0, 123, 255, 1)" // Blue
|
|
||||||
defaultColour: "#ff6b6b" // Red (hex format)
|
|
||||||
```
|
|
||||||
|
|
||||||
### Allow Color Changes
|
|
||||||
|
|
||||||
Control whether users can change the accent color:
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
CanChangeColour: true // Users can change color
|
|
||||||
CanChangeColour: false // Color is locked
|
|
||||||
```
|
|
||||||
|
|
||||||
## Best Practices
|
|
||||||
|
|
||||||
### 1. Use CSS Variables
|
|
||||||
|
|
||||||
Always use CSS variables instead of hardcoded colors:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Good */
|
|
||||||
.my-element {
|
|
||||||
background: var(--background-primary);
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Bad */
|
|
||||||
.my-element {
|
|
||||||
background: #ffffff;
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Support Both Light and Dark Modes
|
|
||||||
|
|
||||||
Unless your theme forces a specific mode, ensure it works in both:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Use variables that adapt automatically */
|
|
||||||
.my-element {
|
|
||||||
background: var(--background-primary);
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Or explicitly handle both modes */
|
|
||||||
html.dark .my-element {
|
|
||||||
background: #1a1a1a;
|
|
||||||
}
|
|
||||||
|
|
||||||
html:not(.dark) .my-element {
|
|
||||||
background: #ffffff;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Use !important Sparingly
|
|
||||||
|
|
||||||
Only use `!important` when necessary to override SEQTA's default styles:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Good - necessary override */
|
|
||||||
#title {
|
|
||||||
background: var(--background-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Bad - unnecessary */
|
|
||||||
.my-element {
|
|
||||||
color: var(--text-primary) !important;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4. Test Responsive Design
|
|
||||||
|
|
||||||
SEQTA is responsive. Test your theme at different screen sizes:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Example: Mobile-specific styles */
|
|
||||||
@media (max-width: 900px) {
|
|
||||||
#menu {
|
|
||||||
transform: translate(-270px);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5. Use Semantic Selectors
|
|
||||||
|
|
||||||
Prefer semantic selectors over fragile ones:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Good - stable selector */
|
|
||||||
#main > .dashboard > section {
|
|
||||||
border-radius: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Caution - CSS module classes may change */
|
|
||||||
[class*="Dashboard__Dashboard___"] {
|
|
||||||
border-radius: 16px;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 6. Optimize Images
|
|
||||||
|
|
||||||
Keep image file sizes reasonable:
|
|
||||||
|
|
||||||
- Use appropriate formats (PNG for transparency, JPG for photos)
|
|
||||||
- Compress images before uploading
|
|
||||||
- Consider using CSS for simple graphics instead of images
|
|
||||||
|
|
||||||
### 7. Document Your Theme
|
|
||||||
|
|
||||||
Include comments in your CSS explaining complex styles:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/*
|
|
||||||
* Custom gradient background for dashboard
|
|
||||||
* Uses the user's accent color for a cohesive look
|
|
||||||
*/
|
|
||||||
#main > .dashboard {
|
|
||||||
background: linear-gradient(
|
|
||||||
135deg,
|
|
||||||
var(--better-main),
|
|
||||||
var(--background-secondary)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Examples
|
|
||||||
|
|
||||||
### Example 1: Simple Color Theme
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Change accent color throughout */
|
|
||||||
:root {
|
|
||||||
--better-main: #ff6b6b;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Style the menu */
|
|
||||||
#menu {
|
|
||||||
background: var(--background-primary);
|
|
||||||
border-right: 3px solid var(--better-main);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Style buttons */
|
|
||||||
.uiButton {
|
|
||||||
background: var(--better-main);
|
|
||||||
color: var(--text-color);
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Example 2: Custom Background Image
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Use a custom background image */
|
|
||||||
body {
|
|
||||||
background-image: var(--custom-background);
|
|
||||||
background-size: cover;
|
|
||||||
background-attachment: fixed;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Add overlay for readability */
|
|
||||||
#main::before {
|
|
||||||
content: '';
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
background: rgba(0, 0, 0, 0.3);
|
|
||||||
z-index: -1;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Example 3: Rounded Corners Theme
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Make everything more rounded */
|
|
||||||
#main > .dashboard > section,
|
|
||||||
.dashlet,
|
|
||||||
.notice,
|
|
||||||
.document {
|
|
||||||
border-radius: 20px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Round buttons */
|
|
||||||
.uiButton {
|
|
||||||
border-radius: 25px !important;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Example 4: Minimal Theme
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Remove shadows and borders */
|
|
||||||
#main > .dashboard > section,
|
|
||||||
.dashlet,
|
|
||||||
.notice {
|
|
||||||
box-shadow: none !important;
|
|
||||||
border: 1px solid var(--background-secondary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Simplify colors */
|
|
||||||
#menu {
|
|
||||||
background: var(--background-primary) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Remove gradients */
|
|
||||||
.day {
|
|
||||||
background: var(--background-primary) !important;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Example 5: High Contrast Theme
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Increase contrast */
|
|
||||||
:root {
|
|
||||||
--background-primary: #000000;
|
|
||||||
--background-secondary: #1a1a1a;
|
|
||||||
--text-primary: #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
html:not(.dark) {
|
|
||||||
--background-primary: #ffffff;
|
|
||||||
--background-secondary: #f0f0f0;
|
|
||||||
--text-primary: #000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Add borders for clarity */
|
|
||||||
.dashlet,
|
|
||||||
.notice,
|
|
||||||
.document {
|
|
||||||
border: 2px solid var(--better-main) !important;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Advanced Techniques
|
|
||||||
|
|
||||||
### CSS Custom Properties Override
|
|
||||||
|
|
||||||
You can override CSS variables in your theme:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Override a variable */
|
|
||||||
:root {
|
|
||||||
--better-main: #your-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Override conditionally */
|
|
||||||
html.dark {
|
|
||||||
--background-primary: #your-dark-color;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Animations
|
|
||||||
|
|
||||||
Add smooth transitions:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Smooth color transitions */
|
|
||||||
#menu li {
|
|
||||||
transition: background-color 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Hover effects */
|
|
||||||
.dashlet:hover {
|
|
||||||
transform: translateY(-2px);
|
|
||||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
|
||||||
transition: all 0.3s ease;
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Pseudo-elements
|
|
||||||
|
|
||||||
Use pseudo-elements for decorative elements:
|
|
||||||
|
|
||||||
```css
|
|
||||||
/* Add decorative border */
|
|
||||||
.notice::before {
|
|
||||||
content: '';
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
width: 4px;
|
|
||||||
background: var(--better-main);
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
### Theme Not Applying
|
|
||||||
|
|
||||||
1. Check browser console for CSS errors
|
|
||||||
2. Verify CSS syntax is correct
|
|
||||||
3. Ensure selectors are specific enough
|
|
||||||
4. Check if `!important` is needed
|
|
||||||
|
|
||||||
### Colors Not Changing
|
|
||||||
|
|
||||||
1. Verify you're using CSS variables
|
|
||||||
2. Check if `forceDark` is overriding your styles
|
|
||||||
3. Ensure variables are set on `:root` or `html`
|
|
||||||
|
|
||||||
### Images Not Showing
|
|
||||||
|
|
||||||
1. Verify image variable name matches CSS
|
|
||||||
2. Check image format is supported
|
|
||||||
3. Ensure image size is reasonable
|
|
||||||
4. Verify `url()` wrapper in CSS
|
|
||||||
|
|
||||||
### Dark Mode Issues
|
|
||||||
|
|
||||||
1. Test with `forceDark: true` and `forceDark: false`
|
|
||||||
2. Check if transparency effects are interfering
|
|
||||||
3. Verify `html.dark` selector is correct
|
|
||||||
|
|
||||||
## Resources
|
|
||||||
|
|
||||||
- **Theme Creator**: Access via BetterSEQTA+ settings
|
|
||||||
- **CSS Variables Reference**: See [CSS Variables](#css-variables) section above
|
|
||||||
- **SEQTA DOM Structure**: Inspect SEQTA pages in browser DevTools
|
|
||||||
- **BetterSEQTA+ Source**: Check `src/css/injected.scss` for default styles
|
|
||||||
|
|
||||||
## Contributing Themes
|
|
||||||
|
|
||||||
If you create a great theme, consider sharing it:
|
|
||||||
|
|
||||||
1. Export your theme (Share button in theme creator)
|
|
||||||
2. Submit to the BetterSEQTA+ theme store
|
|
||||||
3. Or share on GitHub/Discord
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Note**: This documentation is based on BetterSEQTA+ v3.4.13. Some details may change in future versions.
|
|
||||||
|
|
||||||
+2
-5
@@ -1,14 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "betterseqtaplus",
|
"name": "betterseqtaplus",
|
||||||
"version": "3.4.15",
|
"version": "3.4.13",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"description": "Enhance SEQTA Learn's usability and aesthetics! A fork of BetterSEQTA to continue development add add heaps more features!",
|
"description": "Enhance SEQTA Learn's usability and aesthetics! A fork of BetterSEQTA to continue development add add heaps more features!",
|
||||||
"browserslist": "> 0.5%, last 2 versions, not dead",
|
"browserslist": "> 0.5%, last 2 versions, not dead",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"autoaudit": "npm audit && npm audit fix && npm run build",
|
|
||||||
"dev": "cross-env MODE=chrome vite dev",
|
"dev": "cross-env MODE=chrome vite dev",
|
||||||
"dev:firefox": "cross-env MODE=firefox vite build --watch",
|
"dev:firefox": "cross-env MODE=firefox vite build --watch",
|
||||||
"compile": "npm i && npm run build",
|
|
||||||
"build": "cross-env MODE=chrome vite build && cross-env MODE=firefox vite build",
|
"build": "cross-env MODE=chrome vite build && cross-env MODE=firefox vite build",
|
||||||
"build:chrome": "cross-env MODE=chrome vite build",
|
"build:chrome": "cross-env MODE=chrome vite build",
|
||||||
"build:firefox": "cross-env MODE=firefox vite build",
|
"build:firefox": "cross-env MODE=firefox vite build",
|
||||||
@@ -49,7 +47,7 @@
|
|||||||
"mime-types": "^3.0.1",
|
"mime-types": "^3.0.1",
|
||||||
"prettier": "^3.5.3",
|
"prettier": "^3.5.3",
|
||||||
"process": "^0.11.10",
|
"process": "^0.11.10",
|
||||||
"publish-browser-extension": "^4.0.0",
|
"publish-browser-extension": "^3.0.1",
|
||||||
"sass": "^1.85.1",
|
"sass": "^1.85.1",
|
||||||
"sass-loader": "^16.0.5",
|
"sass-loader": "^16.0.5",
|
||||||
"semver": "^7.7.1",
|
"semver": "^7.7.1",
|
||||||
@@ -95,7 +93,6 @@
|
|||||||
"mathjs": "^14.4.0",
|
"mathjs": "^14.4.0",
|
||||||
"million": "^3.1.11",
|
"million": "^3.1.11",
|
||||||
"motion": "^12.4.12",
|
"motion": "^12.4.12",
|
||||||
"pdfjs-dist": "^5.4.530",
|
|
||||||
"postcss": "^8.5.3",
|
"postcss": "^8.5.3",
|
||||||
"react": "17",
|
"react": "17",
|
||||||
"react-best-gradient-color-picker": "3.0.11",
|
"react-best-gradient-color-picker": "3.0.11",
|
||||||
|
|||||||
+22
-36
@@ -25,8 +25,24 @@ if (document.childNodes[1]) {
|
|||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes BetterSEQTA+ on a SEQTA page.
|
||||||
|
*
|
||||||
|
* This function performs the following steps:
|
||||||
|
* 1. Verifies that the current page is a SEQTA page.
|
||||||
|
* 2. Injects CSS styles for document loading.
|
||||||
|
* 3. Changes the page's favicon.
|
||||||
|
* 4. Initializes the extension's settings state.
|
||||||
|
* 5. Sets default storage if settings are not already defined.
|
||||||
|
* 6. Calls the main function to apply core BetterSEQTA+ modifications.
|
||||||
|
* 7. Initializes legacy and new plugins if the extension is enabled.
|
||||||
|
* 8. Logs success or error messages during initialization.
|
||||||
|
*/
|
||||||
async function init() {
|
async function init() {
|
||||||
if (hasSEQTAText && document.title.includes("SEQTA Learn") && !IsSEQTAPage) {
|
const hasSEQTATitle = document.title.includes("SEQTA Learn");
|
||||||
|
|
||||||
|
if (hasSEQTAText && hasSEQTATitle && !IsSEQTAPage) {
|
||||||
|
// Verify we are on a SEQTA page
|
||||||
IsSEQTAPage = true;
|
IsSEQTAPage = true;
|
||||||
console.info("[BetterSEQTA+] Verified SEQTA Page");
|
console.info("[BetterSEQTA+] Verified SEQTA Page");
|
||||||
|
|
||||||
@@ -34,30 +50,10 @@ async function init() {
|
|||||||
documentLoadStyle.textContent = documentLoadCSS;
|
documentLoadStyle.textContent = documentLoadCSS;
|
||||||
document.head.appendChild(documentLoadStyle);
|
document.head.appendChild(documentLoadStyle);
|
||||||
|
|
||||||
replaceIcons();
|
const icon = document.querySelector(
|
||||||
|
'link[rel*="icon"]',
|
||||||
const observer = new MutationObserver((mutations) => {
|
)! as HTMLLinkElement;
|
||||||
for (const mutation of mutations) {
|
icon.href = icon48; // Change the icon
|
||||||
|
|
||||||
if (
|
|
||||||
mutation.type === "attributes" &&
|
|
||||||
mutation.target instanceof HTMLLinkElement &&
|
|
||||||
mutation.target.rel.includes("icon") &&
|
|
||||||
mutation.attributeName === "href"
|
|
||||||
) {
|
|
||||||
replaceIcons();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
observer.observe(document.head, {
|
|
||||||
subtree: true,
|
|
||||||
attributes: true,
|
|
||||||
attributeFilter: ["href"],
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await initializeSettingsState();
|
await initializeSettingsState();
|
||||||
@@ -82,18 +78,8 @@ async function init() {
|
|||||||
console.info(
|
console.info(
|
||||||
"[BetterSEQTA+] Successfully initialised BetterSEQTA+, starting to load assets.",
|
"[BetterSEQTA+] Successfully initialised BetterSEQTA+, starting to load assets.",
|
||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error: any) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function replaceIcons() {
|
|
||||||
document
|
|
||||||
.querySelectorAll<HTMLLinkElement>('link[rel*="icon"]')
|
|
||||||
.forEach((link) => {
|
|
||||||
if (link.href !== icon48) {
|
|
||||||
link.href = icon48;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -17,19 +17,10 @@
|
|||||||
|
|
||||||
@use "injected/popup.scss";
|
@use "injected/popup.scss";
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: "Roboto";
|
|
||||||
src: url("https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3yUBA.woff2")
|
|
||||||
format("woff2");
|
|
||||||
font-weight: 700;
|
|
||||||
font-style: normal;
|
|
||||||
font-display: swap;
|
|
||||||
}
|
|
||||||
|
|
||||||
html {
|
html {
|
||||||
background: #161616 !important;
|
background: #161616 !important;
|
||||||
background-color: #161616;
|
background-color: #161616;
|
||||||
font-family: Roboto, system-ui, -apple-system, sans-serif !important;
|
font-family: Rubik, Roboto !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tooltip svg {
|
.tooltip svg {
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.cke_panel_listItem > a {
|
.cke_panel_listItem > a {
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background: #3d3d3e !important;
|
background: #3d3d3e !important;
|
||||||
}
|
}
|
||||||
|
|||||||
+275
-130
@@ -1,15 +1,5 @@
|
|||||||
@use "sass:meta";
|
@use "sass:meta";
|
||||||
@import url("https://fonts.googleapis.com/css?family=Rubik:300,400,500,600,700");
|
@import url("https://fonts.googleapis.com/css?family=Rubik:300,400,500,600");
|
||||||
|
|
||||||
/* Force Roboto for legacy-root - SEQTA UI update overrides fonts */
|
|
||||||
@font-face {
|
|
||||||
font-family: "Roboto";
|
|
||||||
src: url("https://fonts.gstatic.com/s/roboto/v50/KFO7CnqEu92Fr1ME7kSn66aGLdTylUAMa3yUBA.woff2")
|
|
||||||
format("woff2");
|
|
||||||
font-weight: 700;
|
|
||||||
font-style: normal;
|
|
||||||
font-display: swap;
|
|
||||||
}
|
|
||||||
|
|
||||||
@include meta.load-css("injected/sidebar-animation.scss");
|
@include meta.load-css("injected/sidebar-animation.scss");
|
||||||
@include meta.load-css("injected/theme.scss");
|
@include meta.load-css("injected/theme.scss");
|
||||||
@@ -22,10 +12,6 @@
|
|||||||
font-family: Rubik, sans-serif !important;
|
font-family: Rubik, sans-serif !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
*:not([class^="Canvas__canvas___"]):not([class^="Canvas__canvas___"] *):not([class^="ThemeCard__"]):not([class^="ThemeCard__"] *):not([class^="ThemePreview__"]):not([class^="ThemePreview__"] *):not([class^="academicReportsWrapper"]):not([class^="academicReportsWrapper"] *):not(textarea):not(.doesntexist) {
|
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
::view-transition-old(root),
|
::view-transition-old(root),
|
||||||
::view-transition-new(root) {
|
::view-transition-new(root) {
|
||||||
animation: none;
|
animation: none;
|
||||||
@@ -53,17 +39,7 @@ html {
|
|||||||
font-family: Rubik, sans-serif !important;
|
font-family: Rubik, sans-serif !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.legacy-root {
|
/* Ensure native select dropdowns are readable on Windows */
|
||||||
color: rgb(var(--theme-fg-parts));
|
|
||||||
cursor: default;
|
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
text-rendering: optimizeLegibility;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
select option {
|
select option {
|
||||||
background-color: #ffffff !important;
|
background-color: #ffffff !important;
|
||||||
color: #111827 !important;
|
color: #111827 !important;
|
||||||
@@ -73,6 +49,7 @@ select option {
|
|||||||
color: #ffffff !important;
|
color: #ffffff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Consistent rounded corners for selects */
|
||||||
select {
|
select {
|
||||||
border-radius: 8px !important;
|
border-radius: 8px !important;
|
||||||
}
|
}
|
||||||
@@ -181,7 +158,8 @@ select {
|
|||||||
#main {
|
#main {
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
position: relative;
|
position: relative;
|
||||||
|
}
|
||||||
|
#main {
|
||||||
> .timetablepage {
|
> .timetablepage {
|
||||||
> .quickbar {
|
> .quickbar {
|
||||||
.gutter {
|
.gutter {
|
||||||
@@ -298,8 +276,10 @@ select {
|
|||||||
grid-template-columns: repeat(autofit, minmax(200px, 400px)) !important;
|
grid-template-columns: repeat(autofit, minmax(200px, 400px)) !important;
|
||||||
background: unset;
|
background: unset;
|
||||||
|
|
||||||
|
// TODO: Make this only opacity 0 when the animation will be played to stop a flash of the original
|
||||||
> section {
|
> section {
|
||||||
border-radius: 16px !important;
|
border-radius: 16px !important;
|
||||||
|
//opacity: 0;
|
||||||
|
|
||||||
button {
|
button {
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
@@ -339,6 +319,7 @@ select {
|
|||||||
> .dashlet {
|
> .dashlet {
|
||||||
background: var(--background-primary);
|
background: var(--background-primary);
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
|
//opacity: 0;
|
||||||
|
|
||||||
&[data-ident="timetable"] {
|
&[data-ident="timetable"] {
|
||||||
grid-row: span 2 / auto !important;
|
grid-row: span 2 / auto !important;
|
||||||
@@ -358,6 +339,9 @@ select {
|
|||||||
.dashlet-summary-homework > .summary > .subject > .item {
|
.dashlet-summary-homework > .summary > .subject > .item {
|
||||||
color: var(--text-primary) !important;
|
color: var(--text-primary) !important;
|
||||||
}
|
}
|
||||||
|
.dashlet-summary-homework > .summary > .subject > .item {
|
||||||
|
color: var(--text-primary) !important;
|
||||||
|
}
|
||||||
.dashlet-notes > ul {
|
.dashlet-notes > ul {
|
||||||
background: var(--background-primary);
|
background: var(--background-primary);
|
||||||
}
|
}
|
||||||
@@ -422,6 +406,7 @@ ul.magicDelete > li.deleting {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Allow long course/assessment names in the sidebar to wrap and break safely */
|
||||||
#menu li > label,
|
#menu li > label,
|
||||||
#menu section > label {
|
#menu section > label {
|
||||||
white-space: normal;
|
white-space: normal;
|
||||||
@@ -432,22 +417,13 @@ ul.magicDelete > li.deleting {
|
|||||||
hyphens: auto;
|
hyphens: auto;
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
}
|
}
|
||||||
#menu,
|
|
||||||
#menu li,
|
|
||||||
#menu section,
|
|
||||||
#menu li > label,
|
|
||||||
#menu section > label {
|
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
font-size: 16px !important;
|
|
||||||
font-weight: 700 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#menu {
|
#menu {
|
||||||
width: 270px;
|
width: 270px;
|
||||||
z-index: 19;
|
z-index: 19;
|
||||||
background: var(--better-main) !important;
|
background: var(--better-main) !important;
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
border-right: none;
|
border-right: none;
|
||||||
|
font-family: Rubik, sans-serif !important;
|
||||||
}
|
}
|
||||||
#menu li > label > svg,
|
#menu li > label > svg,
|
||||||
#menu section > label > svg {
|
#menu section > label > svg {
|
||||||
@@ -458,11 +434,6 @@ ul.magicDelete > li.deleting {
|
|||||||
[class*="notifications__items___"] {
|
[class*="notifications__items___"] {
|
||||||
-ms-overflow-style: none !important;
|
-ms-overflow-style: none !important;
|
||||||
scrollbar-width: none !important;
|
scrollbar-width: none !important;
|
||||||
border-bottom: none;
|
|
||||||
height: 540px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
@@ -522,9 +493,9 @@ ul.magicDelete > li.deleting {
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
html {
|
html {
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
background: var(--better-main) !important;
|
background: var(--better-main) !important;
|
||||||
}
|
}
|
||||||
|
/* Messages */
|
||||||
.menuShown .content .anyoneSelect .listWrapper .list:has(.item) {
|
.menuShown .content .anyoneSelect .listWrapper .list:has(.item) {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
}
|
}
|
||||||
@@ -543,6 +514,7 @@ ol:has([class*="MessageList__avatar___"] svg) {
|
|||||||
transition-duration: 150ms !important;
|
transition-duration: 150ms !important;
|
||||||
transition-delay: 0ms !important;
|
transition-delay: 0ms !important;
|
||||||
}
|
}
|
||||||
|
/* Direct Message Menu */
|
||||||
.wrapper .cke_contents iframe {
|
.wrapper .cke_contents iframe {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
@@ -551,6 +523,7 @@ ol:has([class*="MessageList__avatar___"] svg) {
|
|||||||
}
|
}
|
||||||
.wrapper .cke_contents::-webkit-scrollbar-thumb {
|
.wrapper .cke_contents::-webkit-scrollbar-thumb {
|
||||||
background-color: #969696 !important;
|
background-color: #969696 !important;
|
||||||
|
/* color of the scroll thumb */
|
||||||
}
|
}
|
||||||
.content .footer {
|
.content .footer {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
@@ -755,7 +728,13 @@ td.colourBar {
|
|||||||
#container #content .uiButton {
|
#container #content .uiButton {
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
}
|
}
|
||||||
|
.dark {
|
||||||
|
#toolbar button.toggled,
|
||||||
|
#toolbar button.depressed {
|
||||||
|
background: #333333;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
}
|
||||||
#toolbar button.toggled,
|
#toolbar button.toggled,
|
||||||
#toolbar button.depressed {
|
#toolbar button.depressed {
|
||||||
background: #f3f3f3;
|
background: #f3f3f3;
|
||||||
@@ -845,7 +824,7 @@ div > ol:has(.uiFileHandlerWrapper) {
|
|||||||
[aria-labelledby="lixycoxs-tab-1"] [minlength="0"] {
|
[aria-labelledby="lixycoxs-tab-1"] [minlength="0"] {
|
||||||
min-height: 128px !important;
|
min-height: 128px !important;
|
||||||
}
|
}
|
||||||
body.student #menu > ul::before {
|
.student #menu > ul::before {
|
||||||
background-image: var(--betterseqta-logo) !important;
|
background-image: var(--betterseqta-logo) !important;
|
||||||
position: -webkit-sticky;
|
position: -webkit-sticky;
|
||||||
position: sticky;
|
position: sticky;
|
||||||
@@ -871,7 +850,7 @@ html.transparencyEffects
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
#menu li:hover {
|
#menu li:hover {
|
||||||
background: rgba(0, 0, 0, 0.15) !important;
|
background: rgba(0, 0, 0, 0.15);
|
||||||
}
|
}
|
||||||
#main > .timetablepage > .container {
|
#main > .timetablepage > .container {
|
||||||
background: var(--background-primary);
|
background: var(--background-primary);
|
||||||
@@ -990,14 +969,6 @@ html.transparencyEffects
|
|||||||
color: white !important;
|
color: white !important;
|
||||||
}
|
}
|
||||||
.notices-container {
|
.notices-container {
|
||||||
width: 100%;
|
|
||||||
max-height: 60em;
|
|
||||||
background: var(--better-main);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
-webkit-box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
|
|
||||||
box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
|
|
||||||
|
|
||||||
input {
|
input {
|
||||||
border: none;
|
border: none;
|
||||||
color: var(--text-color) !important;
|
color: var(--text-color) !important;
|
||||||
@@ -1013,7 +984,6 @@ html.transparencyEffects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#main > .notices > .notice > .label,
|
#main > .notices > .notice > .label,
|
||||||
#main > .notices > .notice > .staff,
|
#main > .notices > .notice > .staff,
|
||||||
#main > .notices > .notice > h2 {
|
#main > .notices > .notice > h2 {
|
||||||
@@ -1184,12 +1154,9 @@ html.transparencyEffects
|
|||||||
transition: 200ms;
|
transition: 200ms;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 15em;
|
height: 15em;
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
font-size: 14px !important;
|
|
||||||
font-weight: 700 !important;
|
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-auto-flow: column;
|
grid-auto-flow: column;
|
||||||
grid-auto-columns: minmax(100px, 1fr);
|
grid-auto-columns: minmax(142px, 1fr);
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
|
|
||||||
@@ -1229,6 +1196,15 @@ html.transparencyEffects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.notices-container {
|
||||||
|
width: 100%;
|
||||||
|
max-height: 60em;
|
||||||
|
background: var(--better-main);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
-webkit-box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
|
||||||
|
box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
|
||||||
|
}
|
||||||
.notice-container {
|
.notice-container {
|
||||||
background: var(--better-main);
|
background: var(--better-main);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -1377,14 +1353,19 @@ html.transparencyEffects
|
|||||||
.clickable {
|
.clickable {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
.day:hover {
|
||||||
|
background: var(--background);
|
||||||
|
transition: 200ms;
|
||||||
|
}
|
||||||
|
|
||||||
.day h2 {
|
.day h2 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
padding-top: 14px;
|
padding-top: 14px;
|
||||||
font-size: 14px !important;
|
font-size: 20px !important;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
min-height: 46px;
|
min-height: 46px;
|
||||||
|
/* Let the title expand naturally but clamp to 2 lines to avoid overlap */
|
||||||
height: auto;
|
height: auto;
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
@@ -1410,8 +1391,8 @@ html.transparencyEffects
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
padding-left: 8px;
|
padding-left: 8px;
|
||||||
font-size: 13px !important;
|
font-size: 16px !important;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
.day h5 {
|
.day h5 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@@ -1421,11 +1402,14 @@ html.transparencyEffects
|
|||||||
bottom: 0;
|
bottom: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
font-size: 10px !important;
|
font-size: 10px !important;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
.waitWindow {
|
.waitWindow {
|
||||||
background: var(--better-main);
|
background: var(--better-main);
|
||||||
}
|
}
|
||||||
|
.modaliser {
|
||||||
|
background: var(--better-main);
|
||||||
|
}
|
||||||
.alert-container {
|
.alert-container {
|
||||||
height: 35em;
|
height: 35em;
|
||||||
width: 22em;
|
width: 22em;
|
||||||
@@ -1458,6 +1442,8 @@ html.transparencyEffects
|
|||||||
background: white;
|
background: white;
|
||||||
z-index: 21 !important;
|
z-index: 21 !important;
|
||||||
color: var(--better-sub);
|
color: var(--better-sub);
|
||||||
|
}
|
||||||
|
[class*="notifications__notifications___"] > button {
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
}
|
}
|
||||||
.legacy-root button > svg,
|
.legacy-root button > svg,
|
||||||
@@ -1478,6 +1464,10 @@ html.transparencyEffects
|
|||||||
.legacy-root button::after {
|
.legacy-root button::after {
|
||||||
background: black !important;
|
background: black !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.legacy-root button::after {
|
||||||
|
background: var(--better-main);
|
||||||
|
}
|
||||||
.legacy-root button:not([disabled]):focus {
|
.legacy-root button:not([disabled]):focus {
|
||||||
border-color: var(--better-sub);
|
border-color: var(--better-sub);
|
||||||
}
|
}
|
||||||
@@ -1523,6 +1513,12 @@ html.transparencyEffects
|
|||||||
border: 1px solid white;
|
border: 1px solid white;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
[class*="notifications__items___"] {
|
||||||
|
border-bottom: none;
|
||||||
|
height: 540px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
[class*="notifications__details___"] {
|
[class*="notifications__details___"] {
|
||||||
max-width: 80%;
|
max-width: 80%;
|
||||||
overflow: clip;
|
overflow: clip;
|
||||||
@@ -1554,6 +1550,7 @@ html.transparencyEffects
|
|||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
[class*="MessageList__MessageList___"] ol [class*="Button__Button___"]::before {
|
[class*="MessageList__MessageList___"] ol [class*="Button__Button___"]::before {
|
||||||
|
// plus icon
|
||||||
content: "";
|
content: "";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
@@ -1675,7 +1672,8 @@ iframe.userHTML {
|
|||||||
}
|
}
|
||||||
[class*="Thermoscore__Thermoscore___"] {
|
[class*="Thermoscore__Thermoscore___"] {
|
||||||
background-image: unset;
|
background-image: unset;
|
||||||
background-color: var(--auto-background);
|
background: var(--auto-background);
|
||||||
|
border-radius: 8px;
|
||||||
}
|
}
|
||||||
.dark [class*="Thermoscore__Thermoscore___"] {
|
.dark [class*="Thermoscore__Thermoscore___"] {
|
||||||
border: 2px solid rgba(255, 255, 255, 0.3);
|
border: 2px solid rgba(255, 255, 255, 0.3);
|
||||||
@@ -1713,9 +1711,6 @@ iframe.userHTML {
|
|||||||
box-shadow: 0 0 40px 0px rgba(0, 0, 0, 0.05);
|
box-shadow: 0 0 40px 0px rgba(0, 0, 0, 0.05);
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 400px;
|
|
||||||
background: var(--background-primary);
|
|
||||||
position: relative;
|
|
||||||
|
|
||||||
.navigator {
|
.navigator {
|
||||||
padding: 6px !important;
|
padding: 6px !important;
|
||||||
@@ -1843,6 +1838,7 @@ iframe.userHTML {
|
|||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* set button(top and bottom of the scrollbar) */
|
||||||
body::-webkit-scrollbar-button {
|
body::-webkit-scrollbar-button {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
@@ -1856,6 +1852,30 @@ ul {
|
|||||||
scrollbar-color: #babac0 #fff !important;
|
scrollbar-color: #babac0 #fff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dark {
|
||||||
|
body,
|
||||||
|
div,
|
||||||
|
ol,
|
||||||
|
ul {
|
||||||
|
scrollbar-width: thin;
|
||||||
|
scrollbar-color: #333 #111 !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.connectedNotificationsWrapper > div > button {
|
||||||
|
color: var(--text-primary) !important;
|
||||||
|
height: 45px;
|
||||||
|
width: 45px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.programmeNavigator {
|
||||||
|
width: 400px;
|
||||||
|
background: var(--background-primary);
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
#userActions > .details > .code {
|
||||||
|
text-transform: initial;
|
||||||
|
}
|
||||||
div:has(> [class*="AssessmentDetails__AssessmentDetails___"]) {
|
div:has(> [class*="AssessmentDetails__AssessmentDetails___"]) {
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
}
|
}
|
||||||
@@ -1991,13 +2011,14 @@ div:has(> [class*="AssessmentDetails__AssessmentDetails___"]) {
|
|||||||
}
|
}
|
||||||
div.entry.class {
|
div.entry.class {
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
width: 100% !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.entry.class {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
div.entry.class[style*="left: 46.5%"] {
|
div.entry.class[style*="left: 46.5%"] {
|
||||||
left: 50% !important;
|
left: 50% !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.entry.class[style*="width: 46.5%"] {
|
div.entry.class[style*="width: 46.5%"] {
|
||||||
width: 50% !important;
|
width: 50% !important;
|
||||||
}
|
}
|
||||||
@@ -2079,22 +2100,6 @@ a.uiFile:not(.rows) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark {
|
|
||||||
body,
|
|
||||||
div,
|
|
||||||
ol,
|
|
||||||
ul {
|
|
||||||
scrollbar-width: thin;
|
|
||||||
scrollbar-color: #333 #111 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#toolbar button.toggled,
|
|
||||||
#toolbar button.depressed {
|
|
||||||
background: #333333;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .title a.uiFile {
|
.dark .title a.uiFile {
|
||||||
color: #06b4fc !important;
|
color: #06b4fc !important;
|
||||||
}
|
}
|
||||||
@@ -2289,8 +2294,8 @@ div.bar.flat {
|
|||||||
.cke_toolbox {
|
.cke_toolbox {
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
padding-left: 8px !important;
|
padding-left: 8px !important;
|
||||||
|
background: unset !important;
|
||||||
gap: 0 8px;
|
gap: 0 8px;
|
||||||
background: var(--better-main);
|
|
||||||
}
|
}
|
||||||
.cke_toolbar:has(.cke_toolgroup) {
|
.cke_toolbar:has(.cke_toolgroup) {
|
||||||
.cke_combo {
|
.cke_combo {
|
||||||
@@ -2363,6 +2368,7 @@ ul.buttonChecklist,
|
|||||||
ul.buttonMenu,
|
ul.buttonMenu,
|
||||||
ul.colourButtonOptions,
|
ul.colourButtonOptions,
|
||||||
ul.uiSplitButtonList,
|
ul.uiSplitButtonList,
|
||||||
|
ul.buttonMenu,
|
||||||
.contactFormPanel {
|
.contactFormPanel {
|
||||||
background: var(--background-primary) !important;
|
background: var(--background-primary) !important;
|
||||||
border: solid 4px var(--background-primary);
|
border: solid 4px var(--background-primary);
|
||||||
@@ -2434,9 +2440,14 @@ body {
|
|||||||
.days {
|
.days {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
.hidden {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.cke_toolbox {
|
||||||
|
background: var(--better-main);
|
||||||
|
}
|
||||||
.modaliser {
|
.modaliser {
|
||||||
display: none;
|
display: none;
|
||||||
background: var(--better-main);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[class*="MessageList__unread___"] {
|
[class*="MessageList__unread___"] {
|
||||||
@@ -2695,16 +2706,16 @@ body {
|
|||||||
}
|
}
|
||||||
.big-circle {
|
.big-circle {
|
||||||
margin: -88px;
|
margin: -88px;
|
||||||
animation: spin 3s ease infinite;
|
animation-timing-function: ease;
|
||||||
-moz-animation: spin 3s ease infinite;
|
animation: spin 3s linear infinite;
|
||||||
|
-moz-animation: spin 3s linear infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
.small-circle {
|
.small-circle {
|
||||||
margin: -66px;
|
margin: -66px;
|
||||||
animation: spin 3s ease infinite;
|
animation-timing-function: ease;
|
||||||
-moz-animation: spin 3s ease infinite;
|
animation: spin 3s linear infinite;
|
||||||
|
-moz-animation: spin 3s linear infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark [class*="LabelList__name___"] {
|
.dark [class*="LabelList__name___"] {
|
||||||
text-shadow: 0 0 5px black;
|
text-shadow: 0 0 5px black;
|
||||||
}
|
}
|
||||||
@@ -2746,8 +2757,9 @@ body {
|
|||||||
}
|
}
|
||||||
.outer-circle {
|
.outer-circle {
|
||||||
margin: -108px;
|
margin: -108px;
|
||||||
animation: spinback 1s linear infinite alternate-reverse;
|
animation-direction: alternate-reverse;
|
||||||
-moz-animation: spinback 1s linear infinite alternate-reverse;
|
animation: spinback 1s linear infinite;
|
||||||
|
-moz-animation: spinback 1s linear infinite;
|
||||||
}
|
}
|
||||||
@-moz-keyframes spin {
|
@-moz-keyframes spin {
|
||||||
100% {
|
100% {
|
||||||
@@ -2778,7 +2790,6 @@ body {
|
|||||||
bottom: 20px;
|
bottom: 20px;
|
||||||
}
|
}
|
||||||
#userActions > .details > .code {
|
#userActions > .details > .code {
|
||||||
text-transform: initial;
|
|
||||||
overflow: visible !important;
|
overflow: visible !important;
|
||||||
}
|
}
|
||||||
.code {
|
.code {
|
||||||
@@ -2881,8 +2892,7 @@ div.day-empty {
|
|||||||
.upcoming-subject-title {
|
.upcoming-subject-title {
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
width: 15%;
|
width: 15%;
|
||||||
font-size: 20px !important;
|
font-size: 20px;
|
||||||
font-weight: 700 !important;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -2891,26 +2901,39 @@ div.day-empty {
|
|||||||
border-radius: 5px 0px 0px 5px;
|
border-radius: 5px 0px 0px 5px;
|
||||||
background: var(--item-colour);
|
background: var(--item-colour);
|
||||||
}
|
}
|
||||||
|
.upcoming-assessment-title {
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
.upcoming-assessment {
|
.upcoming-assessment {
|
||||||
border: 2px solid var(--item-colour);
|
border: 2px solid var(--item-colour);
|
||||||
margin: 5px 50px;
|
margin: 5px 50px;
|
||||||
height: 6em;
|
height: 6em;
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
font-size: 20px !important;
|
|
||||||
font-weight: 700 !important;
|
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
.upcoming-assessment {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
.upcoming-date-container {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
.upcoming-date-title {
|
.upcoming-date-title {
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
font-size: 20px !important;
|
font-size: 20px;
|
||||||
font-weight: 700 !important;
|
}
|
||||||
|
.upcoming-details h5 {
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: #aaaaaa;
|
||||||
|
padding: 0px 4px;
|
||||||
}
|
}
|
||||||
.upcoming-details p:hover {
|
.upcoming-details p:hover {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
|
.upcoming-special-day {
|
||||||
|
font-size: 20px;
|
||||||
|
}
|
||||||
.upcoming-blank {
|
.upcoming-blank {
|
||||||
display: flex;
|
display: flex;
|
||||||
border-bottom: 2px solid #bebebe;
|
border-bottom: 2px solid #bebebe;
|
||||||
@@ -2918,9 +2941,17 @@ div.day-empty {
|
|||||||
height: 2em;
|
height: 2em;
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
|
.upcoming-blank p {
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
.upcoming-tick {
|
.upcoming-tick {
|
||||||
align-self: center;
|
align-self: center;
|
||||||
}
|
}
|
||||||
|
.upcoming-title {
|
||||||
|
display: flex;
|
||||||
|
align-content: space-between;
|
||||||
|
}
|
||||||
.upcoming-title h2 {
|
.upcoming-title h2 {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
@@ -2950,11 +2981,60 @@ div.day-empty {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
/* Hide the browser's default checkbox */
|
||||||
|
.upcoming-checkbox-container input {
|
||||||
|
position: absolute;
|
||||||
|
opacity: 0;
|
||||||
|
cursor: pointer;
|
||||||
|
height: 0;
|
||||||
|
width: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
/* Create a custom checkbox */
|
||||||
|
.upcoming-checkmark {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
height: 15px;
|
||||||
|
width: 15px;
|
||||||
|
border: 3px solid var(--item-colour);
|
||||||
|
border-radius: 5px;
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.upcoming-checkbox-container:hover input ~ .upcoming-checkmark {
|
||||||
|
filter: brightness(0.8);
|
||||||
|
}
|
||||||
|
|
||||||
|
.upcoming-checkbox-container input:checked ~ .upcoming-checkmark {
|
||||||
|
background: var(--item-colour);
|
||||||
|
}
|
||||||
|
|
||||||
|
.upcoming-checkmark:after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Show the checkmark when checked */
|
||||||
|
.upcoming-checkbox-container input:checked ~ .upcoming-checkmark:after {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
/* Style the checkmark/indicator */
|
||||||
|
.upcoming-checkbox-container .upcoming-checkmark:after {
|
||||||
|
left: 3.5px;
|
||||||
|
top: 0px;
|
||||||
|
width: 5px;
|
||||||
|
height: 10px;
|
||||||
|
border: solid white;
|
||||||
|
border-width: 0 3px 3px 0;
|
||||||
|
-webkit-transform: rotate(45deg);
|
||||||
|
-ms-transform: rotate(45deg);
|
||||||
|
transform: rotate(45deg);
|
||||||
|
}
|
||||||
.upcoming-hiddenassessment {
|
.upcoming-hiddenassessment {
|
||||||
color: #797979;
|
color: #797979;
|
||||||
}
|
}
|
||||||
|
|
||||||
.calendarEventEditor > .tabset > .item {
|
.calendarEventEditor > .tabset > .item {
|
||||||
border-radius: 0 !important;
|
border-radius: 0 !important;
|
||||||
}
|
}
|
||||||
@@ -3005,15 +3085,16 @@ div.day-empty {
|
|||||||
height: 15em;
|
height: 15em;
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
background: var(--background-primary);
|
background: var(--background-primary);
|
||||||
font-family: Rubik, sans-serif !important;
|
font-family: Rubik, sans-serif;
|
||||||
font-size: 14px !important;
|
|
||||||
font-weight: 700 !important;
|
|
||||||
}
|
}
|
||||||
.dark .day {
|
.dark .day {
|
||||||
box-shadow:
|
box-shadow:
|
||||||
inset 0px 6px 0 var(--item-colour, transparent),
|
inset 0px 6px 0 var(--item-colour, transparent),
|
||||||
inset 0px 40px 50px -40px rgba(0, 0, 0, 0.9);
|
inset 0px 40px 50px -40px rgba(0, 0, 0, 0.9);
|
||||||
}
|
}
|
||||||
|
.clickable {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
.day:hover {
|
.day:hover {
|
||||||
background: var(--background-secondary);
|
background: var(--background-secondary);
|
||||||
transition: 200ms;
|
transition: 200ms;
|
||||||
@@ -3034,9 +3115,6 @@ div.day-empty {
|
|||||||
200ms,
|
200ms,
|
||||||
background-color 0s;
|
background-color 0s;
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
font-family: Rubik, sans-serif !important;
|
|
||||||
font-size: 20px !important;
|
|
||||||
font-weight: 700 !important;
|
|
||||||
}
|
}
|
||||||
.dark .upcoming-items {
|
.dark .upcoming-items {
|
||||||
box-shadow: inset 0px 40px 80px -40px rgba(0, 0, 0, 0.6);
|
box-shadow: inset 0px 40px 80px -40px rgba(0, 0, 0, 0.6);
|
||||||
@@ -3044,16 +3122,25 @@ div.day-empty {
|
|||||||
.upcoming-assessment-title {
|
.upcoming-assessment-title {
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
transition: 200ms;
|
transition: 200ms;
|
||||||
font-size: 20px !important;
|
font-size: 10px;
|
||||||
font-weight: 700 !important;
|
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
.upcoming-assessment {
|
||||||
|
border: 3px solid var(--item-colour);
|
||||||
|
margin: 5px 50px;
|
||||||
|
height: 6em;
|
||||||
|
padding: 0px;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
.upcoming-assessment {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
.upcoming-date-container {
|
.upcoming-date-container {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
}
|
}
|
||||||
.upcoming-date-title h5 {
|
.upcoming-date-title h5 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
.upcoming-details {
|
.upcoming-details {
|
||||||
width: 60%;
|
width: 60%;
|
||||||
@@ -3061,7 +3148,6 @@ div.day-empty {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: 0px 12px;
|
padding: 0px 12px;
|
||||||
font-size: 15px;
|
|
||||||
}
|
}
|
||||||
.upcoming-details h5 {
|
.upcoming-details h5 {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
@@ -3070,8 +3156,7 @@ div.day-empty {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
.upcoming-details p {
|
.upcoming-details p {
|
||||||
font-size: 15px !important;
|
font-size: 15px;
|
||||||
font-weight: 700 !important;
|
|
||||||
padding: 4px;
|
padding: 4px;
|
||||||
}
|
}
|
||||||
.upcoming-special-day {
|
.upcoming-special-day {
|
||||||
@@ -3092,6 +3177,33 @@ div.day-empty {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-content: space-between;
|
align-content: space-between;
|
||||||
}
|
}
|
||||||
|
.upcoming-filters {
|
||||||
|
display: flex;
|
||||||
|
height: 26px;
|
||||||
|
width: 65%;
|
||||||
|
align-self: center;
|
||||||
|
align-items: center;
|
||||||
|
color: var(--text-color);
|
||||||
|
padding: 5px;
|
||||||
|
overflow-x: scroll;
|
||||||
|
overflow-y: hidden;
|
||||||
|
}
|
||||||
|
.upcoming-checkbox-container {
|
||||||
|
position: relative;
|
||||||
|
padding: none !important;
|
||||||
|
padding-left: 25px !important;
|
||||||
|
padding-right: 10px !important;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 12px;
|
||||||
|
-webkit-user-select: none;
|
||||||
|
-moz-user-select: none;
|
||||||
|
-ms-user-select: none;
|
||||||
|
user-select: none;
|
||||||
|
height: 20px;
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
/* Hide the browser's default checkbox */
|
||||||
.upcoming-checkbox-container input {
|
.upcoming-checkbox-container input {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
@@ -3100,6 +3212,7 @@ div.day-empty {
|
|||||||
width: 0;
|
width: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
/* Create a custom checkbox */
|
||||||
.upcoming-checkmark {
|
.upcoming-checkmark {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
@@ -3110,20 +3223,25 @@ div.day-empty {
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
}
|
}
|
||||||
|
/* On mouse-over, add a grey background color */
|
||||||
.upcoming-checkbox-container:hover input ~ .upcoming-checkmark {
|
.upcoming-checkbox-container:hover input ~ .upcoming-checkmark {
|
||||||
filter: brightness(0.8);
|
filter: brightness(0.8);
|
||||||
}
|
}
|
||||||
|
/* When the checkbox is checked, add a blue background */
|
||||||
.upcoming-checkbox-container input:checked ~ .upcoming-checkmark {
|
.upcoming-checkbox-container input:checked ~ .upcoming-checkmark {
|
||||||
background: var(--item-colour);
|
background: var(--item-colour);
|
||||||
}
|
}
|
||||||
|
/* Create the checkmark/indicator (hidden when not checked) */
|
||||||
.upcoming-checkmark:after {
|
.upcoming-checkmark:after {
|
||||||
content: "";
|
content: "";
|
||||||
position: absolute;
|
position: absolute;
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
/* Show the checkmark when checked */
|
||||||
.upcoming-checkbox-container input:checked ~ .upcoming-checkmark:after {
|
.upcoming-checkbox-container input:checked ~ .upcoming-checkmark:after {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
/* Style the checkmark/indicator */
|
||||||
.upcoming-checkbox-container .upcoming-checkmark:after {
|
.upcoming-checkbox-container .upcoming-checkmark:after {
|
||||||
left: 3.5px;
|
left: 3.5px;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
@@ -3135,6 +3253,9 @@ div.day-empty {
|
|||||||
-ms-transform: rotate(45deg);
|
-ms-transform: rotate(45deg);
|
||||||
transform: rotate(45deg);
|
transform: rotate(45deg);
|
||||||
}
|
}
|
||||||
|
.upcoming-hiddenassessment {
|
||||||
|
color: #797979;
|
||||||
|
}
|
||||||
.titlebar {
|
.titlebar {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
transition: 200ms;
|
transition: 200ms;
|
||||||
@@ -3172,7 +3293,7 @@ div.day-empty {
|
|||||||
.userInfoName {
|
.userInfoName {
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
.userInfoCode {
|
.userInfoCode {
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
@@ -3313,7 +3434,7 @@ div.day-empty {
|
|||||||
padding-bottom: 0.125rem;
|
padding-bottom: 0.125rem;
|
||||||
margin-left: 2px;
|
margin-left: 2px;
|
||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
color: #9a3412;
|
color: #9a3412;
|
||||||
border-radius: 9999px;
|
border-radius: 9999px;
|
||||||
border: 1px solid rgba(253, 186, 140, 0.3);
|
border: 1px solid rgba(253, 186, 140, 0.3);
|
||||||
@@ -3428,6 +3549,7 @@ div.day-empty {
|
|||||||
overflow: visible;
|
overflow: visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Auto collapsing alignment toolbar
|
||||||
.cke_toolbar:has(.cke_button__seqta-align-left) {
|
.cke_toolbar:has(.cke_button__seqta-align-left) {
|
||||||
overflow: visible !important;
|
overflow: visible !important;
|
||||||
|
|
||||||
@@ -3468,11 +3590,13 @@ div.day-empty {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Button icons
|
||||||
.cke_button_icon {
|
.cke_button_icon {
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// menu background
|
||||||
&:before {
|
&:before {
|
||||||
content: "";
|
content: "";
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@@ -3490,6 +3614,7 @@ div.day-empty {
|
|||||||
transition: all 0.2s ease-out;
|
transition: all 0.2s ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dropdown behavior on hover
|
||||||
&:hover {
|
&:hover {
|
||||||
&:hover:before {
|
&:hover:before {
|
||||||
transform: scale(1);
|
transform: scale(1);
|
||||||
@@ -3500,6 +3625,7 @@ div.day-empty {
|
|||||||
visibility: visible;
|
visibility: visible;
|
||||||
transition-delay: 0s;
|
transition-delay: 0s;
|
||||||
|
|
||||||
|
// Stack buttons in dropdown with spacing
|
||||||
&:first-child {
|
&:first-child {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
border-top-left-radius: 12px !important;
|
border-top-left-radius: 12px !important;
|
||||||
@@ -3527,6 +3653,7 @@ div.day-empty {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add subtle animation when closing dropdown
|
||||||
&:not(:hover)
|
&:not(:hover)
|
||||||
.cke_button:not(.cke_button_on):not(
|
.cke_button:not(.cke_button_on):not(
|
||||||
.cke_button__seqta-align-left:first-child
|
.cke_button__seqta-align-left:first-child
|
||||||
@@ -3550,10 +3677,15 @@ div.day-empty {
|
|||||||
scrollbar-width: none !important;
|
scrollbar-width: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.notice-modal-content {
|
||||||
|
border: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
.notice-unified-content.notice-modal-state {
|
.notice-unified-content.notice-modal-state {
|
||||||
border: none !important;
|
border: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Notice card hover effects for main page cards
|
||||||
.notice-unified-content.notice-card-state:not([data-transitioning]) {
|
.notice-unified-content.notice-card-state:not([data-transitioning]) {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
||||||
@@ -3572,7 +3704,7 @@ div.day-empty {
|
|||||||
padding: 4px 10px;
|
padding: 4px 10px;
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3594,6 +3726,7 @@ div.day-empty {
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Modal styles
|
||||||
.notice-modal-overlay {
|
.notice-modal-overlay {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
@@ -3612,7 +3745,7 @@ div.day-empty {
|
|||||||
.notice-modal-transition {
|
.notice-modal-transition {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 10001;
|
z-index: 10001;
|
||||||
transition: none;
|
transition: none; // Controlled by motion animations
|
||||||
}
|
}
|
||||||
|
|
||||||
.notice-modal-content {
|
.notice-modal-content {
|
||||||
@@ -3646,7 +3779,13 @@ div.day-empty {
|
|||||||
padding: 16px;
|
padding: 16px;
|
||||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dark .notice-unified-content {
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notice-unified-content {
|
||||||
h1,
|
h1,
|
||||||
h2,
|
h2,
|
||||||
h3,
|
h3,
|
||||||
@@ -3670,7 +3809,7 @@ div.day-empty {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.notice-content-title {
|
.notice-content-title {
|
||||||
font-size: 20px !important;
|
font-size: 20px !important; // Nice middle ground - not too big, not too small
|
||||||
font-weight: 600 !important;
|
font-weight: 600 !important;
|
||||||
color: var(--text-primary) !important;
|
color: var(--text-primary) !important;
|
||||||
margin: 0 0 12px !important;
|
margin: 0 0 12px !important;
|
||||||
@@ -3685,14 +3824,17 @@ div.day-empty {
|
|||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: block;
|
display: block;
|
||||||
min-width: 600px;
|
// Force stable layout dimensions - content renders at full size always
|
||||||
|
min-width: 600px; // Ensure tables have consistent width for layout
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The ONLY difference between states is clipping!
|
||||||
&.notice-card-state {
|
&.notice-card-state {
|
||||||
.notice-content-body {
|
.notice-content-body {
|
||||||
|
// Clip to show only 2 lines but keep full layout
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
max-height: 3em;
|
max-height: 3em; // ~2 lines worth of height
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3702,8 +3844,10 @@ div.day-empty {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.notice-content-body {
|
.notice-content-body {
|
||||||
overflow-y: hidden;
|
// Show full content with scrolling
|
||||||
|
overflow-y: auto;
|
||||||
|
|
||||||
|
// Custom scrollbar for long content
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 6px;
|
width: 6px;
|
||||||
}
|
}
|
||||||
@@ -3721,6 +3865,7 @@ div.day-empty {
|
|||||||
background: rgba(255, 255, 255, 0.3);
|
background: rgba(255, 255, 255, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Style content elements nicely
|
||||||
p {
|
p {
|
||||||
margin-bottom: 12px;
|
margin-bottom: 12px;
|
||||||
|
|
||||||
@@ -3751,10 +3896,6 @@ div.day-empty {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark .notice-unified-content {
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notice-header {
|
.notice-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
@@ -3805,7 +3946,7 @@ button.notice-close-btn {
|
|||||||
padding: 6px 12px;
|
padding: 6px 12px;
|
||||||
border-radius: 20px;
|
border-radius: 20px;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: 700;
|
font-weight: 500;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3853,6 +3994,7 @@ button.notice-close-btn {
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
|
||||||
|
// Custom scrollbar
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 6px;
|
width: 6px;
|
||||||
}
|
}
|
||||||
@@ -3870,6 +4012,7 @@ button.notice-close-btn {
|
|||||||
background: rgba(255, 255, 255, 0.3);
|
background: rgba(255, 255, 255, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Style content elements
|
||||||
p {
|
p {
|
||||||
margin-bottom: 12px;
|
margin-bottom: 12px;
|
||||||
|
|
||||||
@@ -3898,6 +4041,7 @@ button.notice-close-btn {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dark mode adjustments
|
||||||
.dark {
|
.dark {
|
||||||
.notice-card {
|
.notice-card {
|
||||||
border-color: rgba(255, 255, 255, 0.05);
|
border-color: rgba(255, 255, 255, 0.05);
|
||||||
@@ -3912,6 +4056,7 @@ button.notice-close-btn {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Mobile responsiveness
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.notice-modal-overlay {
|
.notice-modal-overlay {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
|||||||
@@ -7,20 +7,6 @@ import {
|
|||||||
import { type Plugin } from "@/plugins/core/types";
|
import { type Plugin } from "@/plugins/core/types";
|
||||||
import stringToHTML from "@/seqta/utils/stringToHTML";
|
import stringToHTML from "@/seqta/utils/stringToHTML";
|
||||||
import { waitForElm } from "@/seqta/utils/waitForElm";
|
import { waitForElm } from "@/seqta/utils/waitForElm";
|
||||||
import ReactFiber from "@/seqta/utils/ReactFiber.ts";
|
|
||||||
import {
|
|
||||||
clearStuck,
|
|
||||||
getClassByPattern,
|
|
||||||
initStorage,
|
|
||||||
letterToNumber,
|
|
||||||
parseAssessments,
|
|
||||||
processAssessments,
|
|
||||||
} from "./utils.ts";
|
|
||||||
|
|
||||||
interface weightingsStorage {
|
|
||||||
weightings: Record<string, string>;
|
|
||||||
assessments: Record<string, string>;
|
|
||||||
}
|
|
||||||
|
|
||||||
const settings = defineSettings({
|
const settings = defineSettings({
|
||||||
lettergrade: booleanSetting({
|
lettergrade: booleanSetting({
|
||||||
@@ -37,7 +23,7 @@ class AssessmentsAveragePluginClass extends BasePlugin<typeof settings> {
|
|||||||
|
|
||||||
const instance = new AssessmentsAveragePluginClass();
|
const instance = new AssessmentsAveragePluginClass();
|
||||||
|
|
||||||
const assessmentsAveragePlugin: Plugin<typeof settings, weightingsStorage> = {
|
const assessmentsAveragePlugin: Plugin<typeof settings> = {
|
||||||
id: "assessments-average",
|
id: "assessments-average",
|
||||||
name: "Assessment Averages",
|
name: "Assessment Averages",
|
||||||
description: "Adds an average grade to the Assessments page",
|
description: "Adds an average grade to the Assessments page",
|
||||||
@@ -46,10 +32,8 @@ const assessmentsAveragePlugin: Plugin<typeof settings, weightingsStorage> = {
|
|||||||
settings: instance.settings,
|
settings: instance.settings,
|
||||||
|
|
||||||
run: async (api) => {
|
run: async (api) => {
|
||||||
await initStorage(api);
|
|
||||||
clearStuck(api);
|
|
||||||
|
|
||||||
api.seqta.onMount(".assessmentsWrapper", async () => {
|
api.seqta.onMount(".assessmentsWrapper", async () => {
|
||||||
|
// Wait for any assessment item to load first
|
||||||
await waitForElm(
|
await waitForElm(
|
||||||
"#main > .assessmentsWrapper .assessments [class*='AssessmentItem__AssessmentItem___']",
|
"#main > .assessmentsWrapper .assessments [class*='AssessmentItem__AssessmentItem___']",
|
||||||
true,
|
true,
|
||||||
@@ -57,13 +41,26 @@ const assessmentsAveragePlugin: Plugin<typeof settings, weightingsStorage> = {
|
|||||||
1000,
|
1000,
|
||||||
);
|
);
|
||||||
|
|
||||||
await parseAssessments(api);
|
// Helper function to find actual class names by their base pattern
|
||||||
|
const getClassByPattern = (
|
||||||
|
element: Element | Document,
|
||||||
|
basePattern: string,
|
||||||
|
): string => {
|
||||||
|
// Find all classes on the element
|
||||||
|
const classes = Array.from(element.querySelectorAll("*"))
|
||||||
|
.flatMap((el) => Array.from(el.classList))
|
||||||
|
.filter((className) => className.startsWith(basePattern));
|
||||||
|
|
||||||
|
return classes.length ? classes[0] : "";
|
||||||
|
};
|
||||||
|
|
||||||
|
// Find actual class names from the DOM
|
||||||
const sampleAssessmentItem = document.querySelector(
|
const sampleAssessmentItem = document.querySelector(
|
||||||
"[class*='AssessmentItem__AssessmentItem___']",
|
"[class*='AssessmentItem__AssessmentItem___']",
|
||||||
);
|
);
|
||||||
if (!sampleAssessmentItem) return;
|
if (!sampleAssessmentItem) return;
|
||||||
|
|
||||||
|
// Extract all necessary class patterns from a sample assessment item
|
||||||
const assessmentItemClass =
|
const assessmentItemClass =
|
||||||
Array.from(sampleAssessmentItem.classList).find((c) =>
|
Array.from(sampleAssessmentItem.classList).find((c) =>
|
||||||
c.startsWith("AssessmentItem__AssessmentItem___"),
|
c.startsWith("AssessmentItem__AssessmentItem___"),
|
||||||
@@ -86,6 +83,7 @@ const assessmentsAveragePlugin: Plugin<typeof settings, weightingsStorage> = {
|
|||||||
"AssessmentItem__title___",
|
"AssessmentItem__title___",
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Get Thermoscore classes
|
||||||
const thermoscoreElement = document.querySelector(
|
const thermoscoreElement = document.querySelector(
|
||||||
"[class*='Thermoscore__Thermoscore___']",
|
"[class*='Thermoscore__Thermoscore___']",
|
||||||
);
|
);
|
||||||
@@ -104,34 +102,62 @@ const assessmentsAveragePlugin: Plugin<typeof settings, weightingsStorage> = {
|
|||||||
"Thermoscore__text___",
|
"Thermoscore__text___",
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Find assessment list
|
||||||
const assessmentsList = document.querySelector(
|
const assessmentsList = document.querySelector(
|
||||||
"#main > .assessmentsWrapper .assessments [class*='AssessmentList__items___']",
|
"#main > .assessmentsWrapper .assessments [class*='AssessmentList__items___']",
|
||||||
);
|
);
|
||||||
if (!assessmentsList) return;
|
if (!assessmentsList) return;
|
||||||
|
|
||||||
const state = await ReactFiber.find(
|
const gradeElements = document.querySelectorAll(
|
||||||
"[class*='AssessmentList__items___']",
|
"[class*='Thermoscore__text___']",
|
||||||
).getState();
|
|
||||||
const marks = state["marks"];
|
|
||||||
if (!marks || !marks.length) return;
|
|
||||||
|
|
||||||
const assessmentItems = Array.from(
|
|
||||||
assessmentsList.querySelectorAll(
|
|
||||||
`[class*='AssessmentItem__AssessmentItem___']`,
|
|
||||||
),
|
|
||||||
).filter(
|
|
||||||
(item) =>
|
|
||||||
!item
|
|
||||||
.querySelector(`[class*='AssessmentItem__title___']`)
|
|
||||||
?.textContent?.includes("Subject Average"),
|
|
||||||
);
|
);
|
||||||
|
if (!gradeElements.length) return;
|
||||||
|
|
||||||
const { weightedTotal, totalWeight, hasInaccurateWeighting, count } =
|
// Parse and average grades
|
||||||
await processAssessments(api, assessmentItems);
|
const letterToNumber: Record<string, number> = {
|
||||||
|
"A+": 100,
|
||||||
|
A: 95,
|
||||||
|
"A-": 90,
|
||||||
|
"B+": 85,
|
||||||
|
B: 80,
|
||||||
|
"B-": 75,
|
||||||
|
"C+": 70,
|
||||||
|
C: 65,
|
||||||
|
"C-": 60,
|
||||||
|
"D+": 55,
|
||||||
|
D: 50,
|
||||||
|
"D-": 45,
|
||||||
|
"E+": 40,
|
||||||
|
E: 35,
|
||||||
|
"E-": 30,
|
||||||
|
F: 0,
|
||||||
|
};
|
||||||
|
|
||||||
if (!count || totalWeight === 0) return;
|
function parseGrade(text: string): number {
|
||||||
|
const str = text.trim().toUpperCase();
|
||||||
|
if (str.includes("/")) {
|
||||||
|
const [raw, max] = str.split("/").map((n) => parseFloat(n));
|
||||||
|
return (raw / max) * 100;
|
||||||
|
}
|
||||||
|
if (str.includes("%")) {
|
||||||
|
return parseFloat(str.replace("%", "")) || 0;
|
||||||
|
}
|
||||||
|
return letterToNumber[str] ?? 0;
|
||||||
|
}
|
||||||
|
|
||||||
const avg = weightedTotal / totalWeight;
|
let total = 0;
|
||||||
|
let count = 0;
|
||||||
|
gradeElements.forEach((el) => {
|
||||||
|
const grade = parseGrade(el.textContent || "");
|
||||||
|
if (grade > 0) {
|
||||||
|
total += grade;
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!count) return;
|
||||||
|
|
||||||
|
const avg = total / count;
|
||||||
const rounded = Math.ceil(avg / 5) * 5;
|
const rounded = Math.ceil(avg / 5) * 5;
|
||||||
const numberToLetter = Object.entries(letterToNumber).reduce(
|
const numberToLetter = Object.entries(letterToNumber).reduce(
|
||||||
(acc, [k, v]) => {
|
(acc, [k, v]) => {
|
||||||
@@ -146,40 +172,31 @@ const assessmentsAveragePlugin: Plugin<typeof settings, weightingsStorage> = {
|
|||||||
? letterAvg
|
? letterAvg
|
||||||
: `${avg.toFixed(2)}%`;
|
: `${avg.toFixed(2)}%`;
|
||||||
|
|
||||||
|
// Prevent duplicate
|
||||||
const existing = assessmentsList.querySelector(
|
const existing = assessmentsList.querySelector(
|
||||||
`[class*='AssessmentItem__title___']`,
|
`[class*='AssessmentItem__title___']`,
|
||||||
);
|
);
|
||||||
if (existing?.textContent === "Subject Average") return;
|
if (existing?.textContent === "Subject Average") return;
|
||||||
|
|
||||||
let warningHTML = "";
|
// Use the dynamic class names in the HTML template
|
||||||
if (hasInaccurateWeighting) {
|
const averageElement = stringToHTML(/* html */ `
|
||||||
warningHTML = /* html */ `
|
|
||||||
<div style="margin-top: 4px; font-size: 11px; color: rgba(255, 255, 255, 0.6); opacity: 0.8; line-height: 1.3;">
|
|
||||||
⚠ Some weightings unavailable
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
assessmentsList.insertBefore(
|
|
||||||
stringToHTML(/* html */ `
|
|
||||||
<div class="${assessmentItemClass}">
|
<div class="${assessmentItemClass}">
|
||||||
<div class="${metaContainerClass}">
|
<div class="${metaContainerClass}">
|
||||||
<div class="${metaClass}">
|
<div class="${metaClass}">
|
||||||
<div class="${simpleResultClass}">
|
<div class="${simpleResultClass}">
|
||||||
<div class="${titleClass}">Subject Average</div>
|
<div class="${titleClass}">Subject Average</div>
|
||||||
${warningHTML}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="${thermoscoreClass}">
|
<div class="${thermoscoreClass}">
|
||||||
<div class="${fillClass}" style="width: ${avg.toFixed(2)}%">
|
<div class="${fillClass}" style="width: ${avg.toFixed(2)}%">
|
||||||
<div class="${textClass}" title="${hasInaccurateWeighting ? display + " (some weightings unavailable)" : display}">${display}</div>
|
<div class="${textClass}" title="${display}">${display}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
`).firstChild!,
|
`).firstChild;
|
||||||
assessmentsList.firstChild,
|
|
||||||
);
|
assessmentsList.insertBefore(averageElement!, assessmentsList.firstChild);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,572 +0,0 @@
|
|||||||
import { getUserInfo } from "@/seqta/ui/AddBetterSEQTAElements.ts";
|
|
||||||
import ReactFiber from "@/seqta/utils/ReactFiber.ts";
|
|
||||||
import * as pdfjs from "pdfjs-dist";
|
|
||||||
pdfjs.GlobalWorkerOptions.workerSrc =
|
|
||||||
"https://cdn.jsdelivr.net/npm/pdfjs-dist/build/pdf.worker.min.mjs";
|
|
||||||
|
|
||||||
export async function initStorage(api: any) {
|
|
||||||
await api.storage.loaded;
|
|
||||||
|
|
||||||
if (!api.storage.weightings) {
|
|
||||||
api.storage.weightings = {};
|
|
||||||
}
|
|
||||||
if (!api.storage.assessments) {
|
|
||||||
api.storage.assessments = {};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function clearStuck(api: any) {
|
|
||||||
let hasStuckProcessing = false;
|
|
||||||
for (const key in api.storage.weightings) {
|
|
||||||
if (api.storage.weightings[key] === "processing") {
|
|
||||||
delete api.storage.weightings[key];
|
|
||||||
hasStuckProcessing = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (hasStuckProcessing) {
|
|
||||||
api.storage.weightings = { ...api.storage.weightings };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper function to find actual class names by their base pattern
|
|
||||||
export const getClassByPattern = (
|
|
||||||
element: Element | Document,
|
|
||||||
basePattern: string,
|
|
||||||
): string => {
|
|
||||||
const classes = Array.from(element.querySelectorAll("*"))
|
|
||||||
.flatMap((el) => Array.from(el.classList))
|
|
||||||
.filter((className) => className.startsWith(basePattern));
|
|
||||||
|
|
||||||
return classes.length ? classes[0] : "";
|
|
||||||
};
|
|
||||||
|
|
||||||
export const letterToNumber: Record<string, number> = {
|
|
||||||
"A+": 100,
|
|
||||||
A: 95,
|
|
||||||
"A-": 90,
|
|
||||||
"B+": 85,
|
|
||||||
B: 80,
|
|
||||||
"B-": 75,
|
|
||||||
"C+": 70,
|
|
||||||
C: 65,
|
|
||||||
"C-": 60,
|
|
||||||
"D+": 55,
|
|
||||||
D: 50,
|
|
||||||
"D-": 45,
|
|
||||||
"E+": 40,
|
|
||||||
E: 35,
|
|
||||||
"E-": 30,
|
|
||||||
F: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
function parseGrade(text: string): number {
|
|
||||||
const str = text.trim().toUpperCase();
|
|
||||||
if (str.includes("/")) {
|
|
||||||
const [raw, max] = str.split("/").map((n) => parseFloat(n));
|
|
||||||
return (raw / max) * 100;
|
|
||||||
}
|
|
||||||
if (str.includes("%")) {
|
|
||||||
return parseFloat(str.replace("%", "")) || 0;
|
|
||||||
}
|
|
||||||
return letterToNumber[str] ?? 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
function createWeightLabel(
|
|
||||||
assessmentItem: Element,
|
|
||||||
weighting: string | undefined,
|
|
||||||
) {
|
|
||||||
const statsContainer = assessmentItem.querySelector(
|
|
||||||
`[class*='AssessmentItem__stats___']`,
|
|
||||||
) as HTMLElement;
|
|
||||||
|
|
||||||
if (
|
|
||||||
!statsContainer ||
|
|
||||||
statsContainer.querySelector(".betterseqta-weight-label")
|
|
||||||
)
|
|
||||||
return;
|
|
||||||
|
|
||||||
const label = statsContainer.querySelector(
|
|
||||||
`[class*='Label__Label___']`,
|
|
||||||
) as HTMLElement;
|
|
||||||
|
|
||||||
if (!label) return;
|
|
||||||
|
|
||||||
const weightLabel = label.cloneNode(true) as HTMLElement;
|
|
||||||
weightLabel.classList.add("betterseqta-weight-label");
|
|
||||||
|
|
||||||
const innerTextDiv = weightLabel.querySelector(
|
|
||||||
`[class*='Label__innerText___']`,
|
|
||||||
);
|
|
||||||
if (innerTextDiv) innerTextDiv.textContent = "Weight";
|
|
||||||
|
|
||||||
const textNodes = Array.from(weightLabel.childNodes).filter(
|
|
||||||
(node) => node.nodeType === Node.TEXT_NODE,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (textNodes.length) {
|
|
||||||
textNodes[0].textContent =
|
|
||||||
weighting && weighting !== "processing"
|
|
||||||
? `${Number(weighting) % 1 === 0 ? Number(weighting) : weighting}%`
|
|
||||||
: "N/A";
|
|
||||||
}
|
|
||||||
|
|
||||||
statsContainer.style.position = "relative";
|
|
||||||
weightLabel.style.position = "absolute";
|
|
||||||
weightLabel.style.right = "0";
|
|
||||||
weightLabel.style.top = "50%";
|
|
||||||
weightLabel.style.transform = "translateY(-50%)";
|
|
||||||
|
|
||||||
statsContainer.appendChild(weightLabel);
|
|
||||||
}
|
|
||||||
|
|
||||||
export const isFirefox =
|
|
||||||
navigator.userAgent.toLowerCase().indexOf("firefox") > -1 &&
|
|
||||||
!navigator.userAgent.toLowerCase().includes("seamonkey") &&
|
|
||||||
!navigator.userAgent.toLowerCase().includes("waterfox");
|
|
||||||
|
|
||||||
async function fetchPDFAsArrayBuffer(url: string): Promise<ArrayBuffer> {
|
|
||||||
const isBlobUrl = url.startsWith("blob:");
|
|
||||||
|
|
||||||
if (isBlobUrl || isFirefox) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
const script = document.createElement("script");
|
|
||||||
const requestId = `pdf-fetch-${Date.now()}-${Math.random()}`;
|
|
||||||
const escapedUrl = url.replace(/'/g, "\\'");
|
|
||||||
|
|
||||||
script.textContent = `
|
|
||||||
(function() {
|
|
||||||
fetch('${escapedUrl}')
|
|
||||||
.then(response => {
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('HTTP ' + response.status + ': ' + response.statusText);
|
|
||||||
}
|
|
||||||
return response.arrayBuffer();
|
|
||||||
})
|
|
||||||
.then(arrayBuffer => {
|
|
||||||
window.postMessage({
|
|
||||||
type: '${requestId}',
|
|
||||||
success: true,
|
|
||||||
data: Array.from(new Uint8Array(arrayBuffer))
|
|
||||||
}, '*');
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
window.postMessage({
|
|
||||||
type: '${requestId}',
|
|
||||||
success: false,
|
|
||||||
error: error.message || String(error)
|
|
||||||
}, '*');
|
|
||||||
});
|
|
||||||
})();
|
|
||||||
`;
|
|
||||||
|
|
||||||
const messageHandler = (event: MessageEvent) => {
|
|
||||||
if (event.data?.type === requestId) {
|
|
||||||
window.removeEventListener("message", messageHandler);
|
|
||||||
if (script.parentNode) {
|
|
||||||
script.parentNode.removeChild(script);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.data.success) {
|
|
||||||
resolve(new Uint8Array(event.data.data).buffer);
|
|
||||||
} else {
|
|
||||||
reject(new Error(event.data.error || "Failed to fetch PDF"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener("message", messageHandler);
|
|
||||||
(document.head || document.documentElement).appendChild(script);
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
window.removeEventListener("message", messageHandler);
|
|
||||||
if (script.parentNode) {
|
|
||||||
script.parentNode.removeChild(script);
|
|
||||||
}
|
|
||||||
reject(new Error("Timeout fetching PDF"));
|
|
||||||
}, 30000);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const response = await fetch(url, {
|
|
||||||
credentials: "include",
|
|
||||||
redirect: "follow",
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.url && response.url.startsWith("blob:")) {
|
|
||||||
return await fetchPDFAsArrayBuffer(response.url);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(
|
|
||||||
`Failed to fetch PDF: ${response.status} ${response.statusText}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.arrayBuffer();
|
|
||||||
} catch (error: any) {
|
|
||||||
if (
|
|
||||||
error?.message?.includes("blob") ||
|
|
||||||
error?.message?.includes("Security") ||
|
|
||||||
error?.message?.includes("CSP")
|
|
||||||
) {
|
|
||||||
return await fetchPDFAsArrayBuffer(url);
|
|
||||||
}
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function extractPDFText(url: string): Promise<string> {
|
|
||||||
try {
|
|
||||||
if (isFirefox) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
const script = document.createElement("script");
|
|
||||||
const requestId = `pdf-extract-${Date.now()}-${Math.random()}`;
|
|
||||||
|
|
||||||
const escapedUrl = url
|
|
||||||
.replace(/\\/g, "\\\\")
|
|
||||||
.replace(/'/g, "\\'")
|
|
||||||
.replace(/"/g, '\\"');
|
|
||||||
|
|
||||||
script.textContent = `
|
|
||||||
(function() {
|
|
||||||
const requestId = '${requestId}';
|
|
||||||
const url = '${escapedUrl}';
|
|
||||||
|
|
||||||
if (window.pdfjsLib) {
|
|
||||||
extractPDF();
|
|
||||||
} else {
|
|
||||||
const pdfjsScript = document.createElement('script');
|
|
||||||
pdfjsScript.src = 'https://cdn.jsdelivr.net/npm/pdfjs-dist/build/pdf.min.js';
|
|
||||||
pdfjsScript.type = 'text/javascript';
|
|
||||||
|
|
||||||
pdfjsScript.onload = function() {
|
|
||||||
extractPDF();
|
|
||||||
};
|
|
||||||
pdfjsScript.onerror = function() {
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: false,
|
|
||||||
error: 'Failed to load pdfjs library'
|
|
||||||
}, '*');
|
|
||||||
};
|
|
||||||
|
|
||||||
document.head.appendChild(pdfjsScript);
|
|
||||||
}
|
|
||||||
|
|
||||||
function extractPDF() {
|
|
||||||
try {
|
|
||||||
window.pdfjsLib.GlobalWorkerOptions.workerSrc = '';
|
|
||||||
|
|
||||||
const xhr = new XMLHttpRequest();
|
|
||||||
xhr.open('GET', url, true);
|
|
||||||
xhr.responseType = 'arraybuffer';
|
|
||||||
xhr.withCredentials = true;
|
|
||||||
|
|
||||||
xhr.onload = function() {
|
|
||||||
if (xhr.status !== 200) {
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: false,
|
|
||||||
error: 'HTTP ' + xhr.status + ': ' + xhr.statusText
|
|
||||||
}, '*');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const arrayBuffer = xhr.response;
|
|
||||||
if (!arrayBuffer || arrayBuffer.byteLength === 0) {
|
|
||||||
throw new Error('PDF response is empty');
|
|
||||||
}
|
|
||||||
|
|
||||||
window.pdfjsLib.getDocument({
|
|
||||||
data: arrayBuffer,
|
|
||||||
useSystemFonts: true,
|
|
||||||
verbosity: 0,
|
|
||||||
useWorkerFetch: false,
|
|
||||||
isEvalSupported: false
|
|
||||||
}).promise
|
|
||||||
.then(pdf => {
|
|
||||||
const pagePromises = [];
|
|
||||||
for (let i = 1; i <= pdf.numPages; i++) {
|
|
||||||
pagePromises.push(
|
|
||||||
pdf.getPage(i).then(page => {
|
|
||||||
return page.getTextContent().then(content => {
|
|
||||||
return content.items.map(item => item.str).join(' ');
|
|
||||||
});
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return Promise.all(pagePromises);
|
|
||||||
})
|
|
||||||
.then(pages => {
|
|
||||||
const text = pages.join('\\n');
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: true,
|
|
||||||
text: text
|
|
||||||
}, '*');
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: false,
|
|
||||||
error: 'PDF parsing error: ' + (error.message || String(error))
|
|
||||||
}, '*');
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: false,
|
|
||||||
error: 'ArrayBuffer error: ' + (error.message || String(error))
|
|
||||||
}, '*');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
xhr.onerror = function() {
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: false,
|
|
||||||
error: 'Network error fetching PDF'
|
|
||||||
}, '*');
|
|
||||||
};
|
|
||||||
|
|
||||||
xhr.ontimeout = function() {
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: false,
|
|
||||||
error: 'Timeout fetching PDF'
|
|
||||||
}, '*');
|
|
||||||
};
|
|
||||||
|
|
||||||
xhr.timeout = 30000;
|
|
||||||
xhr.send();
|
|
||||||
} catch (error) {
|
|
||||||
window.postMessage({
|
|
||||||
type: requestId,
|
|
||||||
success: false,
|
|
||||||
error: 'Setup error: ' + (error.message || String(error))
|
|
||||||
}, '*');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
`;
|
|
||||||
|
|
||||||
const messageHandler = (event: MessageEvent) => {
|
|
||||||
if (event.data?.type === requestId) {
|
|
||||||
window.removeEventListener("message", messageHandler);
|
|
||||||
if (script.parentNode) {
|
|
||||||
script.parentNode.removeChild(script);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.data.success) {
|
|
||||||
resolve(event.data.text);
|
|
||||||
} else {
|
|
||||||
reject(
|
|
||||||
new Error(event.data.error || "Failed to extract PDF text"),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener("message", messageHandler);
|
|
||||||
(document.head || document.documentElement).appendChild(script);
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
window.removeEventListener("message", messageHandler);
|
|
||||||
if (script.parentNode) {
|
|
||||||
script.parentNode.removeChild(script);
|
|
||||||
}
|
|
||||||
reject(new Error("Timeout extracting PDF text"));
|
|
||||||
}, 60000);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const arrayBuffer = await fetchPDFAsArrayBuffer(url);
|
|
||||||
|
|
||||||
if (arrayBuffer.byteLength === 0) {
|
|
||||||
throw new Error("PDF response is empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
const pdf = await pdfjs.getDocument({
|
|
||||||
data: arrayBuffer,
|
|
||||||
useSystemFonts: true,
|
|
||||||
}).promise;
|
|
||||||
|
|
||||||
let text = "";
|
|
||||||
|
|
||||||
for (let i = 1; i <= pdf.numPages; i++) {
|
|
||||||
const page = await pdf.getPage(i);
|
|
||||||
const content = await page.getTextContent();
|
|
||||||
text += content.items.map((item: any) => item.str).join(" ") + "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
return text;
|
|
||||||
} catch (error) {
|
|
||||||
console.error("[BetterSEQTA+] Failed to extract PDF text:", error);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleWeightings(mark: any, api: any) {
|
|
||||||
const assessmentID = mark.id;
|
|
||||||
const metaclassID = mark.metaclassID;
|
|
||||||
const userInfo = await getUserInfo();
|
|
||||||
const userID = userInfo.id;
|
|
||||||
const title = mark.title;
|
|
||||||
|
|
||||||
if (
|
|
||||||
api.storage.weightings[assessmentID] != undefined &&
|
|
||||||
api.storage.weightings[assessmentID] !== "processing"
|
|
||||||
) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
api.storage.weightings = {
|
|
||||||
...api.storage.weightings,
|
|
||||||
[assessmentID]: "processing",
|
|
||||||
};
|
|
||||||
|
|
||||||
api.storage.assessments = {
|
|
||||||
...api.storage.assessments,
|
|
||||||
[title.trim()]: assessmentID,
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
const filename =
|
|
||||||
"BetterSEQTA-" +
|
|
||||||
String(Math.floor(Math.random() * 1e15)).padStart(15, "0");
|
|
||||||
|
|
||||||
const printResponse = await fetch(
|
|
||||||
`${location.origin}/seqta/student/print/assessment`,
|
|
||||||
{
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json; charset=utf-8" },
|
|
||||||
credentials: "include",
|
|
||||||
body: JSON.stringify({
|
|
||||||
fileName: filename,
|
|
||||||
id: assessmentID,
|
|
||||||
metaclass: metaclassID,
|
|
||||||
student: userID,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!printResponse.ok) {
|
|
||||||
throw new Error(
|
|
||||||
`Failed to generate PDF: ${printResponse.status} ${printResponse.statusText}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
||||||
|
|
||||||
const pdfUrl = `${location.origin}/seqta/student/report/get?file=${filename}`;
|
|
||||||
|
|
||||||
if (pdfUrl.startsWith("blob:")) {
|
|
||||||
throw new Error(`Cannot fetch blob URL from extension: ${pdfUrl}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
let text: string;
|
|
||||||
try {
|
|
||||||
text = await extractPDFText(pdfUrl);
|
|
||||||
} catch (error: any) {
|
|
||||||
if (
|
|
||||||
isFirefox &&
|
|
||||||
(error?.message?.includes("blob") ||
|
|
||||||
error?.message?.includes("Security") ||
|
|
||||||
error?.message?.includes("CSP"))
|
|
||||||
) {
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 2000));
|
|
||||||
text = await extractPDFText(pdfUrl);
|
|
||||||
} else {
|
|
||||||
throw new Error(`PDF extraction failed: ${error.message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const match = text.match(/weight:\s*(\d+\.?\d*)/i);
|
|
||||||
|
|
||||||
api.storage.weightings = {
|
|
||||||
...api.storage.weightings,
|
|
||||||
[assessmentID]: match ? match[1] : "N/A",
|
|
||||||
};
|
|
||||||
} catch (error: any) {
|
|
||||||
api.storage.weightings = {
|
|
||||||
...api.storage.weightings,
|
|
||||||
[assessmentID]: "N/A",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function parseAssessments(api: any) {
|
|
||||||
const state = await ReactFiber.find(
|
|
||||||
"[class*='AssessmentList__items___']",
|
|
||||||
).getState();
|
|
||||||
|
|
||||||
const marks = state["marks"];
|
|
||||||
if (!marks) return;
|
|
||||||
|
|
||||||
await Promise.all(marks.map((mark: any) => handleWeightings(mark, api)));
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function processAssessments(api: any, assessmentItems: Element[]) {
|
|
||||||
let weightedTotal = 0;
|
|
||||||
let totalWeight = 0;
|
|
||||||
let hasInaccurateWeighting = false;
|
|
||||||
let count = 0;
|
|
||||||
|
|
||||||
for (const assessmentItem of assessmentItems) {
|
|
||||||
const gradeElement = assessmentItem.querySelector(
|
|
||||||
`[class*='Thermoscore__text___']`,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!gradeElement) continue;
|
|
||||||
|
|
||||||
const grade = parseGrade(gradeElement.textContent || "");
|
|
||||||
if (grade <= 0) continue;
|
|
||||||
|
|
||||||
const titleEl = assessmentItem.querySelector(
|
|
||||||
`[class*='AssessmentItem__title___']`,
|
|
||||||
);
|
|
||||||
if (!titleEl) continue;
|
|
||||||
|
|
||||||
const title = titleEl.textContent?.trim();
|
|
||||||
if (!title) continue;
|
|
||||||
|
|
||||||
const assessmentID = api.storage.assessments?.[title];
|
|
||||||
const weighting = assessmentID
|
|
||||||
? api.storage.weightings?.[assessmentID]
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
createWeightLabel(assessmentItem, weighting);
|
|
||||||
|
|
||||||
if (
|
|
||||||
weighting === null ||
|
|
||||||
weighting === undefined ||
|
|
||||||
weighting === "N/A" ||
|
|
||||||
weighting === "processing"
|
|
||||||
) {
|
|
||||||
hasInaccurateWeighting = true;
|
|
||||||
weightedTotal += grade;
|
|
||||||
totalWeight += 1;
|
|
||||||
} else {
|
|
||||||
const weight = parseFloat(weighting);
|
|
||||||
|
|
||||||
if (!isNaN(weight) && weight >= 0) {
|
|
||||||
weightedTotal += grade * weight;
|
|
||||||
totalWeight += weight;
|
|
||||||
} else {
|
|
||||||
weightedTotal += grade;
|
|
||||||
totalWeight += 1;
|
|
||||||
hasInaccurateWeighting = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
weightedTotal,
|
|
||||||
totalWeight,
|
|
||||||
hasInaccurateWeighting,
|
|
||||||
count,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { Plugin } from "../../core/types";
|
import type { Plugin } from "../../core/types";
|
||||||
import { waitForElm } from "@/seqta/utils/waitForElm";
|
import { waitForElm } from "@/seqta/utils/waitForElm";
|
||||||
import { getAssessmentsData } from "./api";
|
import { getAssessmentsData } from "./api";
|
||||||
import { renderErrorState, renderSkeletonLoader } from "./ui";
|
import { renderSkeletonLoader, renderErrorState } from "./ui";
|
||||||
import styles from "./styles.css?inline";
|
import styles from "./styles.css?inline";
|
||||||
import { delay } from "@/seqta/utils/delay";
|
import { delay } from "@/seqta/utils/delay";
|
||||||
|
|
||||||
|
|||||||
@@ -106,6 +106,7 @@
|
|||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
background: #f8fafc;
|
background: #f8fafc;
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
|
box-shadow: 0 0 0 2px #e2e8f0;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
@@ -339,7 +340,7 @@
|
|||||||
font-size: 0.875rem;
|
font-size: 0.875rem;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: #1a1a1a;
|
color: #1a1a1a;
|
||||||
margin: 0 0 0.75rem;
|
margin: 0 0 0.75rem 0;
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
padding-right: 2rem; /* Make room for menu button */
|
padding-right: 2rem; /* Make room for menu button */
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { Plugin } from "@/plugins/core/types";
|
import type { Plugin } from "@/plugins/core/types";
|
||||||
import { booleanSetting, componentSetting, defineSettings, numberSetting } from "@/plugins/core/settingsHelpers";
|
import { componentSetting, defineSettings, numberSetting, booleanSetting } from "@/plugins/core/settingsHelpers";
|
||||||
import styles from "./styles.css?inline";
|
import styles from "./styles.css?inline";
|
||||||
import BackgroundMusicSetting from "./BackgroundMusicSetting.svelte";
|
import BackgroundMusicSetting from "./BackgroundMusicSetting.svelte";
|
||||||
import localforage from "localforage";
|
import localforage from "localforage";
|
||||||
|
|||||||
@@ -42,12 +42,8 @@ const settings = defineSettings({
|
|||||||
|
|
||||||
if (confirmed) {
|
if (confirmed) {
|
||||||
try {
|
try {
|
||||||
// Dynamically import modules to avoid loading heavy dependencies
|
// Dynamically import the worker manager to avoid loading heavy dependencies
|
||||||
const { VectorWorkerManager } = await import("./src/indexing/worker/vectorWorkerManager");
|
const { VectorWorkerManager } = await import("./src/indexing/worker/vectorWorkerManager");
|
||||||
const { resetDatabase } = await import("./src/indexing/db");
|
|
||||||
|
|
||||||
// Reset vector worker first
|
|
||||||
try {
|
|
||||||
const workerManager = VectorWorkerManager.getInstance();
|
const workerManager = VectorWorkerManager.getInstance();
|
||||||
await workerManager.resetWorker();
|
await workerManager.resetWorker();
|
||||||
console.log("Vector worker reset successfully");
|
console.log("Vector worker reset successfully");
|
||||||
@@ -55,56 +51,23 @@ const settings = defineSettings({
|
|||||||
console.warn("Failed to reset vector worker:", e);
|
console.warn("Failed to reset vector worker:", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close all database connections properly before deletion
|
// Delete both 'embeddiaDB' and 'betterseqta-index' using native IndexedDB APIs
|
||||||
try {
|
|
||||||
await resetDatabase();
|
|
||||||
console.log("betterseqta-index database closed and reset");
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("Failed to reset betterseqta-index database:", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait a bit for connections to fully close
|
|
||||||
await new Promise(resolve => setTimeout(resolve, 100));
|
|
||||||
|
|
||||||
// Delete embeddiaDB (vector search database)
|
|
||||||
const deleteDb = (dbName: string) => {
|
const deleteDb = (dbName: string) => {
|
||||||
return new Promise<void>((resolve, reject) => {
|
return new Promise<void>((resolve, reject) => {
|
||||||
const req = indexedDB.deleteDatabase(dbName);
|
const req = indexedDB.deleteDatabase(dbName);
|
||||||
req.onsuccess = () => {
|
req.onsuccess = () => resolve();
|
||||||
console.log(`Successfully deleted database: ${dbName}`);
|
req.onerror = () => reject(req.error);
|
||||||
resolve();
|
|
||||||
};
|
|
||||||
req.onerror = () => {
|
|
||||||
console.error(`Error deleting database ${dbName}:`, req.error);
|
|
||||||
reject(req.error);
|
|
||||||
};
|
|
||||||
req.onblocked = () => {
|
req.onblocked = () => {
|
||||||
console.warn(`Database ${dbName} deletion blocked - connections still open`);
|
reject(new Error(`One database is open, failed to remove: ${dbName}`));
|
||||||
// Wait and retry once
|
|
||||||
setTimeout(() => {
|
|
||||||
const retryReq = indexedDB.deleteDatabase(dbName);
|
|
||||||
retryReq.onsuccess = () => {
|
|
||||||
console.log(`Successfully deleted database on retry: ${dbName}`);
|
|
||||||
resolve();
|
|
||||||
};
|
|
||||||
retryReq.onerror = () => reject(retryReq.error);
|
|
||||||
retryReq.onblocked = () => {
|
|
||||||
reject(new Error(`One database is open, failed to remove: ${dbName}. Please close other tabs and try again.`));
|
|
||||||
};
|
|
||||||
}, 500);
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await deleteDb("embeddiaDB");
|
await deleteDb("embeddiaDB");
|
||||||
await deleteDb("betterseqta-index");
|
await deleteDb("betterseqta-index");
|
||||||
alert("Search index and storage have been reset successfully.");
|
alert("Search index and storage have been reset.");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
alert("Failed to reset one or more databases: " + String(e) + "\n\nTry closing other browser tabs and try again.");
|
alert("Failed to reset one or more databases: " + String(e));
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
alert("Failed to reset index: " + String(e));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -35,8 +35,6 @@
|
|||||||
let isIndexing = $state(false);
|
let isIndexing = $state(false);
|
||||||
let completedJobs = $state(0);
|
let completedJobs = $state(0);
|
||||||
let totalJobs = $state(0);
|
let totalJobs = $state(0);
|
||||||
let indexingStatus = $state<string | null>(null);
|
|
||||||
let indexingDetail = $state<string | null>(null);
|
|
||||||
|
|
||||||
let commandPalleteOpen = $state(false);
|
let commandPalleteOpen = $state(false);
|
||||||
let searchTerm = $state('');
|
let searchTerm = $state('');
|
||||||
@@ -112,12 +110,10 @@
|
|||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
const progressHandler = (event: CustomEvent) => {
|
const progressHandler = (event: CustomEvent) => {
|
||||||
const { completed, total, indexing, status, detail } = event.detail;
|
const { completed, total, indexing } = event.detail;
|
||||||
completedJobs = completed;
|
completedJobs = completed;
|
||||||
totalJobs = total;
|
totalJobs = total;
|
||||||
isIndexing = indexing;
|
isIndexing = indexing;
|
||||||
indexingStatus = status || null;
|
|
||||||
indexingDetail = detail || null;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
window.addEventListener('indexing-progress', progressHandler as EventListener);
|
window.addEventListener('indexing-progress', progressHandler as EventListener);
|
||||||
@@ -172,9 +168,6 @@
|
|||||||
term,
|
term,
|
||||||
commandsFuse,
|
commandsFuse,
|
||||||
commandIdToItemMap,
|
commandIdToItemMap,
|
||||||
dynamicContentFuse,
|
|
||||||
dynamicIdToItemMap,
|
|
||||||
true, // sortByRecent
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
combinedResults = [];
|
combinedResults = [];
|
||||||
@@ -183,19 +176,13 @@
|
|||||||
isLoading = false;
|
isLoading = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Optimized debounce: shorter delay for better responsiveness
|
const debouncedPerformSearch = debounce(performSearch, 20);
|
||||||
const debouncedPerformSearch = debounce(performSearch, 50);
|
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (commandPalleteOpen) {
|
if (commandPalleteOpen) {
|
||||||
if (searchTerm === '') {
|
if (searchTerm === '') {
|
||||||
// Immediate search for empty query (shows recent items)
|
|
||||||
performSearch();
|
|
||||||
} else if (searchTerm.length <= 2) {
|
|
||||||
// Immediate search for very short queries
|
|
||||||
performSearch();
|
performSearch();
|
||||||
} else {
|
} else {
|
||||||
// Debounced search for longer queries
|
|
||||||
debouncedPerformSearch();
|
debouncedPerformSearch();
|
||||||
}
|
}
|
||||||
tick().then(() => searchbar?.focus());
|
tick().then(() => searchbar?.focus());
|
||||||
@@ -402,6 +389,19 @@
|
|||||||
{@render Shortcut({ text: 'Select', keybind: ['↵']})}
|
{@render Shortcut({ text: 'Select', keybind: ['↵']})}
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
{#if isIndexing}
|
||||||
|
<div class="inset-x-0 top-0">
|
||||||
|
<div class="absolute right-2 -bottom-4 text-[10px] text-zinc-500 dark:text-zinc-400">
|
||||||
|
Indexing
|
||||||
|
</div>
|
||||||
|
<div class="overflow-hidden h-0.5 bg-zinc-200 dark:bg-zinc-700">
|
||||||
|
<div
|
||||||
|
class="h-full bg-blue-500 transition-all duration-300 ease-out"
|
||||||
|
style="width: {(completedJobs / totalJobs) * 100}%"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import {
|
|||||||
booleanSetting,
|
booleanSetting,
|
||||||
buttonSetting,
|
buttonSetting,
|
||||||
defineSettings,
|
defineSettings,
|
||||||
hotkeySetting,
|
|
||||||
Setting,
|
Setting,
|
||||||
|
hotkeySetting,
|
||||||
} from "@/plugins/core/settingsHelpers";
|
} from "@/plugins/core/settingsHelpers";
|
||||||
import styles from "./styles.css?inline";
|
import styles from "./styles.css?inline";
|
||||||
import { waitForElm } from "@/seqta/utils/waitForElm";
|
import { waitForElm } from "@/seqta/utils/waitForElm";
|
||||||
@@ -14,7 +14,6 @@ import { initVectorSearch } from "../search/vector/vectorSearch";
|
|||||||
import { cleanupSearchBar, mountSearchBar } from "./mountSearchBar";
|
import { cleanupSearchBar, mountSearchBar } from "./mountSearchBar";
|
||||||
import { IndexedDbManager } from "embeddia";
|
import { IndexedDbManager } from "embeddia";
|
||||||
import { VectorWorkerManager } from "../indexing/worker/vectorWorkerManager";
|
import { VectorWorkerManager } from "../indexing/worker/vectorWorkerManager";
|
||||||
import { checkAndHandleUpdate } from "../utils/versionCheck";
|
|
||||||
|
|
||||||
// Platform-aware default hotkey
|
// Platform-aware default hotkey
|
||||||
const getDefaultHotkey = () => {
|
const getDefaultHotkey = () => {
|
||||||
@@ -51,11 +50,7 @@ const settings = defineSettings({
|
|||||||
|
|
||||||
if (confirmed) {
|
if (confirmed) {
|
||||||
try {
|
try {
|
||||||
// Import resetDatabase function to properly close connections
|
|
||||||
const { resetDatabase } = await import("../indexing/db");
|
|
||||||
|
|
||||||
// Reset the vector worker first
|
// Reset the vector worker first
|
||||||
try {
|
|
||||||
const workerManager = VectorWorkerManager.getInstance();
|
const workerManager = VectorWorkerManager.getInstance();
|
||||||
await workerManager.resetWorker();
|
await workerManager.resetWorker();
|
||||||
console.log("Vector worker reset successfully");
|
console.log("Vector worker reset successfully");
|
||||||
@@ -63,55 +58,23 @@ const settings = defineSettings({
|
|||||||
console.warn("Failed to reset vector worker:", e);
|
console.warn("Failed to reset vector worker:", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close all database connections properly before deletion
|
// Delete both 'embeddiaDB' and 'betterseqta-index' using native IndexedDB APIs
|
||||||
try {
|
|
||||||
await resetDatabase();
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("Failed to reset betterseqta-index database:", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait a bit for connections to fully close
|
|
||||||
await new Promise(resolve => setTimeout(resolve, 100));
|
|
||||||
|
|
||||||
// Delete embeddiaDB (vector search database)
|
|
||||||
const deleteDb = (dbName: string) => {
|
const deleteDb = (dbName: string) => {
|
||||||
return new Promise<void>((resolve, reject) => {
|
return new Promise<void>((resolve, reject) => {
|
||||||
const req = indexedDB.deleteDatabase(dbName);
|
const req = indexedDB.deleteDatabase(dbName);
|
||||||
req.onsuccess = () => {
|
req.onsuccess = () => resolve();
|
||||||
console.log(`Successfully deleted database: ${dbName}`);
|
req.onerror = () => reject(req.error);
|
||||||
resolve();
|
|
||||||
};
|
|
||||||
req.onerror = () => {
|
|
||||||
console.error(`Error deleting database ${dbName}:`, req.error);
|
|
||||||
reject(req.error);
|
|
||||||
};
|
|
||||||
req.onblocked = () => {
|
req.onblocked = () => {
|
||||||
console.warn(`Database ${dbName} deletion blocked - connections still open`);
|
reject(new Error(`One database is open, failed to remove: ${dbName}`));
|
||||||
// Wait and retry once
|
|
||||||
setTimeout(() => {
|
|
||||||
const retryReq = indexedDB.deleteDatabase(dbName);
|
|
||||||
retryReq.onsuccess = () => {
|
|
||||||
console.log(`Successfully deleted database on retry: ${dbName}`);
|
|
||||||
resolve();
|
|
||||||
};
|
|
||||||
retryReq.onerror = () => reject(retryReq.error);
|
|
||||||
retryReq.onblocked = () => {
|
|
||||||
reject(new Error(`One database is open, failed to remove: ${dbName}. Please close other tabs and try again.`));
|
|
||||||
};
|
|
||||||
}, 500);
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await deleteDb("embeddiaDB");
|
await deleteDb("embeddiaDB");
|
||||||
await deleteDb("betterseqta-index");
|
await deleteDb("betterseqta-index");
|
||||||
alert("Search index and storage have been reset successfully.");
|
alert("Search index and storage have been reset.");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
alert("Failed to reset one or more databases: " + String(e) + "\n\nTry closing other browser tabs and try again.");
|
alert("Failed to reset one or more databases: " + String(e));
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
alert("Failed to reset index: " + String(e));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -151,27 +114,6 @@ const globalSearchPlugin: Plugin<typeof settings> = {
|
|||||||
run: async (api) => {
|
run: async (api) => {
|
||||||
const appRef = { current: null };
|
const appRef = { current: null };
|
||||||
|
|
||||||
// Check for extension updates and clear caches if needed
|
|
||||||
// Use a timeout to avoid blocking initialization
|
|
||||||
setTimeout(async () => {
|
|
||||||
try {
|
|
||||||
const wasUpdated = await checkAndHandleUpdate();
|
|
||||||
if (wasUpdated) {
|
|
||||||
console.log("[Global Search] Extension updated - caches cleared");
|
|
||||||
}
|
|
||||||
} catch (error: any) {
|
|
||||||
// Handle CSS preload errors and other failures gracefully
|
|
||||||
// These can happen in Firefox or when assets aren't available
|
|
||||||
if (error?.message?.includes("preload CSS") ||
|
|
||||||
error?.message?.includes("MIME type") ||
|
|
||||||
error?.message?.includes("NS_ERROR_CORRUPTED_CONTENT")) {
|
|
||||||
console.debug("[Global Search] Version check skipped due to asset loading restrictions:", error.message);
|
|
||||||
} else {
|
|
||||||
console.warn("[Global Search] Failed to check for updates:", error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, 100);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await IndexedDbManager.create("embeddiaDB", "embeddiaObjectStore", {
|
await IndexedDbManager.create("embeddiaDB", "embeddiaObjectStore", {
|
||||||
primaryKey: "id",
|
primaryKey: "id",
|
||||||
@@ -184,16 +126,10 @@ const globalSearchPlugin: Plugin<typeof settings> = {
|
|||||||
|
|
||||||
initVectorSearch();
|
initVectorSearch();
|
||||||
|
|
||||||
// Warm up vector worker in background to improve initial response time (skip in Firefox)
|
// Warm up vector worker in background to improve initial response time
|
||||||
setTimeout(async () => {
|
setTimeout(async () => {
|
||||||
try {
|
try {
|
||||||
// Only initialize worker if vector search is supported
|
|
||||||
const { isVectorSearchSupported } = await import("../utils/browserDetection");
|
|
||||||
if (isVectorSearchSupported()) {
|
|
||||||
VectorWorkerManager.getInstance();
|
VectorWorkerManager.getInstance();
|
||||||
} else {
|
|
||||||
console.debug("[Global Search] Skipping vector worker warm-up (Firefox detected - using text search only)");
|
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.warn("[Global Search] Vector worker warm-up failed:", error);
|
console.warn("[Global Search] Vector worker warm-up failed:", error);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import browser from "webextension-polyfill";
|
|||||||
export function mountSearchBar(
|
export function mountSearchBar(
|
||||||
titleElement: Element,
|
titleElement: Element,
|
||||||
api: any,
|
api: any,
|
||||||
appRef: { current: any; storageChangeHandler?: any; progressHandler?: any },
|
appRef: { current: any; storageChangeHandler?: any },
|
||||||
) {
|
) {
|
||||||
if (titleElement.querySelector(".search-trigger")) {
|
if (titleElement.querySelector(".search-trigger")) {
|
||||||
return;
|
return;
|
||||||
@@ -21,72 +21,6 @@ export function mountSearchBar(
|
|||||||
const searchButton = document.createElement("div");
|
const searchButton = document.createElement("div");
|
||||||
searchButton.className = "search-trigger";
|
searchButton.className = "search-trigger";
|
||||||
|
|
||||||
// Create progress indicator container
|
|
||||||
const progressContainer = document.createElement("div");
|
|
||||||
progressContainer.className = "search-progress-container";
|
|
||||||
progressContainer.style.cssText = "display: flex; align-items: center; gap: 8px; margin-left: 8px; min-width: 120px;";
|
|
||||||
|
|
||||||
// Create progress bar
|
|
||||||
const progressBarWrapper = document.createElement("div");
|
|
||||||
progressBarWrapper.className = "search-progress-bar-wrapper";
|
|
||||||
progressBarWrapper.style.cssText = "flex: 1; height: 4px; background: rgba(0, 0, 0, 0.1); border-radius: 2px; overflow: hidden; display: none;";
|
|
||||||
|
|
||||||
const progressBar = document.createElement("div");
|
|
||||||
progressBar.className = "search-progress-bar";
|
|
||||||
progressBar.style.cssText = "height: 100%; background: linear-gradient(90deg, #3b82f6, #2563eb, #3b82f6); transition: width 0.3s ease-out; width: 0%; position: relative;";
|
|
||||||
|
|
||||||
// Add shimmer effect
|
|
||||||
const shimmer = document.createElement("div");
|
|
||||||
shimmer.style.cssText = "position: absolute; inset: 0; background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent); animation: shimmer 2s infinite;";
|
|
||||||
progressBar.appendChild(shimmer);
|
|
||||||
progressBarWrapper.appendChild(progressBar);
|
|
||||||
|
|
||||||
// Create progress text
|
|
||||||
const progressText = document.createElement("span");
|
|
||||||
progressText.className = "search-progress-text";
|
|
||||||
progressText.style.cssText = "font-size: 11px; color: #666; white-space: nowrap; display: none;";
|
|
||||||
|
|
||||||
progressContainer.appendChild(progressBarWrapper);
|
|
||||||
progressContainer.appendChild(progressText);
|
|
||||||
|
|
||||||
// Indexing state
|
|
||||||
let isIndexing = false;
|
|
||||||
let completedJobs = 0;
|
|
||||||
let totalJobs = 0;
|
|
||||||
let indexingStatus: string | null = null;
|
|
||||||
|
|
||||||
const updateProgressDisplay = () => {
|
|
||||||
if (isIndexing && totalJobs > 0) {
|
|
||||||
const percentage = Math.round((completedJobs / totalJobs) * 100);
|
|
||||||
progressBar.style.width = `${Math.max(2, percentage)}%`;
|
|
||||||
progressBarWrapper.style.display = "block";
|
|
||||||
|
|
||||||
if (indexingStatus) {
|
|
||||||
progressText.textContent = indexingStatus.length > 20 ? indexingStatus.substring(0, 20) + "..." : indexingStatus;
|
|
||||||
progressText.style.display = "block";
|
|
||||||
} else {
|
|
||||||
progressText.textContent = `${completedJobs}/${totalJobs} (${percentage}%)`;
|
|
||||||
progressText.style.display = "block";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
progressBarWrapper.style.display = "none";
|
|
||||||
progressText.style.display = "none";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Listen for indexing progress events
|
|
||||||
const progressHandler = (event: CustomEvent) => {
|
|
||||||
const { completed, total, indexing, status } = event.detail;
|
|
||||||
completedJobs = completed || 0;
|
|
||||||
totalJobs = total || 0;
|
|
||||||
isIndexing = indexing || false;
|
|
||||||
indexingStatus = status || null;
|
|
||||||
updateProgressDisplay();
|
|
||||||
};
|
|
||||||
|
|
||||||
window.addEventListener('indexing-progress', progressHandler as EventListener);
|
|
||||||
appRef.progressHandler = progressHandler;
|
|
||||||
|
|
||||||
const updateSearchButtonDisplay = () => {
|
const updateSearchButtonDisplay = () => {
|
||||||
searchButton.innerHTML = /* html */ `
|
searchButton.innerHTML = /* html */ `
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
@@ -100,7 +34,6 @@ export function mountSearchBar(
|
|||||||
|
|
||||||
updateSearchButtonDisplay();
|
updateSearchButtonDisplay();
|
||||||
titleElement.appendChild(searchButton);
|
titleElement.appendChild(searchButton);
|
||||||
titleElement.appendChild(progressContainer);
|
|
||||||
|
|
||||||
// Listen for hotkey setting changes
|
// Listen for hotkey setting changes
|
||||||
const handleStorageChange = (changes: any, area: string) => {
|
const handleStorageChange = (changes: any, area: string) => {
|
||||||
@@ -139,7 +72,7 @@ export function mountSearchBar(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function cleanupSearchBar(appRef: { current: any; storageChangeHandler?: any; progressHandler?: any }) {
|
export function cleanupSearchBar(appRef: { current: any; storageChangeHandler?: any }) {
|
||||||
if (appRef.current) {
|
if (appRef.current) {
|
||||||
try {
|
try {
|
||||||
unmount(appRef.current);
|
unmount(appRef.current);
|
||||||
@@ -149,24 +82,12 @@ export function cleanupSearchBar(appRef: { current: any; storageChangeHandler?:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove progress event listener
|
|
||||||
if (appRef.progressHandler) {
|
|
||||||
window.removeEventListener('indexing-progress', appRef.progressHandler as EventListener);
|
|
||||||
appRef.progressHandler = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove search trigger button
|
// Remove search trigger button
|
||||||
const searchTrigger = document.querySelector(".search-trigger");
|
const searchTrigger = document.querySelector(".search-trigger");
|
||||||
if (searchTrigger) {
|
if (searchTrigger) {
|
||||||
searchTrigger.remove();
|
searchTrigger.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove progress container
|
|
||||||
const progressContainer = document.querySelector(".search-progress-container");
|
|
||||||
if (progressContainer) {
|
|
||||||
progressContainer.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove search root
|
// Remove search root
|
||||||
const searchRoot = document.querySelector("div[data-search-root]");
|
const searchRoot = document.querySelector("div[data-search-root]");
|
||||||
if (searchRoot) {
|
if (searchRoot) {
|
||||||
|
|||||||
@@ -69,71 +69,3 @@
|
|||||||
.dark .highlight {
|
.dark .highlight {
|
||||||
background-color: rgba(255, 230, 100, 0.4);
|
background-color: rgba(255, 230, 100, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes shimmer {
|
|
||||||
0% {
|
|
||||||
transform: translateX(-100%);
|
|
||||||
}
|
|
||||||
100% {
|
|
||||||
transform: translateX(100%);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.animate-shimmer {
|
|
||||||
animation: shimmer 2s infinite;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Progress indicator next to search trigger */
|
|
||||||
.search-progress-container {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
margin-left: 8px;
|
|
||||||
min-width: 120px;
|
|
||||||
max-width: 200px;
|
|
||||||
height: 32px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-progress-bar-wrapper {
|
|
||||||
flex: 1;
|
|
||||||
height: 4px;
|
|
||||||
background: rgba(0, 0, 0, 0.1);
|
|
||||||
border-radius: 2px;
|
|
||||||
overflow: hidden;
|
|
||||||
display: none;
|
|
||||||
min-width: 60px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .search-progress-bar-wrapper {
|
|
||||||
background: rgba(255, 255, 255, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-progress-bar {
|
|
||||||
height: 100%;
|
|
||||||
background: linear-gradient(90deg, #3b82f6, #2563eb, #3b82f6);
|
|
||||||
transition: width 0.3s ease-out;
|
|
||||||
width: 0%;
|
|
||||||
position: relative;
|
|
||||||
border-radius: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-progress-bar::after {
|
|
||||||
content: '';
|
|
||||||
position: absolute;
|
|
||||||
inset: 0;
|
|
||||||
background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent);
|
|
||||||
animation: shimmer 2s infinite;
|
|
||||||
border-radius: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-progress-text {
|
|
||||||
font-size: 11px;
|
|
||||||
color: #666;
|
|
||||||
white-space: nowrap;
|
|
||||||
display: none;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dark .search-progress-text {
|
|
||||||
color: #999;
|
|
||||||
}
|
|
||||||
@@ -59,132 +59,17 @@ export const actionMap: Record<string, ActionHandler<any>> = {
|
|||||||
}) as ActionHandler<any>,
|
}) as ActionHandler<any>,
|
||||||
|
|
||||||
assessment: (async (item: IndexItem & { metadata: AssessmentMetadata }) => {
|
assessment: (async (item: IndexItem & { metadata: AssessmentMetadata }) => {
|
||||||
// Deep clone the entire item to avoid Firefox XrayWrapper issues
|
if (item.metadata.isMessageBased) {
|
||||||
// Firefox XrayWrapper prevents direct access to nested properties
|
|
||||||
let itemClone: IndexItem & { metadata: AssessmentMetadata };
|
|
||||||
let metadata: AssessmentMetadata;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// First try to clone the entire item
|
|
||||||
itemClone = JSON.parse(JSON.stringify(item));
|
|
||||||
metadata = itemClone.metadata || {};
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Assessment Action] Failed to clone item, trying to clone metadata separately:", e);
|
|
||||||
try {
|
|
||||||
// If full clone fails, try cloning just metadata
|
|
||||||
metadata = JSON.parse(JSON.stringify(item.metadata || {}));
|
|
||||||
itemClone = { ...item, metadata };
|
|
||||||
} catch (e2) {
|
|
||||||
console.warn("[Assessment Action] Failed to clone metadata, using direct access:", e2);
|
|
||||||
itemClone = item;
|
|
||||||
metadata = item.metadata || {} as AssessmentMetadata;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to extract metadata values using multiple methods to handle XrayWrapper
|
|
||||||
const getMetadataValue = (key: string, altKey?: string): any => {
|
|
||||||
try {
|
|
||||||
// Try direct access first
|
|
||||||
const value = metadata[key];
|
|
||||||
if (value !== undefined && value !== null) {
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
if (altKey) {
|
|
||||||
const altValue = metadata[altKey];
|
|
||||||
if (altValue !== undefined && altValue !== null) {
|
|
||||||
return altValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Try accessing via Object.keys iteration (works around XrayWrapper)
|
|
||||||
try {
|
|
||||||
const keys = Object.keys(metadata);
|
|
||||||
for (const k of keys) {
|
|
||||||
if (k === key || k === altKey) {
|
|
||||||
const val = metadata[k];
|
|
||||||
if (val !== undefined && val !== null) {
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Object.keys might fail on XrayWrapper, that's okay
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
} catch (e) {
|
|
||||||
console.warn(`[Assessment Action] Failed to access metadata.${key}:`, e);
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (getMetadataValue('isMessageBased')) {
|
|
||||||
window.location.hash = `#?page=/messages`;
|
window.location.hash = `#?page=/messages`;
|
||||||
|
|
||||||
await waitForElm('[class*="Viewer__Viewer___"] > div', true, 20);
|
await waitForElm('[class*="Viewer__Viewer___"] > div', true, 20);
|
||||||
|
|
||||||
// Select the specific direct message
|
// Select the specific direct message
|
||||||
ReactFiber.find('[class*="Viewer__Viewer___"] > div').setState({
|
ReactFiber.find('[class*="Viewer__Viewer___"] > div').setState({
|
||||||
selected: new Set([getMetadataValue('messageId')]),
|
selected: new Set([item.metadata.messageId]),
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// Extract values - check both camelCase and PascalCase, and try multiple access methods
|
window.location.hash = `#?page=/assessments&id=${item.metadata.assessmentId}`;
|
||||||
let programmeId = getMetadataValue('programmeId', 'programmeID');
|
|
||||||
let metaclassId = getMetadataValue('metaclassId', 'metaclassID');
|
|
||||||
let assessmentId = getMetadataValue('assessmentId', 'assessmentID');
|
|
||||||
|
|
||||||
// Fallback: try to extract assessmentId from item ID if metadata is missing
|
|
||||||
if ((assessmentId === undefined || assessmentId === null) && itemClone.id && itemClone.id.startsWith('assignment-')) {
|
|
||||||
const extractedId = itemClone.id.replace('assignment-', '');
|
|
||||||
assessmentId = Number(extractedId) || extractedId;
|
|
||||||
console.log("[Assessment Action] Extracted assessmentId from item ID:", assessmentId);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert to numbers, but preserve 0 as valid
|
|
||||||
if (programmeId !== undefined && programmeId !== null && programmeId !== '') {
|
|
||||||
const num = Number(programmeId);
|
|
||||||
programmeId = isNaN(num) ? programmeId : num;
|
|
||||||
}
|
|
||||||
if (metaclassId !== undefined && metaclassId !== null && metaclassId !== '') {
|
|
||||||
const num = Number(metaclassId);
|
|
||||||
metaclassId = isNaN(num) ? metaclassId : num;
|
|
||||||
}
|
|
||||||
if (assessmentId !== undefined && assessmentId !== null && assessmentId !== '') {
|
|
||||||
const num = Number(assessmentId);
|
|
||||||
assessmentId = isNaN(num) ? assessmentId : num;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if values exist (including 0, which is a valid ID)
|
|
||||||
// Use typeof check to properly handle 0
|
|
||||||
const hasProgrammeId = programmeId !== undefined && programmeId !== null && programmeId !== '' && typeof programmeId === 'number';
|
|
||||||
const hasMetaclassId = metaclassId !== undefined && metaclassId !== null && metaclassId !== '' && typeof metaclassId === 'number';
|
|
||||||
const hasAssessmentId = assessmentId !== undefined && assessmentId !== null && assessmentId !== '' && typeof assessmentId === 'number';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (hasProgrammeId && hasMetaclassId && hasAssessmentId) {
|
|
||||||
const url = `#?page=/assessments/${programmeId}:${metaclassId}&item=${assessmentId}`;
|
|
||||||
console.log("[Assessment Action] ✅ Navigating to:", url);
|
|
||||||
window.location.hash = url;
|
|
||||||
} else {
|
|
||||||
// Fallback: try to navigate to assessments page if metadata is incomplete
|
|
||||||
console.error("[Assessment Action] ❌ Missing required metadata:", {
|
|
||||||
programmeId,
|
|
||||||
metaclassId,
|
|
||||||
assessmentId,
|
|
||||||
hasProgrammeId,
|
|
||||||
hasMetaclassId,
|
|
||||||
hasAssessmentId,
|
|
||||||
metadataKeys: Object.keys(metadata),
|
|
||||||
metadataString: JSON.stringify(metadata),
|
|
||||||
itemId: itemClone.id,
|
|
||||||
});
|
|
||||||
// If we at least have an assessmentId, try to navigate to the general assessments page
|
|
||||||
if (hasAssessmentId) {
|
|
||||||
window.location.hash = `#?page=/assessments/upcoming&item=${assessmentId}`;
|
|
||||||
} else {
|
|
||||||
console.warn("[Assessment Action] No valid assessment ID, redirecting to upcoming");
|
|
||||||
window.location.hash = `#?page=/assessments/upcoming`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}) as ActionHandler<any>,
|
}) as ActionHandler<any>,
|
||||||
|
|
||||||
|
|||||||
@@ -213,54 +213,25 @@ export async function clear(store: string): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function resetDatabase(): Promise<void> {
|
export async function resetDatabase(): Promise<void> {
|
||||||
// Close cached database connection
|
|
||||||
if (cachedDb) {
|
if (cachedDb) {
|
||||||
try {
|
|
||||||
cachedDb.close();
|
cachedDb.close();
|
||||||
} catch (e) {
|
|
||||||
console.warn("[DB] Error closing cached database:", e);
|
|
||||||
}
|
|
||||||
cachedDb = null;
|
cachedDb = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close pending database promise
|
|
||||||
if (dbPromise) {
|
if (dbPromise) {
|
||||||
try {
|
try {
|
||||||
const db = await dbPromise;
|
const db = await dbPromise;
|
||||||
db.close();
|
db.close();
|
||||||
} catch (e) {
|
} catch (e) {}
|
||||||
// Database might not be open yet, that's okay
|
|
||||||
}
|
|
||||||
dbPromise = null;
|
dbPromise = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit for connections to fully close
|
|
||||||
await new Promise(resolve => setTimeout(resolve, 100));
|
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const req = indexedDB.deleteDatabase(DB_NAME);
|
const req = indexedDB.deleteDatabase(DB_NAME);
|
||||||
req.onsuccess = () => {
|
req.onsuccess = () => {
|
||||||
localStorage.removeItem(VERSION_KEY);
|
localStorage.removeItem(VERSION_KEY);
|
||||||
resolve();
|
resolve();
|
||||||
};
|
};
|
||||||
req.onerror = () => {
|
req.onerror = () => reject(req.error);
|
||||||
console.error("[DB] Error deleting database:", req.error);
|
|
||||||
reject(req.error);
|
|
||||||
};
|
|
||||||
req.onblocked = () => {
|
|
||||||
console.warn("[DB] Database deletion blocked - waiting for connections to close");
|
|
||||||
// Wait a bit longer and try again
|
|
||||||
setTimeout(() => {
|
|
||||||
const retryReq = indexedDB.deleteDatabase(DB_NAME);
|
|
||||||
retryReq.onsuccess = () => {
|
|
||||||
localStorage.removeItem(VERSION_KEY);
|
|
||||||
resolve();
|
|
||||||
};
|
|
||||||
retryReq.onerror = () => reject(retryReq.error);
|
|
||||||
retryReq.onblocked = () => {
|
|
||||||
reject(new Error(`Database is still open. Please close other tabs/windows and try again.`));
|
|
||||||
};
|
|
||||||
}, 500);
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { clear, get, getAll, put, remove } from "./db";
|
import { clear, getAll, get, put, remove } from "./db";
|
||||||
import { jobs } from "./jobs";
|
import { jobs } from "./jobs";
|
||||||
import { renderComponentMap } from "./renderComponents";
|
import { renderComponentMap } from "./renderComponents";
|
||||||
import type { IndexItem, Job, JobContext } from "./types";
|
import type { IndexItem, Job, JobContext } from "./types";
|
||||||
@@ -396,34 +396,18 @@ export async function runIndexing(): Promise<void> {
|
|||||||
stopHeartbeat();
|
stopHeartbeat();
|
||||||
|
|
||||||
allItemsInPrimaryStores = await loadAllStoredItems();
|
allItemsInPrimaryStores = await loadAllStoredItems();
|
||||||
// Create new objects to avoid XrayWrapper issues in Firefox
|
allItemsInPrimaryStores.forEach(item => {
|
||||||
const itemsWithComponents = allItemsInPrimaryStores.map(item => {
|
|
||||||
try {
|
|
||||||
const jobDef = jobs[item.category] || Object.values(jobs).find(j => j.id === item.category) || jobs[item.renderComponentId];
|
const jobDef = jobs[item.category] || Object.values(jobs).find(j => j.id === item.category) || jobs[item.renderComponentId];
|
||||||
let renderComponent = item.renderComponent;
|
|
||||||
if (jobDef) {
|
if (jobDef) {
|
||||||
renderComponent = renderComponentMap[jobDef.renderComponentId] || renderComponent;
|
const renderComponent = renderComponentMap[jobDef.renderComponentId];
|
||||||
|
if (renderComponent) {
|
||||||
|
item.renderComponent = renderComponent;
|
||||||
|
}
|
||||||
} else if (renderComponentMap[item.renderComponentId]) {
|
} else if (renderComponentMap[item.renderComponentId]) {
|
||||||
renderComponent = renderComponentMap[item.renderComponentId];
|
item.renderComponent = renderComponentMap[item.renderComponentId];
|
||||||
}
|
|
||||||
// Deep clone to avoid Firefox XrayWrapper issues with nested objects like metadata
|
|
||||||
// Use JSON serialization to ensure all nested properties are accessible
|
|
||||||
try {
|
|
||||||
const cloned = JSON.parse(JSON.stringify(item));
|
|
||||||
cloned.renderComponent = renderComponent;
|
|
||||||
return cloned;
|
|
||||||
} catch (e) {
|
|
||||||
// Fallback to shallow copy if deep clone fails
|
|
||||||
console.warn("[Indexer] Failed to deep clone item, using shallow copy:", e);
|
|
||||||
return { ...item, renderComponent };
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
// Fallback: return item as-is if modification fails (Firefox XrayWrapper)
|
|
||||||
console.warn("[Indexer] Failed to add render component to item (Firefox XrayWrapper):", error);
|
|
||||||
return item;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
loadDynamicItems(itemsWithComponents);
|
loadDynamicItems(allItemsInPrimaryStores);
|
||||||
window.dispatchEvent(new Event("dynamic-items-updated"));
|
window.dispatchEvent(new Event("dynamic-items-updated"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,12 +3,10 @@ import { messagesJob } from "./jobs/messages";
|
|||||||
import { notificationsJob } from "./jobs/notifications";
|
import { notificationsJob } from "./jobs/notifications";
|
||||||
import { forumsJob } from "./jobs/forums";
|
import { forumsJob } from "./jobs/forums";
|
||||||
import { subjectsJob } from "./jobs/subjects";
|
import { subjectsJob } from "./jobs/subjects";
|
||||||
import { assignmentsJob } from "./jobs/assignments";
|
|
||||||
|
|
||||||
export const jobs: Record<string, Job> = {
|
export const jobs: Record<string, Job> = {
|
||||||
messages: messagesJob,
|
messages: messagesJob,
|
||||||
notifications: notificationsJob,
|
notifications: notificationsJob,
|
||||||
forums: forumsJob,
|
forums: forumsJob,
|
||||||
subjects: subjectsJob,
|
subjects: subjectsJob,
|
||||||
assignments: assignmentsJob,
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,369 +0,0 @@
|
|||||||
import type { IndexItem, Job } from "../types";
|
|
||||||
|
|
||||||
const fetchJSON = async (url: string, body: any) => {
|
|
||||||
const res = await fetch(`${location.origin}${url}`, {
|
|
||||||
method: "POST",
|
|
||||||
credentials: "include",
|
|
||||||
headers: { "Content-Type": "application/json; charset=utf-8" },
|
|
||||||
body: JSON.stringify(body),
|
|
||||||
});
|
|
||||||
return res.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
const fetchUpcomingAssessments = async (student: number = 69) => {
|
|
||||||
try {
|
|
||||||
const res = await fetchJSON("/seqta/student/assessment/list/upcoming?", {
|
|
||||||
student,
|
|
||||||
});
|
|
||||||
// Match analytics.rs: payload is an array, return empty array if not found
|
|
||||||
return Array.isArray(res.payload) ? res.payload : [];
|
|
||||||
} catch (e) {
|
|
||||||
console.error("[Assignments job] Failed to fetch upcoming assessments:", e);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const fetchSubjects = async () => {
|
|
||||||
try {
|
|
||||||
const res = await fetchJSON("/seqta/student/load/subjects?", {});
|
|
||||||
return res.payload
|
|
||||||
?.filter((s: any) => s.active === 1)
|
|
||||||
?.flatMap((s: any) => s.subjects) || [];
|
|
||||||
} catch (e) {
|
|
||||||
console.error("[Assignments job] Failed to fetch subjects:", e);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const fetchPastAssessments = async (student: number = 69, subjects: any[]) => {
|
|
||||||
const map: Record<number, any> = {};
|
|
||||||
|
|
||||||
// Fetch past assessments for all subjects in parallel (like assessmentsOverview does)
|
|
||||||
// This is much faster than sequential fetching
|
|
||||||
await Promise.all(
|
|
||||||
subjects.map(async (subject) => {
|
|
||||||
try {
|
|
||||||
// Match analytics.rs exactly: parameter order is programme, metaclass, student
|
|
||||||
const res = await fetchJSON("/seqta/student/assessment/list/past?", {
|
|
||||||
programme: subject.programme,
|
|
||||||
metaclass: subject.metaclass,
|
|
||||||
student,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Past assessments API can return data in payload.tasks OR payload.pending (or both)
|
|
||||||
// Based on analytics.rs fetch_past_assessments, we need to check both arrays
|
|
||||||
const processAssessment = (assessment: any) => {
|
|
||||||
if (assessment && assessment.id) {
|
|
||||||
// Ensure programme and metaclass are included from the subject
|
|
||||||
// Use the assessment's IDs if available, otherwise fall back to subject's
|
|
||||||
map[assessment.id] = {
|
|
||||||
...assessment,
|
|
||||||
programme: assessment.programme || assessment.programmeID || subject.programme,
|
|
||||||
programmeID: assessment.programmeID || assessment.programme || subject.programme,
|
|
||||||
metaclass: assessment.metaclass || assessment.metaclassID || subject.metaclass,
|
|
||||||
metaclassID: assessment.metaclassID || assessment.metaclass || subject.metaclass,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Match analytics.rs: Check both pending and tasks arrays
|
|
||||||
// Check for pending array first (matching Rust code order)
|
|
||||||
if (res.payload?.pending && Array.isArray(res.payload.pending)) {
|
|
||||||
res.payload.pending.forEach(processAssessment);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for tasks array
|
|
||||||
if (res.payload?.tasks && Array.isArray(res.payload.tasks)) {
|
|
||||||
res.payload.tasks.forEach(processAssessment);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.warn(`[Assignments job] Failed to fetch past assessments for subject ${subject.code || subject.subject || 'unknown'}:`, e);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
return Object.values(map);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const assignmentsJob: Job = {
|
|
||||||
id: "assignments",
|
|
||||||
label: "Assignments",
|
|
||||||
renderComponentId: "assessment",
|
|
||||||
frequency: { type: "expiry", afterMs: 1000 * 60 * 60 * 24 }, // Daily
|
|
||||||
|
|
||||||
boostCriteria: (item, searchTerm) => {
|
|
||||||
if (searchTerm === "") {
|
|
||||||
return -100;
|
|
||||||
}
|
|
||||||
|
|
||||||
let score = 0;
|
|
||||||
|
|
||||||
// Boost upcoming assignments
|
|
||||||
if (item.metadata.dueDate) {
|
|
||||||
const dueDate = new Date(item.metadata.dueDate).getTime();
|
|
||||||
const now = Date.now();
|
|
||||||
const daysUntilDue = (dueDate - now) / (1000 * 60 * 60 * 24);
|
|
||||||
|
|
||||||
if (daysUntilDue >= 0 && daysUntilDue <= 7) {
|
|
||||||
score += 0.05; // Boost assignments due within a week
|
|
||||||
}
|
|
||||||
if (daysUntilDue < 0) {
|
|
||||||
score -= 0.1; // Penalty for overdue assignments
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Boost if submitted
|
|
||||||
if (item.metadata.submitted) {
|
|
||||||
score += 0.02;
|
|
||||||
}
|
|
||||||
|
|
||||||
return score;
|
|
||||||
},
|
|
||||||
|
|
||||||
run: async (ctx) => {
|
|
||||||
// Don't filter by existing IDs - we want to process ALL assessments (both new and old)
|
|
||||||
// to ensure metadata is up-to-date and all past assignments are indexed
|
|
||||||
const existingItems = await ctx.getStoredItems("assignments");
|
|
||||||
const existingIds = new Set(existingItems.map((i) => i.id));
|
|
||||||
|
|
||||||
const student = 69; // TODO: Get from context if available
|
|
||||||
|
|
||||||
console.debug("[Assignments job] Starting indexing - fetching all assessments (upcoming and past)...");
|
|
||||||
|
|
||||||
// Fetch data in parallel
|
|
||||||
const [upcoming, subjects] = await Promise.all([
|
|
||||||
fetchUpcomingAssessments(student),
|
|
||||||
fetchSubjects(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
console.debug(`[Assignments job] Fetched ${upcoming.length} upcoming assessments and ${subjects.length} subjects`);
|
|
||||||
|
|
||||||
// Fetch past assessments for ALL subjects to ensure we get all historical assignments
|
|
||||||
const past = await fetchPastAssessments(student, subjects);
|
|
||||||
|
|
||||||
console.debug(`[Assignments job] Fetched ${past.length} past assessments`);
|
|
||||||
|
|
||||||
// Create a lookup map from subject code to programme/metaclass
|
|
||||||
const subjectLookup = new Map<string, { programme: number; metaclass: number }>();
|
|
||||||
subjects.forEach((s: any) => {
|
|
||||||
if (s.code && s.programme && s.metaclass) {
|
|
||||||
subjectLookup.set(s.code, { programme: s.programme, metaclass: s.metaclass });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Combine and deduplicate
|
|
||||||
const allAssessments = new Map<number, any>();
|
|
||||||
|
|
||||||
upcoming.forEach((a: any) => {
|
|
||||||
if (a && a.id) {
|
|
||||||
// Prioritize capital ID fields (programmeID, metaclassID) as that's what the API returns
|
|
||||||
let programme = a.programmeID || a.programme;
|
|
||||||
let metaclass = a.metaclassID || a.metaclass;
|
|
||||||
|
|
||||||
// If missing, try to get from subject lookup
|
|
||||||
if ((!programme || !metaclass) && a.code) {
|
|
||||||
const subjectInfo = subjectLookup.get(a.code);
|
|
||||||
if (subjectInfo) {
|
|
||||||
programme = programme || subjectInfo.programme;
|
|
||||||
metaclass = metaclass || subjectInfo.metaclass;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
allAssessments.set(a.id, {
|
|
||||||
...a,
|
|
||||||
programme,
|
|
||||||
metaclass,
|
|
||||||
programmeID: programme, // Ensure both formats are available
|
|
||||||
metaclassID: metaclass,
|
|
||||||
isUpcoming: true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
past.forEach((a: any) => {
|
|
||||||
if (a && a.id) {
|
|
||||||
// Prioritize capital ID fields (programmeID, metaclassID) as that's what the API returns
|
|
||||||
let programme = a.programmeID || a.programme;
|
|
||||||
let metaclass = a.metaclassID || a.metaclass;
|
|
||||||
|
|
||||||
const existing = allAssessments.get(a.id);
|
|
||||||
if (existing) {
|
|
||||||
// Merge past assessment data, ensuring programme/metaclass are preserved
|
|
||||||
// Use existing values if new ones are missing
|
|
||||||
programme = programme || existing.programme || existing.programmeID;
|
|
||||||
metaclass = metaclass || existing.metaclass || existing.metaclassID;
|
|
||||||
|
|
||||||
Object.assign(existing, {
|
|
||||||
...a,
|
|
||||||
programme,
|
|
||||||
metaclass,
|
|
||||||
programmeID: programme,
|
|
||||||
metaclassID: metaclass,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
allAssessments.set(a.id, {
|
|
||||||
...a,
|
|
||||||
programme,
|
|
||||||
metaclass,
|
|
||||||
programmeID: programme,
|
|
||||||
metaclassID: metaclass,
|
|
||||||
isUpcoming: false
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const items: IndexItem[] = [];
|
|
||||||
const processedIds = new Set<string>();
|
|
||||||
|
|
||||||
// Process assessments in batches to avoid overwhelming the API
|
|
||||||
const assessmentArray = Array.from(allAssessments.values());
|
|
||||||
const pastCount = assessmentArray.filter(a => !a.isUpcoming).length;
|
|
||||||
const upcomingCount = assessmentArray.filter(a => a.isUpcoming).length;
|
|
||||||
console.debug(`[Assignments job] Processing ${assessmentArray.length} total assessments (${upcomingCount} upcoming, ${pastCount} past)`);
|
|
||||||
const batchSize = 15; // Increased batch size for better performance
|
|
||||||
|
|
||||||
// Skip fetching assessment details - the API endpoint doesn't exist or returns 404
|
|
||||||
// Details are optional and not critical for search functionality
|
|
||||||
|
|
||||||
// Process ALL assessments (both upcoming and past) to ensure everything is indexed
|
|
||||||
for (let i = 0; i < assessmentArray.length; i += batchSize) {
|
|
||||||
const batch = assessmentArray.slice(i, i + batchSize);
|
|
||||||
|
|
||||||
const batchItems = await Promise.all(
|
|
||||||
batch.map(async (assessment) => {
|
|
||||||
const id = `assignment-${assessment.id}`;
|
|
||||||
|
|
||||||
// Skip if already processed in this batch
|
|
||||||
if (processedIds.has(id)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
processedIds.add(id);
|
|
||||||
|
|
||||||
// Process ALL assessments (both new and existing, upcoming and past)
|
|
||||||
// This ensures all historical assignments are indexed and metadata is up-to-date
|
|
||||||
|
|
||||||
// Skip fetching details - API endpoint doesn't exist
|
|
||||||
const description = "";
|
|
||||||
|
|
||||||
const subjectName = assessment.subject || assessment.code || "Unknown Subject";
|
|
||||||
const dueDate = assessment.due ? new Date(assessment.due).getTime() : null;
|
|
||||||
|
|
||||||
// Prioritize capital ID fields (programmeID, metaclassID) as that's what the API returns
|
|
||||||
const programmeId = assessment.programmeID || assessment.programme;
|
|
||||||
const metaclassId = assessment.metaclassID || assessment.metaclass;
|
|
||||||
|
|
||||||
// Validate that we have the required IDs for navigation
|
|
||||||
if (!programmeId || !metaclassId || !assessment.id) {
|
|
||||||
console.warn(`[Assignments job] Skipping assignment ${assessment.id} - missing required IDs:`, {
|
|
||||||
programmeId,
|
|
||||||
metaclassId,
|
|
||||||
assessmentId: assessment.id,
|
|
||||||
programmeID: assessment.programmeID,
|
|
||||||
metaclassID: assessment.metaclassID,
|
|
||||||
programme: assessment.programme,
|
|
||||||
metaclass: assessment.metaclass,
|
|
||||||
assessment,
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert to numbers, preserving 0 as valid
|
|
||||||
let finalProgrammeId: number | undefined;
|
|
||||||
let finalMetaclassId: number | undefined;
|
|
||||||
|
|
||||||
if (programmeId !== undefined && programmeId !== null && programmeId !== '') {
|
|
||||||
const num = Number(programmeId);
|
|
||||||
finalProgrammeId = isNaN(num) ? undefined : num;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metaclassId !== undefined && metaclassId !== null && metaclassId !== '') {
|
|
||||||
const num = Number(metaclassId);
|
|
||||||
finalMetaclassId = isNaN(num) ? undefined : num;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Final validation - check for actual numbers (including 0)
|
|
||||||
if (finalProgrammeId === undefined || finalMetaclassId === undefined || !assessment.id) {
|
|
||||||
console.error(`[Assignments job] ❌ Skipping assignment ${assessment.id} - invalid IDs after conversion:`, {
|
|
||||||
programmeId: finalProgrammeId,
|
|
||||||
metaclassId: finalMetaclassId,
|
|
||||||
assessmentId: assessment.id,
|
|
||||||
rawProgrammeId: programmeId,
|
|
||||||
rawMetaclassId: metaclassId,
|
|
||||||
assessment,
|
|
||||||
});
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const item: IndexItem = {
|
|
||||||
id,
|
|
||||||
text: assessment.title || assessment.name || "Untitled Assignment",
|
|
||||||
category: "assignments",
|
|
||||||
content: `${description}\nSubject: ${subjectName}\nDue: ${assessment.due || "No due date"}`.trim(),
|
|
||||||
dateAdded: dueDate || Date.now(),
|
|
||||||
metadata: {
|
|
||||||
assessmentId: assessment.id,
|
|
||||||
assessmentID: assessment.id, // Store both variants for compatibility
|
|
||||||
subject: subjectName,
|
|
||||||
subjectCode: assessment.code,
|
|
||||||
dueDate: assessment.due,
|
|
||||||
programmeId: finalProgrammeId,
|
|
||||||
programmeID: finalProgrammeId, // Store both variants for compatibility
|
|
||||||
metaclassId: finalMetaclassId,
|
|
||||||
metaclassID: finalMetaclassId, // Store both variants for compatibility
|
|
||||||
submitted: assessment.submitted || false,
|
|
||||||
isUpcoming: assessment.isUpcoming || false,
|
|
||||||
term: assessment.term,
|
|
||||||
timestamp: assessment.due || new Date().toISOString(), // Required by AssessmentMetadata interface
|
|
||||||
},
|
|
||||||
actionId: "assessment",
|
|
||||||
renderComponentId: "assessment",
|
|
||||||
};
|
|
||||||
|
|
||||||
console.debug(`[Assignments job] ✅ Created item for assignment ${assessment.id}:`, {
|
|
||||||
id: item.id,
|
|
||||||
programmeId: item.metadata.programmeId,
|
|
||||||
programmeID: item.metadata.programmeID,
|
|
||||||
metaclassId: item.metadata.metaclassId,
|
|
||||||
metaclassID: item.metadata.metaclassID,
|
|
||||||
assessmentId: item.metadata.assessmentId,
|
|
||||||
assessmentID: item.metadata.assessmentID,
|
|
||||||
});
|
|
||||||
|
|
||||||
return item;
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
// Filter out nulls and add to items
|
|
||||||
batchItems.forEach(item => {
|
|
||||||
if (item) {
|
|
||||||
items.push(item);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Small delay between batches to avoid rate limiting
|
|
||||||
if (i + batchSize < assessmentArray.length) {
|
|
||||||
await new Promise(resolve => setTimeout(resolve, 50)); // Reduced delay
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const newItemsCount = items.filter(item => !existingIds.has(item.id)).length;
|
|
||||||
const updatedItemsCount = items.length - newItemsCount;
|
|
||||||
console.debug(`[Assignments job] Indexed ${items.length} assignment items (${newItemsCount} new, ${updatedItemsCount} updated)`);
|
|
||||||
return items;
|
|
||||||
},
|
|
||||||
|
|
||||||
purge: (items) => {
|
|
||||||
// Keep ALL assignments - don't purge old ones as users may want to search for them
|
|
||||||
// Only remove items that are truly invalid (missing required metadata)
|
|
||||||
return items.filter((i) => {
|
|
||||||
// Keep all items that have valid metadata
|
|
||||||
return i.metadata &&
|
|
||||||
i.metadata.assessmentId &&
|
|
||||||
i.metadata.programmeId !== undefined &&
|
|
||||||
i.metadata.metaclassId !== undefined;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { IndexItem, Job } from "../types";
|
import type { Job, IndexItem } from "../types";
|
||||||
|
|
||||||
const fetchForums = async () => {
|
const fetchForums = async () => {
|
||||||
const res = await fetch(`${location.origin}/seqta/student/load/forums`, {
|
const res = await fetch(`${location.origin}/seqta/student/load/forums`, {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { IndexItem, Job } from "../types";
|
import type { Job, IndexItem } from "../types";
|
||||||
import { htmlToPlainText } from "../utils";
|
import { htmlToPlainText } from "../utils";
|
||||||
import { delay } from "@/seqta/utils/delay";
|
import { delay } from "@/seqta/utils/delay";
|
||||||
import { VectorWorkerManager } from "../worker/vectorWorkerManager";
|
import { VectorWorkerManager } from "../worker/vectorWorkerManager";
|
||||||
@@ -604,34 +604,22 @@ export const messagesJob: Job = {
|
|||||||
if (processedItems.length > 0) {
|
if (processedItems.length > 0) {
|
||||||
try {
|
try {
|
||||||
const currentItems = await loadAllStoredItems();
|
const currentItems = await loadAllStoredItems();
|
||||||
// Create new objects to avoid XrayWrapper issues in Firefox
|
currentItems.forEach((item) => {
|
||||||
const itemsWithComponents = currentItems.map((item) => {
|
|
||||||
try {
|
|
||||||
const jobDef =
|
const jobDef =
|
||||||
jobs[item.category] ||
|
jobs[item.category] ||
|
||||||
Object.values(jobs).find((j) => j.id === item.category) ||
|
Object.values(jobs).find((j) => j.id === item.category) ||
|
||||||
jobs[item.renderComponentId];
|
jobs[item.renderComponentId];
|
||||||
let renderComponent = item.renderComponent;
|
|
||||||
if (jobDef) {
|
if (jobDef) {
|
||||||
renderComponent = renderComponentMap[jobDef.renderComponentId] || renderComponent;
|
const renderComponent =
|
||||||
|
renderComponentMap[jobDef.renderComponentId];
|
||||||
|
if (renderComponent) {
|
||||||
|
item.renderComponent = renderComponent;
|
||||||
|
}
|
||||||
} else if (renderComponentMap[item.renderComponentId]) {
|
} else if (renderComponentMap[item.renderComponentId]) {
|
||||||
renderComponent = renderComponentMap[item.renderComponentId];
|
item.renderComponent = renderComponentMap[item.renderComponentId];
|
||||||
}
|
|
||||||
// Deep clone to avoid Firefox XrayWrapper issues with nested objects like metadata
|
|
||||||
try {
|
|
||||||
const cloned = JSON.parse(JSON.stringify(item));
|
|
||||||
cloned.renderComponent = renderComponent;
|
|
||||||
return cloned;
|
|
||||||
} catch (e) {
|
|
||||||
// Fallback to shallow copy if deep clone fails
|
|
||||||
return { ...item, renderComponent };
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
// Fallback: return item as-is if modification fails (Firefox XrayWrapper)
|
|
||||||
return item;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
loadDynamicItems(itemsWithComponents);
|
loadDynamicItems(currentItems);
|
||||||
window.dispatchEvent(
|
window.dispatchEvent(
|
||||||
new CustomEvent("dynamic-items-updated", {
|
new CustomEvent("dynamic-items-updated", {
|
||||||
detail: {
|
detail: {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { IndexItem, Job } from "../types";
|
import type { Job, IndexItem } from "../types";
|
||||||
import { htmlToPlainText } from "../utils";
|
import { htmlToPlainText } from "../utils";
|
||||||
import { fetchMessageContent } from "./messages";
|
import { fetchMessageContent } from "./messages";
|
||||||
import { delay } from "@/seqta/utils/delay";
|
import { delay } from "@/seqta/utils/delay";
|
||||||
@@ -372,34 +372,23 @@ export const notificationsJob: Job = {
|
|||||||
if (items.length > 0) {
|
if (items.length > 0) {
|
||||||
try {
|
try {
|
||||||
const currentItems = await loadAllStoredItems();
|
const currentItems = await loadAllStoredItems();
|
||||||
// Create new objects to avoid XrayWrapper issues in Firefox
|
currentItems.forEach((item) => {
|
||||||
const itemsWithComponents = currentItems.map((item) => {
|
|
||||||
try {
|
|
||||||
const jobDef =
|
const jobDef =
|
||||||
jobs[item.category] ||
|
jobs[item.category] ||
|
||||||
Object.values(jobs).find((j) => j.id === item.category) ||
|
Object.values(jobs).find((j) => j.id === item.category) ||
|
||||||
jobs[item.renderComponentId];
|
jobs[item.renderComponentId];
|
||||||
let renderComponent = item.renderComponent;
|
|
||||||
if (jobDef) {
|
if (jobDef) {
|
||||||
renderComponent = renderComponentMap[jobDef.renderComponentId] || renderComponent;
|
const renderComponent =
|
||||||
|
renderComponentMap[jobDef.renderComponentId];
|
||||||
|
if (renderComponent) {
|
||||||
|
item.renderComponent = renderComponent;
|
||||||
|
}
|
||||||
} else if (renderComponentMap[item.renderComponentId]) {
|
} else if (renderComponentMap[item.renderComponentId]) {
|
||||||
renderComponent = renderComponentMap[item.renderComponentId];
|
item.renderComponent =
|
||||||
}
|
renderComponentMap[item.renderComponentId];
|
||||||
// Deep clone to avoid Firefox XrayWrapper issues with nested objects like metadata
|
|
||||||
try {
|
|
||||||
const cloned = JSON.parse(JSON.stringify(item));
|
|
||||||
cloned.renderComponent = renderComponent;
|
|
||||||
return cloned;
|
|
||||||
} catch (e) {
|
|
||||||
// Fallback to shallow copy if deep clone fails
|
|
||||||
return { ...item, renderComponent };
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
// Fallback: return item as-is if modification fails (Firefox XrayWrapper)
|
|
||||||
return item;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
loadDynamicItems(itemsWithComponents);
|
loadDynamicItems(currentItems);
|
||||||
window.dispatchEvent(
|
window.dispatchEvent(
|
||||||
new CustomEvent("dynamic-items-updated", {
|
new CustomEvent("dynamic-items-updated", {
|
||||||
detail: {
|
detail: {
|
||||||
|
|||||||
@@ -3,24 +3,9 @@ import type { IndexItem } from "../types";
|
|||||||
|
|
||||||
let vectorIndex: EmbeddingIndex | null = null;
|
let vectorIndex: EmbeddingIndex | null = null;
|
||||||
let isInitialized = false;
|
let isInitialized = false;
|
||||||
let initializationFailed = false;
|
|
||||||
let currentAbortController: AbortController | null = null;
|
let currentAbortController: AbortController | null = null;
|
||||||
let loadedItemIds = new Set<string>();
|
let loadedItemIds = new Set<string>();
|
||||||
|
|
||||||
// Detect Firefox in worker context
|
|
||||||
function isFirefoxWorker(): boolean {
|
|
||||||
try {
|
|
||||||
// Check for Firefox-specific APIs or user agent
|
|
||||||
if (typeof navigator !== "undefined") {
|
|
||||||
return navigator.userAgent.toLowerCase().includes("firefox");
|
|
||||||
}
|
|
||||||
// In worker context, check for Firefox-specific behavior
|
|
||||||
return false;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let streamingSession: {
|
let streamingSession: {
|
||||||
isActive: boolean;
|
isActive: boolean;
|
||||||
totalExpected: number;
|
totalExpected: number;
|
||||||
@@ -36,16 +21,6 @@ async function initWorker() {
|
|||||||
console.debug("Vector worker already initialized.");
|
console.debug("Vector worker already initialized.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip initialization in Firefox
|
|
||||||
if (isFirefoxWorker()) {
|
|
||||||
console.debug("[Vector Worker] Vector search not supported in Firefox - skipping initialization");
|
|
||||||
isInitialized = true;
|
|
||||||
initializationFailed = true;
|
|
||||||
vectorIndex = null;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.debug("Initializing vector worker...");
|
console.debug("Initializing vector worker...");
|
||||||
try {
|
try {
|
||||||
await initializeModel();
|
await initializeModel();
|
||||||
@@ -73,9 +48,8 @@ async function initWorker() {
|
|||||||
isInitialized = true;
|
isInitialized = true;
|
||||||
console.debug("Vector worker initialized successfully.");
|
console.debug("Vector worker initialized successfully.");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("[Vector Worker] Failed to initialize vector worker (will use text search only):", e);
|
console.error("Failed to initialize vector worker:", e);
|
||||||
isInitialized = true;
|
isInitialized = true;
|
||||||
initializationFailed = true;
|
|
||||||
vectorIndex = null;
|
vectorIndex = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -106,29 +80,18 @@ async function startStreamingSession(
|
|||||||
totalExpected: number,
|
totalExpected: number,
|
||||||
batchSize: number = 5,
|
batchSize: number = 5,
|
||||||
) {
|
) {
|
||||||
if (initializationFailed || isFirefoxWorker()) {
|
|
||||||
self.postMessage({
|
|
||||||
type: "progress",
|
|
||||||
data: {
|
|
||||||
status: "complete",
|
|
||||||
message: "Vector search not available in Firefox - using text search only",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!vectorIndex) {
|
if (!vectorIndex) {
|
||||||
console.warn(
|
console.warn(
|
||||||
"Streaming requested but vector index not ready. Attempting init.",
|
"Streaming requested but vector index not ready. Attempting init.",
|
||||||
);
|
);
|
||||||
await initWorker();
|
await initWorker();
|
||||||
if (!vectorIndex || initializationFailed) {
|
if (!vectorIndex) {
|
||||||
self.postMessage({
|
self.postMessage({
|
||||||
type: "progress",
|
type: "progress",
|
||||||
data: {
|
data: {
|
||||||
status: "complete",
|
status: "error",
|
||||||
message:
|
message:
|
||||||
"Vector index not available - using text search only",
|
"Vector index not available for streaming after init attempt.",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
@@ -343,29 +306,18 @@ async function endStreamingSession() {
|
|||||||
async function processItems(items: IndexItem[], signal: AbortSignal) {
|
async function processItems(items: IndexItem[], signal: AbortSignal) {
|
||||||
console.debug("Worker received process request.");
|
console.debug("Worker received process request.");
|
||||||
|
|
||||||
if (initializationFailed || isFirefoxWorker()) {
|
|
||||||
self.postMessage({
|
|
||||||
type: "progress",
|
|
||||||
data: {
|
|
||||||
status: "complete",
|
|
||||||
message: "Vector search not available - using text search only",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!vectorIndex) {
|
if (!vectorIndex) {
|
||||||
console.warn(
|
console.warn(
|
||||||
"Processing requested but vector index not ready. Attempting init.",
|
"Processing requested but vector index not ready. Attempting init.",
|
||||||
);
|
);
|
||||||
await initWorker();
|
await initWorker();
|
||||||
if (!vectorIndex || initializationFailed) {
|
if (!vectorIndex) {
|
||||||
self.postMessage({
|
self.postMessage({
|
||||||
type: "progress",
|
type: "progress",
|
||||||
data: {
|
data: {
|
||||||
status: "complete",
|
status: "error",
|
||||||
message:
|
message:
|
||||||
"Vector index not available - using text search only",
|
"Vector index not available for processing after init attempt.",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { refreshVectorCache } from "../../search/vector/vectorSearch";
|
import { refreshVectorCache } from "../../search/vector/vectorSearch";
|
||||||
import type { IndexItem } from "../types";
|
import type { IndexItem } from "../types";
|
||||||
import { isVectorSearchSupported } from "../../utils/browserDetection";
|
|
||||||
import vectorWorker from "./vectorWorker.ts?inlineWorker";
|
import vectorWorker from "./vectorWorker.ts?inlineWorker";
|
||||||
|
|
||||||
export type ProgressCallback = (data: {
|
export type ProgressCallback = (data: {
|
||||||
@@ -43,13 +42,6 @@ export class VectorWorkerManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async initWorker(): Promise<void> {
|
private async initWorker(): Promise<void> {
|
||||||
// Skip initialization if vector search is not supported (e.g., Firefox)
|
|
||||||
if (!isVectorSearchSupported()) {
|
|
||||||
console.debug("[VectorWorkerManager] Vector search not supported - skipping worker initialization");
|
|
||||||
this.isInitialized = false;
|
|
||||||
return Promise.resolve();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isInitialized) return Promise.resolve();
|
if (this.isInitialized) return Promise.resolve();
|
||||||
if (this.readyPromise) return this.readyPromise;
|
if (this.readyPromise) return this.readyPromise;
|
||||||
|
|
||||||
@@ -242,17 +234,6 @@ export class VectorWorkerManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async processItems(items: IndexItem[], onProgress?: ProgressCallback) {
|
async processItems(items: IndexItem[], onProgress?: ProgressCallback) {
|
||||||
// Skip if vector search is not supported
|
|
||||||
if (!isVectorSearchSupported()) {
|
|
||||||
if (onProgress) {
|
|
||||||
onProgress({
|
|
||||||
status: "complete",
|
|
||||||
message: "Vector search not available - using text search only"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only initialize worker if we actually have items to process
|
// Only initialize worker if we actually have items to process
|
||||||
if (items.length === 0) {
|
if (items.length === 0) {
|
||||||
if (onProgress) {
|
if (onProgress) {
|
||||||
@@ -317,18 +298,6 @@ export class VectorWorkerManager {
|
|||||||
batchSize: number = 10,
|
batchSize: number = 10,
|
||||||
jobId?: string,
|
jobId?: string,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
// Skip if vector search is not supported
|
|
||||||
if (!isVectorSearchSupported()) {
|
|
||||||
console.debug("[VectorWorker] Vector search not supported - skipping streaming session");
|
|
||||||
if (onProgress) {
|
|
||||||
onProgress({
|
|
||||||
status: "complete",
|
|
||||||
message: "Vector search not available - using text search only",
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only initialize if we expect items to process
|
// Only initialize if we expect items to process
|
||||||
if (totalExpectedItems === 0) {
|
if (totalExpectedItems === 0) {
|
||||||
console.debug("[VectorWorker] No items expected, not starting streaming session");
|
console.debug("[VectorWorker] No items expected, not starting streaming session");
|
||||||
|
|||||||
@@ -1,280 +0,0 @@
|
|||||||
import type { IndexItem } from "../indexing/types";
|
|
||||||
import type { CombinedResult } from "../core/types";
|
|
||||||
import { searchVectors, type VectorSearchResult } from "./vector/vectorSearch";
|
|
||||||
import { jobs } from "../indexing/jobs";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hybrid Search Implementation
|
|
||||||
*
|
|
||||||
* Flow:
|
|
||||||
* 1. BM25 (Fuse.js) gets top N results fast
|
|
||||||
* 2. Vector search reranks by semantic similarity
|
|
||||||
* 3. Apply optional boosting (recency, popularity, tags)
|
|
||||||
*/
|
|
||||||
|
|
||||||
export interface HybridSearchOptions {
|
|
||||||
/** Maximum number of BM25 results to retrieve before reranking */
|
|
||||||
bm25TopK?: number;
|
|
||||||
/** Maximum number of final results to return */
|
|
||||||
finalLimit?: number;
|
|
||||||
/** Whether to apply recency boost */
|
|
||||||
recencyBoost?: boolean;
|
|
||||||
/** Weight for BM25 scores (0-1) */
|
|
||||||
bm25Weight?: number;
|
|
||||||
/** Weight for vector similarity scores (0-1) */
|
|
||||||
vectorWeight?: number;
|
|
||||||
/** Weight for recency boost */
|
|
||||||
recencyWeight?: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
const DEFAULT_OPTIONS: Required<HybridSearchOptions> = {
|
|
||||||
bm25TopK: 50, // Get top 50 from BM25, then rerank
|
|
||||||
finalLimit: 10,
|
|
||||||
recencyBoost: true,
|
|
||||||
bm25Weight: 0.4, // 40% BM25, 60% vector
|
|
||||||
vectorWeight: 0.6,
|
|
||||||
recencyWeight: 0.1,
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalizes a score to 0-1 range
|
|
||||||
*/
|
|
||||||
function normalizeScore(score: number, min: number, max: number): number {
|
|
||||||
if (max === min) return 0.5;
|
|
||||||
return Math.max(0, Math.min(1, (score - min) / (max - min)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates recency boost based on item age
|
|
||||||
*/
|
|
||||||
function calculateRecencyBoost(item: IndexItem, now: number): number {
|
|
||||||
const ageInDays = (now - item.dateAdded) / (1000 * 60 * 60 * 24);
|
|
||||||
// Exponential decay: newer items get higher boost
|
|
||||||
// Items from today get boost of 1, items from 30 days ago get ~0.03
|
|
||||||
return 1 / (1 + ageInDays / 7); // Half-life of 7 days
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates popularity boost (can be extended with click tracking, etc.)
|
|
||||||
*/
|
|
||||||
function calculatePopularityBoost(item: IndexItem): number {
|
|
||||||
// For now, boost based on category and metadata
|
|
||||||
let boost = 0;
|
|
||||||
|
|
||||||
// Boost assignments/assessments
|
|
||||||
if (item.category === "assignments") {
|
|
||||||
boost += 0.1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Boost upcoming items
|
|
||||||
if (item.metadata?.isUpcoming) {
|
|
||||||
boost += 0.15;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Boost items with subject codes (more structured)
|
|
||||||
if (item.metadata?.subjectCode) {
|
|
||||||
boost += 0.05;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Math.min(boost, 0.3); // Cap at 0.3
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reranks BM25 results using vector search
|
|
||||||
*/
|
|
||||||
export async function hybridSearch(
|
|
||||||
bm25Results: CombinedResult[],
|
|
||||||
query: string,
|
|
||||||
options: HybridSearchOptions = {},
|
|
||||||
): Promise<CombinedResult[]> {
|
|
||||||
const opts = { ...DEFAULT_OPTIONS, ...options };
|
|
||||||
const trimmedQuery = query.trim().toLowerCase();
|
|
||||||
|
|
||||||
// If no BM25 results, return empty
|
|
||||||
if (bm25Results.length === 0) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Limit BM25 results to top K
|
|
||||||
const topBm25Results = bm25Results.slice(0, opts.bm25TopK);
|
|
||||||
|
|
||||||
// Get vector search results for reranking
|
|
||||||
// We'll search the full index and then filter to our BM25 results
|
|
||||||
let vectorResults: VectorSearchResult[] = [];
|
|
||||||
|
|
||||||
if (trimmedQuery.length > 2) {
|
|
||||||
try {
|
|
||||||
// Get more vector results than BM25 results to ensure coverage
|
|
||||||
// This allows us to find semantic matches that BM25 might have missed
|
|
||||||
const vectorSearchResults = await searchVectors(trimmedQuery, opts.bm25TopK * 2);
|
|
||||||
|
|
||||||
// Create a map of item ID to vector similarity
|
|
||||||
const vectorMap = new Map<string, number>();
|
|
||||||
vectorSearchResults.forEach(v => {
|
|
||||||
// Use the highest similarity if item appears multiple times
|
|
||||||
const existing = vectorMap.get(v.object.id);
|
|
||||||
if (!existing || v.similarity > existing) {
|
|
||||||
vectorMap.set(v.object.id, v.similarity);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Now rerank BM25 results with vector scores
|
|
||||||
const now = Date.now();
|
|
||||||
|
|
||||||
const rerankedResults = topBm25Results.map(result => {
|
|
||||||
const item = result.item;
|
|
||||||
|
|
||||||
// Normalize BM25 score to 0-1
|
|
||||||
// Fuse.js scores: lower is better (0 = perfect match)
|
|
||||||
// We need to invert: higher score = better match
|
|
||||||
// Result.score is typically 0-100, where higher = better
|
|
||||||
// So we normalize it to 0-1
|
|
||||||
const normalizedBm25Score = Math.max(0, Math.min(1, result.score / 100));
|
|
||||||
|
|
||||||
// Get vector similarity (0-1, already normalized)
|
|
||||||
// If item wasn't in vector results, use a default low score
|
|
||||||
const vectorSimilarity = vectorMap.get(item.id) || 0.3; // Default to 0.3 if not found
|
|
||||||
|
|
||||||
// Calculate recency boost (0-1 range)
|
|
||||||
const recencyBoost = opts.recencyBoost
|
|
||||||
? calculateRecencyBoost(item, now) * opts.recencyWeight
|
|
||||||
: 0;
|
|
||||||
|
|
||||||
// Calculate popularity boost (0-1 range)
|
|
||||||
const popularityBoost = calculatePopularityBoost(item);
|
|
||||||
|
|
||||||
// Apply job-specific boost if available
|
|
||||||
const job = jobs[item.category];
|
|
||||||
let jobBoost = 0;
|
|
||||||
if (job && typeof job.boostCriteria === 'function') {
|
|
||||||
const boost = job.boostCriteria(item, trimmedQuery);
|
|
||||||
if (boost) {
|
|
||||||
jobBoost = boost / 100; // Normalize boost to 0-1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Combine scores using weighted average
|
|
||||||
// BM25 and vector are weighted, boosts are additive
|
|
||||||
const hybridScore =
|
|
||||||
(normalizedBm25Score * opts.bm25Weight) +
|
|
||||||
(vectorSimilarity * opts.vectorWeight) +
|
|
||||||
recencyBoost +
|
|
||||||
popularityBoost +
|
|
||||||
jobBoost;
|
|
||||||
|
|
||||||
return {
|
|
||||||
...result,
|
|
||||||
score: hybridScore * 100, // Scale back to 0-100 for consistency
|
|
||||||
// Store component scores for debugging (optional, can be removed in production)
|
|
||||||
_hybridScores: {
|
|
||||||
bm25: normalizedBm25Score,
|
|
||||||
vector: vectorSimilarity,
|
|
||||||
recency: recencyBoost,
|
|
||||||
popularity: popularityBoost,
|
|
||||||
jobBoost: jobBoost,
|
|
||||||
final: hybridScore,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
// Sort by hybrid score descending
|
|
||||||
rerankedResults.sort((a, b) => b.score - a.score);
|
|
||||||
|
|
||||||
// Return top results
|
|
||||||
return rerankedResults.slice(0, opts.finalLimit);
|
|
||||||
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Hybrid Search] Vector reranking failed, using BM25 only:", e);
|
|
||||||
// Fallback to BM25 only
|
|
||||||
return topBm25Results.slice(0, opts.finalLimit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If query is too short for vector search, just return BM25 results
|
|
||||||
return topBm25Results.slice(0, opts.finalLimit);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enhanced hybrid search that also includes vector-only results not found by BM25
|
|
||||||
*/
|
|
||||||
export async function hybridSearchWithExpansion(
|
|
||||||
bm25Results: CombinedResult[],
|
|
||||||
query: string,
|
|
||||||
allItems: IndexItem[],
|
|
||||||
options: HybridSearchOptions = {},
|
|
||||||
): Promise<CombinedResult[]> {
|
|
||||||
const opts = { ...DEFAULT_OPTIONS, ...options };
|
|
||||||
const trimmedQuery = query.trim().toLowerCase();
|
|
||||||
|
|
||||||
// First, rerank BM25 results
|
|
||||||
const rerankedBm25 = await hybridSearch(bm25Results, query, options);
|
|
||||||
|
|
||||||
// If query is too short, skip vector expansion
|
|
||||||
if (trimmedQuery.length <= 2) {
|
|
||||||
return rerankedBm25;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get vector search results
|
|
||||||
let vectorResults: VectorSearchResult[] = [];
|
|
||||||
try {
|
|
||||||
vectorResults = await searchVectors(trimmedQuery, opts.bm25TopK);
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Hybrid Search] Vector search failed:", e);
|
|
||||||
return rerankedBm25;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find vector results that weren't in BM25 results
|
|
||||||
const bm25Ids = new Set(bm25Results.map(r => r.item.id));
|
|
||||||
const vectorOnlyResults: CombinedResult[] = [];
|
|
||||||
|
|
||||||
const now = Date.now();
|
|
||||||
|
|
||||||
vectorResults.forEach(v => {
|
|
||||||
if (!bm25Ids.has(v.object.id)) {
|
|
||||||
// This is a semantic match that BM25 missed
|
|
||||||
const item = v.object;
|
|
||||||
|
|
||||||
// Calculate boosts
|
|
||||||
const recencyBoost = opts.recencyBoost
|
|
||||||
? calculateRecencyBoost(item, now) * opts.recencyWeight
|
|
||||||
: 0;
|
|
||||||
const popularityBoost = calculatePopularityBoost(item);
|
|
||||||
|
|
||||||
// Vector-only results get lower base score but high vector similarity
|
|
||||||
const vectorScore = v.similarity * opts.vectorWeight + recencyBoost + popularityBoost;
|
|
||||||
|
|
||||||
// Apply job-specific boost if available
|
|
||||||
const job = jobs[item.category];
|
|
||||||
let jobBoost = 0;
|
|
||||||
if (job && typeof job.boostCriteria === 'function') {
|
|
||||||
const boost = job.boostCriteria(item, trimmedQuery);
|
|
||||||
if (boost) {
|
|
||||||
jobBoost = boost / 100; // Normalize boost
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
vectorOnlyResults.push({
|
|
||||||
id: item.id,
|
|
||||||
type: "dynamic" as const,
|
|
||||||
score: (vectorScore + jobBoost) * 100,
|
|
||||||
item,
|
|
||||||
_hybridScores: {
|
|
||||||
bm25: 0,
|
|
||||||
vector: v.similarity,
|
|
||||||
recency: recencyBoost,
|
|
||||||
popularity: popularityBoost,
|
|
||||||
final: vectorScore + jobBoost,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Combine reranked BM25 results with vector-only results
|
|
||||||
const allResults = [...rerankedBm25, ...vectorOnlyResults];
|
|
||||||
|
|
||||||
// Sort by score and return top results
|
|
||||||
allResults.sort((a, b) => b.score - a.score);
|
|
||||||
|
|
||||||
return allResults.slice(0, opts.finalLimit);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -6,79 +6,32 @@ import type { IndexItem } from "../indexing/types";
|
|||||||
import { searchVectors } from "./vector/vectorSearch";
|
import { searchVectors } from "./vector/vectorSearch";
|
||||||
import type { VectorSearchResult } from "./vector/vectorTypes";
|
import type { VectorSearchResult } from "./vector/vectorTypes";
|
||||||
import { jobs } from "../indexing/jobs";
|
import { jobs } from "../indexing/jobs";
|
||||||
import { hybridSearchWithExpansion } from "./hybridSearch";
|
|
||||||
|
|
||||||
// Search result cache for better performance
|
|
||||||
const searchCache = new Map<string, { results: CombinedResult[]; timestamp: number }>();
|
|
||||||
const CACHE_TTL = 1000 * 60 * 5; // 5 minutes
|
|
||||||
const MAX_CACHE_SIZE = 100;
|
|
||||||
|
|
||||||
function getCachedResults(query: string): CombinedResult[] | null {
|
|
||||||
const cached = searchCache.get(query);
|
|
||||||
if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
|
|
||||||
return cached.results;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setCachedResults(query: string, results: CombinedResult[]) {
|
|
||||||
// Limit cache size
|
|
||||||
if (searchCache.size >= MAX_CACHE_SIZE) {
|
|
||||||
const firstKey = searchCache.keys().next().value;
|
|
||||||
searchCache.delete(firstKey);
|
|
||||||
}
|
|
||||||
searchCache.set(query, { results, timestamp: Date.now() });
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears the search result cache
|
|
||||||
*/
|
|
||||||
export function clearSearchCache(): void {
|
|
||||||
searchCache.clear();
|
|
||||||
console.debug("[Search] Search result cache cleared");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Listen for cache clear events (e.g., on extension update)
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
window.addEventListener('betterseqta-clear-search-cache', () => {
|
|
||||||
clearSearchCache();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createSearchIndexes() {
|
export function createSearchIndexes() {
|
||||||
const commands = getStaticCommands();
|
const commands = getStaticCommands();
|
||||||
const dynamicItems = getDynamicItems();
|
const dynamicItems = getDynamicItems();
|
||||||
|
|
||||||
// Optimized command search options
|
|
||||||
const commandOptions = {
|
const commandOptions = {
|
||||||
keys: ["text", "category", "keywords"],
|
keys: ["text", "category", "keywords"],
|
||||||
includeScore: true,
|
includeScore: true,
|
||||||
includeMatches: true,
|
includeMatches: true,
|
||||||
threshold: 0.35, // Slightly more permissive for better recall
|
threshold: 0.4,
|
||||||
minMatchCharLength: 2,
|
minMatchCharLength: 2,
|
||||||
useExtendedSearch: false,
|
useExtendedSearch: false,
|
||||||
ignoreLocation: false,
|
|
||||||
findAllMatches: false, // Performance optimization
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Optimized dynamic content search options
|
|
||||||
const dynamicOptions = {
|
const dynamicOptions = {
|
||||||
keys: [
|
keys: [
|
||||||
{ name: "text", weight: 3 }, // Increased weight for title matches
|
{ name: "text", weight: 2 },
|
||||||
{ name: "content", weight: 1 },
|
{ name: "content", weight: 1 },
|
||||||
{ name: "category", weight: 0.5 }, // Lower weight for category
|
{ name: "category", weight: 1 },
|
||||||
{ name: "metadata.subjectName", weight: 1.5 }, // Boost subject name matches
|
|
||||||
{ name: "metadata.subjectCode", weight: 1.5 }, // Boost subject code matches
|
|
||||||
],
|
],
|
||||||
includeScore: true,
|
includeScore: true,
|
||||||
includeMatches: true,
|
includeMatches: true,
|
||||||
threshold: 0.5, // More permissive for better partial word matching (increased from 0.4)
|
threshold: 0.4,
|
||||||
minMatchCharLength: 2, // Minimum 2 characters for Fuse.js matches (substring fallback handles shorter queries)
|
minMatchCharLength: 2,
|
||||||
distance: 100, // Increased to allow matches across longer strings
|
distance: 100,
|
||||||
useExtendedSearch: true,
|
useExtendedSearch: true,
|
||||||
ignoreLocation: true, // Allow matches anywhere in the string for better partial word matching
|
|
||||||
findAllMatches: true, // Enable to find all matches for better partial word support
|
|
||||||
shouldSort: true,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -152,64 +105,18 @@ export function searchDynamicItems(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const queryLower = query.toLowerCase();
|
const searchResults = dynamicContentFuse.search(query, { limit });
|
||||||
const queryTrimmed = query.trim();
|
|
||||||
|
|
||||||
// For short queries (3 chars or less), use a more permissive approach
|
return searchResults.map((result: FuseResult<IndexItem>) => {
|
||||||
const isShortQuery = queryTrimmed.length <= 3;
|
|
||||||
const searchLimit = Math.min(limit * 3, 50);
|
|
||||||
|
|
||||||
// First, try Fuse.js search
|
|
||||||
const searchResults = dynamicContentFuse.search(query, { limit: searchLimit });
|
|
||||||
|
|
||||||
// For short queries, always do a simple substring match to supplement Fuse.js results
|
|
||||||
// This ensures we catch partial word matches like "SAT" in "SAT 1: Differential Calculus"
|
|
||||||
let additionalMatches: IndexItem[] = [];
|
|
||||||
if (isShortQuery) {
|
|
||||||
// Always do substring search for short queries to catch partial word matches
|
|
||||||
for (const item of dynamicIdToItemMap.values()) {
|
|
||||||
const textLower = item.text.toLowerCase();
|
|
||||||
const contentLower = (item.content || '').toLowerCase();
|
|
||||||
const subjectNameLower = (item.metadata?.subjectName || '').toLowerCase();
|
|
||||||
const subjectCodeLower = (item.metadata?.subjectCode || '').toLowerCase();
|
|
||||||
|
|
||||||
// Check if query appears anywhere in the text, content, or metadata
|
|
||||||
if (textLower.includes(queryLower) ||
|
|
||||||
contentLower.includes(queryLower) ||
|
|
||||||
subjectNameLower.includes(queryLower) ||
|
|
||||||
subjectCodeLower.includes(queryLower)) {
|
|
||||||
// Only add if not already in Fuse.js results
|
|
||||||
if (!searchResults.find(r => r.item.id === item.id)) {
|
|
||||||
additionalMatches.push(item);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const results = searchResults.map((result: FuseResult<IndexItem>) => {
|
|
||||||
const item = result.item;
|
const item = result.item;
|
||||||
const fuseScore = 10 * (1 - (result.score || 0.5));
|
const fuseScore = 10 * (1 - (result.score || 0.5));
|
||||||
|
|
||||||
let score = fuseScore;
|
let score = fuseScore;
|
||||||
|
|
||||||
// Recency boost
|
|
||||||
const ageInDays = (now - item.dateAdded) / (1000 * 60 * 60 * 24);
|
const ageInDays = (now - item.dateAdded) / (1000 * 60 * 60 * 24);
|
||||||
const recencyBoost = sortByRecent ? 1 / (ageInDays + 1) : 0;
|
const recencyBoost = sortByRecent ? 1 / (ageInDays + 1) : 0;
|
||||||
score += recencyBoost;
|
score += recencyBoost;
|
||||||
|
|
||||||
// Boost for exact text matches (especially at the start)
|
|
||||||
const textLower = item.text.toLowerCase();
|
|
||||||
if (textLower.startsWith(queryLower)) {
|
|
||||||
score += 5; // Strong boost for prefix matches
|
|
||||||
} else if (textLower.includes(queryLower)) {
|
|
||||||
score += 2; // Boost for substring matches
|
|
||||||
}
|
|
||||||
|
|
||||||
// Boost for category matches
|
|
||||||
if (item.category.toLowerCase().includes(queryLower)) {
|
|
||||||
score += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: item.id,
|
id: item.id,
|
||||||
type: "dynamic" as const,
|
type: "dynamic" as const,
|
||||||
@@ -218,124 +125,60 @@ export function searchDynamicItems(
|
|||||||
matches: result.matches,
|
matches: result.matches,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add additional matches from simple substring search
|
|
||||||
additionalMatches.forEach((item) => {
|
|
||||||
// Check if already in results
|
|
||||||
if (!results.find(r => r.id === item.id)) {
|
|
||||||
const textLower = item.text.toLowerCase();
|
|
||||||
let score = 5; // Base score for substring matches
|
|
||||||
|
|
||||||
// Boost for prefix matches
|
|
||||||
if (textLower.startsWith(queryLower)) {
|
|
||||||
score += 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Recency boost
|
|
||||||
const ageInDays = (now - item.dateAdded) / (1000 * 60 * 60 * 24);
|
|
||||||
const recencyBoost = sortByRecent ? 1 / (ageInDays + 1) : 0;
|
|
||||||
score += recencyBoost;
|
|
||||||
|
|
||||||
results.push({
|
|
||||||
id: item.id,
|
|
||||||
type: "dynamic" as const,
|
|
||||||
score,
|
|
||||||
item,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Sort by score and return top results
|
|
||||||
return results.sort((a, b) => b.score - a.score).slice(0, limit);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function performSearch(
|
export async function performSearch(
|
||||||
query: string,
|
query: string,
|
||||||
commandsFuse: Fuse<StaticCommandItem>,
|
commandsFuse: Fuse<StaticCommandItem>,
|
||||||
commandIdToItemMap: Map<string, StaticCommandItem>,
|
commandIdToItemMap: Map<string, StaticCommandItem>,
|
||||||
dynamicContentFuse?: Fuse<IndexItem>,
|
|
||||||
dynamicIdToItemMap?: Map<string, IndexItem>,
|
|
||||||
sortByRecent: boolean = true,
|
|
||||||
): Promise<CombinedResult[]> {
|
): Promise<CombinedResult[]> {
|
||||||
const trimmedQuery = query.trim().toLowerCase();
|
// Get all results first
|
||||||
|
|
||||||
// Check cache first
|
|
||||||
if (trimmedQuery.length > 2) {
|
|
||||||
const cached = getCachedResults(trimmedQuery);
|
|
||||||
if (cached) {
|
|
||||||
return cached;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 1: Get command results (these don't need hybrid search)
|
|
||||||
const commandResults = searchCommands(
|
const commandResults = searchCommands(
|
||||||
commandsFuse,
|
commandsFuse,
|
||||||
trimmedQuery,
|
query,
|
||||||
commandIdToItemMap,
|
commandIdToItemMap,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Step 2: Get BM25 results for dynamic items
|
// Get vector results in parallel
|
||||||
let dynamicResults: CombinedResult[] = [];
|
let vectorResults: VectorSearchResult[] = [];
|
||||||
if (dynamicContentFuse && dynamicIdToItemMap) {
|
|
||||||
// Get BM25 results first (fast text-based search)
|
|
||||||
const bm25Results = searchDynamicItems(
|
|
||||||
dynamicContentFuse,
|
|
||||||
trimmedQuery,
|
|
||||||
dynamicIdToItemMap,
|
|
||||||
50, // Get top 50 for reranking
|
|
||||||
sortByRecent,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Step 3: Apply hybrid search (BM25 + Vector reranking + boosting)
|
|
||||||
if (trimmedQuery.length > 2 && bm25Results.length > 0) {
|
|
||||||
try {
|
try {
|
||||||
// Get all items for expansion
|
vectorResults = await searchVectors(query);
|
||||||
const allItems = Array.from(dynamicIdToItemMap.values());
|
} catch (e) {}
|
||||||
|
|
||||||
// Apply hybrid search with expansion
|
// Create a map to store our final results, using ID as key to avoid duplicates
|
||||||
dynamicResults = await hybridSearchWithExpansion(
|
const resultMap = new Map<string, CombinedResult>();
|
||||||
bm25Results,
|
|
||||||
trimmedQuery,
|
|
||||||
allItems,
|
|
||||||
{
|
|
||||||
bm25TopK: 50,
|
|
||||||
finalLimit: 20, // Return top 20 after reranking
|
|
||||||
recencyBoost: sortByRecent,
|
|
||||||
bm25Weight: 0.4, // 40% BM25, 60% vector
|
|
||||||
vectorWeight: 0.6,
|
|
||||||
recencyWeight: 0.1,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Search] Hybrid search failed, using BM25 only:", e);
|
|
||||||
// Fallback to BM25 only
|
|
||||||
dynamicResults = bm25Results.slice(0, 20);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// For very short queries or no BM25 results, use BM25 only
|
|
||||||
dynamicResults = bm25Results.slice(0, 20);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 4: Combine command and dynamic results
|
// Add command results first (they keep their original scores)
|
||||||
const allResults = [...commandResults, ...dynamicResults];
|
commandResults.forEach((r) => resultMap.set(r.id, r));
|
||||||
|
|
||||||
// Sort by score (commands typically have higher priority)
|
// Process dynamic results and vector results together
|
||||||
allResults.sort((a, b) => {
|
const seenIds = new Set<string>();
|
||||||
// Commands always come first if scores are similar
|
|
||||||
if (a.type === "command" && b.type === "dynamic") {
|
vectorResults.forEach((v) => {
|
||||||
return b.score - a.score - 10; // Commands get +10 boost
|
const id = v.object.id;
|
||||||
|
|
||||||
|
if (!seenIds.has(id)) {
|
||||||
|
// This is a semantic match that Fuse missed - add it with the vector similarity as score
|
||||||
|
let score = v.similarity * 0.5; // High base score for semantic matches
|
||||||
|
const job = jobs[v.object.category];
|
||||||
|
if (job && typeof job.boostCriteria === 'function') {
|
||||||
|
const boost = job.boostCriteria(v.object, query);
|
||||||
|
if (boost) {
|
||||||
|
score += boost;
|
||||||
}
|
}
|
||||||
if (a.type === "dynamic" && b.type === "command") {
|
|
||||||
return b.score - a.score + 10; // Commands get +10 boost
|
|
||||||
}
|
}
|
||||||
return b.score - a.score;
|
resultMap.set(id, {
|
||||||
|
id,
|
||||||
|
type: "dynamic" as const,
|
||||||
|
score,
|
||||||
|
item: v.object,
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Cache results for queries longer than 2 chars
|
// Convert to array and sort by score
|
||||||
if (trimmedQuery.length > 2) {
|
const results = Array.from(resultMap.values());
|
||||||
setCachedResults(trimmedQuery, allResults);
|
results.sort((a, b) => b.score - a.score);
|
||||||
}
|
|
||||||
|
|
||||||
return allResults;
|
return results;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,36 +1,16 @@
|
|||||||
import { EmbeddingIndex, getEmbedding, initializeModel } from "embeddia";
|
import { EmbeddingIndex, getEmbedding, initializeModel } from "embeddia";
|
||||||
import type { IndexItem } from "../../indexing/types";
|
import type { IndexItem } from "../../indexing/types";
|
||||||
import type { SearchResult } from "embeddia";
|
import type { SearchResult } from "embeddia";
|
||||||
import { isVectorSearchSupported } from "../../utils/browserDetection";
|
|
||||||
|
|
||||||
let vectorIndex: EmbeddingIndex | null = null;
|
let vectorIndex: EmbeddingIndex | null = null;
|
||||||
let initializationAttempted = false;
|
|
||||||
let initializationFailed = false;
|
|
||||||
|
|
||||||
export async function initVectorSearch() {
|
export async function initVectorSearch() {
|
||||||
// Skip initialization if already attempted and failed, or if not supported
|
|
||||||
if (initializationFailed || !isVectorSearchSupported()) {
|
|
||||||
if (!isVectorSearchSupported()) {
|
|
||||||
console.debug("[Vector Search] Vector search not supported in Firefox - using text search only");
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (initializationAttempted) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
initializationAttempted = true;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await initializeModel();
|
await initializeModel();
|
||||||
vectorIndex = new EmbeddingIndex([]);
|
vectorIndex = new EmbeddingIndex([]);
|
||||||
vectorIndex.preloadIndexedDB();
|
vectorIndex.preloadIndexedDB();
|
||||||
console.debug("[Vector Search] Initialized successfully");
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.warn("[Vector Search] Failed to initialize vector search (will use text search only):", e);
|
console.error("Error initializing vector search", e);
|
||||||
initializationFailed = true;
|
|
||||||
vectorIndex = null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,111 +18,28 @@ export interface VectorSearchResult extends SearchResult {
|
|||||||
object: IndexItem & { embedding: number[] };
|
object: IndexItem & { embedding: number[] };
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cache for query embeddings to avoid recomputing
|
|
||||||
const embeddingCache = new Map<string, number[]>();
|
|
||||||
const EMBEDDING_CACHE_TTL = 1000 * 60 * 30; // 30 minutes
|
|
||||||
const MAX_EMBEDDING_CACHE_SIZE = 50;
|
|
||||||
|
|
||||||
function getCachedEmbedding(query: string): number[] | null {
|
|
||||||
const cached = embeddingCache.get(query);
|
|
||||||
if (cached) {
|
|
||||||
return cached;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setCachedEmbedding(query: string, embedding: number[]) {
|
|
||||||
// Limit cache size
|
|
||||||
if (embeddingCache.size >= MAX_EMBEDDING_CACHE_SIZE) {
|
|
||||||
const firstKey = embeddingCache.keys().next().value;
|
|
||||||
embeddingCache.delete(firstKey);
|
|
||||||
}
|
|
||||||
embeddingCache.set(query, embedding);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears the embedding cache
|
|
||||||
*/
|
|
||||||
export function clearEmbeddingCache(): void {
|
|
||||||
embeddingCache.clear();
|
|
||||||
console.debug("[Vector Search] Embedding cache cleared");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Listen for cache clear events (e.g., on extension update)
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
window.addEventListener('betterseqta-clear-embedding-cache', () => {
|
|
||||||
clearEmbeddingCache();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function searchVectors(
|
export async function searchVectors(
|
||||||
query: string,
|
query: string,
|
||||||
topK: number = 20,
|
topK: number = 20,
|
||||||
): Promise<VectorSearchResult[]> {
|
): Promise<VectorSearchResult[]> {
|
||||||
// Return empty array if vector search is not supported or failed to initialize
|
if (!vectorIndex) await initVectorSearch();
|
||||||
if (!isVectorSearchSupported() || initializationFailed) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!vectorIndex) {
|
const queryEmbedding = await getEmbedding(query.slice(0, 100));
|
||||||
await initVectorSearch();
|
|
||||||
if (!vectorIndex) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Normalize query for caching
|
|
||||||
const normalizedQuery = query.trim().toLowerCase().slice(0, 100);
|
|
||||||
|
|
||||||
// Check cache first
|
|
||||||
let queryEmbedding = getCachedEmbedding(normalizedQuery);
|
|
||||||
|
|
||||||
if (!queryEmbedding) {
|
|
||||||
try {
|
|
||||||
queryEmbedding = await getEmbedding(normalizedQuery);
|
|
||||||
setCachedEmbedding(normalizedQuery, queryEmbedding);
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Vector Search] Failed to get embedding:", e);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const results = await vectorIndex!.search(queryEmbedding, {
|
const results = await vectorIndex!.search(queryEmbedding, {
|
||||||
topK: Math.min(topK * 2, 30), // Get more results, filter later
|
topK,
|
||||||
useStorage: "indexedDB",
|
useStorage: "indexedDB",
|
||||||
dedupeEntries: true,
|
dedupeEntries: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Filter results with a similarity below 0.80 (slightly more permissive)
|
// filter results with a similarity below 0.81
|
||||||
// and sort by similarity descending
|
const filteredResults = results.filter((r) => r.similarity > 0.81);
|
||||||
const filteredResults = results
|
|
||||||
.filter((r) => r.similarity > 0.80)
|
|
||||||
.sort((a, b) => b.similarity - a.similarity)
|
|
||||||
.slice(0, topK);
|
|
||||||
|
|
||||||
return filteredResults as VectorSearchResult[];
|
return filteredResults as VectorSearchResult[];
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Vector Search] Search failed:", e);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function refreshVectorCache() {
|
export async function refreshVectorCache() {
|
||||||
if (!isVectorSearchSupported() || initializationFailed) {
|
if (!vectorIndex) await initVectorSearch();
|
||||||
return;
|
vectorIndex!.clearIndexedDBCache();
|
||||||
}
|
vectorIndex!.preloadIndexedDB();
|
||||||
|
|
||||||
if (!vectorIndex) {
|
|
||||||
await initVectorSearch();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vectorIndex) {
|
|
||||||
try {
|
|
||||||
vectorIndex.clearIndexedDBCache();
|
|
||||||
vectorIndex.preloadIndexedDB();
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Vector Search] Failed to refresh cache:", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
import browser from "webextension-polyfill";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Detects if the current browser is Firefox
|
|
||||||
*/
|
|
||||||
export function isFirefox(): boolean {
|
|
||||||
try {
|
|
||||||
// Firefox-specific API
|
|
||||||
if (typeof (browser.runtime as any).getBrowserInfo === "function") {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
// Fallback: check user agent
|
|
||||||
if (typeof navigator !== "undefined") {
|
|
||||||
return navigator.userAgent.toLowerCase().includes("firefox");
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
} catch {
|
|
||||||
// If we can't detect, assume not Firefox (safer for Chrome/Edge)
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if vector search is supported in the current browser
|
|
||||||
* Currently disabled for Firefox due to security restrictions
|
|
||||||
*/
|
|
||||||
export function isVectorSearchSupported(): boolean {
|
|
||||||
return !isFirefox();
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,115 +0,0 @@
|
|||||||
import browser from "webextension-polyfill";
|
|
||||||
|
|
||||||
const VERSION_STORAGE_KEY = "betterseqta-global-search-version";
|
|
||||||
const VERSION_CACHE_KEY = "betterseqta-global-search-cache-version";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the current extension version from the manifest
|
|
||||||
*/
|
|
||||||
export function getCurrentVersion(): string {
|
|
||||||
try {
|
|
||||||
return browser.runtime.getManifest().version;
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Version Check] Failed to get manifest version:", e);
|
|
||||||
return "0.0.0";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the last stored version from localStorage
|
|
||||||
*/
|
|
||||||
export function getStoredVersion(): string | null {
|
|
||||||
try {
|
|
||||||
return localStorage.getItem(VERSION_STORAGE_KEY);
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Version Check] Failed to get stored version:", e);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stores the current version in localStorage
|
|
||||||
*/
|
|
||||||
export function storeVersion(version: string): void {
|
|
||||||
try {
|
|
||||||
localStorage.setItem(VERSION_STORAGE_KEY, version);
|
|
||||||
localStorage.setItem(VERSION_CACHE_KEY, version);
|
|
||||||
} catch (e) {
|
|
||||||
console.warn("[Version Check] Failed to store version:", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the extension has been updated and clears caches if needed
|
|
||||||
* Returns true if an update was detected
|
|
||||||
*/
|
|
||||||
export async function checkAndHandleUpdate(): Promise<boolean> {
|
|
||||||
const currentVersion = getCurrentVersion();
|
|
||||||
const storedVersion = getStoredVersion();
|
|
||||||
|
|
||||||
// If no stored version, this is first run - store current version
|
|
||||||
if (!storedVersion) {
|
|
||||||
console.debug(`[Version Check] First run detected, storing version ${currentVersion}`);
|
|
||||||
storeVersion(currentVersion);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If versions match, no update
|
|
||||||
if (storedVersion === currentVersion) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Version mismatch detected - extension was updated
|
|
||||||
console.log(`[Version Check] Extension updated from ${storedVersion} to ${currentVersion}, clearing caches...`);
|
|
||||||
|
|
||||||
// Clear all caches
|
|
||||||
await clearAllCaches();
|
|
||||||
|
|
||||||
// Store new version
|
|
||||||
storeVersion(currentVersion);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears all search-related caches
|
|
||||||
*/
|
|
||||||
export async function clearAllCaches(): Promise<void> {
|
|
||||||
try {
|
|
||||||
// Clear search result cache (in-memory Map)
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
// Dispatch event to clear caches in other modules
|
|
||||||
window.dispatchEvent(new CustomEvent('betterseqta-clear-search-cache'));
|
|
||||||
window.dispatchEvent(new CustomEvent('betterseqta-clear-embedding-cache'));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Also try to directly clear caches if modules are already loaded
|
|
||||||
// Use setTimeout to avoid blocking and handle CSS preload errors
|
|
||||||
setTimeout(async () => {
|
|
||||||
try {
|
|
||||||
const { clearSearchCache } = await import("../search/searchUtils");
|
|
||||||
clearSearchCache();
|
|
||||||
} catch (e: any) {
|
|
||||||
// Module might not be loaded yet, or CSS preload error - that's okay
|
|
||||||
if (!e?.message?.includes("preload CSS") && !e?.message?.includes("MIME type")) {
|
|
||||||
console.debug("[Version Check] Could not clear search cache:", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { clearEmbeddingCache } = await import("../search/vector/vectorSearch");
|
|
||||||
clearEmbeddingCache();
|
|
||||||
} catch (e: any) {
|
|
||||||
// Module might not be loaded yet, or CSS preload error - that's okay
|
|
||||||
if (!e?.message?.includes("preload CSS") && !e?.message?.includes("MIME type")) {
|
|
||||||
console.debug("[Version Check] Could not clear embedding cache:", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, 50);
|
|
||||||
|
|
||||||
console.debug("[Version Check] All caches cleared");
|
|
||||||
} catch (e) {
|
|
||||||
console.error("[Version Check] Error clearing caches:", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { Plugin } from "@/plugins/core/types";
|
import type { Plugin } from "@/plugins/core/types";
|
||||||
import { componentSetting, defineSettings } from "@/plugins/core/settingsHelpers";
|
import { defineSettings, componentSetting } from "@/plugins/core/settingsHelpers";
|
||||||
import ProfilePictureSetting from "./ProfilePictureSetting.svelte";
|
import ProfilePictureSetting from "./ProfilePictureSetting.svelte";
|
||||||
import { waitForElm } from "@/seqta/utils/waitForElm";
|
import { waitForElm } from "@/seqta/utils/waitForElm";
|
||||||
import styles from "./styles.css?inline";
|
import styles from "./styles.css?inline";
|
||||||
|
|||||||
@@ -147,21 +147,14 @@ export class ThemeManager {
|
|||||||
public async initialize(): Promise<void> {
|
public async initialize(): Promise<void> {
|
||||||
console.debug("[ThemeManager] Starting initialization");
|
console.debug("[ThemeManager] Starting initialization");
|
||||||
try {
|
try {
|
||||||
const neumorphicThemeId = "9a9786d1-b5fc-4a91-8c7a-f8bf7f7679ad";
|
// Check if theme creator was open during reload
|
||||||
const migrationCSS = "#title {\nbackground: transparent !important;\n}";
|
|
||||||
|
|
||||||
const theme = (await localforage.getItem(neumorphicThemeId)) as CustomTheme | null;
|
|
||||||
if (theme && theme.CustomCSS && !theme.CustomCSS.includes("#title {\nbackground: transparent !important;\n}")) {
|
|
||||||
theme.CustomCSS = theme.CustomCSS + "\n" + migrationCSS;
|
|
||||||
await localforage.setItem(neumorphicThemeId, theme);
|
|
||||||
}
|
|
||||||
|
|
||||||
const themeCreatorOpen = localStorage.getItem("themeCreatorOpen");
|
const themeCreatorOpen = localStorage.getItem("themeCreatorOpen");
|
||||||
if (themeCreatorOpen === "true") {
|
if (themeCreatorOpen === "true") {
|
||||||
console.debug(
|
console.debug(
|
||||||
"[ThemeManager] Theme creator was open, clearing preview state",
|
"[ThemeManager] Theme creator was open, clearing preview state",
|
||||||
);
|
);
|
||||||
this.clearPreview();
|
this.clearPreview();
|
||||||
|
// Clean up the flag
|
||||||
localStorage.removeItem("themeCreatorOpen");
|
localStorage.removeItem("themeCreatorOpen");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,17 +47,7 @@ export function createLazyPlugin<T extends PluginSettings = PluginSettings, S =
|
|||||||
|
|
||||||
// Execute the actual plugin's run function
|
// Execute the actual plugin's run function
|
||||||
return await actualPlugin.run(api);
|
return await actualPlugin.run(api);
|
||||||
} catch (error: any) {
|
} catch (error) {
|
||||||
// Handle Firefox MIME type errors gracefully
|
|
||||||
if (error?.message?.includes("MIME type") || error?.message?.includes("NS_ERROR_CORRUPTED_CONTENT")) {
|
|
||||||
console.error(
|
|
||||||
`[BetterSEQTA+] Failed to load plugin "${lazyPlugin.id}" due to Firefox module loading restrictions. ` +
|
|
||||||
`This may be a build configuration issue. Error:`,
|
|
||||||
error
|
|
||||||
);
|
|
||||||
// Don't throw - allow the extension to continue functioning without this plugin
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.error(`[BetterSEQTA+] Failed to dynamically load plugin "${lazyPlugin.id}":`, error);
|
console.error(`[BetterSEQTA+] Failed to dynamically load plugin "${lazyPlugin.id}":`, error);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import type {
|
import type {
|
||||||
BooleanSetting,
|
BooleanSetting,
|
||||||
ButtonSetting,
|
|
||||||
ComponentSetting,
|
|
||||||
HotkeySetting,
|
|
||||||
NumberSetting,
|
NumberSetting,
|
||||||
Plugin,
|
Plugin,
|
||||||
PluginSettings,
|
PluginSettings,
|
||||||
SelectSetting,
|
SelectSetting,
|
||||||
StringSetting,
|
StringSetting,
|
||||||
|
ButtonSetting,
|
||||||
|
HotkeySetting,
|
||||||
|
ComponentSetting,
|
||||||
} from "./types";
|
} from "./types";
|
||||||
import { createPluginAPI } from "./createAPI";
|
import { createPluginAPI } from "./createAPI";
|
||||||
import browser from "webextension-polyfill";
|
import browser from "webextension-polyfill";
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import type {
|
import type {
|
||||||
BooleanSetting,
|
BooleanSetting,
|
||||||
ButtonSetting,
|
ButtonSetting,
|
||||||
ComponentSetting,
|
|
||||||
HotkeySetting,
|
|
||||||
NumberSetting,
|
NumberSetting,
|
||||||
PluginSettings,
|
|
||||||
SelectSetting,
|
SelectSetting,
|
||||||
StringSetting,
|
StringSetting,
|
||||||
|
HotkeySetting,
|
||||||
|
PluginSettings,
|
||||||
|
ComponentSetting,
|
||||||
} from "./types";
|
} from "./types";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ let cachedUserInfo: any = null;
|
|||||||
|
|
||||||
let LightDarkModeSnakeEggButton = 0;
|
let LightDarkModeSnakeEggButton = 0;
|
||||||
|
|
||||||
export async function getUserInfo() {
|
async function getUserInfo() {
|
||||||
if (cachedUserInfo) return cachedUserInfo;
|
if (cachedUserInfo) return cachedUserInfo;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -30,10 +30,11 @@ export async function getUserInfo() {
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
cachedUserInfo = (await response.json()).payload;
|
const responseData = await response.json();
|
||||||
|
cachedUserInfo = responseData.payload;
|
||||||
return cachedUserInfo;
|
return cachedUserInfo;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[BetterSEQTA+] Failed to get user info:", error);
|
console.error("Error fetching user info:", error);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -60,7 +61,7 @@ export async function AddBetterSEQTAElements() {
|
|||||||
handleStudentData(),
|
handleStudentData(),
|
||||||
]);
|
]);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[BetterSEQTA+] Failed to initialize UI elements:", error);
|
console.error("Error initializing UI elements:", error);
|
||||||
}
|
}
|
||||||
|
|
||||||
setupEventListeners();
|
setupEventListeners();
|
||||||
@@ -79,18 +80,20 @@ function createHomeButton(fragment: DocumentFragment, _: HTMLElement) {
|
|||||||
div.classList.add("titlebar");
|
div.classList.add("titlebar");
|
||||||
container.append(div);
|
container.append(div);
|
||||||
|
|
||||||
fragment.appendChild(
|
const NewButton = stringToHTML(
|
||||||
stringToHTML(
|
/* html */`<li class="item" data-key="home" id="homebutton" data-path="/home" data-betterseqta="true"><label><svg style="width:24px;height:24px" viewBox="0 0 24 24"><path fill="currentColor" d="M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z" /></svg><span>Home</span></label></li>`
|
||||||
/* html */ `<li class="item" data-key="home" id="homebutton" data-path="/home" data-betterseqta="true"><label><svg style="width:24px;height:24px" viewBox="0 0 24 24"><path fill="currentColor" d="M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z" /></svg><span>Home</span></label></li>`,
|
|
||||||
).firstChild!,
|
|
||||||
);
|
);
|
||||||
|
if (NewButton.firstChild) {
|
||||||
|
fragment.appendChild(NewButton.firstChild);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleUserInfo() {
|
async function handleUserInfo() {
|
||||||
try {
|
try {
|
||||||
updateUserInfo(await getUserInfo());
|
const info = await getUserInfo();
|
||||||
|
updateUserInfo(info);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[BetterSEQTA+] Failed to handle user info:", error);
|
console.error("Error fetching and processing student data:", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,17 +117,15 @@ function updateUserInfo(info: {
|
|||||||
}) {
|
}) {
|
||||||
const titlebar = document.getElementsByClassName("titlebar")[0];
|
const titlebar = document.getElementsByClassName("titlebar")[0];
|
||||||
|
|
||||||
titlebar.append(
|
const userInfo = stringToHTML(/* html */ `
|
||||||
stringToHTML(/* html */ `
|
|
||||||
<div class="userInfosvgdiv tooltip">
|
<div class="userInfosvgdiv tooltip">
|
||||||
<svg class="userInfosvg" viewBox="0 0 24 24"><path fill="var(--text-primary)" d="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"></path></svg>
|
<svg class="userInfosvg" viewBox="0 0 24 24"><path fill="var(--text-primary)" d="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"></path></svg>
|
||||||
<div class="tooltiptext topmenutooltip" id="logouttooltip"></div>
|
<div class="tooltiptext topmenutooltip" id="logouttooltip"></div>
|
||||||
</div>
|
</div>
|
||||||
`).firstChild!,
|
`).firstChild;
|
||||||
);
|
titlebar.append(userInfo!);
|
||||||
|
|
||||||
titlebar.append(
|
const userinfo = stringToHTML(/* html */ `
|
||||||
stringToHTML(/* html */ `
|
|
||||||
<div class="userInfo">
|
<div class="userInfo">
|
||||||
<div class="userInfoText">
|
<div class="userInfoText">
|
||||||
<div style="display: flex; align-items: center;">
|
<div style="display: flex; align-items: center;">
|
||||||
@@ -134,12 +135,12 @@ function updateUserInfo(info: {
|
|||||||
<p class="userInfoCode">${info.meta.code} // ${info.meta.governmentID}</p>
|
<p class="userInfoCode">${info.meta.code} // ${info.meta.governmentID}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
`).firstChild!,
|
`).firstChild;
|
||||||
);
|
titlebar.append(userinfo!);
|
||||||
|
|
||||||
document
|
var logoutbutton = document.getElementsByClassName("logout")[0];
|
||||||
.getElementById("logouttooltip")!
|
var userInfosvgdiv = document.getElementById("logouttooltip")!;
|
||||||
.appendChild(document.getElementsByClassName("logout")[0]);
|
userInfosvgdiv.appendChild(logoutbutton);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleStudentData() {
|
async function handleStudentData() {
|
||||||
@@ -155,40 +156,48 @@ async function handleStudentData() {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
await updateStudentInfo((await response.json()).payload);
|
const responseData = await response.json();
|
||||||
|
let students = responseData.payload;
|
||||||
|
await updateStudentInfo(students);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[BetterSEQTA+] Failed to handle student data:", error);
|
console.error("Error fetching and processing student data:", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function updateStudentInfo(students: any) {
|
async function updateStudentInfo(students: any) {
|
||||||
const info = await getUserInfo();
|
const info = await getUserInfo();
|
||||||
const index = students.findIndex(
|
var index = students.findIndex(function (person: any) {
|
||||||
(person: any) =>
|
return (
|
||||||
person.firstname == info.userDesc.split(" ")[0] &&
|
person.firstname == info.userDesc.split(" ")[0] &&
|
||||||
person.surname == info.userDesc.split(" ")[1],
|
person.surname == info.userDesc.split(" ")[1]
|
||||||
);
|
);
|
||||||
|
});
|
||||||
|
|
||||||
const houseelement = document.getElementsByClassName(
|
const houseelement = document.getElementsByClassName("userInfohouse")[0] as HTMLElement;
|
||||||
"userInfohouse",
|
|
||||||
)[0] as HTMLElement;
|
// Fallback to N/A
|
||||||
|
let text = 'N/A';
|
||||||
const student = students[index] ?? {};
|
const student = students[index] ?? {};
|
||||||
let text = "N/A";
|
|
||||||
|
|
||||||
|
// If student has a house, prefer to show year + house. If no year, only show house.
|
||||||
if (student.house) {
|
if (student.house) {
|
||||||
text = `${student.year ?? ""}${student.house}`;
|
text = `${student.year ?? ""}${student.house}`;
|
||||||
|
|
||||||
|
// If house_colour exists, compute colour
|
||||||
if (student.house_colour) {
|
if (student.house_colour) {
|
||||||
houseelement.style.background = student.house_colour;
|
houseelement.style.background = student.house_colour;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const colorresult = GetThresholdOfColor(student.house_colour);
|
const colorresult = GetThresholdOfColor(student.house_colour);
|
||||||
houseelement.style.color =
|
houseelement.style.color =
|
||||||
colorresult && colorresult > 300 ? "black" : "white";
|
colorresult && colorresult > 300 ? "black" : "white";
|
||||||
} catch {
|
|
||||||
// Invalid color format, leave text color as default
|
} catch (err) {
|
||||||
|
// Colour calculation failed, no text colour set
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (student.year) {
|
} else if (student.year) {
|
||||||
|
// No house, only year will be shown
|
||||||
text = student.year;
|
text = student.year;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,13 +205,15 @@ async function updateStudentInfo(students: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createNewsButton(fragment: DocumentFragment, menu: HTMLElement) {
|
function createNewsButton(fragment: DocumentFragment, menu: HTMLElement) {
|
||||||
fragment.appendChild(
|
const NewsButtonStr =
|
||||||
stringToHTML(
|
'<li class="item" data-key="news" id="newsbutton" data-path="/news" data-betterseqta="true"><label><svg style="width:24px;height:24px" viewBox="0 0 24 24"><path fill="currentColor" d="M20 3H4C2.89 3 2 3.89 2 5V19C2 20.11 2.89 21 4 21H20C21.11 21 22 20.11 22 19V5C22 3.89 21.11 3 20 3M5 7H10V13H5V7M19 17H5V15H19V17M19 13H12V11H19V13M19 9H12V7H19V9Z" /></svg><span>News</span></label></li>';
|
||||||
'<li class="item" data-key="news" id="newsbutton" data-path="/news" data-betterseqta="true"><label><svg style="width:24px;height:24px" viewBox="0 0 24 24"><path fill="currentColor" d="M20 3H4C2.89 3 2 3.89 2 5V19C2 20.11 2.89 21 4 21H20C21.11 21 22 20.11 22 19V5C22 3.89 21.11 3 20 3M5 7H10V13H5V7M19 17H5V15H19V17M19 13H12V11H19V13M19 9H12V7H19V9Z" /></svg><span>News</span></label></li>',
|
const NewsButton = stringToHTML(NewsButtonStr);
|
||||||
).firstChild!,
|
|
||||||
);
|
|
||||||
|
|
||||||
const iconCover = document.createElement("div");
|
if (NewsButton.firstChild) {
|
||||||
|
fragment.appendChild(NewsButton.firstChild);
|
||||||
|
}
|
||||||
|
|
||||||
|
let iconCover = document.createElement("div");
|
||||||
iconCover.classList.add("icon-cover");
|
iconCover.classList.add("icon-cover");
|
||||||
iconCover.id = "icon-cover";
|
iconCover.id = "icon-cover";
|
||||||
menu.appendChild(iconCover);
|
menu.appendChild(iconCover);
|
||||||
@@ -241,42 +252,46 @@ function setupEventListeners() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function createSettingsButton() {
|
async function createSettingsButton() {
|
||||||
document.getElementById("content")!.append(
|
let SettingsButton = stringToHTML(/* html */ `
|
||||||
stringToHTML(/* html */ `
|
|
||||||
<button class="addedButton tooltip" id="AddedSettings">
|
<button class="addedButton tooltip" id="AddedSettings">
|
||||||
<svg width="24" height="24" viewBox="0 0 24 24">
|
<svg width="24" height="24" viewBox="0 0 24 24">
|
||||||
<g><g><path d="M23.182,6.923c-.29,0-3.662,2.122-4.142,2.4l-2.8-1.555V4.511l4.257-2.456a.518.518,0,0,0,.233-.408.479.479,0,0,0-.233-.407,6.511,6.511,0,1,0-3.327,12.107,6.582,6.582,0,0,0,6.148-4.374,5.228,5.228,0,0,0,.333-1.542A.461.461,0,0,0,23.182,6.923Z"></path><path d="M9.73,10.418,7.376,12.883c-.01.01-.021.016-.03.025L1.158,19.1a2.682,2.682,0,1,0,3.793,3.793l4.583-4.582,0,0,4.1-4.005-.037-.037A9.094,9.094,0,0,1,9.73,10.418ZM3.053,21.888A.894.894,0,1,1,3.946,21,.893.893,0,0,1,3.053,21.888Z"></path></g></g>
|
<g><g><path d="M23.182,6.923c-.29,0-3.662,2.122-4.142,2.4l-2.8-1.555V4.511l4.257-2.456a.518.518,0,0,0,.233-.408.479.479,0,0,0-.233-.407,6.511,6.511,0,1,0-3.327,12.107,6.582,6.582,0,0,0,6.148-4.374,5.228,5.228,0,0,0,.333-1.542A.461.461,0,0,0,23.182,6.923Z"></path><path d="M9.73,10.418,7.376,12.883c-.01.01-.021.016-.03.025L1.158,19.1a2.682,2.682,0,1,0,3.793,3.793l4.583-4.582,0,0,4.1-4.005-.037-.037A9.094,9.094,0,0,1,9.73,10.418ZM3.053,21.888A.894.894,0,1,1,3.946,21,.893.893,0,0,1,3.053,21.888Z"></path></g></g>
|
||||||
</svg>
|
</svg>
|
||||||
${settingsState.onoff ? '<div class="tooltiptext topmenutooltip">BetterSEQTA+ Settings</div>' : ""}
|
${settingsState.onoff ? '<div class="tooltiptext topmenutooltip">BetterSEQTA+ Settings</div>' : ""}
|
||||||
</button>
|
</button>
|
||||||
`).firstChild!,
|
`);
|
||||||
);
|
let ContentDiv = document.getElementById("content");
|
||||||
|
ContentDiv!.append(SettingsButton.firstChild!);
|
||||||
}
|
}
|
||||||
|
|
||||||
function GetLightDarkModeString() {
|
function GetLightDarkModeString() {
|
||||||
return settingsState.DarkMode
|
if (settingsState.DarkMode) {
|
||||||
? "Switch to light theme"
|
return "Switch to light theme";
|
||||||
: "Switch to dark theme";
|
} else {
|
||||||
|
return "Switch to dark theme";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function addDarkLightToggle() {
|
async function addDarkLightToggle() {
|
||||||
|
const tooltipString = GetLightDarkModeString();
|
||||||
const SUN_ICON_SVG = /* html */ `<defs><clipPath id="__lottie_element_80"><rect width="24" height="24" x="0" y="0"></rect></clipPath></defs><g clip-path="url(#__lottie_element_80)"><g style="display: block;" transform="matrix(1,0,0,1,12,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,-4 C-2.2100000381469727,-4 -4,-2.2100000381469727 -4,0 C-4,2.2100000381469727 -2.2100000381469727,4 0,4 C2.2100000381469727,4 4,2.2100000381469727 4,0 C4,-2.2100000381469727 2.2100000381469727,-4 0,-4z"></path></g></g><g style="display: block;" transform="matrix(1,0,0,1,12,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,6 C-3.309999942779541,6 -6,3.309999942779541 -6,0 C-6,-3.309999942779541 -3.309999942779541,-6 0,-6 C3.309999942779541,-6 6,-3.309999942779541 6,0 C6,3.309999942779541 3.309999942779541,6 0,6z M8,-3.309999942779541 C8,-3.309999942779541 8,-8 8,-8 C8,-8 3.309999942779541,-8 3.309999942779541,-8 C3.309999942779541,-8 0,-11.3100004196167 0,-11.3100004196167 C0,-11.3100004196167 -3.309999942779541,-8 -3.309999942779541,-8 C-3.309999942779541,-8 -8,-8 -8,-8 C-8,-8 -8,-3.309999942779541 -8,-3.309999942779541 C-8,-3.309999942779541 -11.3100004196167,0 -11.3100004196167,0 C-11.3100004196167,0 -8,3.309999942779541 -8,3.309999942779541 C-8,3.309999942779541 -8,8 -8,8 C-8,8 -3.309999942779541,8 -3.309999942779541,8 C-3.309999942779541,8 0,11.3100004196167 0,11.3100004196167 C0,11.3100004196167 3.309999942779541,8 3.309999942779541,8 C3.309999942779541,8 8,8 8,8 C8,8 8,3.309999942779541 8,3.309999942779541 C8,3.309999942779541 11.3100004196167,0 11.3100004196167,0 C11.3100004196167,0 8,-3.309999942779541 8,-3.309999942779541z"></path></g></g></g>`;
|
const SUN_ICON_SVG = /* html */ `<defs><clipPath id="__lottie_element_80"><rect width="24" height="24" x="0" y="0"></rect></clipPath></defs><g clip-path="url(#__lottie_element_80)"><g style="display: block;" transform="matrix(1,0,0,1,12,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,-4 C-2.2100000381469727,-4 -4,-2.2100000381469727 -4,0 C-4,2.2100000381469727 -2.2100000381469727,4 0,4 C2.2100000381469727,4 4,2.2100000381469727 4,0 C4,-2.2100000381469727 2.2100000381469727,-4 0,-4z"></path></g></g><g style="display: block;" transform="matrix(1,0,0,1,12,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,6 C-3.309999942779541,6 -6,3.309999942779541 -6,0 C-6,-3.309999942779541 -3.309999942779541,-6 0,-6 C3.309999942779541,-6 6,-3.309999942779541 6,0 C6,3.309999942779541 3.309999942779541,6 0,6z M8,-3.309999942779541 C8,-3.309999942779541 8,-8 8,-8 C8,-8 3.309999942779541,-8 3.309999942779541,-8 C3.309999942779541,-8 0,-11.3100004196167 0,-11.3100004196167 C0,-11.3100004196167 -3.309999942779541,-8 -3.309999942779541,-8 C-3.309999942779541,-8 -8,-8 -8,-8 C-8,-8 -8,-3.309999942779541 -8,-3.309999942779541 C-8,-3.309999942779541 -11.3100004196167,0 -11.3100004196167,0 C-11.3100004196167,0 -8,3.309999942779541 -8,3.309999942779541 C-8,3.309999942779541 -8,8 -8,8 C-8,8 -3.309999942779541,8 -3.309999942779541,8 C-3.309999942779541,8 0,11.3100004196167 0,11.3100004196167 C0,11.3100004196167 3.309999942779541,8 3.309999942779541,8 C3.309999942779541,8 8,8 8,8 C8,8 8,3.309999942779541 8,3.309999942779541 C8,3.309999942779541 11.3100004196167,0 11.3100004196167,0 C11.3100004196167,0 8,-3.309999942779541 8,-3.309999942779541z"></path></g></g></g>`;
|
||||||
const MOON_ICON_SVG = /* html */ `<defs><clipPath id="__lottie_element_263"><rect width="24" height="24" x="0" y="0"></rect></clipPath></defs><g clip-path="url(#__lottie_element_263)"><g style="display: block;" transform="matrix(1.5,0,0,1.5,7,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,-4 C-2.2100000381469727,-4 -1.2920000553131104,-2.2100000381469727 -1.2920000553131104,0 C-1.2920000553131104,2.2100000381469727 -2.2100000381469727,4 0,4 C2.2100000381469727,4 4,2.2100000381469727 4,0 C4,-2.2100000381469727 2.2100000381469727,-4 0,-4z"></path></g></g><g style="display: block;" transform="matrix(-1,0,0,-1,12,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,6 C-3.309999942779541,6 -6,3.309999942779541 -6,0 C-6,-3.309999942779541 -3.309999942779541,-6 0,-6 C3.309999942779541,-6 6,-3.309999942779541 6,0 C6,3.309999942779541 3.309999942779541,6 0,6z M8,-3.309999942779541 C8,-3.309999942779541 8,-8 8,-8 C8,-8 3.309999942779541,-8 3.309999942779541,-8 C3.309999942779541,-8 0,-11.3100004196167 0,-11.3100004196167 C0,-11.3100004196167 -3.309999942779541,-8 -3.309999942779541,-8 C-3.309999942779541,-8 -8,-8 -8,-8 C-8,-8 -8,-3.309999942779541 -8,-3.309999942779541 C-8,-3.309999942779541 -11.3100004196167,0 -11.3100004196167,0 C-11.3100004196167,0 -8,3.309999942779541 -8,3.309999942779541 C-8,3.309999942779541 -8,8 -8,8 C-8,8 -3.309999942779541,8 -3.309999942779541,8 C-3.309999942779541,8 0,11.3100004196167 0,11.3100004196167 C0,11.3100004196167 3.309999942779541,8 3.309999942779541,8 C3.309999942779541,8 8,8 8,8 C8,8 8,3.309999942779541 8,3.309999942779541 C8,3.309999942779541 11.3100004196167,0 11.3100004196167,0 C11.3100004196167,0 8,-3.309999942779541 8,-3.309999942779541z"></path></g></g></g>`;
|
const MOON_ICON_SVG = /* html */ `<defs><clipPath id="__lottie_element_263"><rect width="24" height="24" x="0" y="0"></rect></clipPath></defs><g clip-path="url(#__lottie_element_263)"><g style="display: block;" transform="matrix(1.5,0,0,1.5,7,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,-4 C-2.2100000381469727,-4 -1.2920000553131104,-2.2100000381469727 -1.2920000553131104,0 C-1.2920000553131104,2.2100000381469727 -2.2100000381469727,4 0,4 C2.2100000381469727,4 4,2.2100000381469727 4,0 C4,-2.2100000381469727 2.2100000381469727,-4 0,-4z"></path></g></g><g style="display: block;" transform="matrix(-1,0,0,-1,12,12)" opacity="1"><g opacity="1" transform="matrix(1,0,0,1,0,0)"><path fill-opacity="1" d=" M0,6 C-3.309999942779541,6 -6,3.309999942779541 -6,0 C-6,-3.309999942779541 -3.309999942779541,-6 0,-6 C3.309999942779541,-6 6,-3.309999942779541 6,0 C6,3.309999942779541 3.309999942779541,6 0,6z M8,-3.309999942779541 C8,-3.309999942779541 8,-8 8,-8 C8,-8 3.309999942779541,-8 3.309999942779541,-8 C3.309999942779541,-8 0,-11.3100004196167 0,-11.3100004196167 C0,-11.3100004196167 -3.309999942779541,-8 -3.309999942779541,-8 C-3.309999942779541,-8 -8,-8 -8,-8 C-8,-8 -8,-3.309999942779541 -8,-3.309999942779541 C-8,-3.309999942779541 -11.3100004196167,0 -11.3100004196167,0 C-11.3100004196167,0 -8,3.309999942779541 -8,3.309999942779541 C-8,3.309999942779541 -8,8 -8,8 C-8,8 -3.309999942779541,8 -3.309999942779541,8 C-3.309999942779541,8 0,11.3100004196167 0,11.3100004196167 C0,11.3100004196167 3.309999942779541,8 3.309999942779541,8 C3.309999942779541,8 8,8 8,8 C8,8 8,3.309999942779541 8,3.309999942779541 C8,3.309999942779541 11.3100004196167,0 11.3100004196167,0 C11.3100004196167,0 8,-3.309999942779541 8,-3.309999942779541z"></path></g></g></g>`;
|
||||||
|
|
||||||
document.getElementById("content")!.append(
|
const initialSvgContent = settingsState.DarkMode ? SUN_ICON_SVG : MOON_ICON_SVG;
|
||||||
stringToHTML(/* html */ `
|
|
||||||
|
const LightDarkModeButton = stringToHTML(/* html */ `
|
||||||
<button class="addedButton DarkLightButton tooltip" id="LightDarkModeButton">
|
<button class="addedButton DarkLightButton tooltip" id="LightDarkModeButton">
|
||||||
<svg xmlns="http://www.w3.org/2000/svg">${settingsState.DarkMode ? SUN_ICON_SVG : MOON_ICON_SVG}</svg>
|
<svg xmlns="http://www.w3.org/2000/svg">${initialSvgContent}</svg>
|
||||||
<div class="tooltiptext topmenutooltip" id="darklighttooliptext">${GetLightDarkModeString()}</div>
|
<div class="tooltiptext topmenutooltip" id="darklighttooliptext">${tooltipString}</div>
|
||||||
</button>
|
</button>
|
||||||
`).firstChild!,
|
`);
|
||||||
);
|
|
||||||
|
let ContentDiv = document.getElementById("content");
|
||||||
|
ContentDiv!.append(LightDarkModeButton.firstChild!);
|
||||||
|
|
||||||
updateAllColors();
|
updateAllColors();
|
||||||
|
|
||||||
const lightDarkModeButtonElement = document.getElementById(
|
const lightDarkModeButtonElement = document.getElementById("LightDarkModeButton")!;
|
||||||
"LightDarkModeButton",
|
|
||||||
)!;
|
|
||||||
|
|
||||||
lightDarkModeButtonElement.addEventListener("click", async () => {
|
lightDarkModeButtonElement.addEventListener("click", async () => {
|
||||||
const darklightText = document.getElementById("darklighttooliptext");
|
const darklightText = document.getElementById("darklighttooliptext");
|
||||||
@@ -288,6 +303,7 @@ async function addDarkLightToggle() {
|
|||||||
LightDarkModeSnakeEggButton = 0;
|
LightDarkModeSnakeEggButton = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
settingsState.originalDarkMode !== undefined &&
|
settingsState.originalDarkMode !== undefined &&
|
||||||
settingsState.selectedTheme
|
settingsState.selectedTheme
|
||||||
@@ -298,24 +314,38 @@ async function addDarkLightToggle() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!document.startViewTransition || !settingsState.animations || window.matchMedia("(prefers-reduced-motion: reduce)").matches) {
|
||||||
settingsState.DarkMode = !settingsState.DarkMode;
|
settingsState.DarkMode = !settingsState.DarkMode;
|
||||||
updateAllColors();
|
updateAllColors();
|
||||||
|
|
||||||
const svgElement = lightDarkModeButtonElement.querySelector("svg")!;
|
const newSvgContent = settingsState.DarkMode ? SUN_ICON_SVG : MOON_ICON_SVG;
|
||||||
svgElement.innerHTML = settingsState.DarkMode
|
const svgElement = lightDarkModeButtonElement.querySelector("svg");
|
||||||
? SUN_ICON_SVG
|
if (svgElement) svgElement.innerHTML = newSvgContent;
|
||||||
: MOON_ICON_SVG;
|
darklightText!.innerText = GetLightDarkModeString();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
settingsState.DarkMode = !settingsState.DarkMode;
|
||||||
|
|
||||||
|
updateAllColors();
|
||||||
|
|
||||||
|
const newSvgContent = settingsState.DarkMode ? SUN_ICON_SVG : MOON_ICON_SVG;
|
||||||
|
const svgElement = lightDarkModeButtonElement.querySelector("svg");
|
||||||
|
if (svgElement) svgElement.innerHTML = newSvgContent;
|
||||||
|
|
||||||
darklightText!.innerText = GetLightDarkModeString();
|
darklightText!.innerText = GetLightDarkModeString();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function customizeMenuToggle() {
|
function customizeMenuToggle() {
|
||||||
const menuToggle = document.getElementById("menuToggle")!;
|
const menuToggle = document.getElementById("menuToggle");
|
||||||
|
if (menuToggle) {
|
||||||
menuToggle.innerHTML = "";
|
menuToggle.innerHTML = "";
|
||||||
|
}
|
||||||
|
|
||||||
for (let i = 0; i < 3; i++) {
|
for (let i = 0; i < 3; i++) {
|
||||||
const line = document.createElement("div");
|
const line = document.createElement("div");
|
||||||
line.className = "hamburger-line";
|
line.className = "hamburger-line";
|
||||||
menuToggle.appendChild(line);
|
menuToggle!.appendChild(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,17 +30,20 @@ export async function loadHomePage() {
|
|||||||
element?.classList.add("active");
|
element?.classList.add("active");
|
||||||
|
|
||||||
const main = document.getElementById("main");
|
const main = document.getElementById("main");
|
||||||
if (!main) return;
|
if (!main) {
|
||||||
|
console.error("[BetterSEQTA+] Main element not found.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const homeRoot = stringToHTML(`<div id="home-root" class="home-root"></div>`);
|
||||||
|
|
||||||
main.innerHTML = "";
|
main.innerHTML = "";
|
||||||
main.appendChild(
|
main.appendChild(homeRoot?.firstChild!);
|
||||||
stringToHTML(`<div id="home-root" class="home-root"></div>`).firstChild!,
|
|
||||||
);
|
|
||||||
|
|
||||||
const homeContainer = document.getElementById("home-root");
|
const homeContainer = document.getElementById("home-root");
|
||||||
if (!homeContainer) return;
|
if (!homeContainer) return;
|
||||||
|
|
||||||
const skeletonStructure = stringToHTML(/* html */ `
|
const skeletonStructure = stringToHTML(/* html */`
|
||||||
<div class="home-container" id="home-container">
|
<div class="home-container" id="home-container">
|
||||||
<div class="border shortcut-container">
|
<div class="border shortcut-container">
|
||||||
<div class="border shortcuts" id="shortcuts"></div>
|
<div class="border shortcuts" id="shortcuts"></div>
|
||||||
@@ -98,19 +101,90 @@ export async function loadHomePage() {
|
|||||||
|
|
||||||
renderShortcuts();
|
renderShortcuts();
|
||||||
|
|
||||||
const TodayFormatted = formatDate(new Date());
|
const date = new Date();
|
||||||
|
const TodayFormatted = formatDate(date);
|
||||||
|
|
||||||
|
const [timetablePromise, assessmentsPromise, classesPromise, prefsPromise] = [
|
||||||
|
fetch(`${location.origin}/seqta/student/load/timetable?`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({
|
||||||
|
from: TodayFormatted,
|
||||||
|
until: TodayFormatted,
|
||||||
|
student: 69,
|
||||||
|
}),
|
||||||
|
}).then((res) => res.json()),
|
||||||
|
|
||||||
const [assessments, classes, prefs] = await Promise.all([
|
|
||||||
GetUpcomingAssessments(),
|
GetUpcomingAssessments(),
|
||||||
|
|
||||||
GetActiveClasses(),
|
GetActiveClasses(),
|
||||||
|
|
||||||
fetch(`${location.origin}/seqta/student/load/prefs?`, {
|
fetch(`${location.origin}/seqta/student/load/prefs?`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({ asArray: true, request: "userPrefs" }),
|
body: JSON.stringify({ asArray: true, request: "userPrefs" }),
|
||||||
}).then((res) => res.json()),
|
}).then((res) => res.json()),
|
||||||
|
];
|
||||||
|
|
||||||
|
const [timetableData, assessments, classes, prefs] = await Promise.all([
|
||||||
|
timetablePromise,
|
||||||
|
assessmentsPromise,
|
||||||
|
classesPromise,
|
||||||
|
prefsPromise,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
callHomeTimetable(TodayFormatted, true);
|
const dayContainer = document.getElementById("day-container");
|
||||||
|
if (dayContainer && timetableData.payload.items.length > 0) {
|
||||||
|
const lessonArray = timetableData.payload.items.sort((a: any, b: any) =>
|
||||||
|
a.from.localeCompare(b.from),
|
||||||
|
);
|
||||||
|
const colours = await GetLessonColours();
|
||||||
|
|
||||||
|
dayContainer.innerHTML = "";
|
||||||
|
for (let i = 0; i < lessonArray.length; i++) {
|
||||||
|
const lesson = lessonArray[i];
|
||||||
|
const subjectname = `timetable.subject.colour.${lesson.code}`;
|
||||||
|
const subject = colours.find(
|
||||||
|
(element: any) => element.name === subjectname,
|
||||||
|
);
|
||||||
|
|
||||||
|
lesson.colour = subject
|
||||||
|
? `--item-colour: ${subject.value};`
|
||||||
|
: "--item-colour: #8e8e8e;";
|
||||||
|
lesson.from = lesson.from.substring(0, 5);
|
||||||
|
lesson.until = lesson.until.substring(0, 5);
|
||||||
|
|
||||||
|
if (settingsState.timeFormat === "12") {
|
||||||
|
lesson.from = convertTo12HourFormat(lesson.from);
|
||||||
|
lesson.until = convertTo12HourFormat(lesson.until);
|
||||||
|
}
|
||||||
|
|
||||||
|
lesson.attendanceTitle = CheckUnmarkedAttendance(lesson.attendance);
|
||||||
|
|
||||||
|
const div = makeLessonDiv(lesson, i + 1);
|
||||||
|
if (GetThresholdOfColor(subject?.value) > 300) {
|
||||||
|
const firstChild = div.firstChild as HTMLElement;
|
||||||
|
if (firstChild) {
|
||||||
|
firstChild.classList.add("day-inverted");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dayContainer.appendChild(div.firstChild!);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentSelectedDate.getDate() === date.getDate()) {
|
||||||
|
for (let i = 0; i < lessonArray.length; i++) {
|
||||||
|
CheckCurrentLesson(lessonArray[i], i + 1);
|
||||||
|
}
|
||||||
|
CheckCurrentLessonAll(lessonArray);
|
||||||
|
}
|
||||||
|
} else if (dayContainer) {
|
||||||
|
dayContainer.innerHTML = `
|
||||||
|
<div class="day-empty">
|
||||||
|
<img src="${browser.runtime.getURL(LogoLight)}" />
|
||||||
|
<p>No lessons available.</p>
|
||||||
|
</div>`;
|
||||||
|
}
|
||||||
|
dayContainer?.classList.remove("loading");
|
||||||
|
|
||||||
const activeClass = classes.find((c: any) => c.hasOwnProperty("active"));
|
const activeClass = classes.find((c: any) => c.hasOwnProperty("active"));
|
||||||
const activeSubjects = activeClass?.subjects || [];
|
const activeSubjects = activeClass?.subjects || [];
|
||||||
@@ -147,20 +221,20 @@ export async function loadHomePage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function GetUpcomingAssessments() {
|
async function GetUpcomingAssessments() {
|
||||||
try {
|
let func = fetch(
|
||||||
return fetch(`${location.origin}/seqta/student/assessment/list/upcoming?`, {
|
`${location.origin}/seqta/student/assessment/list/upcoming?`,
|
||||||
|
{
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json; charset=utf-8",
|
"Content-Type": "application/json; charset=utf-8",
|
||||||
},
|
},
|
||||||
body: JSON.stringify({ student: 69 }),
|
body: JSON.stringify({ student: 69 }),
|
||||||
})
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
return func
|
||||||
.then((result) => result.json())
|
.then((result) => result.json())
|
||||||
.then((response) => response.payload);
|
.then((response) => response.payload);
|
||||||
} catch (error) {
|
|
||||||
console.error("[BetterSEQTA+] Failed to get upcoming assessments:", error);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function setupTimetableListeners() {
|
function setupTimetableListeners() {
|
||||||
@@ -218,10 +292,15 @@ async function GetActiveClasses() {
|
|||||||
body: JSON.stringify({}),
|
body: JSON.stringify({}),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
return (await response.json()).payload;
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`HTTP error! Status: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
return data.payload;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[BetterSEQTA+] Failed to get active classes:", error);
|
console.error("Oops! There was a problem fetching active classes:", error);
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,25 +310,28 @@ function setupNotices(labelArray: string[], date: string) {
|
|||||||
) as HTMLInputElement;
|
) as HTMLInputElement;
|
||||||
|
|
||||||
const fetchNotices = async (date: string) => {
|
const fetchNotices = async (date: string) => {
|
||||||
try {
|
let data;
|
||||||
const data = settingsState.mockNotices
|
|
||||||
? getMockNotices()
|
if (settingsState.mockNotices) {
|
||||||
: await (
|
data = getMockNotices();
|
||||||
await fetch(`${location.origin}/seqta/student/load/notices?`, {
|
} else {
|
||||||
|
const response = await fetch(
|
||||||
|
`${location.origin}/seqta/student/load/notices?`,
|
||||||
|
{
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json; charset=utf-8" },
|
headers: { "Content-Type": "application/json; charset=utf-8" },
|
||||||
body: JSON.stringify({ date }),
|
body: JSON.stringify({ date }),
|
||||||
})
|
},
|
||||||
).json();
|
);
|
||||||
|
data = await response.json();
|
||||||
|
}
|
||||||
|
|
||||||
processNotices(data, labelArray);
|
processNotices(data, labelArray);
|
||||||
} catch (error) {
|
|
||||||
console.error("[BetterSEQTA+] Failed to fetch notices:", error);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const debouncedInputChange = debounce((e: Event) => {
|
const debouncedInputChange = debounce((e: Event) => {
|
||||||
fetchNotices((e.target as HTMLInputElement).value);
|
const target = e.target as HTMLInputElement;
|
||||||
|
fetchNotices(target.value);
|
||||||
}, 250);
|
}, 250);
|
||||||
|
|
||||||
dateControl?.addEventListener("input", debouncedInputChange);
|
dateControl?.addEventListener("input", debouncedInputChange);
|
||||||
@@ -270,8 +352,16 @@ function debounce<T extends (...args: any[]) => any>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function comparedate(obj1: any, obj2: any) {
|
function comparedate(obj1: any, obj2: any) {
|
||||||
return obj1.date < obj2.date ? -1 : obj1.date > obj2.date ? 1 : 0;
|
if (obj1.date < obj2.date) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (obj1.date > obj2.date) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function processNotices(response: any, labelArray: string[]) {
|
function processNotices(response: any, labelArray: string[]) {
|
||||||
const NoticeContainer = document.getElementById("notice-container");
|
const NoticeContainer = document.getElementById("notice-container");
|
||||||
if (!NoticeContainer) return;
|
if (!NoticeContainer) return;
|
||||||
@@ -315,13 +405,13 @@ function processNoticeColor(colour: string): string | undefined {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createNoticeElement(notice: any, colour: string | undefined): Node {
|
function createNoticeElement(notice: any, colour: string | undefined): Node {
|
||||||
const textPreview =
|
const textPreview = notice.contents
|
||||||
notice.contents
|
|
||||||
.replace(/<[^>]*>/g, "")
|
.replace(/<[^>]*>/g, "")
|
||||||
.replace(/\[\[[\w]+[:][\w]+[\]\]]+/g, "")
|
.replace(/\[\[[\w]+[:][\w]+[\]\]]+/g, "")
|
||||||
.replace(/\s+/g, " ")
|
.replace(/\s+/g, " ")
|
||||||
.trim()
|
.trim()
|
||||||
.substring(0, 150) + (notice.contents.length > 150 ? "..." : "");
|
.substring(0, 150)
|
||||||
|
+ (notice.contents.length > 150 ? "..." : "");
|
||||||
|
|
||||||
const noticeId = `notice-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
|
const noticeId = `notice-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
|
||||||
|
|
||||||
@@ -341,10 +431,12 @@ function createNoticeElement(notice: any, colour: string | undefined): Node {
|
|||||||
</div>`;
|
</div>`;
|
||||||
|
|
||||||
const element = stringToHTML(htmlContent).firstChild as HTMLElement;
|
const element = stringToHTML(htmlContent).firstChild as HTMLElement;
|
||||||
|
if (element) {
|
||||||
element.addEventListener("click", () =>
|
element.addEventListener("click", () =>
|
||||||
openNoticeModal(notice, colour, element),
|
openNoticeModal(notice, colour, element),
|
||||||
);
|
);
|
||||||
return element;
|
}
|
||||||
|
return element!;
|
||||||
}
|
}
|
||||||
|
|
||||||
function openNoticeModal(
|
function openNoticeModal(
|
||||||
@@ -356,11 +448,15 @@ function openNoticeModal(
|
|||||||
.replace(/\[\[[\w]+[:][\w]+[\]\]]+/g, "")
|
.replace(/\[\[[\w]+[:][\w]+[\]\]]+/g, "")
|
||||||
.replace(/ +/, " ");
|
.replace(/ +/, " ");
|
||||||
|
|
||||||
document.getElementById("notice-modal")?.remove();
|
const existingModal = document.getElementById("notice-modal");
|
||||||
|
if (existingModal) {
|
||||||
|
existingModal.remove();
|
||||||
|
}
|
||||||
|
|
||||||
const sourceRect = sourceElement.getBoundingClientRect();
|
const sourceRect = sourceElement.getBoundingClientRect();
|
||||||
let scrollY = Math.round(window.scrollY);
|
let scrollY = Math.round(window.scrollY);
|
||||||
let scrollX = Math.round(window.scrollX);
|
let scrollX = Math.round(window.scrollX);
|
||||||
|
|
||||||
let sourceLeft = sourceRect.left;
|
let sourceLeft = sourceRect.left;
|
||||||
let sourceTop = sourceRect.top;
|
let sourceTop = sourceRect.top;
|
||||||
let sourceWidth = sourceRect.width;
|
let sourceWidth = sourceRect.width;
|
||||||
@@ -442,6 +538,7 @@ function openNoticeModal(
|
|||||||
let targetHeight = Math.round(
|
let targetHeight = Math.round(
|
||||||
Math.min(Math.max(measuredHeight, 200), viewportHeight * 0.85),
|
Math.min(Math.max(measuredHeight, 200), viewportHeight * 0.85),
|
||||||
);
|
);
|
||||||
|
|
||||||
let targetLeft = Math.round((viewportWidth - targetWidth) / 2);
|
let targetLeft = Math.round((viewportWidth - targetWidth) / 2);
|
||||||
let targetTop = Math.round((viewportHeight - targetHeight) / 2) + scrollY;
|
let targetTop = Math.round((viewportHeight - targetHeight) / 2) + scrollY;
|
||||||
|
|
||||||
@@ -550,10 +647,13 @@ function openNoticeModal(
|
|||||||
const newTargetWidth = Math.round(
|
const newTargetWidth = Math.round(
|
||||||
Math.min(Math.max(newSourceWidth, 800), newViewportWidth - 40),
|
Math.min(Math.max(newSourceWidth, 800), newViewportWidth - 40),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Just measure the existing modal content
|
||||||
const currentHeight = unifiedContent.getBoundingClientRect().height;
|
const currentHeight = unifiedContent.getBoundingClientRect().height;
|
||||||
const newTargetHeight = Math.round(
|
const newTargetHeight = Math.round(
|
||||||
Math.min(Math.max(currentHeight, 200), newViewportHeight * 0.85),
|
Math.min(Math.max(currentHeight, 200), newViewportHeight * 0.85),
|
||||||
);
|
);
|
||||||
|
|
||||||
const newTargetLeft = Math.round((newViewportWidth - newTargetWidth) / 2);
|
const newTargetLeft = Math.round((newViewportWidth - newTargetWidth) / 2);
|
||||||
const newTargetTop =
|
const newTargetTop =
|
||||||
Math.round((newViewportHeight - newTargetHeight) / 2) + newScrollY;
|
Math.round((newViewportHeight - newTargetHeight) / 2) + newScrollY;
|
||||||
@@ -618,8 +718,7 @@ function callHomeTimetable(date: string, change?: any) {
|
|||||||
xhr.setRequestHeader("Content-Type", "application/json; charset=utf-8");
|
xhr.setRequestHeader("Content-Type", "application/json; charset=utf-8");
|
||||||
|
|
||||||
xhr.onreadystatechange = function () {
|
xhr.onreadystatechange = function () {
|
||||||
if (xhr.readyState !== 4) return;
|
if (xhr.readyState === 4) {
|
||||||
|
|
||||||
if (loadingTimeout) {
|
if (loadingTimeout) {
|
||||||
clearTimeout(loadingTimeout);
|
clearTimeout(loadingTimeout);
|
||||||
loadingTimeout = null;
|
loadingTimeout = null;
|
||||||
@@ -627,6 +726,7 @@ function callHomeTimetable(date: string, change?: any) {
|
|||||||
|
|
||||||
const DayContainer = document.getElementById("day-container")!;
|
const DayContainer = document.getElementById("day-container")!;
|
||||||
|
|
||||||
|
try {
|
||||||
var serverResponse = JSON.parse(xhr.response);
|
var serverResponse = JSON.parse(xhr.response);
|
||||||
let lessonArray: Array<any> = [];
|
let lessonArray: Array<any> = [];
|
||||||
|
|
||||||
@@ -640,20 +740,20 @@ function callHomeTimetable(date: string, change?: any) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
GetLessonColours().then((colours) => {
|
GetLessonColours().then((colours) => {
|
||||||
|
let subjects = colours;
|
||||||
for (let i = 0; i < lessonArray.length; i++) {
|
for (let i = 0; i < lessonArray.length; i++) {
|
||||||
let subjectname =
|
let subjectname = `timetable.subject.colour.${lessonArray[i].code}`;
|
||||||
lessonArray[i].type == "tutorial"
|
|
||||||
? `timetable.tutor.${lessonArray[i].tutorID}`
|
let subject = subjects.find(
|
||||||
: `timetable.subject.colour.${lessonArray[i].code}`;
|
|
||||||
let subject = colours.find(
|
|
||||||
(element: any) => element.name === subjectname,
|
(element: any) => element.name === subjectname,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!subject) {
|
if (!subject) {
|
||||||
lessonArray[i].colour = "--item-colour: #8e8e8e;";
|
lessonArray[i].colour = "--item-colour: #8e8e8e;";
|
||||||
} else {
|
} else {
|
||||||
lessonArray[i].colour = `--item-colour: ${subject.value};`;
|
lessonArray[i].colour = `--item-colour: ${subject.value};`;
|
||||||
if (GetThresholdOfColor(subject.value) > 300) {
|
let result = GetThresholdOfColor(subject.value);
|
||||||
|
|
||||||
|
if (result > 300) {
|
||||||
lessonArray[i].invert = true;
|
lessonArray[i].invert = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -662,7 +762,9 @@ function callHomeTimetable(date: string, change?: any) {
|
|||||||
lessonArray[i].until = lessonArray[i].until.substring(0, 5);
|
lessonArray[i].until = lessonArray[i].until.substring(0, 5);
|
||||||
|
|
||||||
if (settingsState.timeFormat === "12") {
|
if (settingsState.timeFormat === "12") {
|
||||||
lessonArray[i].from = convertTo12HourFormat(lessonArray[i].from);
|
lessonArray[i].from = convertTo12HourFormat(
|
||||||
|
lessonArray[i].from,
|
||||||
|
);
|
||||||
lessonArray[i].until = convertTo12HourFormat(
|
lessonArray[i].until = convertTo12HourFormat(
|
||||||
lessonArray[i].until,
|
lessonArray[i].until,
|
||||||
);
|
);
|
||||||
@@ -675,10 +777,13 @@ function callHomeTimetable(date: string, change?: any) {
|
|||||||
|
|
||||||
DayContainer.innerText = "";
|
DayContainer.innerText = "";
|
||||||
for (let i = 0; i < lessonArray.length; i++) {
|
for (let i = 0; i < lessonArray.length; i++) {
|
||||||
const div = makeLessonDiv(lessonArray[i], i + 1);
|
var div = makeLessonDiv(lessonArray[i], i + 1);
|
||||||
|
|
||||||
if (lessonArray[i].invert) {
|
if (lessonArray[i].invert) {
|
||||||
(div.firstChild! as HTMLElement).classList.add("day-inverted");
|
const div1 = div.firstChild! as HTMLElement;
|
||||||
|
div1.classList.add("day-inverted");
|
||||||
}
|
}
|
||||||
|
|
||||||
DayContainer.append(div.firstChild as HTMLElement);
|
DayContainer.append(div.firstChild as HTMLElement);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -689,22 +794,40 @@ function callHomeTimetable(date: string, change?: any) {
|
|||||||
for (let i = 0; i < lessonArray.length; i++) {
|
for (let i = 0; i < lessonArray.length; i++) {
|
||||||
CheckCurrentLesson(lessonArray[i], i + 1);
|
CheckCurrentLesson(lessonArray[i], i + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckCurrentLessonAll(lessonArray);
|
CheckCurrentLessonAll(lessonArray);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
DayContainer.innerHTML = "";
|
DayContainer.innerHTML = "";
|
||||||
const dummyDay = document.createElement("div");
|
var dummyDay = document.createElement("div");
|
||||||
dummyDay.classList.add("day-empty");
|
dummyDay.classList.add("day-empty");
|
||||||
const img = document.createElement("img");
|
let img = document.createElement("img");
|
||||||
img.src = browser.runtime.getURL(LogoLight);
|
img.src = browser.runtime.getURL(LogoLight);
|
||||||
const text = document.createElement("p");
|
let text = document.createElement("p");
|
||||||
text.innerText = "No lessons available.";
|
text.innerText = "No lessons available.";
|
||||||
dummyDay.append(img, text);
|
dummyDay.append(img);
|
||||||
|
dummyDay.append(text);
|
||||||
DayContainer.append(dummyDay);
|
DayContainer.append(dummyDay);
|
||||||
|
|
||||||
DayContainer.classList.remove("loading");
|
DayContainer.classList.remove("loading");
|
||||||
}
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error loading timetable data:", error);
|
||||||
|
|
||||||
|
DayContainer.classList.remove("loading");
|
||||||
|
|
||||||
|
DayContainer.innerHTML = "";
|
||||||
|
const errorDiv = document.createElement("div");
|
||||||
|
errorDiv.classList.add("day-empty");
|
||||||
|
errorDiv.innerHTML = `
|
||||||
|
<img src="${browser.runtime.getURL(LogoLight)}" />
|
||||||
|
<p>Error loading lessons. Please try again.</p>
|
||||||
|
`;
|
||||||
|
DayContainer.append(errorDiv);
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
xhr.send(
|
xhr.send(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
@@ -793,6 +916,8 @@ async function CheckCurrentLesson(lesson: any, num: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function makeLessonDiv(lesson: any, num: number) {
|
function makeLessonDiv(lesson: any, num: number) {
|
||||||
|
if (!lesson) throw new Error("No lesson provided.");
|
||||||
|
|
||||||
const {
|
const {
|
||||||
code,
|
code,
|
||||||
colour,
|
colour,
|
||||||
@@ -805,19 +930,17 @@ function makeLessonDiv(lesson: any, num: number) {
|
|||||||
programmeID,
|
programmeID,
|
||||||
metaID,
|
metaID,
|
||||||
assessments,
|
assessments,
|
||||||
type,
|
|
||||||
} = lesson;
|
} = lesson;
|
||||||
|
|
||||||
let lessonString = `
|
let lessonString = `
|
||||||
<div class="day" id="${code + num}" style="${colour}">
|
<div class="day" id="${code + num}" style="${colour}">
|
||||||
<h2>${type == "class" ? description : type == "tutorial" ? "Tutorial" : "Unknown"}</h2>
|
<h2>${description || "Unknown"}</h2>
|
||||||
<h3>${staff || "Unknown"}</h3>
|
<h3>${staff || "Unknown"}</h3>
|
||||||
<h3>${room || (type == "tutorial" ? "Unknown" : "N/A")}</h3>
|
<h3>${room || "Unknown"}</h3>
|
||||||
<h4>${from || "Unknown"} - ${until || "Unknown"}</h4>
|
<h4>${from || "Unknown"} - ${until || "Unknown"}</h4>
|
||||||
<h5>${attendanceTitle || "Unknown"}</h5>
|
<h5>${attendanceTitle || "Unknown"}</h5>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
if (type == "class") {
|
|
||||||
if (programmeID !== 0) {
|
if (programmeID !== 0) {
|
||||||
lessonString += `
|
lessonString += `
|
||||||
<div class="day-button clickable" style="right: 5px;" onclick="location.href='${buildAssessmentURL(programmeID, metaID)}'">${assessmentsicon}</div>
|
<div class="day-button clickable" style="right: 5px;" onclick="location.href='${buildAssessmentURL(programmeID, metaID)}'">${assessmentsicon}</div>
|
||||||
@@ -842,7 +965,6 @@ function makeLessonDiv(lesson: any, num: number) {
|
|||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
lessonString += "</div>";
|
lessonString += "</div>";
|
||||||
const element = stringToHTML(lessonString);
|
const element = stringToHTML(lessonString);
|
||||||
@@ -858,48 +980,64 @@ function buildAssessmentURL(programmeID: any, metaID: any, itemID = "") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function CheckUnmarkedAttendance(lessonattendance: any) {
|
function CheckUnmarkedAttendance(lessonattendance: any) {
|
||||||
return lessonattendance ? lessonattendance.label : " ";
|
if (lessonattendance) {
|
||||||
|
var lesson = lessonattendance.label;
|
||||||
|
} else {
|
||||||
|
lesson = " ";
|
||||||
|
}
|
||||||
|
return lesson;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
async function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
||||||
const upcomingitemcontainer = document.querySelector("#upcoming-items");
|
let upcomingitemcontainer = document.querySelector("#upcoming-items");
|
||||||
const overdueDates = [];
|
let overdueDates = [];
|
||||||
const upcomingDates = {};
|
let upcomingDates = {};
|
||||||
const Today = new Date();
|
|
||||||
|
var Today = new Date();
|
||||||
|
|
||||||
for (let i = 0; i < assessments.length; i++) {
|
for (let i = 0; i < assessments.length; i++) {
|
||||||
const assessmentdue = new Date(assessments[i].due);
|
const assessment = assessments[i];
|
||||||
if (assessmentdue < Today && !CheckSpecialDay(Today, assessmentdue)) {
|
let assessmentdue = new Date(assessment.due);
|
||||||
overdueDates.push(assessments[i]);
|
|
||||||
|
CheckSpecialDay(Today, assessmentdue);
|
||||||
|
if (assessmentdue < Today) {
|
||||||
|
if (!CheckSpecialDay(Today, assessmentdue)) {
|
||||||
|
overdueDates.push(assessment);
|
||||||
assessments.splice(i, 1);
|
assessments.splice(i, 1);
|
||||||
i--;
|
i--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var TomorrowDate = new Date();
|
||||||
|
TomorrowDate.setDate(TomorrowDate.getDate() + 1);
|
||||||
|
|
||||||
const colours = await GetLessonColours();
|
const colours = await GetLessonColours();
|
||||||
|
|
||||||
|
let subjects = colours;
|
||||||
for (let i = 0; i < assessments.length; i++) {
|
for (let i = 0; i < assessments.length; i++) {
|
||||||
const subject = colours.find(
|
let subjectname = `timetable.subject.colour.${assessments[i].code}`;
|
||||||
(element: any) =>
|
|
||||||
element.name === `timetable.subject.colour.${assessments[i].code}`,
|
let subject = subjects.find((element: any) => element.name === subjectname);
|
||||||
);
|
|
||||||
if (!subject) {
|
if (!subject) {
|
||||||
assessments[i].colour = "--item-colour: #8e8e8e;";
|
assessments[i].colour = "--item-colour: #8e8e8e;";
|
||||||
} else {
|
} else {
|
||||||
assessments[i].colour = `--item-colour: ${subject.value};`;
|
assessments[i].colour = `--item-colour: ${subject.value};`;
|
||||||
|
GetThresholdOfColor(subject.value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let i = 0; i < activeSubjects.length; i++) {
|
for (let i = 0; i < activeSubjects.length; i++) {
|
||||||
const element = activeSubjects[i];
|
const element = activeSubjects[i];
|
||||||
const colour = colours.find(
|
let subjectname = `timetable.subject.colour.${element.code}`;
|
||||||
(c: any) => c.name === `timetable.subject.colour.${element.code}`,
|
let colour = colours.find((element: any) => element.name === subjectname);
|
||||||
);
|
|
||||||
if (!colour) {
|
if (!colour) {
|
||||||
element.colour = "--item-colour: #8e8e8e;";
|
element.colour = "--item-colour: #8e8e8e;";
|
||||||
} else {
|
} else {
|
||||||
element.colour = `--item-colour: ${colour.value};`;
|
element.colour = `--item-colour: ${colour.value};`;
|
||||||
if (GetThresholdOfColor(colour.value) > 300) {
|
let result = GetThresholdOfColor(colour.value);
|
||||||
|
if (result > 300) {
|
||||||
element.invert = true;
|
element.invert = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -907,34 +1045,52 @@ async function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
|||||||
|
|
||||||
CreateFilters(activeSubjects);
|
CreateFilters(activeSubjects);
|
||||||
|
|
||||||
|
let type;
|
||||||
|
let class_;
|
||||||
|
|
||||||
for (let i = 0; i < assessments.length; i++) {
|
for (let i = 0; i < assessments.length; i++) {
|
||||||
const element: any = assessments[i];
|
const element: any = assessments[i];
|
||||||
if (!upcomingDates[element.due as keyof typeof upcomingDates]) {
|
if (!upcomingDates[element.due as keyof typeof upcomingDates]) {
|
||||||
const dateObj: any = {
|
let dateObj: any = new Object();
|
||||||
div: CreateElement("div", "upcoming-date-container"),
|
dateObj.div = CreateElement(
|
||||||
assessments: [],
|
(type = "div"),
|
||||||
};
|
(class_ = "upcoming-date-container"),
|
||||||
|
);
|
||||||
|
dateObj.assessments = [];
|
||||||
(upcomingDates[element.due as keyof typeof upcomingDates] as any) =
|
(upcomingDates[element.due as keyof typeof upcomingDates] as any) =
|
||||||
dateObj;
|
dateObj;
|
||||||
}
|
}
|
||||||
const assessmentDateDiv =
|
let assessmentDateDiv =
|
||||||
upcomingDates[element.due as keyof typeof upcomingDates];
|
upcomingDates[element.due as keyof typeof upcomingDates];
|
||||||
|
|
||||||
if (assessmentDateDiv) {
|
if (assessmentDateDiv) {
|
||||||
(assessmentDateDiv as any).assessments.push(element);
|
(assessmentDateDiv as any).assessments.push(element);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var date in upcomingDates) {
|
for (var date in upcomingDates) {
|
||||||
const assessmentdue = new Date(
|
let assessmentdue = new Date(
|
||||||
(upcomingDates[date as keyof typeof upcomingDates] as any).assessments[0]
|
(
|
||||||
.due,
|
upcomingDates[date as keyof typeof upcomingDates] as any
|
||||||
|
).assessments[0].due,
|
||||||
);
|
);
|
||||||
const specialcase = CheckSpecialDay(Today, assessmentdue);
|
let specialcase = CheckSpecialDay(Today, assessmentdue);
|
||||||
const assessmentDate = createAssessmentDateDiv(
|
let assessmentDate;
|
||||||
|
|
||||||
|
if (specialcase) {
|
||||||
|
let datecase: string = specialcase!;
|
||||||
|
assessmentDate = createAssessmentDateDiv(
|
||||||
date,
|
date,
|
||||||
upcomingDates[date as keyof typeof upcomingDates],
|
upcomingDates[date as keyof typeof upcomingDates],
|
||||||
specialcase,
|
|
||||||
|
datecase,
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
assessmentDate = createAssessmentDateDiv(
|
||||||
|
date,
|
||||||
|
upcomingDates[date as keyof typeof upcomingDates],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (specialcase === "Yesterday") {
|
if (specialcase === "Yesterday") {
|
||||||
upcomingitemcontainer!.insertBefore(
|
upcomingitemcontainer!.insertBefore(
|
||||||
@@ -957,68 +1113,77 @@ async function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createAssessmentDateDiv(date: string, value: any, datecase?: any) {
|
function createAssessmentDateDiv(date: string, value: any, datecase?: any) {
|
||||||
const options = {
|
var options = {
|
||||||
weekday: "long" as "long",
|
weekday: "long" as "long",
|
||||||
month: "long" as "long",
|
month: "long" as "long",
|
||||||
day: "numeric" as "numeric",
|
day: "numeric" as "numeric",
|
||||||
};
|
};
|
||||||
const FormattedDate = new Date(date);
|
const FormattedDate = new Date(date);
|
||||||
|
|
||||||
const assessments = value.assessments;
|
const assessments = value.assessments;
|
||||||
const container = value.div;
|
const container = value.div;
|
||||||
|
|
||||||
const DateTitleDiv = document.createElement("div");
|
let DateTitleDiv = document.createElement("div");
|
||||||
DateTitleDiv.classList.add("upcoming-date-title");
|
DateTitleDiv.classList.add("upcoming-date-title");
|
||||||
|
|
||||||
if (datecase) {
|
if (datecase) {
|
||||||
const datetitle = document.createElement("h5");
|
let datetitle = document.createElement("h5");
|
||||||
datetitle.classList.add("upcoming-special-day");
|
datetitle.classList.add("upcoming-special-day");
|
||||||
datetitle.innerText = datecase;
|
datetitle.innerText = datecase;
|
||||||
DateTitleDiv.append(datetitle);
|
DateTitleDiv.append(datetitle);
|
||||||
container.setAttribute("data-day", datecase);
|
container.setAttribute("data-day", datecase);
|
||||||
}
|
}
|
||||||
|
|
||||||
const DateTitle = document.createElement("h5");
|
let DateTitle = document.createElement("h5");
|
||||||
DateTitle.innerText = FormattedDate.toLocaleDateString("en-AU", options);
|
DateTitle.innerText = FormattedDate.toLocaleDateString("en-AU", options);
|
||||||
DateTitleDiv.append(DateTitle);
|
DateTitleDiv.append(DateTitle);
|
||||||
|
|
||||||
container.append(DateTitleDiv);
|
container.append(DateTitleDiv);
|
||||||
|
|
||||||
const assessmentContainer = document.createElement("div");
|
let assessmentContainer = document.createElement("div");
|
||||||
assessmentContainer.classList.add("upcoming-date-assessments");
|
assessmentContainer.classList.add("upcoming-date-assessments");
|
||||||
|
|
||||||
for (let i = 0; i < assessments.length; i++) {
|
for (let i = 0; i < assessments.length; i++) {
|
||||||
const element = assessments[i];
|
const element = assessments[i];
|
||||||
const item = document.createElement("div");
|
let item = document.createElement("div");
|
||||||
item.classList.add("upcoming-assessment");
|
item.classList.add("upcoming-assessment");
|
||||||
item.setAttribute("data-subject", element.code);
|
item.setAttribute("data-subject", element.code);
|
||||||
item.id = `assessment${element.id}`;
|
item.id = `assessment${element.id}`;
|
||||||
|
|
||||||
item.style.cssText = element.colour;
|
item.style.cssText = element.colour;
|
||||||
|
|
||||||
const titlediv = document.createElement("div");
|
let titlediv = document.createElement("div");
|
||||||
titlediv.classList.add("upcoming-subject-title");
|
titlediv.classList.add("upcoming-subject-title");
|
||||||
titlediv.append(
|
|
||||||
|
let titlesvg =
|
||||||
stringToHTML(`<svg viewBox="0 0 24 24" style="width:35px;height:35px;fill:white;">
|
stringToHTML(`<svg viewBox="0 0 24 24" style="width:35px;height:35px;fill:white;">
|
||||||
<path d="M6 20H13V22H6C4.89 22 4 21.11 4 20V4C4 2.9 4.89 2 6 2H18C19.11 2 20 2.9 20 4V12.54L18.5 11.72L18 12V4H13V12L10.5 9.75L8 12V4H6V20M24 17L18.5 14L13 17L18.5 20L24 17M15 19.09V21.09L18.5 23L22 21.09V19.09L18.5 21L15 19.09Z"></path>
|
<path d="M6 20H13V22H6C4.89 22 4 21.11 4 20V4C4 2.9 4.89 2 6 2H18C19.11 2 20 2.9 20 4V12.54L18.5 11.72L18 12V4H13V12L10.5 9.75L8 12V4H6V20M24 17L18.5 14L13 17L18.5 20L24 17M15 19.09V21.09L18.5 23L22 21.09V19.09L18.5 21L15 19.09Z"></path>
|
||||||
</svg>`).firstChild!,
|
</svg>`).firstChild;
|
||||||
);
|
titlediv.append(titlesvg!);
|
||||||
|
|
||||||
const detailsdiv = document.createElement("div");
|
let detailsdiv = document.createElement("div");
|
||||||
detailsdiv.classList.add("upcoming-details");
|
detailsdiv.classList.add("upcoming-details");
|
||||||
const detailstitle = document.createElement("h5");
|
let detailstitle = document.createElement("h5");
|
||||||
detailstitle.innerText = `${element.subject} assessment`;
|
detailstitle.innerText = `${element.subject} assessment`;
|
||||||
const subject = document.createElement("p");
|
let subject = document.createElement("p");
|
||||||
subject.innerText = element.title;
|
subject.innerText = element.title;
|
||||||
subject.classList.add("upcoming-assessment-title");
|
subject.classList.add("upcoming-assessment-title");
|
||||||
subject.onclick = function () {
|
subject.onclick = function () {
|
||||||
document.querySelector("#menu ul")!.classList.add("noscroll");
|
document.querySelector("#menu ul")!.classList.add("noscroll");
|
||||||
location.href = `../#?page=/assessments/${element.programmeID}:${element.metaclassID}&item=${element.id}`;
|
location.href = `../#?page=/assessments/${element.programmeID}:${element.metaclassID}&item=${element.id}`;
|
||||||
};
|
};
|
||||||
detailsdiv.append(detailstitle, subject);
|
detailsdiv.append(detailstitle);
|
||||||
item.append(titlediv, detailsdiv);
|
detailsdiv.append(subject);
|
||||||
|
|
||||||
|
item.append(titlediv);
|
||||||
|
item.append(detailsdiv);
|
||||||
assessmentContainer.append(item);
|
assessmentContainer.append(item);
|
||||||
|
|
||||||
fetch(`${location.origin}/seqta/student/assessment/submissions/get`, {
|
fetch(`${location.origin}/seqta/student/assessment/submissions/get`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json; charset=utf-8" },
|
headers: {
|
||||||
|
"Content-Type": "application/json; charset=utf-8",
|
||||||
|
},
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
assessment: element.id,
|
assessment: element.id,
|
||||||
metaclass: element.metaclassID,
|
metaclass: element.metaclassID,
|
||||||
@@ -1029,7 +1194,8 @@ function createAssessmentDateDiv(date: string, value: any, datecase?: any) {
|
|||||||
.then((response) => {
|
.then((response) => {
|
||||||
if (response.payload.length > 0) {
|
if (response.payload.length > 0) {
|
||||||
const assessment = document.querySelector(`#assessment${element.id}`);
|
const assessment = document.querySelector(`#assessment${element.id}`);
|
||||||
const submittedtext = document.createElement("div");
|
|
||||||
|
let submittedtext = document.createElement("div");
|
||||||
submittedtext.classList.add("upcoming-submittedtext");
|
submittedtext.classList.add("upcoming-submittedtext");
|
||||||
submittedtext.innerText = "Submitted";
|
submittedtext.innerText = "Submitted";
|
||||||
assessment!.append(submittedtext);
|
assessment!.append(submittedtext);
|
||||||
@@ -1067,37 +1233,36 @@ function CheckSpecialDay(date1: Date, date2: Date) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function GetLessonColours() {
|
async function GetLessonColours() {
|
||||||
try {
|
let func = fetch(`${location.origin}/seqta/student/load/prefs?`, {
|
||||||
return fetch(`${location.origin}/seqta/student/load/prefs?`, {
|
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json; charset=utf-8" },
|
headers: {
|
||||||
|
"Content-Type": "application/json; charset=utf-8",
|
||||||
|
},
|
||||||
body: JSON.stringify({ request: "userPrefs", asArray: true, user: 69 }),
|
body: JSON.stringify({ request: "userPrefs", asArray: true, user: 69 }),
|
||||||
})
|
});
|
||||||
|
return func
|
||||||
.then((result) => result.json())
|
.then((result) => result.json())
|
||||||
.then((response) => response.payload);
|
.then((response) => response.payload);
|
||||||
} catch (error) {
|
|
||||||
console.error("[BetterSEQTA+] Failed to get lesson colours:", error);
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function CreateFilters(subjects: any) {
|
function CreateFilters(subjects: any) {
|
||||||
const filteroptions = settingsState.subjectfilters;
|
let filteroptions = settingsState.subjectfilters;
|
||||||
const filterdiv = document.querySelector("#upcoming-filters");
|
|
||||||
|
|
||||||
|
let filterdiv = document.querySelector("#upcoming-filters");
|
||||||
for (let i = 0; i < subjects.length; i++) {
|
for (let i = 0; i < subjects.length; i++) {
|
||||||
const element = subjects[i];
|
const element = subjects[i];
|
||||||
|
|
||||||
if (!Object.prototype.hasOwnProperty.call(filteroptions, element.code)) {
|
if (!Object.prototype.hasOwnProperty.call(filteroptions, element.code)) {
|
||||||
filteroptions[element.code] = true;
|
filteroptions[element.code] = true;
|
||||||
settingsState.subjectfilters = filteroptions;
|
settingsState.subjectfilters = filteroptions;
|
||||||
}
|
}
|
||||||
filterdiv!.append(
|
let elementdiv = CreateSubjectFilter(
|
||||||
CreateSubjectFilter(
|
|
||||||
element.code,
|
element.code,
|
||||||
element.colour,
|
element.colour,
|
||||||
filteroptions[element.code],
|
filteroptions[element.code],
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
filterdiv!.append(elementdiv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1106,20 +1271,23 @@ function CreateSubjectFilter(
|
|||||||
itemcolour: string,
|
itemcolour: string,
|
||||||
checked: any,
|
checked: any,
|
||||||
) {
|
) {
|
||||||
const label = CreateElement("label", "upcoming-checkbox-container");
|
let label = CreateElement("label", "upcoming-checkbox-container");
|
||||||
label.innerText = subjectcode;
|
label.innerText = subjectcode;
|
||||||
const input = CreateElement("input") as HTMLInputElement;
|
let input1 = CreateElement("input");
|
||||||
|
const input = input1 as HTMLInputElement;
|
||||||
input.type = "checkbox";
|
input.type = "checkbox";
|
||||||
input.checked = checked;
|
input.checked = checked;
|
||||||
input.id = `filter-${subjectcode}`;
|
input.id = `filter-${subjectcode}`;
|
||||||
label.style.cssText = itemcolour;
|
label.style.cssText = itemcolour;
|
||||||
const span = CreateElement("span", "upcoming-checkmark");
|
let span = CreateElement("span", "upcoming-checkmark");
|
||||||
label.append(input, span);
|
label.append(input);
|
||||||
|
label.append(span);
|
||||||
|
|
||||||
input.addEventListener("change", function (change) {
|
input.addEventListener("change", function (change) {
|
||||||
const filters = settingsState.subjectfilters;
|
let filters = settingsState.subjectfilters;
|
||||||
const id = (change.target as HTMLInputElement).id.split("-")[1];
|
let id = (change.target as HTMLInputElement)!.id.split("-")[1];
|
||||||
filters[id] = (change.target as HTMLInputElement).checked;
|
filters[id] = (change.target as HTMLInputElement)!.checked;
|
||||||
|
|
||||||
settingsState.subjectfilters = filters;
|
settingsState.subjectfilters = filters;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ export function OpenAboutPage() {
|
|||||||
</h1>
|
</h1>
|
||||||
<div style="max-width: 600px; margin: auto;">
|
<div style="max-width: 600px; margin: auto;">
|
||||||
<img
|
<img
|
||||||
src="https://contrib.rocks/image?repo=BetterSEQTA/BetterSEQTA-Plus&columns=10"
|
src="https://contrib.rocks/image?repo=BetterSEQTA/BetterSEQTA-Plus&columns=14"
|
||||||
style="width: 100%; max-width: 500px; height: auto; object-fit: contain; display: block; margin: -80px auto 0;">
|
style="width: 100%; max-width: 500px; height: auto; object-fit: contain; display: block; margin: -110px auto 0;">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
`).firstChild as HTMLElement;
|
`).firstChild as HTMLElement;
|
||||||
|
|||||||
@@ -32,20 +32,6 @@ export function OpenWhatsNewPopup() {
|
|||||||
const text = stringToHTML(/* html */ `
|
const text = stringToHTML(/* html */ `
|
||||||
<div class="whatsnewTextContainer" style="height: 50%;overflow-y: auto;">
|
<div class="whatsnewTextContainer" style="height: 50%;overflow-y: auto;">
|
||||||
|
|
||||||
<h1>3.4.15 - SEQTA New UI Patch</h1>
|
|
||||||
<li>Fixed compatibility issues caused by the new SEQTA UI update</li>
|
|
||||||
<li>Adjusted styling to match updated SEQTA layout changes</li>
|
|
||||||
<li>Other minor bug fixes and stability improvements</li>
|
|
||||||
|
|
||||||
<h1>3.4.14 - Search & Assessments Update</h1>
|
|
||||||
<li>Global Search improvements: indexing progress, more accurate results, and now includes past assessments/assignments</li>
|
|
||||||
<li>Assessment Averages now parse weightings when possible for more accurate subject averages</li>
|
|
||||||
<li>Added weight labels to assessment items (including proper handling of 0% and missing weights)</li>
|
|
||||||
<li>Fixed homepage tutor lesson colours and assessments/courses visibility issues</li>
|
|
||||||
<li>Fixed upcoming lessons tutorial room not displaying</li>
|
|
||||||
<li>Fixed favicon not showing / race condition issues</li>
|
|
||||||
<li>Other minor styling and stability improvements</li>
|
|
||||||
|
|
||||||
<h1>3.4.13 - Bug Fixes & Styling Improvements</h1>
|
<h1>3.4.13 - Bug Fixes & Styling Improvements</h1>
|
||||||
<li>Fixed house/year box hard failing when house_colour does not exist</li>
|
<li>Fixed house/year box hard failing when house_colour does not exist</li>
|
||||||
<li>Fixed message of the day being unreadable in light mode</li>
|
<li>Fixed message of the day being unreadable in light mode</li>
|
||||||
|
|||||||
Reference in New Issue
Block a user