feat(ui): improve lesson cards and theme button, optimize dependency checks

UI Improvements:
- Highlight classroom number in lesson cards using Badge component
  * Applied to both mobile and desktop views
  * Improved visual distinction for classroom information

- Fix theme switcher button layout on mobile
  * Add "Тема" text label inside the button (visible on all devices)
  * Remove redundant absolute positioned span below button
  * Fix text overflow issues on mobile devices
  * Improve button isolation to prevent text escaping

Performance Optimization:
- Optimize dependency installation check in deployment scripts
  * Replace timestamp-based check with content hash comparison
  * Use MD5 hash of package.json and lock files to detect real changes
  * Save hash after successful installation for future comparisons
  * Significantly reduce unnecessary npm install runs during updates
  * Add .dependencies.hash to .gitignore

Files changed:
- src/widgets/schedule/lesson.tsx - Added Badge for classroom
- src/features/theme-switch/index.tsx - Added text label to button
- src/widgets/navbar/index.tsx - Improved button container structure
- src/pages/index.tsx - Removed redundant theme label span
- scripts/manage.sh - Optimized dependency check logic
- scripts/install.sh - Optimized dependency check logic
- .gitignore - Added .dependencies.hash exclusion
This commit is contained in:
kilyabin
2025-11-26 01:09:46 +04:00
parent 2225851177
commit 24bb531dfb
7 changed files with 102 additions and 58 deletions

3
.gitignore vendored
View File

@@ -36,3 +36,6 @@ next-env.d.ts
.vscode/ .vscode/
/.vscode /.vscode
.env .env
# dependency hash (installation-specific)
.dependencies.hash

View File

@@ -169,38 +169,54 @@ cd "$INSTALL_DIR"
# Check if node_modules exists and is up to date # Check if node_modules exists and is up to date
NEED_INSTALL=true NEED_INSTALL=true
LOCK_FILE="" LOCK_FILE=""
DEPENDENCY_HASH_FILE="$INSTALL_DIR/.dependencies.hash"
if [ -f "package-lock.json" ]; then if [ -f "package-lock.json" ]; then
LOCK_FILE="package-lock.json" LOCK_FILE="package-lock.json"
elif [ -f "pnpm-lock.yaml" ]; then elif [ -f "pnpm-lock.yaml" ]; then
LOCK_FILE="pnpm-lock.yaml" LOCK_FILE="pnpm-lock.yaml"
fi fi
if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ]; then if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ] && [ -f "package.json" ] && [ -f "$LOCK_FILE" ]; then
# Check if package.json is newer than lock file # Calculate hash of package files (content-based, not timestamp)
if [ "package.json" -nt "$LOCK_FILE" ]; then CURRENT_HASH=$(cat package.json "$LOCK_FILE" 2>/dev/null | md5sum | cut -d' ' -f1)
echo -e "${YELLOW}package.json is newer than $LOCK_FILE, reinstalling...${NC}"
NEED_INSTALL=true # Check if hash file exists and matches
else if [ -f "$DEPENDENCY_HASH_FILE" ]; then
# Check if all dependencies are installed by checking if node_modules/.bin exists and has entries SAVED_HASH=$(cat "$DEPENDENCY_HASH_FILE" 2>/dev/null)
if [ "$CURRENT_HASH" = "$SAVED_HASH" ]; then
# Hash matches, check if key dependencies exist
if [ -d "node_modules/.bin" ] && [ "$(ls -A node_modules/.bin 2>/dev/null | wc -l)" -gt 0 ]; then if [ -d "node_modules/.bin" ] && [ "$(ls -A node_modules/.bin 2>/dev/null | wc -l)" -gt 0 ]; then
# Quick check: verify that key dependencies exist
if [ -d "node_modules/next" ] && [ -d "node_modules/react" ] && [ -d "node_modules/typescript" ]; then if [ -d "node_modules/next" ] && [ -d "node_modules/react" ] && [ -d "node_modules/typescript" ]; then
echo -e "${GREEN}Dependencies already installed, skipping...${NC}" echo -e "${GREEN}Dependencies are up to date (content unchanged), skipping installation...${NC}"
NEED_INSTALL=false NEED_INSTALL=false
else else
echo -e "${YELLOW}Some dependencies missing, reinstalling...${NC}" echo -e "${YELLOW}Hash matches but some dependencies missing, reinstalling...${NC}"
NEED_INSTALL=true NEED_INSTALL=true
fi fi
else else
echo -e "${YELLOW}node_modules appears incomplete, reinstalling...${NC}" echo -e "${YELLOW}Hash matches but node_modules incomplete, reinstalling...${NC}"
NEED_INSTALL=true NEED_INSTALL=true
fi fi
else
echo -e "${YELLOW}Dependency files changed (content differs), reinstalling...${NC}"
NEED_INSTALL=true
fi
else
echo -e "${YELLOW}No hash file found, need to install dependencies...${NC}"
NEED_INSTALL=true
fi fi
fi fi
if [ "$NEED_INSTALL" = true ]; then if [ "$NEED_INSTALL" = true ]; then
echo -e "${YELLOW}Installing dependencies...${NC}" echo -e "${YELLOW}Installing dependencies...${NC}"
npm ci --legacy-peer-deps --production=false npm ci --legacy-peer-deps --production=false
# Save hash after successful installation
if [ -n "$LOCK_FILE" ] && [ -f "package.json" ] && [ -f "$LOCK_FILE" ]; then
cat package.json "$LOCK_FILE" 2>/dev/null | md5sum | cut -d' ' -f1 > "$DEPENDENCY_HASH_FILE"
echo -e "${GREEN}Saved dependency hash for future checks${NC}"
fi
else else
echo -e "${GREEN}Dependencies are up to date, skipping installation${NC}" echo -e "${GREEN}Dependencies are up to date, skipping installation${NC}"
fi fi

