From 21f1110323d40f050eb8a171be06aeba1a5c3dec Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Sat, 15 Jul 2023 15:43:55 -0400
Subject: [PATCH] Package React files in common to ui subdirectory

---
 common/src/{ => ui}/DayChanger.test.tsx    | 0
 common/src/{ => ui}/DayChanger.tsx         | 2 +-
 common/src/{ => ui}/MobileTooltip.scss     | 0
 common/src/{ => ui}/MobileTooltip.tsx      | 0
 common/src/{ => ui}/MonthBasedCalendar.tsx | 0
 frcal/src/Calendar.tsx                     | 4 ++--
 frcal/src/index.scss                       | 2 +-
 frcal/src/index.tsx                        | 2 +-
 jcal/src/App.tsx                           | 2 +-
 jcal/src/Calendar.tsx                      | 4 ++--
 jcal/src/index.scss                        | 2 +-
 jcal/src/index.tsx                         | 2 +-
 12 files changed, 10 insertions(+), 10 deletions(-)
 rename common/src/{ => ui}/DayChanger.test.tsx (100%)
 rename common/src/{ => ui}/DayChanger.tsx (94%)
 rename common/src/{ => ui}/MobileTooltip.scss (100%)
 rename common/src/{ => ui}/MobileTooltip.tsx (100%)
 rename common/src/{ => ui}/MonthBasedCalendar.tsx (100%)

diff --git a/common/src/DayChanger.test.tsx b/common/src/ui/DayChanger.test.tsx
similarity index 100%
rename from common/src/DayChanger.test.tsx
rename to common/src/ui/DayChanger.test.tsx
diff --git a/common/src/DayChanger.tsx b/common/src/ui/DayChanger.tsx
similarity index 94%
rename from common/src/DayChanger.tsx
rename to common/src/ui/DayChanger.tsx
index efb423e..a8f84dc 100644
--- a/common/src/DayChanger.tsx
+++ b/common/src/ui/DayChanger.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {dateJDN} from './gregorian';
+import {dateJDN} from '../gregorian';
 
 function dayMs(date: Date): number {
     return date.getHours() * 3_600_000 + date.getMinutes() * 60_000 + date.getSeconds() * 1000 + date.getMilliseconds();
diff --git a/common/src/MobileTooltip.scss b/common/src/ui/MobileTooltip.scss
similarity index 100%
rename from common/src/MobileTooltip.scss
rename to common/src/ui/MobileTooltip.scss
diff --git a/common/src/MobileTooltip.tsx b/common/src/ui/MobileTooltip.tsx
similarity index 100%
rename from common/src/MobileTooltip.tsx
rename to common/src/ui/MobileTooltip.tsx
diff --git a/common/src/MonthBasedCalendar.tsx b/common/src/ui/MonthBasedCalendar.tsx
similarity index 100%
rename from common/src/MonthBasedCalendar.tsx
rename to common/src/ui/MonthBasedCalendar.tsx
diff --git a/frcal/src/Calendar.tsx b/frcal/src/Calendar.tsx
index 13eb204..ecd3ce6 100644
--- a/frcal/src/Calendar.tsx
+++ b/frcal/src/Calendar.tsx
@@ -15,8 +15,8 @@ import {
 } from '@common/french';
 import {jdnDate} from '@common/gregorian';
 import {jdnLongCount} from '@common/longCount';
-import {useMobileTooltipProps} from '@common/MobileTooltip';
-import {MonthBasedCalendar} from '@common/MonthBasedCalendar';
+import {useMobileTooltipProps} from '@common/ui/MobileTooltip';
+import {MonthBasedCalendar} from '@common/ui/MonthBasedCalendar';
 
 type FrenchYear = number;
 
diff --git a/frcal/src/index.scss b/frcal/src/index.scss
index a0fb809..de7a422 100644
--- a/frcal/src/index.scss
+++ b/frcal/src/index.scss
@@ -9,7 +9,7 @@
 @import 'bootstrap/scss/forms';
 @import 'bootstrap/scss/root';
 @import './consts';
-@import '@common/MobileTooltip.scss';
+@import '@common/ui/MobileTooltip.scss';
 
 body {
   padding-top: $spacer * 4;
diff --git a/frcal/src/index.tsx b/frcal/src/index.tsx
index 19cf95e..4c53ce7 100644
--- a/frcal/src/index.tsx
+++ b/frcal/src/index.tsx
@@ -4,7 +4,7 @@ import 'bootstrap/js/dist/collapse';
 import './index.scss';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
-import {MobileTooltipProvider} from '@common/MobileTooltip';
+import {MobileTooltipProvider} from '@common/ui/MobileTooltip';
 
 ReactDOM.render(
     <React.StrictMode>
diff --git a/jcal/src/App.tsx b/jcal/src/App.tsx
index 9af34d5..157d537 100644
--- a/jcal/src/App.tsx
+++ b/jcal/src/App.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {Calendar} from './Calendar';
 import {dateJDN, gregorianJDN, JulianMonth} from '@common/gregorian';
-import {DayChanger} from '@common/DayChanger';
+import {DayChanger} from '@common/ui/DayChanger';
 import {jdnJulian} from '@common/julian';
 import {GregorianJumper} from '@common/dateJump';
 
diff --git a/jcal/src/Calendar.tsx b/jcal/src/Calendar.tsx
index 581ebdd..0a8408b 100644
--- a/jcal/src/Calendar.tsx
+++ b/jcal/src/Calendar.tsx
@@ -4,8 +4,8 @@ import {formatJG, jdnGregorian, JulianDay, JulianMonth, monthName, weekdayNames}
 import {jdnLongCount} from '@common/longCount';
 import {jdnJulian, julianJDN, julianMonthDays} from '@common/julian';
 import {frDateFormat, frEndJD, frStartJD, jdnFrench} from '@common/french';
-import {useMobileTooltipProps} from '@common/MobileTooltip';
-import {MonthBasedCalendar} from '@common/MonthBasedCalendar';
+import {useMobileTooltipProps} from '@common/ui/MobileTooltip';
+import {MonthBasedCalendar} from '@common/ui/MonthBasedCalendar';
 
 type JulianYear = number;
 
diff --git a/jcal/src/index.scss b/jcal/src/index.scss
index a0fb809..de7a422 100644
--- a/jcal/src/index.scss
+++ b/jcal/src/index.scss
@@ -9,7 +9,7 @@
 @import 'bootstrap/scss/forms';
 @import 'bootstrap/scss/root';
 @import './consts';
-@import '@common/MobileTooltip.scss';
+@import '@common/ui/MobileTooltip.scss';
 
 body {
   padding-top: $spacer * 4;
diff --git a/jcal/src/index.tsx b/jcal/src/index.tsx
index 19cf95e..4c53ce7 100644
--- a/jcal/src/index.tsx
+++ b/jcal/src/index.tsx
@@ -4,7 +4,7 @@ import 'bootstrap/js/dist/collapse';
 import './index.scss';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
-import {MobileTooltipProvider} from '@common/MobileTooltip';
+import {MobileTooltipProvider} from '@common/ui/MobileTooltip';
 
 ReactDOM.render(
     <React.StrictMode>