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
@@ -169,38 +169,54 @@ cd "$INSTALL_DIR"
|
||||
# Check if node_modules exists and is up to date
|
||||
NEED_INSTALL=true
|
||||
LOCK_FILE=""
|
||||
DEPENDENCY_HASH_FILE="$INSTALL_DIR/.dependencies.hash"
|
||||
|
||||
if [ -f "package-lock.json" ]; then
|
||||
LOCK_FILE="package-lock.json"
|
||||
elif [ -f "pnpm-lock.yaml" ]; then
|
||||
LOCK_FILE="pnpm-lock.yaml"
|
||||
fi
|
||||
|
||||
if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ]; then
|
||||
# Check if package.json is newer than lock file
|
||||
if [ "package.json" -nt "$LOCK_FILE" ]; then
|
||||
echo -e "${YELLOW}package.json is newer than $LOCK_FILE, reinstalling...${NC}"
|
||||
NEED_INSTALL=true
|
||||
else
|
||||
# Check if all dependencies are installed by checking if node_modules/.bin exists and has entries
|
||||
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
|
||||
echo -e "${GREEN}Dependencies already installed, skipping...${NC}"
|
||||
NEED_INSTALL=false
|
||||
if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ] && [ -f "package.json" ] && [ -f "$LOCK_FILE" ]; then
|
||||
# Calculate hash of package files (content-based, not timestamp)
|
||||
CURRENT_HASH=$(cat package.json "$LOCK_FILE" 2>/dev/null | md5sum | cut -d' ' -f1)
|
||||
|
||||
# Check if hash file exists and matches
|
||||
if [ -f "$DEPENDENCY_HASH_FILE" ]; then
|
||||
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/next" ] && [ -d "node_modules/react" ] && [ -d "node_modules/typescript" ]; then
|
||||
echo -e "${GREEN}Dependencies are up to date (content unchanged), skipping installation...${NC}"
|
||||
NEED_INSTALL=false
|
||||
else
|
||||
echo -e "${YELLOW}Hash matches but some dependencies missing, reinstalling...${NC}"
|
||||
NEED_INSTALL=true
|
||||
fi
|
||||
else
|
||||
echo -e "${YELLOW}Some dependencies missing, reinstalling...${NC}"
|
||||
echo -e "${YELLOW}Hash matches but node_modules incomplete, reinstalling...${NC}"
|
||||
NEED_INSTALL=true
|
||||
fi
|
||||
else
|
||||
echo -e "${YELLOW}node_modules appears incomplete, reinstalling...${NC}"
|
||||
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
|
||||
|
||||
if [ "$NEED_INSTALL" = true ]; then
|
||||
echo -e "${YELLOW}Installing dependencies...${NC}"
|
||||
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
|
||||
echo -e "${GREEN}Dependencies are up to date, skipping installation${NC}"
|
||||
fi
|
||||
|
||||
@@ -102,6 +102,7 @@ case "$1" in
|
||||
--exclude='.env.test' \
|
||||
--exclude='.env.test.local' \
|
||||
--exclude='*.md' \
|
||||
--exclude='.dependencies.hash' \
|
||||
"$PROJECT_DIR/" "$INSTALL_DIR/"
|
||||
|
||||
# Handle .env file (preserve existing if present)
|
||||
@@ -121,38 +122,54 @@ case "$1" in
|
||||
# Check if node_modules exists and is up to date
|
||||
NEED_INSTALL=true
|
||||
LOCK_FILE=""
|
||||
DEPENDENCY_HASH_FILE="$INSTALL_DIR/.dependencies.hash"
|
||||
|
||||
if [ -f "package-lock.json" ]; then
|
||||
LOCK_FILE="package-lock.json"
|
||||
elif [ -f "pnpm-lock.yaml" ]; then
|
||||
LOCK_FILE="pnpm-lock.yaml"
|
||||
fi
|
||||
|
||||
if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ]; then
|
||||
# Check if package.json is newer than lock file
|
||||
if [ "package.json" -nt "$LOCK_FILE" ]; then
|
||||
echo -e "${YELLOW}package.json is newer than $LOCK_FILE, reinstalling...${NC}"
|
||||
NEED_INSTALL=true
|
||||
else
|
||||
# Check if all dependencies are installed by checking if node_modules/.bin exists and has entries
|
||||
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
|
||||
echo -e "${GREEN}Dependencies already installed, skipping...${NC}"
|
||||
NEED_INSTALL=false
|
||||
if [ -d "node_modules" ] && [ -n "$LOCK_FILE" ] && [ -f "package.json" ] && [ -f "$LOCK_FILE" ]; then
|
||||
# Calculate hash of package files (content-based, not timestamp)
|
||||
CURRENT_HASH=$(cat package.json "$LOCK_FILE" 2>/dev/null | md5sum | cut -d' ' -f1)
|
||||
|
||||
# Check if hash file exists and matches
|
||||
if [ -f "$DEPENDENCY_HASH_FILE" ]; then
|
||||
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/next" ] && [ -d "node_modules/react" ] && [ -d "node_modules/typescript" ]; then
|
||||
echo -e "${GREEN}Dependencies are up to date (content unchanged), skipping installation...${NC}"
|
||||
NEED_INSTALL=false
|
||||
else
|
||||
echo -e "${YELLOW}Hash matches but some dependencies missing, reinstalling...${NC}"
|
||||
NEED_INSTALL=true
|
||||
fi
|
||||
else
|
||||
echo -e "${YELLOW}Some dependencies missing, reinstalling...${NC}"
|
||||
echo -e "${YELLOW}Hash matches but node_modules incomplete, reinstalling...${NC}"
|
||||
NEED_INSTALL=true
|
||||
fi
|
||||
else
|
||||
echo -e "${YELLOW}node_modules appears incomplete, reinstalling...${NC}"
|
||||
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
|
||||
|
||||
if [ "$NEED_INSTALL" = true ]; then
|
||||
echo -e "${YELLOW}Installing dependencies...${NC}"
|
||||
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
|
||||
echo -e "${GREEN}Dependencies are up to date, skipping installation${NC}"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user