View File

@@ -102,6 +102,7 @@ case "$1" in
--exclude='.env.test' \ --exclude='.env.test' \
--exclude='.env.test.local' \ --exclude='.env.test.local' \
--exclude='*.md' \ --exclude='*.md' \
--exclude='.dependencies.hash' \
"$PROJECT_DIR/" "$INSTALL_DIR/" "$PROJECT_DIR/" "$INSTALL_DIR/"
# Handle .env file (preserve existing if present) # Handle .env file (preserve existing if present)
@@ -121,38 +122,54 @@ case "$1" in
# Check if node_modules exists and is up to date # Check if node_modules exists and is up to date
NEED_INSTALL=true NEED_INSTALL=true
LOCK_FILE="" LOCK_FILE=""
DEPENDENCY_HASH_FILE="$INSTALL_DIR/.dependencies.hash"
if [ -f "package-lock.json" ]; then if [ -f "package-lock.json" ]; then
LOCK_FILE="package-lock.json" LOCK_FILE="package-lock.json"
elif [ -f "pnpm-lock.yaml" ]; then elif [ -f "pnpm-lock.yaml" ]; then
LOCK_FILE="pnpm-lock.yaml" LOCK_FILE="pnpm-lock.yaml"
fi fi
if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ]; then if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ] && [ -f "package.json" ] && [ -f "$LOCK_FILE" ]; then
# Check if package.json is newer than lock file # Calculate hash of package files (content-based, not timestamp)
if [ "package.json" -nt "$LOCK_FILE" ]; then CURRENT_HASH=$(cat package.json "$LOCK_FILE" 2>/dev/null | md5sum | cut -d' ' -f1)
echo -e "${YELLOW}package.json is newer than $LOCK_FILE, reinstalling...${NC}"
NEED_INSTALL=true # Check if hash file exists and matches
else if [ -f "$DEPENDENCY_HASH_FILE" ]; then
# Check if all dependencies are installed by checking if node_modules/.bin exists and has entries SAVED_HASH=$(cat "$DEPENDENCY_HASH_FILE" 2>/dev/null)
if [ "$CURRENT_HASH" = "$SAVED_HASH" ]; then
# Hash matches, check if key dependencies exist
if [ -d "node_modules/.bin" ] && [ "$(ls -A node_modules/.bin 2>/dev/null | wc -l)" -gt 0 ]; then if [ -d "node_modules/.bin" ] && [ "$(ls -A node_modules/.bin 2>/dev/null | wc -l)" -gt 0 ]; then
# Quick check: verify that key dependencies exist
if [ -d "node_modules/next" ] && [ -d "node_modules/react" ] && [ -d "node_modules/typescript" ]; then if [ -d "node_modules/next" ] && [ -d "node_modules/react" ] && [ -d "node_modules/typescript" ]; then
echo -e "${GREEN}Dependencies already installed, skipping...${NC}" echo -e "${GREEN}Dependencies are up to date (content unchanged), skipping installation...${NC}"
NEED_INSTALL=false NEED_INSTALL=false
else else
echo -e "${YELLOW}Some dependencies missing, reinstalling...${NC}" echo -e "${YELLOW}Hash matches but some dependencies missing, reinstalling...${NC}"
NEED_INSTALL=true NEED_INSTALL=true
fi fi
else else
echo -e "${YELLOW}node_modules appears incomplete, reinstalling...${NC}" echo -e "${YELLOW}Hash matches but node_modules incomplete, reinstalling...${NC}"
NEED_INSTALL=true NEED_INSTALL=true
fi fi
else
echo -e "${YELLOW}Dependency files changed (content differs), reinstalling...${NC}"
NEED_INSTALL=true
fi
else
echo -e "${YELLOW}No hash file found, need to install dependencies...${NC}"
NEED_INSTALL=true
fi fi
fi fi
if [ "$NEED_INSTALL" = true ]; then if [ "$NEED_INSTALL" = true ]; then
echo -e "${YELLOW}Installing dependencies...${NC}" echo -e "${YELLOW}Installing dependencies...${NC}"
npm ci --legacy-peer-deps --production=false npm ci --legacy-peer-deps --production=false
# Save hash after successful installation
if [ -n "$LOCK_FILE" ] && [ -f "package.json" ] && [ -f "$LOCK_FILE" ]; then
cat package.json "$LOCK_FILE" 2>/dev/null | md5sum | cut -d' ' -f1 > "$DEPENDENCY_HASH_FILE"
echo -e "${GREEN}Saved dependency hash for future checks${NC}"
fi
else else
echo -e "${GREEN}Dependencies are up to date, skipping installation${NC}" echo -e "${GREEN}Dependencies are up to date, skipping installation${NC}"
fi fi

