diff --git a/.claude/commands/do-test.md b/.claude/commands/do-test.md
new file mode 100644
index 00000000..fb65663e
--- /dev/null
+++ b/.claude/commands/do-test.md
@@ -0,0 +1,52 @@
+---
+description: Run development verification checks (lint, build, and optionally e2e tests)
+argument-hint: "[e2e]"
+---
+
+## Development Test Suite
+
+Run comprehensive development verification checks for the Codu project.
+
+## Current Context
+
+Branch: !`git branch --show-current`
+Status: !`git status --short | head -10`
+
+## Task
+
+Run the following verification steps in order:
+
+### 1. Lint Check
+Run ESLint and verify there are **0 errors** (warnings are acceptable):
+```bash
+npm run lint
+```
+Report the error/warning counts.
+
+### 2. TypeScript Compilation
+Verify TypeScript compiles without errors:
+```bash
+npx tsc --noEmit
+```
+
+### 3. Build Check
+Verify the Next.js build completes successfully:
+```bash
+npm run build
+```
+
+### 4. E2E Tests (if requested)
+If `$ARGUMENTS` includes "e2e", also run E2E tests:
+```bash
+npm run test:e2e
+```
+
+## Output
+
+Provide a clear summary:
+- Lint: PASS/FAIL (X errors, Y warnings)
+- TypeScript: PASS/FAIL
+- Build: PASS/FAIL
+- E2E Tests: PASS/FAIL/SKIPPED
+
+If any check fails, provide details and suggest fixes.
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index 57efadbf..00000000
--- a/.eslintrc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "parser": "@typescript-eslint/parser",
- "parserOptions": {
- "project": "./tsconfig.json"
- },
- "plugins": ["@typescript-eslint", "jsx-a11y"],
- "extends": [
- "next/core-web-vitals",
- "plugin:@typescript-eslint/recommended",
- "prettier",
- "plugin:jsx-a11y/recommended",
- "plugin:playwright/recommended"
- ],
- "rules": {
- "@typescript-eslint/consistent-type-imports": "warn",
- "@typescript-eslint/ban-ts-comment": "warn",
- "@next/next/no-img-element": "off",
- "no-unused-vars": "warn",
- "@typescript-eslint/no-unused-vars": "warn",
- "no-console": "warn"
- },
- "ignorePatterns": ["next.config.js", "*/lambdas/**/*.js"]
-}
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1bd77156..4df4870b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,19 +1,25 @@
# ✨ Codu Pull Request 💻
Fixes #(issue)
+
## Pull Request details
-- INFO ABOUT YOUR PULL REQUEST GOES HERE (Please be as descriptive as possible) 🤜
-- Use bullet points to make it easy to read.
+
## Any Breaking changes
-- IF ANYTHING YOU'RE COMMITTING WOULD BREAK SOMETHING, INCLUDE HERE WHAT WOULD BREAK
-- IF YOU HAVE NO BREAKING CHANGES, ENTER 'None'
+
## Associated Screenshots
-- IF YOU HAVE ANY SCREENSHOTS, INCLUDE THEM HERE. _( Welcome file extensions include gifs/png screenshots of your feature in action )_
-- IF YOU HAVE NO SCREENSHOTS, ENTER 'None'
+
+
+## [Optional] What gif best describes this PR or how it makes you feel
+
+
diff --git a/.github/workflows/alt-text-bot.yml b/.github/workflows/alt-text-bot.yml
index 3fe35936..edba0194 100644
--- a/.github/workflows/alt-text-bot.yml
+++ b/.github/workflows/alt-text-bot.yml
@@ -1,4 +1,5 @@
-name: Accessibility-alt-text-bot
+name: Accessibility Alt Text Bot
+
on:
issues:
types: [opened, edited]
@@ -11,6 +12,10 @@ on:
discussion_comment:
types: [created, edited]
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.issue.number || github.event.pull_request.number || github.event.discussion.number || github.ref }}
+ cancel-in-progress: true
+
permissions:
issues: write
pull-requests: write
@@ -18,8 +23,8 @@ permissions:
jobs:
accessibility_alt_text_bot:
- name: Check alt text is set on issue or pull requests
+ name: Check alt text on issues and pull requests
runs-on: ubuntu-latest
steps:
- - name: Get action 'github/accessibility-alt-text-bot'
- uses: github/accessibility-alt-text-bot@v1.4.0 # Set to latest
+ - name: Run Alt Text Bot
+ uses: github/accessibility-alt-text-bot@v1.4.0
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
new file mode 100644
index 00000000..79da9231
--- /dev/null
+++ b/.github/workflows/e2e-tests.yml
@@ -0,0 +1,109 @@
+name: E2E Tests
+
+on:
+ push:
+ branches:
+ - develop
+ pull_request_target:
+ types: [opened, synchronize, reopened]
+ branches:
+ - develop
+
+# Cancel old builds on new commit for same workflow + branch/PR
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ initial-checks:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ fetch-depth: 0
+
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: ".nvmrc"
+ cache: "npm"
+
+ - name: Install dependencies
+ run: npm ci
+
+ e2e:
+ needs: initial-checks
+ runs-on: ubuntu-latest
+ environment: production
+
+ env:
+ DATABASE_URL: "postgresql://postgres:secret@localhost:5432/postgres"
+ NEXTAUTH_URL: http://localhost:3000/api/auth
+ GITHUB_ID: ${{ secrets.E2E_GITHUB_ID }}
+ GITHUB_SECRET: ${{ secrets.E2E_GITHUB_SECRET }}
+ NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ fetch-depth: 0
+
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: ".nvmrc"
+ cache: "npm"
+
+ - name: Cache Playwright browsers
+ uses: actions/cache@v3
+ with:
+ path: ~/.cache/ms-playwright
+ key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: |
+ ${{ runner.os }}-playwright-
+
+ - name: Run docker-compose
+ uses: isbang/compose-action@v1.5.1
+ with:
+ compose-file: "./docker-compose.yml"
+ down-flags: "--volumes"
+ services: |
+ db
+
+ - name: Wait for DB to be ready
+ run: |
+ timeout 60s bash -c 'until nc -z localhost 5432; do echo "Waiting for database connection..."; sleep 2; done'
+ shell: bash
+
+ - name: Install dependencies
+ run: npm ci
+
+ - name: Install Playwright browsers
+ run: npx playwright install --with-deps
+ if: steps.playwright-cache.outputs.cache-hit != 'true'
+
+ - name: Seed database
+ run: |
+ npm run db:migrate
+ npm run db:seed
+
+ - name: Run Playwright tests
+ id: playwright-tests
+ run: npx playwright test
+ continue-on-error: true
+
+ - name: Upload Playwright report
+ uses: actions/upload-artifact@v4
+ if: always()
+ with:
+ name: playwright-report
+ path: playwright-report/
+ retention-days: 30
+
+ - name: Check test results
+ if: steps.playwright-tests.outcome == 'failure'
+ run: exit 1
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
index e404107c..f9c10ab7 100644
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -1,4 +1,4 @@
-name: 'Welcome New Contributors'
+name: "Welcome New Contributors"
on:
issues:
@@ -6,13 +6,20 @@ on:
pull_request_target:
types: [opened]
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.issue.number || github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
welcome-new-contributor:
runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ pull-requests: write
steps:
- - name: 'Greet the contributor'
+ - name: "Greet the contributor"
uses: garg3133/welcome-new-contributors@v1.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
- issue-message: 'Hello @contributor_name, thanks for opening your first issue! your contribution is valuable to us. The maintainers will review this issue and provide feedback as soon as possible.'
- pr-message: 'Hello @contributor_name, thanks for opening your first Pull Request. The maintainers will review this Pull Request and provide feedback as soon as possible. Keep up the great work!'
+ issue-message: "Hello @contributor_name, thanks for opening your first issue! Your contribution is valuable to us. The maintainers will review this issue and provide feedback as soon as possible."
+ pr-message: "Hello @contributor_name, thanks for opening your first Pull Request. The maintainers will review this Pull Request and provide feedback as soon as possible. Keep up the great work!"
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index f339ff8f..2da5fc1e 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -1,23 +1,39 @@
-name: Check the pull request
+name: Code Quality Checks
on:
pull_request:
types: [opened, synchronize, reopened, edited]
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
jobs:
- check-pull-request:
- name: Check code styling and run tests
+ lint-and-format:
+ name: Run ESLint and Prettier
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v4
- - name: Use the correct Node.js version
+
+ - name: Use Node.js
uses: actions/setup-node@v4
with:
- node-version: "20.17.0"
+ node-version-file: ".nvmrc"
+ cache: "npm"
+
- name: Install dependencies
run: npm ci
+
- name: Run ESLint
run: npm run lint
+
- name: Run Prettier
run: npm run prettier
+
+ - name: Check for uncommitted changes
+ run: |
+ git diff --exit-code || \
+ (echo "Detected uncommitted changes after build. See status below:" && \
+ git diff && \
+ exit 1)
diff --git a/.gitignore b/.gitignore
index 705a6d5c..2951c3a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,4 +67,7 @@ ssmSetup.zsh
# open-next
-.open-next
\ No newline at end of file
+.open-next
+
+# Snyk Security Extension - AI Rules (auto-generated)
+.github/instructions/snyk_rules.instructions.md
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 00000000..a86d7c2c
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,27 @@
+{
+ "mcpServers": {
+ "context7": {
+ "command": "npx",
+ "args": ["-y", "@upstash/context7-mcp"],
+ "env": {
+ "CONTEXT7_API_KEY": "ctx7sk-1d829fe1-62b2-4697-b7f4-673ae5047efd"
+ }
+ },
+ "puppeteer": {
+ "command": "npx",
+ "args": ["-y", "puppeteer-mcp-server"],
+ "env": {}
+ },
+ "next-devtools": {
+ "command": "npx",
+ "args": ["-y", "next-devtools-mcp@latest"]
+ },
+ "sequential-thinking": {
+ "command": "npx",
+ "args": ["-y", "@modelcontextprotocol/server-sequential-thinking"]
+ },
+ "Sentry": {
+ "url": "https://mcp.sentry.dev/mcp/assemble-pro/javascript-nextjs"
+ }
+ }
+}
diff --git a/.nvmrc b/.nvmrc
index 016e34ba..54c65116 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v20.17.0
+v24
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6ea072a8..addefd7d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -120,7 +120,7 @@ For e2e tests we are using playwright
After making changes make sure that tests passes
-To create a e2e test make a file in `/e2e` directory
+To create a e2e test make a file in `/e2e` directory
**1.** Start the codu application by typing this command:
@@ -136,7 +136,6 @@ yarn test:e2e
Read Playwright [documentation](https://playwright.dev/)
-
---
## Style Guide for Git Commit Messages :memo:
diff --git a/E2E Overview.md b/E2E Overview.md
new file mode 100644
index 00000000..ba014663
--- /dev/null
+++ b/E2E Overview.md
@@ -0,0 +1,36 @@
+# End-to-End Testing with Playwright
+
+To run the end-to-end tests using Playwright, you need to configure your environment and follow these steps:
+
+### Session and User Setup
+
+First, you need to add your E2E test user to your locally running database. Do this by running the following script if you haven't already:
+
+```bash
+npm run db:seed
+```
+
+This will create a user and session for your E2E tests. Details of the E2E user created can be seen in `drizzle/seedE2E.ts`.
+
+### Running the Tests
+
+You can run the end-to-end tests using one of the following commands:
+
+For headless mode:
+
+```bash
+npx playwright test
+```
+
+For UI mode:
+
+```bash
+npx playwright test --ui
+```
+
+### Additional E2E constants
+
+- **E2E_USER_ONE_SESSION_ID**: This is the session token UUID for one E2E user.
+- **E2E_USER_TWO_SESSION_ID**: This is the session token UUID for another E2E user.
+- **E2E_USER_ONE_ID**: The user ID of one of the E2E users.
+- **E2E_USER_TWO_ID**: The user ID of another E2E user.
diff --git a/EDITOR_SHORTCUTS.MD b/EDITOR_SHORTCUTS.MD
index 9b761ead..81435ec9 100644
--- a/EDITOR_SHORTCUTS.MD
+++ b/EDITOR_SHORTCUTS.MD
@@ -4,20 +4,20 @@ This guide provides an overview of the available hotkeys and shortcuts for the c
## Hotkeys
-| Hotkey | Description |
-|-----------------|------------------------------|
-| `Tab` | Trigger shortcuts (see below)|
-| `Backspace` | Select Previous word |
-| `Meta+(1-6)` | Heading 1 - 6 |
-| `Meta+b` | Bold |
-| `Meta+i` | Italic |
-| `Meta+shift+b` | Bold & Italic |
-| `Meta+s` | Code Snippet |
-| `Meta+shift+c` | Code Block |
-| `Meta+Shift+.` | Block Quote |
-| `Meta+u` | URL |
-| `Meta+l` | Link |
-| `Meta+Shift+i` | Image |
+| Hotkey | Description |
+| -------------- | ----------------------------- |
+| `Tab` | Trigger shortcuts (see below) |
+| `Backspace` | Select Previous word |
+| `Meta+(1-6)` | Heading 1 - 6 |
+| `Meta+b` | Bold |
+| `Meta+i` | Italic |
+| `Meta+shift+b` | Bold & Italic |
+| `Meta+s` | Code Snippet |
+| `Meta+shift+c` | Code Block |
+| `Meta+Shift+.` | Block Quote |
+| `Meta+u` | URL |
+| `Meta+l` | Link |
+| `Meta+Shift+i` | Image |
## How to Use Hotkeys
@@ -25,22 +25,21 @@ This guide provides an overview of the available hotkeys and shortcuts for the c
2. You can also highlight the word and then use the hotkey combination and for this you can double click the word or phrase or press meta+backspace a few times to highlight the required selection of text.
3. For Links and images, select the text and then use the hotkey combination. You will be prompted for the url.
-
## Markdown Shortcuts
-| Shortcut | Description | Example |
-|----------|----------------------------------------|-------------------------------|
-| `/link` | Create a link with text and URL | `[text](url)` |
-| `/image` | Insert an image with alt text and URL | `` |
+| Shortcut | Description | Example |
+| -------- | ------------------------------------- | -------------- |
+| `/link` | Create a link with text and URL | `[text](url)` |
+| `/image` | Insert an image with alt text and URL | `` |
## Custom Tag Shortcuts
-| Shortcut | Description | Example |
-|---------------|------------------------------------|-------------------------------|
-| `/media` | Embed a media file with src | `{% media src="url" /%}` |
-| `/youtube` | Embed a YouTube video with src | `{% youtube src="url" /%}` |
-| `/codepen` | Embed a CodePen project with src | `{% codepen src="url" /%}` |
-| `/codesandbox`| Embed a CodeSandbox project with src | `{% codesandbox src="url" /%}`|
+| Shortcut | Description | Example |
+| -------------- | ------------------------------------ | ------------------------------ |
+| `/media` | Embed a media file with src | `{% media src="url" /%}` |
+| `/youtube` | Embed a YouTube video with src | `{% youtube src="url" /%}` |
+| `/codepen` | Embed a CodePen project with src | `{% codepen src="url" /%}` |
+| `/codesandbox` | Embed a CodeSandbox project with src | `{% codesandbox src="url" /%}` |
## How to Use Shortcuts
@@ -48,6 +47,6 @@ This guide provides an overview of the available hotkeys and shortcuts for the c
2. Type the shortcut (e.g., `/link`).
3. Press the `Tab` key.
4. For Markdown shortcuts `/link` and `/image`, you'll be prompted to enter the text and URL.
-5. For custom tag shortcuts, you'll be prompted to enter the URL for the `src` attribute.
+5. For custom tag shortcuts, you'll be prompted to enter the URL for the `src` attribute.
The editor will automatically replace the shortcut with the corresponding content.
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index fad72169..096edb97 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,27 +1,27 @@
## Context
-Please provide any relevant information about your setup
+
## Expected Behavior
-Please describe the behavior you are expecting
+
## Current Behavior
-What is the current behavior?
+
## Screenshots
-Drag and drop screenshots here to better describe your issue
+
## Steps to reproduce
-Please provide detailed steps for reproducing the issue
-
+
## Additional info
-Provide any additional information here
+
diff --git a/LICENSE.md b/LICENSE.md
index 827e8119..1d67f706 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -2,180 +2,180 @@
Version 2.0, January 2004
http://www.apache.org/licenses/
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
@@ -186,16 +186,16 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2023 Codú (Codú Software Solutions Limited).
+Copyright 2023 Codú (Codú Software Solutions Limited).
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/README.md b/README.md
index 50b1151b..a366c088 100644
--- a/README.md
+++ b/README.md
@@ -41,31 +41,35 @@ GITHUB_SECRET=YOUR_GITHUB_APP_SECRET
NEXTAUTH_URL=http://localhost:3000/api/auth
```
-For a more detailed how to guide on setting them up [go to the Environment Variables section](#environment-variables).
+For a more detailed guide on setting them up [go to the Environment Variables section](#environment-variables).
-6. [Make sure your database is running](#database_url) and setup the tables in the database with Drizzle by running:
+**NOTE:** Before proceeding, [make sure your database is running](#database_url).
+
+6. Setup the tables in the database with Drizzle by running:
```bash
-npm run db:push
+npm run db:migrate
```
+The full command can be seen in our [package.json](/package.json#16) file.
+
7. Seed the database with some mock data by running:
```bash
npm run db:seed
```
+The full command can be seen in our [package.json](/package.json#19) file.
+
8. Finally, run the development server:
```bash
npm run dev
```
-After completion of above commands, now -
+After completion of the above commands, navigate to [http://localhost:3000](http://localhost:3000) in your browser to see the result.
-Navigate to [http://localhost:3000](http://localhost:3000) in your browser to see the result.
-
-You can start your journey by modifying `pages/index.tsx`. With Auto-update feature, pages updates as you edit the file.
+You can start your journey by modifying `pages/index.tsx`. With the auto-update feature, pages update as you edit the file.
The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.
@@ -83,36 +87,39 @@ To run this file, make sure you have [Docker installed](https://docs.docker.com/
Run the command `docker compose up`.
-Alternatively, if you have PostgreSQL running locally then you can use your local connection string or grab one from a free service like [Supabase](https://supabase.com/docs/guides/database/connecting-to-postgres#finding-your-connection-string).
+Alternatively, if you have PostgreSQL running locally, you can use your local connection string or grab one from a free service like [Supabase](https://supabase.com/docs/guides/database/connecting-to-postgres#finding-your-connection-string).
### GITHUB_ID and GITHUB_SECRET
-Currently, we only allow authentication via GitHub. To enable this you need to have a `GITHUB_ID` and `GITHUB_SECRET` value.
+Currently, we only allow authentication via GitHub. To enable this, you need to have a `GITHUB_ID` and `GITHUB_SECRET` value.
-Setup your GitHub ID & Secret on GitHub:
+Set up your GitHub ID & Secret on GitHub:
-- [https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps](https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps)
+- [Click here](https://github.com/settings/applications/new) to set up a New OAuth App and fill in the details as shown below.
-**Shortcut** - [Click here](https://github.com/settings/applications/new) to setup New OAuth App.
+For development, make sure you set this up with a **Homepage URL** of
-For development, make sure you setup this with a **Homepage URL** of `http://localhost:3000/` and **Authorization callback URL** of `http://localhost:3000/api/auth`.
+```
+http://localhost:3000/
+```
-
+and an **Authorization callback URL** of
-After you click the "Register application" button you should see the `GITHUB_ID` and be able to generate a new client secret. You can see this in the screenshot below. 👇
-
-After generating the secret, make sure you copy this value to your `.env` file as this value can not be seen again once you refresh the page. 👇
-
+```
+http://localhost:3000/api/auth
+```
+
+After you click the "Register application" button, you should see the `GITHUB_ID` and be able to generate a new client secret. After generating the secret, make sure you copy this value to your `.env` file as this value cannot be seen again once you refresh the page.
-### Setting up Passwordless auth locally
+More info on Authorizing OAuth in the GitHub documentation [here](https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps).
-In order to use Passwordless login locally you need to have a `ACCESS_KEY` and `SECRET_KEY` value.
+### Setting up Passwordless Auth Locally
-Niall has written a [tutorial](https://www.codu.co/articles/sending-emails-with-aws-ses-and-nodemailer-in-node-js-xfuucrri) on how to send emails with AWS SES and shows how to get these values.
+In order to use Passwordless login locally, you need to have an `ACCESS_KEY` and `SECRET_KEY` value.
-Check out the example .env file [here](./sample.env) to see how to populate these values
+Check out the example `.env` file [here](./sample.env) to see how to populate these values.
-**Note: Currenly the AWS region of the SNS service is hardcoded to "eu-west-1" it may be necessary to change this if your SNS service is in a different region**
+**Note:** Currently, the AWS region of the SNS service is hardcoded to "eu-west-1"; it may be necessary to change this if your SNS service is in a different region.
### NEXTAUTH_URL
@@ -122,17 +129,16 @@ You shouldn't need to change the default value here. This is a variable used by
NEXTAUTH_URL=http://localhost:3000/api/auth
```
-For more information, you can read the documentation [here](https://next-auth.js.org/configuration/options).
-**Example .env file can be found [here](./sample.env). You can rename this to .env to get started**
+**Example .env file can be found [here](./sample.env). You can rename this to `.env` to get started.**
## 👨💻 Contribution Guidelines
- Contributions are **greatly appreciated**. Contributions make the open-source community an amazing place to learn, inspire, and create.
-- Check out our [contribution guidelines](/CONTRIBUTING.md) for contributiong to our repo. It includes
+- Check out our [contribution guidelines](/CONTRIBUTING.md) for contributing to our repo. It includes
- How to Contribute
- How to create a Pull Request
- Run Tests
- - Also, Style Guide for Commit Messages
+ - Style Guide for Commit Messages
## 📙 Prerequisite Skills to Contribute
@@ -159,10 +165,14 @@ To learn more about Next.js, take a look at the following resources:
### Editor Doc
-To learn about the editor shortcuts and hotkeys you can check out this document
+To learn about the editor shortcuts and hotkeys, you can check out this document:
+
+- [Markdoc Editor Hotkeys and Shortcuts](/EDITOR_SHORTCUTS.MD)
+
+## 🧪 E2E Testing
-- [Markdoc Editor Hotkeys and Shortcus](/EDITOR_SHORTCUTS.MD)
+For information on E2E testing, please refer to our dedicated documentation [here](./E2E%20Overview.md).
## 💥 Issues
-You are welcome to [open issues](https://github.com/codu-code/codu/issues/new/choose) to discuss ideas about improving our Codú. Enhancements are encouraged and appreciated.
+You are welcome to [open issues](https://github.com/codu-code/codu/issues/new/choose) to discuss ideas about improving Codú. Enhancements are encouraged and appreciated.
diff --git a/app/(app)/(tsandcs)/privacy/page.mdx b/app/(app)/(tsandcs)/privacy/page.mdx
index 2fa94cc3..5235a5d7 100644
--- a/app/(app)/(tsandcs)/privacy/page.mdx
+++ b/app/(app)/(tsandcs)/privacy/page.mdx
@@ -1,13 +1,15 @@
# Privacy Policy
-Last updated March 01, 2024
+Last updated January 02, 2026
This privacy notice for Codú Limited (doing business as Codú) ("**we**," "**us**," or "**our**"), describes how and why we might collect, store, use, and/or share ("**process**") your information when you use our services ("**Services**"), such as when you:
-This Policy supplements and is governed by our [Terms of Service](http://www.codu.co/terms) (“Terms”).
+This Policy supplements and is governed by our [Terms of Service](http://www.codu.co/terms) ("Terms") and [Newsletter Terms of Use](http://www.codu.co/tou).
- Visit our website at [http://www.codu.co](http://www.codu.co), or any website of ours that links to this privacy notice
+- Subscribe to or read our newsletter at [https://newsletter.codu.co](https://newsletter.codu.co)
+
- Engage with us in other related ways, including any sales, marketing, or events
**Questions or concerns?** Reading this privacy notice will help you understand your privacy rights and choices. If you do not agree with our policies and practices, please do not use our Services. If you still have any questions or concerns, please contact us at niall@codu.co.
@@ -70,7 +72,7 @@ Want to learn more about what we do with any information we collect? Review the
**Personal information you disclose to us**
-**_In Short:_** *We collect personal information that you provide to us.*
+***In Short:*** *We collect personal information that you provide to us.*
We collect personal information that you voluntarily provide to us when you register on the Services, express an interest in obtaining information about us or our products and Services, when you participate in activities on the Services, or otherwise when you contact us.
@@ -90,13 +92,25 @@ We collect personal information that you voluntarily provide to us when you regi
**Sensitive Information.** We do not process sensitive information.
+**Newsletter Subscriber Data.** When you subscribe to our newsletter, we collect and process the following information:
+
+- Email address (required for subscription)
+- Subscription date and source
+- Email engagement data (whether you open emails, which links you click)
+- Geographic location at country/region level (derived from IP address)
+- Device and email client information
+- Survey responses (if you participate in newsletter surveys)
+- Referral information (if you were referred by another subscriber)
+
+This data helps us deliver relevant content, understand our audience, and improve our newsletter. We use Beehiiv as our newsletter platform, and your data is processed in accordance with their privacy practices. You can unsubscribe at any time using the link in any newsletter email.
+
**Social Media Login Data.** We may provide you with the option to register with us using your existing social media account details, like your Facebook, Twitter, or other social media account. If you choose to register in this way, we will collect the information described in the section called "HOW DO WE HANDLE YOUR SOCIAL LOGINS?" below.
All personal information that you provide to us must be true, complete, and accurate, and you must notify us of any changes to such personal information.
**2\. HOW DO WE PROCESS YOUR INFORMATION?**
-**_In Short:_** *We process your information to provide, improve, and administer our Services, communicate with you, for security and fraud prevention, and to comply with law. We may also process your information for other purposes with your consent.*
+***In Short:*** *We process your information to provide, improve, and administer our Services, communicate with you, for security and fraud prevention, and to comply with law. We may also process your information for other purposes with your consent.*
**We process your personal information for a variety of reasons, depending on how you interact with our Services, including:**
@@ -158,7 +172,7 @@ In some exceptional cases, we may be legally permitted under applicable law to p
**4\. WHEN AND WITH WHOM DO WE SHARE YOUR PERSONAL INFORMATION?**
-**_In Short:_** *We may share information in specific situations described in this section and/or with the following third parties.*
+***In Short:*** *We may share information in specific situations described in this section and/or with the following third parties.*
We may need to share your personal information in the following situations:
@@ -168,7 +182,7 @@ We may need to share your personal information in the following situations:
**5\. HOW DO WE HANDLE YOUR SOCIAL LOGINS?**
-**_In Short:_** *If you choose to register or log in to our Services using a social media account, we may have access to certain information about you.*
+***In Short:*** *If you choose to register or log in to our Services using a social media account, we may have access to certain information about you.*
Our Services offer you the ability to register and log in using your third-party social media account details (like your Facebook or Twitter logins). Where you choose to do this, we will receive certain profile information about you from your social media provider. The profile information we receive may vary depending on the social media provider concerned, but will often include your name, email address, friends list, and profile picture, as well as other information you choose to make public on such a social media platform.
@@ -176,7 +190,7 @@ We will use the information we receive only for the purposes that are described
**6\. HOW LONG DO WE KEEP YOUR INFORMATION?**
-**_In Short:_** *We keep your information for as long as necessary to fulfill the purposes outlined in this privacy notice unless otherwise required by law.*
+***In Short:*** *We keep your information for as long as necessary to fulfill the purposes outlined in this privacy notice unless otherwise required by law.*
We will only keep your personal information for as long as it is necessary for the purposes set out in this privacy notice, unless a longer retention period is required or permitted by law (such as tax, accounting, or other legal requirements). No purpose in this notice will require us keeping your personal information for longer than the period of time in which users have an account with us.
@@ -184,19 +198,19 @@ When we have no ongoing legitimate business need to process your personal inform
**7\. HOW DO WE KEEP YOUR INFORMATION SAFE?**
-**_In Short:_** *We aim to protect your personal information through a system of organizational and technical security measures.*
+***In Short:*** *We aim to protect your personal information through a system of organizational and technical security measures.*
We have implemented appropriate and reasonable technical and organizational security measures designed to protect the security of any personal information we process. However, despite our safeguards and efforts to secure your information, no electronic transmission over the Internet or information storage technology can be guaranteed to be 100% secure, so we cannot promise or guarantee that hackers, cybercriminals, or other unauthorized third parties will not be able to defeat our security and improperly collect, access, steal, or modify your information. Although we will do our best to protect your personal information, transmission of personal information to and from our Services is at your own risk. You should only access the Services within a secure environment.
**8\. DO WE COLLECT INFORMATION FROM MINORS?**
-**_In Short:_** *We do not knowingly collect data from or market to children under 18 years of age.*
+***In Short:*** *We do not knowingly collect data from or market to children under 18 years of age.*
We do not knowingly solicit data from or market to children under 18 years of age. By using the Services, you represent that you are at least 18 or that you are the parent or guardian of such a minor and consent to such minor dependent’s use of the Services. If we learn that personal information from users less than 18 years of age has been collected, we will deactivate the account and take reasonable measures to promptly delete such data from our records. If you become aware of any data we may have collected from children under age 18, please contact us at niall@codu.co.
**9\. WHAT ARE YOUR PRIVACY RIGHTS?**
-**_In Short:_** *In some regions, such as the European Economic Area (EEA), United Kingdom (UK), Switzerland, and Canada, you have rights that allow you greater access to and control over your personal information. You may review, change, or terminate your account at any time.*
+***In Short:*** *In some regions, such as the European Economic Area (EEA), United Kingdom (UK), Switzerland, and Canada, you have rights that allow you greater access to and control over your personal information. You may review, change, or terminate your account at any time.*
In some regions (like the EEA, UK, Switzerland, and Canada), you have certain rights under applicable data protection laws. These may include the right (i) to request access and obtain a copy of your personal information, (ii) to request rectification or erasure; (iii) to restrict the processing of your personal information; (iv) if applicable, to data portability; and (v) not to be subject to automated decision-making. In certain circumstances, you may also have the right to object to the processing of your personal information. You can make such a request by contacting us by using the contact details provided in the section "HOW CAN YOU CONTACT US ABOUT THIS NOTICE?" below.
@@ -228,7 +242,7 @@ Most web browsers and some mobile operating systems and mobile applications incl
**11\. DO UNITED STATES RESIDENTS HAVE SPECIFIC PRIVACY RIGHTS?**
-**_In Short:_** *If you are a resident of California, Colorado, Connecticut, Utah or Virginia, you are granted specific rights regarding access to your personal information.*
+***In Short:*** *If you are a resident of California, Colorado, Connecticut, Utah or Virginia, you are granted specific rights regarding access to your personal information.*
**What categories of personal information do we collect?**
diff --git a/app/(app)/(tsandcs)/tou/page.mdx b/app/(app)/(tsandcs)/tou/page.mdx
new file mode 100644
index 00000000..d6ee270a
--- /dev/null
+++ b/app/(app)/(tsandcs)/tou/page.mdx
@@ -0,0 +1,106 @@
+# Newsletter Terms of Use
+
+Last updated January 02, 2026
+
+Welcome to the Codú Newsletter. By subscribing to or reading our newsletter, you accept and agree to be bound by these Terms of Use. If you do not agree to these terms, please do not subscribe to or use our newsletter.
+
+## 1. Acceptance and Eligibility
+
+By subscribing to the Codú Newsletter, you confirm that you are at least 16 years of age and have the legal capacity to enter into these terms. If you are subscribing on behalf of an organization, you represent that you have the authority to bind that organization to these terms.
+
+## 2. Newsletter Service
+
+The Codú Newsletter provides content related to web development, programming, and technology. We aim to deliver valuable insights, tutorials, and industry news to help you grow as a developer.
+
+**Service includes:**
+
+- Weekly email newsletters
+- Curated content and resources
+- Community updates and announcements
+
+## 3. Subscription and Unsubscription
+
+- You may subscribe to our newsletter by providing your email address through our website or partner platforms
+- You may unsubscribe at any time by clicking the unsubscribe link in any newsletter email
+- We will process your unsubscription request promptly
+
+## 4. Content and Intellectual Property
+
+All content in our newsletters, including text, graphics, logos, and images, is owned by Codú Limited or its content suppliers and is protected by intellectual property laws.
+
+**You may:**
+
+- Read and share newsletter content for personal, non-commercial purposes
+- Share links to our content with proper attribution
+
+**You may not:**
+
+- Reproduce, distribute, or republish newsletter content without permission
+- Use our content for commercial purposes without prior written consent
+- Remove any copyright or proprietary notices from our content
+
+## 5. User Conduct
+
+As a subscriber, you agree not to:
+
+- Provide false or misleading information when subscribing
+- Use automated systems to subscribe multiple email addresses
+- Attempt to interfere with our newsletter delivery systems
+- Use our newsletter content to spam or harass others
+
+## 6. Third-Party Links and Content
+
+Our newsletters may contain links to third-party websites or resources. We are not responsible for:
+
+- The availability or accuracy of such external sites or resources
+- Any content, advertising, products, or services on or available from such sites
+- Any damage or loss caused by your use of such content or resources
+
+## 7. Disclaimer of Warranties
+
+Our newsletter is provided on an "AS IS" and "AS AVAILABLE" basis without warranties of any kind, either express or implied.
+
+We do not warrant that:
+
+- The newsletter will be uninterrupted or error-free
+- The content will be accurate, complete, or current
+- Any errors will be corrected
+
+## 8. Limitation of Liability
+
+To the maximum extent permitted by law, Codú Limited shall not be liable for any indirect, incidental, special, consequential, or punitive damages arising from your use of or inability to use our newsletter.
+
+## 9. Privacy
+
+Your privacy is important to us. Please review our [Privacy Policy](/privacy) to understand how we collect, use, and protect your information when you subscribe to our newsletter.
+
+**Newsletter-specific data we collect:**
+
+- Email address
+- Subscription preferences
+- Email engagement metrics (opens, clicks)
+- Geographic location (country/region level)
+
+## 10. Modifications to Terms
+
+We reserve the right to modify these terms at any time. Changes will be effective immediately upon posting. Your continued subscription after changes constitutes acceptance of the modified terms.
+
+## 11. Termination
+
+We may terminate or suspend your subscription at any time, without prior notice, for conduct that we believe:
+
+- Violates these terms
+- Is harmful to other subscribers or third parties
+- Is fraudulent or illegal
+
+## 12. Governing Law
+
+These terms shall be governed by and construed in accordance with the laws of Ireland, without regard to its conflict of law provisions.
+
+## 13. Contact Information
+
+If you have any questions about these Terms of Use, please contact us:
+
+**Codú Limited**
+Email: niall@codu.co
+Website: [https://www.codu.co](https://www.codu.co)
diff --git a/app/(app)/[username]/[slug]/_feedArticleContent.tsx b/app/(app)/[username]/[slug]/_feedArticleContent.tsx
new file mode 100644
index 00000000..dbe9e19a
--- /dev/null
+++ b/app/(app)/[username]/[slug]/_feedArticleContent.tsx
@@ -0,0 +1,439 @@
+"use client";
+
+import Link from "next/link";
+import * as Sentry from "@sentry/nextjs";
+import {
+ ArrowTopRightOnSquareIcon,
+ BookmarkIcon,
+ ChatBubbleLeftIcon,
+ ChevronUpIcon,
+ ChevronDownIcon,
+ ShareIcon,
+} from "@heroicons/react/20/solid";
+import { BookmarkIcon as BookmarkOutlineIcon } from "@heroicons/react/24/outline";
+import { api } from "@/server/trpc/react";
+import { signIn, useSession } from "next-auth/react";
+import { toast } from "sonner";
+import { Temporal } from "@js-temporal/polyfill";
+import DiscussionArea from "@/components/Discussion/DiscussionArea";
+
+type Props = {
+ sourceSlug: string;
+ articleSlug: string;
+};
+
+// Get favicon URL from a website
+const getFaviconUrl = (
+ websiteUrl: string | null | undefined,
+): string | null => {
+ if (!websiteUrl) return null;
+ try {
+ const url = new URL(websiteUrl);
+ return `https://www.google.com/s2/favicons?domain=${url.hostname}&sz=32`;
+ } catch {
+ return null;
+ }
+};
+
+// Get hostname from URL
+const getHostname = (urlString: string): string => {
+ try {
+ const url = new URL(urlString);
+ return url.hostname;
+ } catch {
+ return urlString;
+ }
+};
+
+// Ensure image URL uses https
+const ensureHttps = (url: string | null | undefined): string | null => {
+ if (!url) return null;
+ if (url.startsWith("http://")) {
+ return url.replace("http://", "https://");
+ }
+ return url;
+};
+
+const FeedArticleContent = ({ sourceSlug, articleSlug }: Props) => {
+ const { data: session } = useSession();
+ const utils = api.useUtils();
+
+ const { data: article, status } = api.feed.getBySourceAndArticleSlug.useQuery(
+ {
+ sourceSlug,
+ articleSlug,
+ },
+ );
+
+ const { data: discussionCount } =
+ api.discussion.getContentDiscussionCount.useQuery(
+ { contentId: article?.id ?? "" },
+ { enabled: !!article?.id },
+ );
+
+ const { mutate: vote, status: voteStatus } = api.content.vote.useMutation({
+ onSuccess: () => {
+ utils.feed.getBySourceAndArticleSlug.invalidate({
+ sourceSlug,
+ articleSlug,
+ });
+ utils.content.getFeed.invalidate();
+ },
+ onError: (error) => {
+ toast.error("Failed to update vote");
+ Sentry.captureException(error);
+ },
+ });
+
+ const { mutate: bookmark, status: bookmarkStatus } =
+ api.feed.bookmark.useMutation({
+ onSuccess: () => {
+ utils.feed.getBySourceAndArticleSlug.invalidate({
+ sourceSlug,
+ articleSlug,
+ });
+ utils.feed.getFeed.invalidate();
+ utils.feed.mySavedArticles.invalidate();
+ },
+ onError: (error) => {
+ toast.error("Failed to update bookmark");
+ Sentry.captureException(error);
+ },
+ });
+
+ const { mutate: trackClick } = api.feed.trackClick.useMutation();
+
+ const handleVote = (voteType: "up" | "down" | null) => {
+ if (!session) {
+ signIn();
+ return;
+ }
+ if (article) {
+ vote({ contentId: article.id, voteType });
+ }
+ };
+
+ const handleBookmark = () => {
+ if (!session) {
+ signIn();
+ return;
+ }
+ if (article) {
+ bookmark({ articleId: article.id, setBookmarked: !article.isBookmarked });
+ }
+ };
+
+ const handleShare = async () => {
+ const shareUrl = `${window.location.origin}/${sourceSlug}/${articleSlug}`;
+ try {
+ await navigator.clipboard.writeText(shareUrl);
+ toast.success("Link copied to clipboard");
+ } catch {
+ toast.error("Failed to copy link");
+ }
+ };
+
+ const handleExternalClick = () => {
+ if (article) {
+ trackClick({ articleId: article.id });
+ }
+ };
+
+ if (status === "pending") {
+ return (
+
+ ) : faviconUrl ? (
+ 
+ ) : (
+