Design a new project structure

.github/workflows/badges.yml

@@ -45,12 +45,12 @@ jobs:
 
       - name: Installing dependencies
         run: |
-          cd app
+          cd ui
           npm install
 
       - name: Tests
         run: |
-          cd app
+          cd ui
           npm run test:coverage
 
       - name: Switch to badges branch

.github/workflows/ci.yml

@@ -45,15 +45,15 @@ jobs:
 
       - name: Install dependencies
         run: |
-          cd app
+          cd ui
           npm install
 
       - name: Run ESLint
         run: |
-          cd app
+          cd ui
           npm run lint
 
       - name: Run Jest Tests
         run: |
-          cd app
+          cd ui
           npm run test

.gitignore

@@ -1,48 +1,48 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-app/node_modules
-app/.pnp
-app/pnp.js
+ui/node_modules
+ui/.pnp
+ui/pnp.js
 
 # testing
-app/coverage
+ui/coverage
 
 # next.js
-app/.next/
-app/out/
+ui/.next/
+ui/out/
 
 # production
-app/build
+ui/build
 
 # misc
 **/.DS_Store
-app/*.pem
+ui/*.pem
 
 # debug
-app/npm-debug.log*
-app/yarn-debug.log*
-app/yarn-error.log*
-app/.pnpm-debug.log*
+ui/npm-debug.log*
+ui/yarn-debug.log*
+ui/yarn-error.log*
+ui/.pnpm-debug.log*
 
 # local env files
-app/.env*.local
+ui/.env*.local
 
 # vercel
-app/.vercel
+ui/.vercel
 
 # typescript
-app/*.tsbuildinfo
-app/next-env.d.ts
+ui/*.tsbuildinfo
+ui/next-env.d.ts
 
 # IDEs
 .idea
 .vscode
-app/.idea
-app/.vscode
+ui/.idea
+ui/.vscode
 
 # package-lock
-app/package-lock.json
+ui/package-lock.json
 
 # api
 api/.classpath
@@ -57,5 +57,5 @@ api/*.iml
 api/.DS_Store
 
 # cypress
-app/cypress/screenshots/*
-app/cypress/downloads/*
+ui/cypress/screenshots/*
+ui/cypress/downloads/*

api/src/test/java/edu/hawaii/its/holiday/service/HolidayServiceTest.java

@@ -610,11 +610,11 @@ public void various() {
 
                 // String dateStr = Dates.formatDate(h2.getObservedDate().plusDays(-1), "yyyy-MM-dd");
                 // String dateExpectedStr = h1.getObservedDateStr();
-
                 // Holiday holiday = holidayService.findClosestHolidayByDate(dateStr, false, "state");
                 // assertThat(holiday.getObservedDateStr(), equalTo(dateExpectedStr));
             }
 
+
             // String dateStr = "3000-01-01";
             // String dateExpectedStr = holidays.get(holidays.size() - 1).getObservedDateStr();
             // Holiday holiday;