View File

@@ -16,25 +16,29 @@ export function ThemeSwitcher() {
const { setTheme } = useTheme() const { setTheme } = useTheme()
return ( return (
<div className="flex-shrink-0">
<DropdownMenu> <DropdownMenu>
<DropdownMenuTrigger asChild> <DropdownMenuTrigger asChild>
<Button variant="outline" size="icon" className="min-w-[44px] min-h-[44px] md:min-w-0 md:min-h-0"> <Button variant="outline" className="min-h-[44px] md:min-h-0 flex-shrink-0 gap-2 px-3 whitespace-nowrap">
<Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" /> <div className="relative h-[1.2rem] w-[1.2rem] flex-shrink-0">
<Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" /> <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0 absolute inset-0" />
<span className="sr-only">Toggle theme</span> <Moon className="h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100 absolute inset-0" />
</div>
<span className="flex-shrink-0">Тема</span>
</Button> </Button>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent align="end"> <DropdownMenuContent align="end" className="min-w-[140px] whitespace-nowrap">
<DropdownMenuItem onClick={() => setTheme('light')}> <DropdownMenuItem onClick={() => setTheme('light')} className="whitespace-nowrap">
Светлая тема Светлая тема
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme('dark')}> <DropdownMenuItem onClick={() => setTheme('dark')} className="whitespace-nowrap">
Темная тема Темная тема
</DropdownMenuItem> </DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme('system')}> <DropdownMenuItem onClick={() => setTheme('system')} className="whitespace-nowrap">
Как в системе Как в системе
</DropdownMenuItem> </DropdownMenuItem>
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
</div>
) )
} }

