Merge branch 'main' into feat/sponsorship-program

OWASP · Feb 27, 2025 · 07f5706 · 07f5706
2 parents eb87c95 + a60f6fa
commit 07f5706
Show file tree

Hide file tree

Showing 183 changed files with 1,215 additions and 1,349 deletions.
diff --git a/backend/docker/Dockerfile.local b/backend/docker/Dockerfile.local
@@ -26,7 +26,8 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends libpq-dev && \
     rm -rf /var/lib/apt/lists/* && \
     groupadd --system owasp && \
-    useradd --system --create-home --home-dir /home/owasp -g owasp owasp
+    useradd --system --create-home --home-dir /home/owasp -g owasp owasp && \
+    python -m pip install --no-cache-dir poetry
 
 ENV PATH="/home/owasp/.venv/bin:$PATH" \
     PYTHONUNBUFFERED=1

diff --git a/backend/poetry.lock b/backend/poetry.lock
diff --git a/backend/settings/local.py b/backend/settings/local.py
@@ -7,7 +7,10 @@ class Local(Base):
     """Local configuration."""
 
     APP_NAME = "OWASP Nest Local"
-    CORS_ALLOWED_ORIGINS = ("http://localhost:3000",)
+    CORS_ALLOWED_ORIGINS = (
+        "http://127.0.0.1:3000",
+        "http://localhost:3000",
+    )
     DEBUG = True
     LOGGING = {}
     SLACK_COMMANDS_ENABLED = True

diff --git a/e2e/pyproject.toml b/e2e/pyproject.toml
diff --git a/frontend/__tests__/e2e/pages/home.spec.ts b/frontend/__tests__/e2e/pages/home.spec.ts
@@ -24,14 +24,14 @@ test.describe('Home Page', () => {
   test('should have new chapters', async ({ page }) => {
     await expect(page.getByRole('heading', { name: 'New Chapters' })).toBeVisible()
     await expect(page.getByRole('link', { name: 'chapter 1' })).toBeVisible()
-    await expect(page.getByText('February 20,').first()).toBeVisible()
+    await expect(page.getByText('Feb 20,').first()).toBeVisible()
     await page.getByRole('link', { name: 'chapter 1' }).click()
     expect(page.url()).toContain('chapters/chapter-1')
   })
   test('should have new projects', async ({ page }) => {
     await expect(page.getByRole('heading', { name: 'New Projects' })).toBeVisible()
     await expect(page.getByRole('link', { name: 'Project 1' })).toBeVisible()
-    await expect(page.getByText('January 1,').first()).toBeVisible()
+    await expect(page.getByText('Jan 1,').first()).toBeVisible()
     await page.getByRole('link', { name: 'Project 1' }).click()
     expect(page.url()).toContain('projects/project-1')
   })
@@ -48,14 +48,14 @@ test.describe('Home Page', () => {
     await expect(page.getByRole('heading', { name: 'Recent Issues' })).toBeVisible()
     await expect(page.getByRole('heading', { name: 'Issue 1' })).toBeVisible()
     await expect(page.getByText('Author 1').first()).toBeVisible()
-    await expect(page.getByText('February 24,').first()).toBeVisible()
+    await expect(page.getByText('Feb 24,').first()).toBeVisible()
     await expect(page.getByText('5 comments')).toBeVisible()
   })
 
   test('should have recent Releases', async ({ page }) => {
     await expect(page.getByRole('heading', { name: 'Recent Releases' })).toBeVisible()
     await expect(page.getByRole('heading', { name: 'Release 1' })).toBeVisible()
-    await expect(page.getByText('February 22,')).toBeVisible()
+    await expect(page.getByText('Feb 22,')).toBeVisible()
     await expect(page.getByText('v1', { exact: true })).toBeVisible()
   })
 

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/components/ItemCardList.tsx b/frontend/src/components/ItemCardList.tsx
@@ -21,16 +21,22 @@ const ItemCardList = ({
       <div className="h-64 overflow-y-auto pr-2">
         {data.map((item, index) => (
           <div key={index} className="mb-4 rounded-lg bg-gray-200 p-4 dark:bg-gray-700">
-            <h3 className="font-semibold">{item.title || item.name}</h3>
-            <div className="mt-2 flex items-center">
-              <img
-                src={item?.author?.avatarUrl}
-                alt={item?.author?.name}
-                className="mr-2 h-6 w-6 rounded-full"
-              />
-              <span className="text-sm">{item?.author?.name || item?.author?.login}</span>
+            <h3 className="overflow-hidden text-ellipsis whitespace-nowrap font-semibold">
+              {item.title || item.name}
+            </h3>
+            <div className="flex flex-grow-0 flex-col justify-between lg:flex-row">
+              <div className="mt-2 flex items-center">
+                {item?.author?.name && (
+                  <img
+                    src={item?.author?.avatarUrl}
+                    alt={item?.author?.name}
+                    className="mr-2 h-6 w-6 rounded-full"
+                  />
+                )}
+                <span>{item?.author?.name || item?.author?.login}</span>
+              </div>
+              <div>{renderDetails(item)}</div>
             </div>
-            {renderDetails(item)}
           </div>
         ))}
       </div>

diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx
@@ -190,7 +190,7 @@ export default function Home() {
           title="Recent Issues"
           data={data.recentIssues}
           renderDetails={(item) => (
-            <div className="mt-2 flex items-center text-sm text-gray-600 dark:text-gray-300">
+            <div className="mt-2 flex flex-shrink-0 items-center text-sm text-gray-600 dark:text-gray-300">
               <FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
               <span>{formatDate(item.createdAt)}</span>
               <FontAwesomeIcon icon={faFileCode} className="ml-4 mr-2 h-4 w-4" />
@@ -202,11 +202,15 @@ export default function Home() {
           title="Recent Releases"
           data={data.recentReleases}
           renderDetails={(item) => (
-            <div className="mt-2 flex items-center text-sm text-gray-600 dark:text-gray-300">
+            <div className="mt-2 flex flex-shrink-0 text-sm text-gray-600 dark:text-gray-300">
               <FontAwesomeIcon icon={faCalendar} className="mr-2 h-4 w-4" />
               <span>{formatDate(item.publishedAt)}</span>
-              <FontAwesomeIcon icon={faTag} className="ml-4 mr-2 h-4 w-4" />
-              <span>{item.tagName}</span>
+              <div className="flex flex-row overflow-hidden text-ellipsis whitespace-nowrap">
+                <FontAwesomeIcon icon={faTag} className="ml-4 mr-2 h-4 w-1/5" />
+                <span className="w-[100px] flex-grow-0 flex-col justify-between overflow-hidden text-ellipsis whitespace-nowrap lg:flex-row">
+                  {item.tagName}
+                </span>
+              </div>
             </div>
           )}
         />

diff --git a/frontend/src/utils/dateFormatter.ts b/frontend/src/utils/dateFormatter.ts
@@ -10,7 +10,7 @@ export const formatDate = (input: number | string) => {
 
   return date.toLocaleDateString('en-US', {
     year: 'numeric',
-    month: 'long',
+    month: 'short',
     day: 'numeric',
   })
 }