Improve imports regarding

.github/workflows/manage-organization.yml

@@ -64,7 +64,7 @@ jobs:
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add public/organizations/$ORG_NAME_SLUG.$IMAGE_EXT data/users.json
+          git add public/organizations/$ORG_NAME_SLUG.$IMAGE_EXT src/data/users.json
           git commit -m "Add organization $ORG_NAME"
       - name: Create Pull Request
         if: steps.update_data.outputs.valid == 'true'

.github/workflows/scripts/create_organization_pr.js

@@ -95,7 +95,7 @@ module.exports = async ({ github, context, core }) => {
   }
 
   // Update the users.json file
-  const usersPath = path.join(__dirname, '../../../data/users.json')
+  const usersPath = path.join(__dirname, '../../../src/data/users.json')
   const users = JSON.parse(fs.readFileSync(usersPath)) // Load the users
 
   let user = {

src/app/[locale]/layout.tsx

@@ -1,24 +1,14 @@
 import type {Metadata} from "next";
 import {Inter} from "next/font/google";
 import "./globals.css";
-import {Providers} from "@/src/app/[locale]/providers";
+import {Providers} from "@/app/[locale]/providers";
 import React from "react";
-import {routing} from "@/src/i18n/routing";
+import {routing} from "@/i18n/routing";
 import {notFound} from "next/navigation";
 import {setRequestLocale} from "next-intl/server";
 
 const inter = Inter({subsets: ["latin"]});
 
-export const metadata: Metadata = {
-    title: "eduMFA",
-    description: "Up-to-date multifactor authentication for academic institutions",
-    openGraph: {
-        title: "eduMFA",
-        type: "website",
-        url: "https://edumfa.com",
-    }
-};
-
 export function generateStaticParams() {
     return routing.locales.map((locale) => ({locale}));
 }

src/app/[locale]/page.tsx

@@ -5,11 +5,11 @@ import organizationData from "@/data/users.json";
 import {User} from "@/types/organizationTypes";
 import {Link} from "@heroui/link";
 import {ScrollShadow} from "@heroui/scroll-shadow";
-import {OrganizationBox} from "@/src/components/OrganizationBox";
-import {NavigationBar} from "@/src/components/NavigationBar";
+import {OrganizationBox} from "@/components/OrganizationBox";
+import {NavigationBar} from "@/components/NavigationBar";
 import {useTranslations} from "next-intl";
-import RichText from "@/src/components/RichText";
-import {Footer} from "@/src/components/Footer";
+import RichText from "@/components/RichText";
+import {Footer} from "@/components/Footer";
 
 const organizations = organizationData as User[];
 

src/app/layout.tsx

@@ -1,4 +1,15 @@
 import React from "react";
+import type {Metadata} from "next";
+
+export const metadata: Metadata = {
+    title: "eduMFA",
+    description: "Up-to-date multifactor authentication for academic institutions",
+    openGraph: {
+        title: "eduMFA",
+        type: "website",
+        url: "https://edumfa.com",
+    }
+};
 
 export default function RootLayout({ children } : { children: React.ReactNode }) {
     return children;

tsconfig.json

@@ -23,7 +23,7 @@
     ],
     "paths": {
       "@/*": [
-        "./*"
+        "./src/*"
       ]
     },
     "target": "ES2017"