View File

@@ -162,13 +162,10 @@ export default function HomePage({ groups, groupsByCourse }: HomePageProps) {
</Button> </Button>
</div> </div>
<div <div
className="relative stagger-card" className="stagger-card"
style={{ animationDelay: `${0.15 + courseOffsets.totalGroups * 0.04 + 0.08}s` } as React.CSSProperties} style={{ animationDelay: `${0.15 + courseOffsets.totalGroups * 0.04 + 0.08}s` } as React.CSSProperties}
> >
<ThemeSwitcher /> <ThemeSwitcher />
<span className="absolute -bottom-5 left-1/2 transform -translate-x-1/2 text-xs text-muted-foreground whitespace-nowrap sm:hidden">
Тема
</span>
</div> </div>
<div <div
className="stagger-card" className="stagger-card"

View File

@@ -55,10 +55,11 @@ export function NavBar({ cacheAvailableFor, groups }: {
</li> </li>
</ul> </ul>
</div> </div>
<div className='flex gap-1 min-[500px]:gap-2 flex-shrink-0'> <div className='flex gap-1 min-[500px]:gap-2 flex-shrink-0 items-center flex-nowrap'>
<Link href={GITHUB_REPO_URL} target='_blank' rel='nofollower noreferrer'> <Link href={GITHUB_REPO_URL} target='_blank' rel='nofollower noreferrer' className="flex-shrink-0">
<Button variant='outline' size='icon' className="min-w-[44px] min-h-[44px] md:min-w-0 md:min-h-0" tabIndex={-1}> <Button variant='outline' size='icon' className="min-w-[44px] min-h-[44px] md:min-w-0 md:min-h-0 flex-shrink-0" tabIndex={-1}>
<FaGithub /> <FaGithub />
<span className="sr-only">GitHub</span>
</Button> </Button>
</Link> </Link>
<ThemeSwitcher /> <ThemeSwitcher />

View File

@@ -126,7 +126,10 @@ export function Lesson({ lesson, width = 350, animationDelay }: {
{!isCancelled && ('place' in lesson && lesson.place) && ( {!isCancelled && ('place' in lesson && lesson.place) && (
<div className='flex flex-col text-muted-foreground text-xs break-words mt-3 md:hidden'> <div className='flex flex-col text-muted-foreground text-xs break-words mt-3 md:hidden'>
<span className='flex items-center gap-2'><BsFillGeoAltFill /> <span className="break-words">{lesson.place.address}</span></span> <span className='flex items-center gap-2'><BsFillGeoAltFill /> <span className="break-words">{lesson.place.address}</span></span>
<span className='font-bold flex items-center gap-2'><RiGroup2Fill /> {lesson.place.classroom}</span> <span className='flex items-center gap-2 mt-1'>
<RiGroup2Fill />
<Badge variant="outline" className="font-bold text-xs">{lesson.place.classroom}</Badge>
</span>
</div> </div>
)} )}
</CardContent> </CardContent>
@@ -135,7 +138,10 @@ export function Lesson({ lesson, width = 350, animationDelay }: {
{('place' in lesson && lesson.place) ? ( {('place' in lesson && lesson.place) ? (
<div className='hidden md:flex flex-col text-muted-foreground text-xs break-words'> <div className='hidden md:flex flex-col text-muted-foreground text-xs break-words'>
<span className='flex items-center gap-2'><BsFillGeoAltFill /> <span className="break-words">{lesson.place.address}</span></span> <span className='flex items-center gap-2'><BsFillGeoAltFill /> <span className="break-words">{lesson.place.address}</span></span>
<span className='font-bold flex items-center gap-2'><RiGroup2Fill /> {lesson.place.classroom}</span> <span className='flex items-center gap-2 mt-1'>
<RiGroup2Fill />
<Badge variant="outline" className="font-bold text-xs">{lesson.place.classroom}</Badge>
</span>
</div> </div>
) : <span />} ) : <span />}
{Boolean(lesson.resources.length) && ( {Boolean(lesson.resources.length) && (