Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a51c2c7
Fix banners
o-seliuchenko Nov 6, 2025
a3be9c3
Implement swep banners
o-seliuchenko Nov 7, 2025
1aa8a77
Finish implementing swep banners
o-seliuchenko Nov 9, 2025
1230f66
Fix eslint errors
o-seliuchenko Nov 9, 2025
d58e559
Update swep property name
o-seliuchenko Nov 9, 2025
ce4e0ca
Format swep dates
o-seliuchenko Nov 9, 2025
f8bff9f
Fix swep dates ativation
o-seliuchenko Nov 9, 2025
2bc1d70
Sort locations by name
o-seliuchenko Nov 9, 2025
86ac52d
Update swep activation dates
o-seliuchenko Nov 9, 2025
b522cbf
Make both swep dates required
o-seliuchenko Nov 9, 2025
3bead3c
Implement Resources listing and edit page
o-seliuchenko Nov 10, 2025
255bde9
Temporary hide confirmation cancel modal
o-seliuchenko Nov 11, 2025
80ce106
Almost implement Resources
o-seliuchenko Nov 11, 2025
43ed7ee
Fix eslint errors
o-seliuchenko Nov 11, 2025
1558dfd
Rename resource properties
o-seliuchenko Nov 12, 2025
a831dc0
Open access to Resources
o-seliuchenko Nov 14, 2025
cda34b5
Fix breadcrumbs
o-seliuchenko Nov 14, 2025
8c64952
Implement Advice
o-seliuchenko Nov 16, 2025
863eb2a
Start implementing logos
o-seliuchenko Nov 16, 2025
af61973
Fix eslint errors
o-seliuchenko Nov 16, 2025
ae385cb
Fix middleware
o-seliuchenko Nov 16, 2025
086e4af
Add allowed urls
o-seliuchenko Nov 17, 2025
be1c7ea
Update error messages
o-seliuchenko Nov 17, 2025
45a099a
Fix banners
o-seliuchenko Nov 17, 2025
c25baf9
Open access to SWEP, Advice, Logos
o-seliuchenko Nov 18, 2025
0488b15
Fix eslint errors
o-seliuchenko Nov 18, 2025
aa332d6
Fix error
o-seliuchenko Nov 18, 2025
c225229
Fix Advice route
o-seliuchenko Nov 18, 2025
29a0765
Implement banners
o-seliuchenko Nov 20, 2025
46562a0
Add icon
o-seliuchenko Nov 21, 2025
11c76a0
Remove AccentGraphic
o-seliuchenko Nov 21, 2025
c5e0608
Fix eslint errors. Remove AccentGraphic.
o-seliuchenko Nov 21, 2025
1c31d6e
Implement ConfirmModal on Cancel if user has unsaved changes
o-seliuchenko Nov 22, 2025
6f052c7
Update uploading files/images
o-seliuchenko Nov 22, 2025
77cb1cb
Fix Search, Administrators bugs
o-seliuchenko Nov 23, 2025
6fcde95
Update inputs
o-seliuchenko Nov 23, 2025
b0c5450
Revert input changes for Add role modal
o-seliuchenko Nov 23, 2025
d6c1e17
Add using custom reusable ui components whre possible
o-seliuchenko Nov 23, 2025
da8128a
Add tests job to pipeline
o-seliuchenko Nov 23, 2025
e1ffde6
Fix RichTextEditor
o-seliuchenko Nov 24, 2025
63063ea
Handle 404 error code
o-seliuchenko Nov 24, 2025
3abb116
Fix eslint error
o-seliuchenko Nov 24, 2025
817053f
Add temp change
o-seliuchenko Nov 24, 2025
9a8e5a0
Revert temp changes
o-seliuchenko Nov 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 23 additions & 3 deletions .github/workflows/test-and-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,33 @@
name: Deploy to Staging
name: Test & Deploy

on:
push:
branches: [staging, main]
pull_request:
branches: [staging, main]
push:
branches: [staging, main]

jobs:
test:
runs-on: ubuntu-latest
name: test

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 22

- name: Install dependencies
run: npm ci

- name: Run tests and build
run: npm run build

deploy:
needs: test
if: github.ref == 'refs/heads/staging'
runs-on: ubuntu-latest
name: deploy
Expand Down
4 changes: 3 additions & 1 deletion config/jest.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ const createJestConfig = nextJest({

// Add any custom config to be passed to Jest
const customJestConfig = {
// Ensure <rootDir> is the project root (one level up from /config)
rootDir: '../',
setupFilesAfterEnv: ['<rootDir>/config/jest.setup.js'],
moduleNameMapping: {
moduleNameMapper: {
// Handle module aliases (this will be automatically configured for you based on your tsconfig.json paths)
'^@/(.*)$': '<rootDir>/src/$1',
},
Expand Down
10 changes: 0 additions & 10 deletions config/jest.setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,3 @@ jest.mock('next/router', () => ({
};
},
}));

// Mock Auth0
jest.mock('@auth0/nextjs-auth0/client', () => ({
useUser: () => ({
user: null,
error: null,
isLoading: false,
}),
UserProvider: ({ children }) => children,
}));
21 changes: 9 additions & 12 deletions next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ const nextConfig = {
formats: ['image/avif', 'image/webp'],

// Allowed remote image sources (domains is deprecated)
remotePatterns: [
{
protocol: 'https',
hostname: 'streetsupportstoragestag.blob.core.windows.net',
port: '',
pathname: '/**',
},
],
remotePatterns: process.env.BLOB_STORAGE_HOSTNAME
? [
{
protocol: 'https',
hostname: process.env.BLOB_STORAGE_HOSTNAME,
pathname: '/**',
},
]
: [],

// Device sizes for responsive images
deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048],
Expand All @@ -51,10 +52,6 @@ const nextConfig = {
},
},

eslint: {
ignoreDuringBuilds: true,
},

// Production optimizations
...(process.env.NODE_ENV === 'production' && {
output: 'standalone', // Optimize for deployment
Expand Down
Loading