Merge pull request #131 from dump-hr/app-cleanup

app cleanup

.dockerignore

@@ -1,2 +1,3 @@
 node_modules
-.turbo
+.turbo
+.env.local

.github/workflows/deploy.yml

@@ -30,6 +30,7 @@ jobs:
 
       - name: Build frontend web apps
         run: yarn build --filter=admin... --filter=sponsor...
+        # TODO: web
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2

.github/workflows/docker-image-build.yml

@@ -30,6 +30,7 @@ jobs:
 
       - name: Build frontend web apps
         run: yarn build --filter=admin... --filter=sponsor...
+        # TODO: web
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2

.github/workflows/lint.yml

@@ -5,8 +5,48 @@ on:
   workflow_dispatch:
 
 jobs:
-  eslint_web:
-    name: Run ESLint (web)
+  # eslint_web:
+  #   name: Run ESLint (web)
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v3
+
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 18.x
+  #         cache: 'yarn'
+
+  #     - name: Install dependencies
+  #       run: yarn install --immutable
+
+  #     - name: Run ESLint
+  #       run: yarn workspace web run lint
+
+  eslint_sponsor:
+    name: Run ESLint (sponsor)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18.x
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Run ESLint
+        run: yarn workspace sponsor run lint
+
+  eslint_admin:
+    name: Run ESLint (admin)
     runs-on: ubuntu-latest
 
     steps:
@@ -23,7 +63,7 @@ jobs:
         run: yarn install --immutable
 
       - name: Run ESLint
-        run: yarn workspace web run lint
+        run: yarn workspace admin run lint
 
   eslint_api:
     name: Run ESLint (api)

.gitignore

@@ -1,2 +1,4 @@
 node_modules
 .turbo
+.env.local
+dist

.vscode/settings.json

@@ -1,8 +1,8 @@
 {
-    "eslint.workingDirectories": [{ "mode": "auto" }],
-    "eslint.format.enable": true,
-    "editor.codeActionsOnSave": {
-      "source.fixAll": "explicit",
-      "source.fixAll.eslint": "explicit"
-    }
-}
+  "eslint.workingDirectories": [{ "mode": "auto" }],
+  "eslint.format.enable": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "explicit",
+    "source.fixAll.eslint": "explicit"
+  }
+}

README.md

@@ -1,6 +1,8 @@
 <h1 align="center">DUMP Days App</h1>
 
-DUMP Days App
+Env        | CI status
+---------- | ---------
+Production | ![Deploy](https://github.com/dump-hr/ddays-app/actions/workflows/deploy.yml/badge.svg?branch=main) ![Lint](https://github.com/dump-hr/ddays-app/actions/workflows/lint.yml/badge.svg?branch=main)
 
 ## Development
 
@@ -11,16 +13,12 @@ DUMP Days App
 
 #### Setup environment
 
-1. Run `docker compose up` in separate terminal or follow steps below if you already have postgres server running locally. 
-
-    If you use local postgres db server, create manually new database named `ddays` 
+1. Run `docker compose up` in separate terminal or follow steps below if you already have postgres server running locally.
 
+   If you use local postgres db server, create manually new database named `ddays-app` 
 
 2. Create `.env.local` file that can override configuration options from `.env` in web/api apps.
 
-    Add required env variables for `api`:
-   - `DATABASE_URL`
-
 #### Install dependencies
 
 Run command from workspace level
@@ -32,28 +30,24 @@ yarn
 #### Generate new database migrations (after adding models)
 
 ```
-yarn generate
+yarn db:generate
 ```
 
 #### Run database migrations
 
 ```
-yarn migrate
+yarn db:migrate
 ```
 
-#### Run database seed
-
-```
-//todo
-```
+or just restart development server
 
-#### Run app
+#### Run development server
 
 ```
 yarn dev
 ```
 
-App is now accessible on <http://localhost:5173/>. API routes are prefixed with `/api`.
+App is now accessible on <http://localhost:3000/>. API routes are prefixed with `/api`, Admin app is prefixed with `/admin` and Sponsor app is prefixed with `/sponsor`.
 
 ## Cookbook
 

apps/admin/.env

@@ -1 +1 @@
-VITE_MSAL_CLIENT_ID='c98e2d15-0979-4dbe-96d1-f8afa75b9207'
+VITE_MSAL_CLIENT_ID=c98e2d15-0979-4dbe-96d1-f8afa75b9207

apps/admin/index.html

@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>DUMP Days Admin</title>
+    <!-- TODO: ubacit react helmet i titleove po pageu kao u sponsor appu -->
   </head>
   <body>
     <div id="root"></div>

apps/admin/package.json

@@ -6,12 +6,12 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
+    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
   },
   "dependencies": {
     "@azure/msal-browser": "^3.6.0",
     "@azure/msal-react": "^2.0.8",
+    "@hookform/resolvers": "^3.3.4",
     "axios": "^1.6.2",
     "clsx": "^2.0.0",
     "date-fns": "^3.0.0",

apps/admin/src/App.tsx

@@ -5,17 +5,10 @@ import { useMsalAuthentication } from '@azure/msal-react';
 import { Toaster } from 'react-hot-toast';
 import { Route, Switch } from 'wouter';
 
-import Layout from './components/Layout';
+import { Layout } from './components/Layout';
 import { Path } from './constants/paths';
-import AchievementsPage from './pages/AchievementsPage';
-import CompaniesPage from './pages/CompaniesPage';
-import EventsPage from './pages/EventsPage';
-import FrequentlyAskedQuestionPage from './pages/FrequentlyAskedQuestion';
-import GuestPage from './pages/GuestPage';
-import HomePage from './pages/HomePage';
-import InterestsPage from './pages/InterestsPage';
-import NotificationsPage from './pages/NotificationsPage/NotificationsPage';
-import SurveyQuestionsPage from './pages/SurveyQuestionsPage';
+import { CompanyPage } from './pages/CompanyPage';
+import { HomePage } from './pages/HomePage';
 
 export const App = () => {
   useMsalAuthentication(InteractionType.Redirect);
@@ -25,22 +18,10 @@ export const App = () => {
       <Layout>
         <Switch>
           <Route path={Path.Home} component={HomePage} />
-          <Route path={Path.Guest} component={GuestPage} />˝
-          <Route path={Path.Events} component={EventsPage} />
-          <Route path={Path.Achievements} component={AchievementsPage} />
-          <Route path={Path.Interests} component={InterestsPage} />
-          <Route
-            path={Path.FrequentlyAskedQuestions}
-            component={FrequentlyAskedQuestionPage}
-          />
-          <Route path={Path.SurveyQuestions} component={SurveyQuestionsPage} />
-          <Route path={Path.Notifications} component={NotificationsPage} />
-          <Route path={Path.Companies} component={CompaniesPage} />
+          <Route path={Path.Company} component={CompanyPage} />
         </Switch>
       </Layout>
       <Toaster />
     </>
   );
 };
-
-export default App;