Skip to content

Commit

Permalink
Merge remote changes and resolve PID file conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
sudoshi committed Feb 28, 2025
2 parents 07ab640 + bd6de0d commit ed6c280
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
/storage/pail
/vendor
.env
.env.backup
.env.production
.phpactor.json
.phpunit.result.cache
Homestead.json
Expand Down Expand Up @@ -40,8 +38,7 @@ config.local.php
/public/css
/public/js
/public/media
.env.*
!.env.example


# Temporary files
*.swp
Expand All @@ -58,3 +55,6 @@ config.local.php
/bootstrap/cache/*
!bootstrap/cache/.gitignore
composer.phar

# PID files
storage/pids/*.pid
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import { useORUtilizationData } from '@/hooks/useORUtilizationData';
import { useAnalytics } from '@/contexts/AnalyticsContext';
import { useORUtilizationData } from '@/Hooks/useORUtilizationData';
import { useAnalytics } from '@/Contexts/AnalyticsContext';
import HierarchicalFilters from '@/Components/Analytics/shared/HierarchicalFilters';
import { motion, AnimatePresence } from 'framer-motion';
import ErrorBoundary from '@/Components/ErrorBoundary';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import { mockTurnoverTimes } from '@/mock-data/turnover-times';
import useAnalyticsData from '@/hooks/useAnalyticsData';
import useAnalyticsData from '@/Hooks/useAnalyticsData';
import HierarchicalFilters from '@/Components/Analytics/shared/HierarchicalFilters';
import OverviewView from './Views/OverviewView';
import TrendsView from './Views/TrendsView';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { TrendingUp, TrendingDown, AlertCircle, Users, DoorOpen, Stethoscope, He
import ConfirmationDialog from './ConfirmationDialog';
import ActionFeedback from './ActionFeedback';
import StatusTooltip from './StatusTooltip';
import useResourceAction from '@/hooks/useResourceAction';
import useKeyboardNavigation from '@/hooks/useKeyboardNavigation';
import useResourceAction from '@/Hooks/useResourceAction';
import useKeyboardNavigation from '@/Hooks/useKeyboardNavigation';
import getResourceTooltips from './getResourceTooltips';

const ResourceOverview = ({ resourceData, predictions, onAction }) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useEffect, useRef, useCallback } from 'react';
import { X } from 'lucide-react';
import ActionDetails from './ActionDetails';
import useClickOutside from '@/hooks/useClickOutside';
import useModalAnimation from '@/hooks/useModalAnimation';
import useClickOutside from '@/Hooks/useClickOutside';
import useModalAnimation from '@/Hooks/useModalAnimation';
import './ActionModal.css';

const ActionModal = ({ isOpen, onClose, action }) => {
Expand Down
2 changes: 1 addition & 1 deletion resources/js/Layouts/AnalyticsLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Head } from '@inertiajs/react';
import AuthenticatedLayout, { useDarkMode } from '@/Layouts/AuthenticatedLayout';
import { FlowbiteThemeProvider, NivoThemeProvider } from '@/Components/ui';
import ErrorBoundary from '@/Components/ErrorBoundary';
import { AnalyticsProvider } from '@/contexts/AnalyticsContext';
import { AnalyticsProvider } from '@/Contexts/AnalyticsContext';

export default function AnalyticsLayout({ children, auth, title, headerButtons }) {
return (
Expand Down
1 change: 0 additions & 1 deletion storage/pids/laravel.pid

This file was deleted.

1 change: 0 additions & 1 deletion storage/pids/vite.pid

This file was deleted.

0 comments on commit ed6c280

Please sign in to comment.