Merge pull request #28 from CivicTechAtlanta/fix-service-worker

Fix service worker

Author: MotorizedWandOfFury

.github/workflows/build-and-deploy.yml

@@ -26,8 +26,6 @@ jobs:
           cache: npm
       - name: Setup Pages
         uses: actions/configure-pages@v5
-        with:
-          static_site_generator: next
       - name: Restore cache
         uses: actions/cache@v4
         with:

README.md

@@ -8,20 +8,11 @@ First, run the development server:
 npm run dev
 ```
 
-Open [http://localhost:3000/](http://localhost:3000/) with your browser to see the result.
+Open [http://localhost:3000/agua-vida-poc](http://localhost:3000/agua-vida-poc) with your browser to see the result.
 
 You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
 
 This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
 
 ## Serve Exported Static Site
-Run `npm run build` to generate static files. Then run `npx serve@latest out` to host static site locally.
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+Run `npm run build` to generate static files. Then run `npx serve@latest out` to host static site locally. You may need to comment out the `basePath` configuration in the `next.config.ts` file before running `npm run build` to ensure the paths are correct locally.

manifest-path-fixup.sh

@@ -4,7 +4,7 @@ echo 'fixing manifest.json path in generated html files...'
 
 for html in $(find ./out -iregex '.*\.html' -not -wholename '*/404.html')
 do
-    sed -i -e 's/\/manifest.json/\/agua-vida-poc\/manifest.json/' $html
+    sed -i -e 's/\/manifest.json/manifest.json/' $html
     echo "fixed $html"
 done
 

next.config.ts

@@ -9,6 +9,7 @@ const withSerwist = withSerwistInit({
 
 const nextConfig: NextConfig = {
   output: 'export',
+  basePath: '/agua-vida-poc',
 };
 
 export default withSerwist(nextConfig);

src/app/chlorine-weight/page.tsx

@@ -16,8 +16,6 @@ export default function ChlorineWeightFormula() {
     const [errorMessage, setErrorMessage] = useState('');
 
     const [showModal, setShowModal] = useState(null as string | null);
-    console.log('showModal:', showModal);
-    console.log('showModal === info:', showModal === 'info');
 
     const [formData, setFormData] = useState({
         motherSolution: '',
@@ -30,11 +28,6 @@ export default function ChlorineWeightFormula() {
     //Calculate the weight of chlorine needed
     const chlorineWeight = .36 * ((Number(formData.motherSolution) * Number(formData.waterIngress) * Number(formData.desiredConcentration)) / (Number(formData.dripRate) * Number(formData.chlorinePercentage)))
 
-    function printChlorineFormula() {
-        console.log("The weight of chlorine needed is: " + chlorineWeight + " grams");
-    }
-    printChlorineFormula()  // The weight of chlorine needed is: 0.6 grams
-
     const handleClick = () => {
         if (
             formData.motherSolution === '' ||

src/app/components/Home/Home.tsx

@@ -3,7 +3,7 @@ import './Home.scss';
 
 export default function Home() {
     return (
-        <Link href="/">
+        <Link href="//">
             <svg className="home" viewBox="0,0,256,256" width="50px" height="50px" fillRule="nonzero"><g fillRule="nonzero" stroke="none" strokeWidth="1" strokeLinecap="butt" strokeLinejoin="miter" strokeMiterlimit="10" strokeDasharray="" strokeDashoffset="0"><g transform="scale(5.12,5.12)"><path d="M25,1.05078c-0.2175,0 -0.43414,0.06898 -0.61914,0.20898l-23,17.95117c-0.43,0.34 -0.50992,0.9682 -0.16992,1.4082c0.34,0.43 0.9682,0.50992 1.4082,0.16992l1.38086,-1.07812v26.28906c0,0.55 0.45,1 1,1h14v-18h12v18h14c0.55,0 1,-0.45 1,-1v-26.28906l1.38086,1.07812c0.19,0.14 0.39914,0.21094 0.61914,0.21094c0.3,0 0.58906,-0.13086 0.78906,-0.38086c0.34,-0.44 0.26008,-1.0682 -0.16992,-1.4082l-23,-17.95117c-0.185,-0.14 -0.40164,-0.20898 -0.61914,-0.20898zM35,5v1.05078l6,4.67969v-5.73047z"></path></g></g></svg>
         </Link>
     );

src/app/mother-solution-concentration/page.tsx

@@ -9,25 +9,6 @@ import LanguageSelector from "../components/LanguageSelector/LanguageSelector";
 
 import "./styles/Main.css";
 
-
-const mother_solution_volume = 600; // liters
-const weight_of_chlorine = 100; // grams
-const desired_reservoir_concentration = 1; // miligrams/liter
-
-const concentration_mother_solution =
-  (weight_of_chlorine * 10 * desired_reservoir_concentration) /
-  mother_solution_volume; // miligrams/liter
-
-function printMotherSolutionConcentration() {
-  console.log(
-    "The concentration of the mother solution is: " +
-    concentration_mother_solution +
-    " milligrams/liter"
-  );
-}
-
-printMotherSolutionConcentration();
-
 export default function MotherSolutionConcentrationFormula() {
   const { t } = useTranslation();
 

src/app/reservoir-ingress/page.tsx

@@ -8,24 +8,6 @@ import "./styles/Main.css";
 import LanguageSelector from "../components/LanguageSelector/LanguageSelector";
 import Home from "../components/Home/Home";
 
-const containerSize = 20  // liters
-
-const tryOne = 20 // seconds
-const tryTwo = 25
-const tryThree = 22
-
-const sum = tryOne + tryTwo + tryThree
-
-const avg = sum / 3
-
-const ingress = containerSize / avg  // liters/second
-
-function printIngressFormula() {
-    console.log("The ingress formula is: " + ingress + " liters/second");
-}
-
-printIngressFormula()
-
 export default function ReservoirIngressFormula() {
     const { t } = useTranslation();